Merge branch 'dev'

Author: Amerlander

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 23
         versionName '2.0.5'
         multiDexEnabled true
@@ -39,16 +39,19 @@ 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'
+    implementation 'com.google.android.material:material:1.4.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

@@ -394,12 +394,11 @@ public void startBluetoothEnableActivity(View view) {
 
     public void onFabClick(View view) {
         State state = ApplicationStateHandler.getStateLiveData().getValue();
-        boolean flashing = false;
-        if (state != null) {
-            flashing = state.getType() == State.STATE_FLASHING;
+        if (state == null) {
+            return;
         }
 
-        if (flashing) {
+        if (state.getType() == State.STATE_FLASHING || state.getType() == State.STATE_BUSY) {
             startFlashingActivity();
         } else {
             createPopupMenu(view);

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

@@ -143,6 +143,7 @@ protected void onPause() {
 
     @Override
     public void onBackPressed() {
+        super.onBackPressed();
         finish();
     }