feat: support android 13 (#1193)

* chore: compile for and target Android 13 (SDK 33) * feat: show permissions dialog on Android 13 * feat: ask for notification permission each time app is upgraded if permission has not been granted. * fix: reset the show notifications flag when there is an app upgrade * chore: update roboelectric to 4.9.2 to support Android 13
dashpay · Sep 1, 2023 · 32d50f3 · 32d50f3
1 parent f3c7b97
commit 32d50f3
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 28 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -5,11 +5,11 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'dagger.hilt.android.plugin'
 
 android {
-    compileSdkVersion 31
 
     defaultConfig {
+        compileSdk 33
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 33
         vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/features/exploredash/build.gradle b/features/exploredash/build.gradle
@@ -9,11 +9,10 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
-
     defaultConfig {
+        compileSdk 33
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 33
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
         javaCompileOptions {
@@ -118,7 +117,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
     testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoVersion"
     testImplementation "androidx.arch.core:core-testing:$coreTestingVersion"
-    testImplementation "org.robolectric:robolectric:4.8.1"
+    testImplementation "org.robolectric:robolectric:4.9.2"
     testImplementation "androidx.room:room-testing:$roomVersion"
     kapt "androidx.room:room-compiler:$roomVersion"
 

diff --git a/integrations/coinbase/build.gradle b/integrations/coinbase/build.gradle
@@ -8,12 +8,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
+        compileSdk 33
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 33
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/integrations/crowdnode/build.gradle b/integrations/crowdnode/build.gradle
@@ -8,11 +8,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
+        compileSdk 33
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 33
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

diff --git a/integrations/uphold/build.gradle b/integrations/uphold/build.gradle
@@ -7,11 +7,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
 
     defaultConfig {
+        compileSdk 33
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/sample-integration-android/build.gradle b/sample-integration-android/build.gradle
@@ -13,9 +13,6 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 31
-
-
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -40,8 +37,9 @@ android {
     }
 
     defaultConfig {
+        compileSdk 33
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 33
         multiDexEnabled true
     }
     compileOptions {

diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
@@ -19,7 +19,7 @@
     <uses-permission android:name="android.permission.CAMERA" /> <!-- group: CAMERA -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-feature
         android:name="android.hardware.touchscreen"

diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -183,12 +183,12 @@ if (file("../local.properties").exists()) {
 }
 
 android {
-    compileSdkVersion 31
     android.ndkVersion '21.3.6528147'
 
     defaultConfig {
+        compileSdk 33
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 90050
         versionName project.hasProperty('versionName') ? project.property('versionName') : "9.0.5"
         multiDexEnabled true

diff --git a/wallet/src/de/schildbach/wallet/service/BootstrapReceiver.java b/wallet/src/de/schildbach/wallet/service/BootstrapReceiver.java
@@ -71,6 +71,8 @@ public class BootstrapReceiver extends BroadcastReceiver {
     protected WalletDataProvider walletDataProvider;
     @Inject
     protected WalletApplication application;
+    @Inject
+    protected Configuration configuration;
 
     @Override
     public void onReceive(final Context context, final Intent intent) {
@@ -101,6 +103,10 @@ private void onAsyncReceive(final Context context, final Intent intent) {
             // if the app hasn't been used for a while and contains coins, maybe show reminder
             maybeShowInactivityNotification();
             application.myPackageReplaced = true;
+
+            // reset the notification explainer flag
+            if (packageReplaced)
+                configuration.setShowNotificationsExplainer(true);
         } else if (ACTION_DISMISS.equals(action)) {
             dismissNotification(context);
         } else if (ACTION_DISMISS_FOREVER.equals(action)) {

diff --git a/wallet/src/de/schildbach/wallet/ui/main/WalletActivity.java b/wallet/src/de/schildbach/wallet/ui/main/WalletActivity.java
@@ -17,9 +17,11 @@
 
 package de.schildbach.wallet.ui.main;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.nfc.NdefMessage;
 import android.nfc.NfcAdapter;
 import android.os.Build;
@@ -28,7 +30,10 @@
 import android.os.LocaleList;
 import android.telephony.TelephonyManager;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.google.common.collect.ImmutableList;
@@ -368,16 +373,33 @@ public void onLockScreenDeactivated() {
         }
     }
 
+    private final ActivityResultLauncher<String> requestPermissionLauncher =
+            registerForActivityResult(new ActivityResultContracts.RequestPermission(), granted -> {
+                // do nothing
+            });
+
+    /**
+     * Android 13 - Show system dialog to get notification permission from user, if not granted
+     *              ask again with each app upgrade if not granted.  This logic is handled by
+     *              {@link #onLockScreenDeactivated} and {@link #onStart}.
+     * Android 12 and below - show a explainer dialog once only.
+     */
     private void explainPushNotifications() {
-        AdaptiveDialog dialog = AdaptiveDialog.create(
-                R.drawable.ic_info_blue,
-                getString(R.string.notification_explainer_title),
-                getString(R.string.notification_explainer_message),
-                "",
-                getString(R.string.button_okay)
-        );
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+                ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
+            requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);
+        } else if (configuration.getShowNotificationsExplainer()) {
+            AdaptiveDialog dialog = AdaptiveDialog.create(
+                    R.drawable.ic_info_blue,
+                    getString(R.string.notification_explainer_title),
+                    getString(R.string.notification_explainer_message),
+                    "",
+                    getString(R.string.button_okay)
+            );
 
-        dialog.show(this, result -> Unit.INSTANCE);
+            dialog.show(this, result -> Unit.INSTANCE);
+        }
+        // only show either the permissions dialog (Android >= 13) or the explainer (Android <= 12) once
         configuration.setShowNotificationsExplainer(false);
     }
 }