Implement Partial Flashing Service

Author: Tsisar

android-partial-flashing-lib

@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "cc.calliope.mini"
         minSdk 23
-        targetSdk 34
+        targetSdk 35
         versionCode 22
         versionName '2.0.4'
         multiDexEnabled true
@@ -36,15 +36,17 @@ android {
 }
 
 dependencies {
+    implementation project(":partialflashing")
+
     implementation 'no.nordicsemi.android.kotlin.ble:scanner:1.1.0'
     implementation 'no.nordicsemi.android:dfu:2.6.0'
 
     implementation 'commons-io:commons-io:2.16.1'
     implementation 'org.apache.commons:commons-lang3:3.15.0'
 
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.8.4'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.8.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.8.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.8.5'
     implementation 'androidx.preference:preference-ktx:1.2.1'
 
     implementation 'androidx.browser:browser:1.8.0'

app/build.gradle

@@ -122,6 +122,12 @@
         <service
             android:name=".core.service.LegacyDfuService"
             android:enabled="true" />
+        <service
+            android:name=".core.service.PartialFlashingService"
+            android:enabled="true" />
+        <service
+            android:name=".core.service.PartialFlashingInitService"
+            android:enabled="true" />
         <service
             android:name=".core.bluetooth.CheckService"
             android:enabled="true" />

app/src/main/AndroidManifest.xml

@@ -27,7 +27,6 @@ import cc.calliope.mini.utils.Constants.MINI_V3
 import cc.calliope.mini.utils.Constants.UNIDENTIFIED
 import cc.calliope.mini.utils.Permission
 import cc.calliope.mini.utils.Preference
-import cc.calliope.mini.utils.Utils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -88,10 +87,7 @@ open class BondingService : Service() {
 
         private fun handleDeviceDisconnection(gatt: BluetoothGatt) {
             Log.w(TAG, "Disconnected by device. Will wait for 2 seconds before attempting to reconnect.")
-            serviceScope.launch {
-                delay(2000)
-                reConnect(gatt.device.address)
-            }
+            reConnect(gatt.device.address)
         }
 
         private fun handleInsufficientAuthorization(gatt: BluetoothGatt) {
@@ -105,7 +101,7 @@ open class BondingService : Service() {
                 attempts++
                 reConnect(gatt.device.address)
             } else {
-                val message: String = getString(GattStatus.get(status).message)
+                val message: String = getString(GattStatusUser.get(status).message)
                 Log.e(TAG, "Connection failed, attempts: $attempts; Error: $status $message")
                 errorCounter++
                 notifyError(R.string.error_connection_failed)

app/src/main/java/cc/calliope/mini/BluetoothService.kt

@@ -0,0 +1,14 @@
+package cc.calliope.mini.core.service
+
+enum class ConnectionState(val code: Int, val description: String) {
+    STATE_CONNECTED(2, "Connected"),
+    STATE_CONNECTING(1, "Connecting"),
+    STATE_DISCONNECTED(0, "Disconnected"),
+    STATE_DISCONNECTING(3, "Disconnecting");
+
+    companion object {
+        fun fromCode(code: Int): ConnectionState? {
+            return entries.find { it.code == code }
+        }
+    }
+}

app/src/main/java/cc/calliope/mini/WebAppInterface.kt

@@ -49,10 +49,10 @@ public void onCreate() {
             DfuServiceInitiator.createDfuNotificationChannel(getApplicationContext());
         }
 
-        IntentFilter dfuServiceFilter = new IntentFilter();
-        dfuServiceFilter.addAction(BROADCAST_PROGRESS);
-        dfuServiceFilter.addAction(BROADCAST_ERROR);
-        LocalBroadcastManager.getInstance(this).registerReceiver(progressReceiver, dfuServiceFilter);
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BROADCAST_PROGRESS);
+        filter.addAction(BROADCAST_ERROR);
+        LocalBroadcastManager.getInstance(this).registerReceiver(progressReceiver, filter);
     }
 
     @Override