Update for Android 15 and Lenovo M10 fix (#89)

martinwork · web-flow · commit 766d5abcf23c · 2025-09-08T14:30:06.000+01:00
* Minimal update for Android 15.
Using Android Studio Koala Feature Drop | 2024.1.2 Patch 1 September 17, 2024 with AGP 8.6.1 &amp; gradle 8.7
* Fix for V2 DFU from Lenovo M10
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,8 @@ local.properties
 .idea/caches/
 .idea/codeStyles/
 .idea/deploymentTargetDropDown.xml
+.idea/appInsightsSettings.xml
+.idea/deploymentTargetSelector.xml
 *.iml
 
 # OS-specific files
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.samsung.microbit"
         minSdkVersion 21
-        targetSdk 34
+        targetSdk 35
         // When target SDK version is 30+,
         // requestLegacyExternalStorage will continue to work for 29 Android 10
     }
@@ -33,16 +33,16 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
-    testImplementation 'junit:junit:4.12'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.lifecycle:lifecycle-process:2.9.2'
+    testImplementation 'junit:junit:4.13.2'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.29'
     implementation 'no.nordicsemi.android:dfu:2.4.1'
     implementation project(':pfLibrary')
-    implementation 'com.google.android.gms:play-services-analytics:18.0.4'
-    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'com.google.android.gms:play-services-analytics:18.1.1'
+    implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -129,7 +129,7 @@
         <activity
             android:name=".ui.activity.NotificationActivity"
             android:label="@string/device_details"
-            android:screenOrientation="portrait"/>
+            android:configChanges="orientation|screenSize" />
         <activity
             android:name=".ui.activity.PairingActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
@@ -146,14 +146,12 @@
             android:name=".ui.activity.AudioRecorderActivity"
             android:configChanges="orientation|screenSize"
             android:label="Audio Recorder"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
+            android:launchMode="singleTask"/>
         <activity
             android:name=".ui.activity.HelpWebView"
             android:configChanges="orientation|screenSize"
             android:label="Help Webview"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
+            android:launchMode="singleTask"/>
         <activity
             android:name=".ui.activity.MakeCodeWebView"
             android:configChanges="orientation|screenSize"
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/AudioRecorderActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/AudioRecorderActivity.java
@@ -108,6 +108,11 @@ public void onClick(View v) {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
+        // TODO: EdgeToEdge - Remove once activities handle insets.
+        // Call before the DecorView is accessed in setContentView
+        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
         super.onCreate(savedInstanceState);
 
         mLaunchActivity = false;
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/FetchActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/FetchActivity.java
@@ -245,6 +245,11 @@ public void run() {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         logi("onCreate");
+
+        // TODO: EdgeToEdge - Remove once activities handle insets.
+        // Call before the DecorView is accessed in setContentView
+        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
         super.onCreate(savedInstanceState);
 
         displayCreate();
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/HelpWebView.java b/app/src/main/java/com/samsung/microbit/ui/activity/HelpWebView.java
@@ -29,6 +29,11 @@ protected void onStop() {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
+        // TODO: EdgeToEdge - Remove once activities handle insets.
+        // Call before the DecorView is accessed in setContentView
+        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_help_web_view);
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/HomeActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/HomeActivity.java
@@ -122,9 +122,14 @@ protected void onStop() {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
         logi("onCreate() :: ");
 
+        // TODO: EdgeToEdge - Remove once activities handle insets.
+        // Call before the DecorView is accessed in setContentView
+        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
+        super.onCreate(savedInstanceState);
+
         setContentView(R.layout.activity_home);
 
         if(savedInstanceState == null) {
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java b/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
@@ -69,6 +69,11 @@ protected void onStop() {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
+        // TODO: EdgeToEdge - Remove once activities handle insets.
+        // Call before the DecorView is accessed in setContentView
+        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
         super.onCreate(savedInstanceState);
 
         activityHandle = this;
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/NotificationActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/NotificationActivity.java
@@ -2,12 +2,20 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Bundle;
 
+import com.samsung.microbit.R;
+
 public class NotificationActivity extends Activity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
+        // TODO: EdgeToEdge - Remove once activities handle insets.
+        // Call before the DecorView is accessed in setContentView
+        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
         super.onCreate(savedInstanceState);
 
         // If this activity is the root activity of the task, the app is not running
@@ -23,6 +31,11 @@ protected void onCreate(Bundle savedInstanceState) {
         finish();
     }
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
     @Override
     protected void onStart() {
         super.onStart();
@@ -33,4 +46,4 @@ protected void onStop() {
         super.onStop();
     }
 
-}
+}
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java
@@ -848,6 +848,10 @@ public void onPause() {
     protected void onCreate(Bundle savedInstanceState) {
         logi("onCreate() ::");
 
+        // TODO: EdgeToEdge - Remove once activities handle insets.
+        // Call before the DecorView is accessed in setContentView
+        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
         super.onCreate(savedInstanceState);
 
         MBApp application = MBApp.getApp();
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/PopUpActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/PopUpActivity.java
@@ -189,6 +189,11 @@ private void releaseViews() {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
+        // TODO: EdgeToEdge - Remove once activities handle insets.
+        // Call before the DecorView is accessed in setContentView
+        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
         super.onCreate(savedInstanceState);
 
         Log.d("PopUpActivity", "onCreate() popuptype = " + getIntent().getIntExtra(INTENT_EXTRA_TYPE, PopUp.TYPE_NONE));
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
@@ -623,6 +623,11 @@ private void releaseViews() {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
+        // TODO: EdgeToEdge - Remove once activities handle insets.
+        // Call before the DecorView is accessed in setContentView
+        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
         super.onCreate(savedInstanceState);
 
         MBApp application = MBApp.getApp();
@@ -1474,6 +1479,14 @@ private void startDFUFlash() {
                     .setKeepBond(true)
                     .setForeground(true)
                     .setZip( getCachePathAppZip());
+
+            // https://github.com/microbit-foundation/microbit-android/issues/82
+            if ( Build.MANUFACTURER.toLowerCase().contains("lenovo")
+                    && Build.DEVICE.toLowerCase().contains("tb328")) {
+                // Tested with Lenovo M10 TB328FU with Android 12 - returns mtu 247, but DFU fails
+                starter.disableMtuRequest(); // faster than setMtu(23), which also works
+            }
+
             final DfuServiceController controller = starter.start(this, DfuService.class);
         } else {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/SplashScreenActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/SplashScreenActivity.java
@@ -44,6 +44,11 @@ public class SplashScreenActivity extends Activity implements View.OnClickListen
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
+        // TODO: EdgeToEdge - Remove once activities handle insets.
+        // Call before the DecorView is accessed in setContentView
+        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_splash_screen);
diff --git a/app/src/main/res/values-v35/styles.xml b/app/src/main/res/values-v35/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- TODO: EdgeToEdge - Remove once activities handle insets. -->
+    <style name="OptOutEdgeToEdgeEnforcement">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -324,4 +324,11 @@
     <style name="AlertDialogDarkButtons" parent="Theme.AppCompat.Light.Dialog.Alert">
         <item name="android:textColor">@color/black_color</item>
     </style>
+
+    <!-- TODO: EdgeToEdge - Remove once activities handle insets. -->
+    <style name="OptOutEdgeToEdgeEnforcement">
+        <!-- android:windowOptOutEdgeToEdgeEnforcement
+             isn't supported before SDK 35. This empty
+             style enables programmatically opting-out. -->
+    </style>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -1,18 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        maven { url 'https://maven.google.com' }
-	    jcenter()
+        google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.android.tools.build:gradle:8.6.1'
+        classpath 'com.google.gms:google-services:4.4.3'
     }
 }
 
 allprojects {
     repositories {
         google()
-	jcenter()
+        mavenCentral()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/pfLibrary b/pfLibrary
@@ -1 +1 @@
-Subproject commit 3a208f4216c705c972d9373acd00e390aa4a49b6
+Subproject commit 99db8c734e6addda43efa76183a50a7a9d32fe7a
