test upgrade version

Penbase · May 12, 2022 · 93f3eaf · 93f3eaf
1 parent 07bf05f
commit 93f3eaf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/android/FCMPlugin.gradle b/src/android/FCMPlugin.gradle
@@ -100,6 +100,7 @@ dependencies {
         print(WARNING_STYLE+"FCMPlugin: Support for Gradle v4 or lower is deprecated. Please upgrade to a newer version."+DEFAULT_STYLE)
         implementation "com.google.firebase:firebase-messaging:${ANDROID_FCM_VERSION}"
     } else {
+        implementation 'com.google.firebase:firebase-iid:21.1.0'
         implementation platform("com.google.firebase:firebase-bom:${ANDROID_FIREBASE_BOM_VERSION}")
         implementation "com.google.firebase:firebase-messaging"
     }

diff --git a/src/android/com/gae/scaffolder/plugin/FCMPluginActivity.java b/src/android/com/gae/scaffolder/plugin/FCMPluginActivity.java
@@ -13,8 +13,6 @@
 
 public class FCMPluginActivity extends Activity {
     private static String TAG = "FCMPlugin";
-    private PendingIntent pendingIntent = null;
-
     /*
      * this activity will be started if the user touches a notification that we own.
      * We send it's data off to the push plugin for processing.
@@ -51,13 +49,6 @@ private void sendPushPayload() {
     private void forceMainActivityReload() {
         PackageManager pm = getPackageManager();
         Intent launchIntent = pm.getLaunchIntentForPackage(getApplicationContext().getPackageName());
-        /*if (Build.ver) launchIntent.addFlags(PendingIntent.FLAG_UPDATE_CURRENT |
-                              PendingIntent.FLAG_MUTABLE);*/
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { 
-            this.pendingIntent = PendingIntent.getActivity(activity.getActivity(), 0, launchIntent, PendingIntent.FLAG_MUTABLE);
-        } else { 
-            this.pendingIntent = PendingIntent.getActivity(activity.getActivity(), 0, launchIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-        }
         startActivity(launchIntent);
     }