Fix the IllegalArgumentException that the pending intent should expli…

…citly declared as mutable or immutable when targetSDK is 31 or above

app/src/main/java/org/mozilla/focus/activity/MainActivity.kt

@@ -650,7 +650,7 @@ class MainActivity :
         )
         val pendingIntent = PendingIntent.getActivity(
             this, 0, intent,
-            PendingIntent.FLAG_ONE_SHOT
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
         )
 
         val builder = NotificationUtil.importantBuilder(this)
@@ -968,7 +968,7 @@ class MainActivity :
             this,
             0,
             intent,
-            PendingIntent.FLAG_UPDATE_CURRENT
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
 
         val builder = NotificationUtil.baseBuilder(this, NotificationUtil.Channel.LOW_PRIORITY)

app/src/main/java/org/mozilla/focus/notification/RocketMessagingService.kt

@@ -224,12 +224,22 @@ class RocketMessagingService : FirebaseMessagingServiceWrapper() {
                 command,
                 deepLink
             )
-            return PendingIntent.getBroadcast(appContext, RocketMessagingService.REQUEST_CODE_CLICK_NOTIFICATION, clickIntent, PendingIntent.FLAG_ONE_SHOT)
+            return PendingIntent.getBroadcast(
+                appContext,
+                REQUEST_CODE_CLICK_NOTIFICATION,
+                clickIntent,
+                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+            )
         }
 
         private fun addDeleteTelemetry(appContext: Context, builder: NotificationCompat.Builder, messageId: String?, link: String?) {
             val intent = IntentUtils.genDeleteFirebaseNotificationActionForBroadcastReceiver(appContext, messageId, link)
-            val pendingIntent = PendingIntent.getBroadcast(appContext, RocketMessagingService.REQUEST_CODE_DELETE_NOTIFICATION, intent, PendingIntent.FLAG_ONE_SHOT)
+            val pendingIntent = PendingIntent.getBroadcast(
+                appContext,
+                REQUEST_CODE_DELETE_NOTIFICATION,
+                intent,
+                PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+            )
             builder.setDeleteIntent(pendingIntent)
         }
     }

app/src/main/java/org/mozilla/focus/utils/DialogUtils.kt

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package org.mozilla.focus.utils
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
 import android.app.PendingIntent
@@ -153,12 +154,13 @@ object DialogUtils {
         }
     }
 
+    @SuppressLint("LaunchActivityFromNotification")
     @JvmStatic
     fun showRateAppNotification(context: Context) { // Brings up Rocket and display full screen "Love Rocket" dialog
         val openRocket = IntentUtils.genFeedbackNotificationClickForBroadcastReceiver(context)
         val openRocketPending = PendingIntent.getBroadcast(
             context, REQUEST_RATE_CLICK, openRocket,
-            PendingIntent.FLAG_ONE_SHOT
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
         )
         val string = context.getString(
             R.string.rate_app_dialog_text_title,
@@ -172,7 +174,7 @@ object DialogUtils {
         val rateStar = IntentUtils.genRateStarNotificationActionForBroadcastReceiver(context)
         val rateStarPending = PendingIntent.getBroadcast(
             context, REQUEST_RATE_RATE, rateStar,
-            PendingIntent.FLAG_ONE_SHOT
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
         )
         builder.addAction(
             R.drawable.notification_rating,
@@ -184,7 +186,7 @@ object DialogUtils {
         val feedback = IntentUtils.genFeedbackNotificationActionForBroadcastReceiver(context)
         val feedbackPending = PendingIntent.getBroadcast(
             context, REQUEST_RATE_FEEDBACK, feedback,
-            PendingIntent.FLAG_ONE_SHOT
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
         )
         builder.addAction(
             R.drawable.notification_feedback,
@@ -196,6 +198,7 @@ object DialogUtils {
         Settings.getInstance(context).setRateAppNotificationDidShow()
     }
 
+    @SuppressLint("LaunchActivityFromNotification")
     @JvmStatic
     @JvmOverloads
     fun showDefaultSettingNotification(
@@ -206,7 +209,7 @@ object DialogUtils {
             IntentUtils.genDefaultBrowserSettingIntentForBroadcastReceiver(context)
         val openRocketPending = PendingIntent.getBroadcast(
             context, REQUEST_DEFAULT_CLICK, openDefaultBrowserSetting,
-            PendingIntent.FLAG_ONE_SHOT
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
         )
         val title: String? = if (TextUtils.isEmpty(message)) {
             context.getString(R.string.preference_default_browser) + "?\uD83D\uDE0A"
@@ -221,13 +224,14 @@ object DialogUtils {
         Settings.getInstance(context).setDefaultBrowserSettingDidShow()
     }
 
+    @SuppressLint("LaunchActivityFromNotification")
     @JvmStatic
     fun showPrivacyPolicyUpdateNotification(context: Context) {
         val privacyPolicyUpdateNotice =
             IntentUtils.genPrivacyPolicyUpdateNotificationActionForBroadcastReceiver(context)
         val openRocketPending = PendingIntent.getBroadcast(
             context, REQUEST_PRIVACY_POLICY_CLICK, privacyPolicyUpdateNotice,
-            PendingIntent.FLAG_ONE_SHOT
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
         )
         val builder = NotificationUtil.importantBuilder(context)
             .setContentTitle(context.getString(R.string.privacy_policy_update_notification_title))

app/src/main/java/org/mozilla/focus/utils/IntentUtils.java

@@ -367,7 +367,7 @@ public static Intent getLauncherHomeIntent() {
 
     public static PendingIntent getLauncherHomePendingIntent(Context context) {
         return PendingIntent.getActivity(context, 0, getLauncherHomeIntent(),
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 
     public interface OpenGooglePlayFallback {

app/src/main/java/org/mozilla/rocket/component/PrivateSessionNotificationService.kt

@@ -71,7 +71,7 @@ class PrivateSessionNotificationService : Service() {
             applicationContext,
             0,
             intent,
-            PendingIntent.FLAG_UPDATE_CURRENT
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
     }
 

app/src/main/java/org/mozilla/rocket/periodic/FirstLaunchWorker.kt

@@ -1,5 +1,6 @@
 package org.mozilla.rocket.periodic
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Context
 import android.content.SharedPreferences
@@ -60,11 +61,12 @@ class FirstLaunchWorker(context: Context, workerParams: WorkerParameters) : Work
         return Result.success()
     }
 
+    @SuppressLint("LaunchActivityFromNotification")
     private fun showNotification(context: Context, messageId: String, title: String?, message: String, openUrl: String?, command: String?, deepLink: String?) {
         val intent = IntentUtils.genFirstrunNotificationClickForBroadcastReceiver(context, messageId, openUrl, command, deepLink)
         val openRocketPending = PendingIntent.getBroadcast(
             context, REQUEST_CODE_CLICK_NOTIFICATION, intent,
-            PendingIntent.FLAG_ONE_SHOT
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
         )
         val builder = NotificationUtil.importantBuilder(context)
             .also {
@@ -87,7 +89,12 @@ class FirstLaunchWorker(context: Context, workerParams: WorkerParameters) : Work
 
     private fun addDeleteTelemetry(appContext: Context, builder: NotificationCompat.Builder, messageId: String, link: String?) {
         val intent = IntentUtils.genDeleteFirstrunNotificationActionForBroadcastReceiver(appContext, messageId, link)
-        val pendingIntent = PendingIntent.getBroadcast(appContext, REQUEST_CODE_DELETE_NOTIFICATION, intent, PendingIntent.FLAG_ONE_SHOT)
+        val pendingIntent = PendingIntent.getBroadcast(
+            appContext,
+            REQUEST_CODE_DELETE_NOTIFICATION,
+            intent,
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+        )
         builder.setDeleteIntent(pendingIntent)
     }
 }