Remove deprecated API (firebase-iid).

zo0r · May 12, 2021 · 66243dd · 66243dd · sheyko-d · May 14, 2021
1 parent 84ca4d5
commit 66243dd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotification.java b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotification.java
@@ -36,8 +36,6 @@
 
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.InstanceIdResult;
 import com.google.firebase.messaging.FirebaseMessaging;
 
 public class RNPushNotification extends ReactContextBaseJavaModule implements ActivityEventListener {
@@ -139,17 +137,17 @@ public void checkPermissions(Promise promise) {
     public void requestPermissions() {
       final RNPushNotificationJsDelivery fMjsDelivery = mJsDelivery;
 
-      FirebaseInstanceId.getInstance().getInstanceId()
-              .addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {
+      FirebaseMessaging.getInstance().getToken()
+              .addOnCompleteListener(new OnCompleteListener<String>() {
                   @Override
-                  public void onComplete(@NonNull Task<InstanceIdResult> task) {
+                  public void onComplete(@NonNull Task<String> task) {
                       if (!task.isSuccessful()) {
                           Log.e(LOG_TAG, "exception", task.getException());
                           return;
                       }
 
                       WritableMap params = Arguments.createMap();
-                      params.putString("deviceToken", task.getResult().getToken());
+                      params.putString("deviceToken", task.getResult());
                       fMjsDelivery.sendEvent("remoteNotificationsRegistered", params);
                   }
               });
@@ -282,17 +280,8 @@ public void removeDeliveredNotifications(ReadableArray identifiers) {
      * Unregister for all remote notifications received
      */
     public void abandonPermissions() {
-      new Thread(new Runnable() {
-          @Override
-          public void run() {
-              try {
-                  FirebaseInstanceId.getInstance().deleteInstanceId();
-                  Log.i(LOG_TAG, "InstanceID deleted");
-              } catch (IOException e) {
-                  Log.e(LOG_TAG, "exception", e);
-              }
-          }
-      }).start();
+      FirebaseMessaging.getInstance().deleteToken();
+      Log.i(LOG_TAG, "InstanceID deleted");
     }
 
     @ReactMethod

diff --git a/example/.gitignore b/example/.gitignore
@@ -26,6 +26,7 @@ DerivedData
 build/
 .idea
 .gradle
+
 local.properties
 *.iml
 
@@ -39,7 +40,6 @@ yarn-error.log
 buck-out/
 \.buckd/
 *.keystore
-!debug.keystore
 
 # fastlane
 #

diff --git a/example/android/app/debug.keystore b/example/android/app/debug.keystore
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -13,7 +13,8 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      android:usesCleartextTraffic="true">
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"