running Android versions lower than 8.0 do not support the BLE 5.0 st…

…andard, including extended advertising.
ingchips · Apr 29, 2024 · 50e366e · 50e366e
1 parent 7f77342
commit 50e366e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/com/ingchips/MyApplication.java b/app/src/main/java/com/ingchips/MyApplication.java
@@ -9,6 +9,6 @@ public class MyApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        CrashReport.initCrashReport(getApplicationContext(), "4fbdc243d3", false);
+        CrashReport.initCrashReport(getApplicationContext(), "4fbdc243d3", true);
     }
 }
diff --git a/app/src/main/java/com/ingchips/fota/BLEUtil.kt b/app/src/main/java/com/ingchips/fota/BLEUtil.kt
@@ -176,9 +176,13 @@ class BLEUtil private constructor(private val context: Context) {
         }
         scanCallback = callback
         scanHandler.postDelayed({ stopScan() }, durationMilli)
-        bluetoothLeScanner!!.startScan(null,
-            ScanSettings.Builder().setLegacy(false).build(),
-            leScanCallback)
+        if (Build.VERSION.SDK_INT >=  Build.VERSION_CODES.O) {
+            bluetoothLeScanner!!.startScan(null,
+                ScanSettings.Builder().setLegacy(false).build(),
+                leScanCallback)
+        } else {
+            bluetoothLeScanner!!.startScan(leScanCallback)
+        }
     }
 
     companion object {

diff --git a/app/src/main/java/com/ingchips/fota/Updater.kt b/app/src/main/java/com/ingchips/fota/Updater.kt
@@ -489,6 +489,7 @@ class Updater
         if (plan.manualReboot)
             driver!!.WriteCtrl(byteArrayOf( OTA_CTRL_REBOOT ))
         //BLEUtil.disconnect(gatt!!.device)
+        abort()
         delay(2000)
         toFirstFragment()
     }