fix(android): Android 12 — merge from PR havesource#185

Android 12 compatibility by bluetech havesource#185
Personal-Group · Jul 27, 2022 · 5282026 · 5282026
1 parent 6bca515
commit 5282026
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 64 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -32,8 +32,6 @@
       <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
       <uses-permission android:name="android.permission.WAKE_LOCK"/>
       <uses-permission android:name="android.permission.VIBRATE"/>
-      <uses-permission android:name="${applicationId}.permission.PushHandlerActivity"/>
-      <permission android:name="${applicationId}.permission.PushHandlerActivity" android:protectionLevel="signature"></permission>
     </config-file>
 
     <config-file target="AndroidManifest.xml" parent="/manifest/application">
@@ -53,12 +51,6 @@
           <action android:name="com.google.firebase.MESSAGING_EVENT"/>
         </intent-filter>
       </service>
-
-      <service android:name="com.adobe.phonegap.push.PushInstanceIDListenerService" android:exported="true" >
-        <intent-filter>
-          <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-        </intent-filter>
-      </service>
     </config-file>
 
     <config-file target="config.xml" parent="/*">
@@ -71,7 +63,7 @@
     </config-file>
 
     <preference name="ANDROIDX_CORE_VERSION" default="1.6.+"/>
-    <preference name="FCM_VERSION" default="18.+"/>
+    <preference name="FCM_VERSION" default="23.+"/>
 
     <framework src="androidx.core:core:$ANDROIDX_CORE_VERSION" />
     <framework src="me.leolin:ShortcutBadger:1.1.22@aar"/>
@@ -81,7 +73,6 @@
     <source-file src="src/android/com/adobe/phonegap/push/PushConstants.kt" target-dir="java/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/PushHandlerActivity.kt" target-dir="java/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/BackgroundHandlerActivity.kt" target-dir="java/com/adobe/phonegap/push/"/>
-    <source-file src="src/android/com/adobe/phonegap/push/PushInstanceIDListenerService.kt" target-dir="java/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/PushPlugin.kt" target-dir="java/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/BackgroundActionButtonHandler.kt" target-dir="java/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/PushDismissedHandler.kt" target-dir="java/com/adobe/phonegap/push/"/>

diff --git a/src/android/com/adobe/phonegap/push/FCMService.kt b/src/android/com/adobe/phonegap/push/FCMService.kt
@@ -45,6 +45,17 @@ class FCMService : FirebaseMessagingService() {
 
     private val messageMap = HashMap<Int, ArrayList<String?>>()
 
+    private val FLAG_MUTABLE = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      PendingIntent.FLAG_MUTABLE
+    } else {
+      0
+    }
+    private val FLAG_IMMUTABLE = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      PendingIntent.FLAG_IMMUTABLE
+    } else {
+      0
+    }
+
     /**
      * Get the Application Name from Label
      */
@@ -62,6 +73,19 @@ class FCMService : FirebaseMessagingService() {
       MODE_PRIVATE
     )
 
+  /**
+   * Called when a new token is generated, after app install or token changes.
+   *
+   * @param token
+   */
+  override fun onNewToken(token: String) {
+    super.onNewToken(token)
+    Log.d(TAG, "Refreshed token: $token")
+
+    // TODO: Implement this method to send any registration to your app's servers.
+    //sendRegistrationToServer(token);
+  }
+
   /**
    * Set Notification
    * If message is empty or null, the message list is cleared.
@@ -448,7 +472,7 @@ class FCMService : FirebaseMessagingService() {
       this,
       requestCode,
       notificationIntent,
-      PendingIntent.FLAG_UPDATE_CURRENT
+      PendingIntent.FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
     )
     val dismissedNotificationIntent = Intent(
       this,
@@ -467,7 +491,7 @@ class FCMService : FirebaseMessagingService() {
       this,
       requestCode,
       dismissedNotificationIntent,
-      PendingIntent.FLAG_CANCEL_CURRENT
+      PendingIntent.FLAG_CANCEL_CURRENT or FLAG_IMMUTABLE
     )
 
     val mBuilder: NotificationCompat.Builder =
@@ -676,7 +700,7 @@ class FCMService : FirebaseMessagingService() {
                   this,
                   uniquePendingIntentRequestCode,
                   intent,
-                  PendingIntent.FLAG_ONE_SHOT
+                  PendingIntent.FLAG_ONE_SHOT or FLAG_MUTABLE
                 )
               } else {
                 Log.d(TAG, "push receiver for notId $notId")
@@ -685,7 +709,7 @@ class FCMService : FirebaseMessagingService() {
                   this,
                   uniquePendingIntentRequestCode,
                   intent,
-                  PendingIntent.FLAG_ONE_SHOT
+                  PendingIntent.FLAG_ONE_SHOT or FLAG_MUTABLE
                 )
               }
             }
@@ -696,7 +720,7 @@ class FCMService : FirebaseMessagingService() {
               pIntent = PendingIntent.getActivity(
                 this, uniquePendingIntentRequestCode,
                 intent,
-                PendingIntent.FLAG_UPDATE_CURRENT
+                PendingIntent.FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
               )
             }
 
@@ -706,7 +730,7 @@ class FCMService : FirebaseMessagingService() {
               pIntent = PendingIntent.getBroadcast(
                 this, uniquePendingIntentRequestCode,
                 intent,
-                PendingIntent.FLAG_UPDATE_CURRENT
+                PendingIntent.FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
               )
             }
           }

diff --git a/src/android/com/adobe/phonegap/push/PushInstanceIDListenerService.kt b/src/android/com/adobe/phonegap/push/PushInstanceIDListenerService.kt
diff --git a/src/android/com/adobe/phonegap/push/PushPlugin.kt b/src/android/com/adobe/phonegap/push/PushPlugin.kt
@@ -16,7 +16,7 @@ import android.provider.Settings
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import com.google.firebase.iid.FirebaseInstanceId
+import com.google.android.gms.tasks.Tasks
 import com.google.firebase.messaging.FirebaseMessaging
 import me.leolin.shortcutbadger.ShortcutBadger
 import org.apache.cordova.*
@@ -25,6 +25,7 @@ import org.json.JSONException
 import org.json.JSONObject
 import java.io.IOException
 import java.util.*
+import java.util.concurrent.ExecutionException
 
 /**
  * Cordova Plugin Push
@@ -442,7 +443,6 @@ class PushPlugin : CordovaPlugin() {
         Context.MODE_PRIVATE
       )
       var jo: JSONObject? = null
-      var token: String? = null
       var senderID: String? = null
 
       try {
@@ -461,18 +461,21 @@ class PushPlugin : CordovaPlugin() {
         Log.v(TAG, formatLogMessage("JSONObject=$jo"))
         Log.v(TAG, formatLogMessage("senderID=$senderID"))
 
-        try {
-          token = FirebaseInstanceId.getInstance().token
-        } catch (e: IllegalStateException) {
-          Log.e(TAG, formatLogMessage("Firebase Token Exception ${e.message}"))
-        }
-
-        if (token == null) {
+        val token = try {
           try {
-            token = FirebaseInstanceId.getInstance().getToken(senderID, PushConstants.FCM)
-          } catch (e: IllegalStateException) {
-            Log.e(TAG, formatLogMessage("Firebase Token Exception ${e.message}"))
+            Tasks.await(FirebaseMessaging.getInstance().token)
+          } catch (e: ExecutionException) {
+            throw e.cause ?: e
           }
+        } catch (e: IllegalStateException) {
+          Log.e(TAG, formatLogMessage("Firebase Token Exception ${e.message}"))
+          null
+        } catch (e: ExecutionException) {
+          Log.e(TAG, formatLogMessage("Firebase Token Exception ${e.message}"))
+          null
+        } catch (e: InterruptedException) {
+          Log.e(TAG, formatLogMessage("Firebase Token Exception ${e.message}"))
+          null
         }
 
         if (token != "") {
@@ -612,7 +615,11 @@ class PushPlugin : CordovaPlugin() {
         if (topics != null) {
           unsubscribeFromTopics(topics)
         } else {
-          FirebaseInstanceId.getInstance().deleteInstanceId()
+          try {
+            Tasks.await(FirebaseMessaging.getInstance().deleteToken())
+          } catch (e: ExecutionException) {
+            throw e.cause ?: e
+          }
           Log.v(TAG, formatLogMessage("UNREGISTER"))
 
           /**
@@ -640,6 +647,9 @@ class PushPlugin : CordovaPlugin() {
       } catch (e: IOException) {
         Log.e(TAG, formatLogMessage("IO Exception ${e.message}"))
         callbackContext.error(e.message)
+      } catch (e: InterruptedException) {
+        Log.e(TAG, formatLogMessage("Interrupted ${e.message}"))
+        callbackContext.error(e.message)
       }
     }
   }