Merge pull request #50 from microbit-foundation/from300

Recent releases have been made from the `from300` branch. Merge that branch back to master. Since #49 master contains only documentation changes since the merge-base commit with `from300` so this will result in an equivalent build to 3.0.7 from master.

See notes on #49

Author: microbit-matt-hillsdon

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Android-DFU-Library"]
+	path = dfuLibrary
+	url = https://github.com/NordicSemiconductor/Android-DFU-Library

.idea/gradle.xml

@@ -1,12 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '28.0.3'
+    compileSdk 34
     defaultConfig {
         applicationId "com.samsung.microbit"
-        minSdkVersion 19
-        targetSdkVersion 26
+        minSdkVersion 21
+        targetSdk 33
+        // When target SDK version is 30+,
+        // requestLegacyExternalStorage will continue to work for 29 Android 10
     }
     buildTypes {
         release {
@@ -16,19 +17,22 @@ android {
     }
     productFlavors {
     }
-    lintOptions {
+    namespace 'com.samsung.microbit'
+    lint {
         abortOnError false
     }
 }
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:23.1.0'
-    implementation 'com.android.support:design:23.1.0'
-    implementation project(':dfuLibrary')
-    implementation 'com.android.support:cardview-v7:23.1.0'
-    implementation 'com.android.support:recyclerview-v7:23.1.0'
-    implementation project(':android-gif-drawable-1.1.13')
-    implementation 'com.google.android.gms:play-services-analytics:9.2.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.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 '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 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 }

.idea/runConfigurations.xml

@@ -14,35 +14,43 @@
   limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.samsung.microbit"
-          android:versionCode="16"
-          android:versionName="2.4">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:versionCode="57"
+    android:versionName="3.0.7">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"  android:protectionLevel="signature"/>
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"  android:protectionLevel="signature"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30"/>
+<!--    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" android:maxSdkVersion="30"/>-->
 
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <!-- API 31 Needed only if your app looks for Bluetooth devices. -->
+    <!-- Include "neverForLocation" only if you can strongly assert that
+        your app never derives physical location from Bluetooth scan results. -->
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
+    <!-- API 31 Needed only if your app communicates with already-paired Bluetooth devices. -->
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
     <uses-feature android:name="android.hardware.telephony" android:required="false"/>
 
-
     <supports-screens android:normalScreens="true" />
     <supports-screens android:largeScreens="true" />
     <supports-screens android:xlargeScreens="true" />
@@ -52,7 +60,9 @@
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme.NoActionBar">
+        android:theme="@style/AppTheme.NoActionBar"
+        android:requestLegacyExternalStorage="true">
+
         <activity
             android:name=".ui.activity.HomeActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
@@ -65,9 +75,10 @@
             android:label="@string/app_name_without_colon"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="adjustResize"
-            android:launchMode="singleTask">
-            <!-- Intent filters for open micro:bit app, accord to user request -->
+            android:launchMode="singleTask"
+            android:exported="true">
 
+            <!-- Intent filters for open micro:bit app, accord to user request -->
 
             <!-- This filter works, when request - open file from File Manager -->
             <intent-filter>
@@ -104,6 +115,15 @@
                       android:scheme="content"/>
             </intent-filter>
 
+            <!-- This filter works, when sharing a hex file from Files app -->
+            <!-- https://developer.android.com/training/sharing/receive#update-manifest -->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:mimeType="application/octet-stream" />
+            </intent-filter>
+
         </activity>
         <activity
             android:name=".ui.activity.NotificationActivity"
@@ -127,24 +147,18 @@
             android:label="Audio Recorder"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"/>
-        <activity
-            android:name=".ui.activity.CameraActivity_OldAPI"
-            android:label="Camera Microbit"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"/>
         <activity
             android:name=".ui.activity.HelpWebView"
             android:configChanges="orientation|screenSize"
             android:label="Help Webview"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"/>
         <activity
-            android:name=".ui.activity.CameraActivityPermissionChecker"
-            android:label="@string/title_activity_camera_activity_permission_checker"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar"/>
-
+            android:name=".ui.activity.MakeCodeWebView"
+            android:configChanges="orientation|screenSize"
+            android:label="MakeCode Webview"
+            android:launchMode="singleTask"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
         <service
             android:name=".service.DfuService"
             android:enabled="true"/>
@@ -165,10 +179,17 @@
             android:enabled="true"
             android:exported="false"/>
 
+        <service
+            android:name=".service.PartialFlashingService"
+            android:enabled="true"
+            android:launchMode="singleInstance"
+        />
+
         <activity
             android:name=".ui.activity.SplashScreenActivity"
             android:screenOrientation="locked"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -182,6 +203,8 @@
                 <action android:name="com.samsung.microbit.core.SHOWFROMSERVICE"/>
             </intent-filter>
         </receiver>
+
     </application>
 
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
 </manifest>

android-gif-drawable-1.1.13/android-gif-drawable-1.1.13.aar

@@ -4,8 +4,6 @@
 import android.graphics.Typeface;
 import android.util.Log;
 
-import com.samsung.microbit.core.GoogleAnalyticsManager;
-
 /**
  * Represents a custom class of the app.
  * Provides some resources that use along app modules,
@@ -26,7 +24,6 @@ public void onCreate() {
         super.onCreate();
         app = this;
         initTypefaces();
-        GoogleAnalyticsManager.createInstance(this);
 
         Log.d("MBApp", "App Created");
     }

android-gif-drawable-1.1.13/build.gradle

@@ -1,6 +1,7 @@
 package com.samsung.microbit.core;
 
 import android.util.Log;
+import android.webkit.DownloadListener;
 
 import com.samsung.microbit.utils.IOUtils;
 
@@ -12,8 +13,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-//TODO: consider to use somewhere or remove
-public class DownloadManager {
+public class DownloadManager implements DownloadListener {
 
     volatile boolean cancelled = false;
 
@@ -44,4 +44,9 @@ public long download(String sourceUrl, String destinationFile) {
 
         return objectSize;
     }
+
+    @Override
+    public void onDownloadStart(String s, String s1, String s2, String s3, long l) {
+        Log.v(TAG, s + " " + s1 + " " + s2 + " " + s3 + " " + l);
+    }
 }