|
36 | 36 |
|
37 | 37 | import com.google.android.gms.tasks.OnCompleteListener; |
38 | 38 | import com.google.android.gms.tasks.Task; |
39 | | -import com.google.firebase.iid.FirebaseInstanceId; |
40 | | -import com.google.firebase.iid.InstanceIdResult; |
41 | 39 | import com.google.firebase.messaging.FirebaseMessaging; |
42 | 40 |
|
43 | 41 | public class RNPushNotification extends ReactContextBaseJavaModule implements ActivityEventListener { |
@@ -139,17 +137,17 @@ public void checkPermissions(Promise promise) { |
139 | 137 | public void requestPermissions() { |
140 | 138 | final RNPushNotificationJsDelivery fMjsDelivery = mJsDelivery; |
141 | 139 |
|
142 | | - FirebaseInstanceId.getInstance().getInstanceId() |
143 | | - .addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() { |
| 140 | + FirebaseMessaging.getInstance().getToken() |
| 141 | + .addOnCompleteListener(new OnCompleteListener<String>() { |
144 | 142 | @Override |
145 | | - public void onComplete(@NonNull Task<InstanceIdResult> task) { |
| 143 | + public void onComplete(@NonNull Task<String> task) { |
146 | 144 | if (!task.isSuccessful()) { |
147 | 145 | Log.e(LOG_TAG, "exception", task.getException()); |
148 | 146 | return; |
149 | 147 | } |
150 | 148 |
|
151 | 149 | WritableMap params = Arguments.createMap(); |
152 | | - params.putString("deviceToken", task.getResult().getToken()); |
| 150 | + params.putString("deviceToken", task.getResult()); |
153 | 151 | fMjsDelivery.sendEvent("remoteNotificationsRegistered", params); |
154 | 152 | } |
155 | 153 | }); |
@@ -282,17 +280,8 @@ public void removeDeliveredNotifications(ReadableArray identifiers) { |
282 | 280 | * Unregister for all remote notifications received |
283 | 281 | */ |
284 | 282 | public void abandonPermissions() { |
285 | | - new Thread(new Runnable() { |
286 | | - @Override |
287 | | - public void run() { |
288 | | - try { |
289 | | - FirebaseInstanceId.getInstance().deleteInstanceId(); |
290 | | - Log.i(LOG_TAG, "InstanceID deleted"); |
291 | | - } catch (IOException e) { |
292 | | - Log.e(LOG_TAG, "exception", e); |
293 | | - } |
294 | | - } |
295 | | - }).start(); |
| 283 | + FirebaseMessaging.getInstance().deleteToken(); |
| 284 | + Log.i(LOG_TAG, "InstanceID deleted"); |
296 | 285 | } |
297 | 286 |
|
298 | 287 | @ReactMethod |
|
0 commit comments