onTokenRefresh in FirebaseInstanceIDService has been deprecated

README.md

@@ -129,7 +129,18 @@ Send a push notification to a single device or topic.
  - If the user taps the notification, the application comes to foreground and the notification data is received in the JavaScript callback.
  - If the user does not tap the notification but opens the applicacion, nothing happens until the notification is tapped.
 
+## Delete InstanceId
 
+```javascript
+//  Stops device from receiving Firebase notifications, returns a promise
+// Note: Deleting the Firebase instance triggers a token refresh, 
+// have to prevent the refreshed token from being sent to the server to stop notifications
+FCMPlugin.deleteInstanceId().then(()=>{
+    // success
+}, err => {
+    //error
+})
+```
 ## License
 ```
 The MIT License

plugin.xml

@@ -24,85 +24,79 @@
     <description>Cordova FCM Plugin</description>
     <license>Apache 2.0</license>
     <keywords>cordova, fcm, push, plugin</keywords>
-    
+
     <info>
 		Cordova FCM plugin v2.1.2 installed
 		For more details visit https://github.com/fechanique/cordova-plugin-fcm
 	</info>
-	
+
     <js-module src="www/FCMPlugin.js" name="FCMPlugin">
 	<clobbers target="FCMPlugin" />
     </js-module>
 
     <engines>
 	<engine name="cordova-android" version=">=4.0.0" />
     </engines>
-	
+
     <!-- ANDROID CONFIGURATION -->
     <platform name="android">
 		<config-file target="AndroidManifest.xml" parent="/manifest/application">
 			<activity android:exported="true" android:name="com.gae.scaffolder.plugin.FCMPluginActivity" android:launchMode="singleTop">
-				<intent-filter>   
-					<action android:name="FCM_PLUGIN_ACTIVITY" />  
+				<intent-filter>
+					<action android:name="FCM_PLUGIN_ACTIVITY" />
 					<category android:name="android.intent.category.DEFAULT" />
-				</intent-filter>			
+				</intent-filter>
 			</activity>
 			<service android:name="com.gae.scaffolder.plugin.MyFirebaseMessagingService">
 				<intent-filter>
 					<action android:name="com.google.firebase.MESSAGING_EVENT"/>
 				</intent-filter>
 			</service>
-			<service android:name="com.gae.scaffolder.plugin.MyFirebaseInstanceIDService">
-				<intent-filter>
-					<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-				</intent-filter>
-			</service>
 		</config-file>
 		<config-file target="res/xml/config.xml" parent="/*">
 			<feature name="FCMPlugin" >
 					<param name="android-package" value="com.gae.scaffolder.plugin.FCMPlugin"/>
 					<param name="onload" value="true" />
 				</feature>
 		</config-file>
-		
+
         <framework src="com.google.firebase:firebase-core:+" />
         <framework src="com.google.firebase:firebase-messaging:+" />
-		
+
 		<framework src="src/android/FCMPlugin.gradle" custom="true" type="gradleReference"/>
-			
+
 		<source-file src="src/android/FCMPlugin.java" target-dir="src/com/gae/scaffolder/plugin" />
 		<source-file src="src/android/MyFirebaseMessagingService.java" target-dir="src/com/gae/scaffolder/plugin" />
-		<source-file src="src/android/MyFirebaseInstanceIDService.java" target-dir="src/com/gae/scaffolder/plugin" />
 		<source-file src="src/android/FCMPluginActivity.java" target-dir="src/com/gae/scaffolder/plugin" />
     </platform>
-	
+
     <!-- IOS CONFIGURATION -->
     <platform name="ios">
         <config-file target="config.xml" parent="/*">
             <feature name="FCMPlugin">
                 <param name="ios-package" value="FCMPlugin"/>
             </feature>
         </config-file>
-		
+
 		<!-- ENABLE PUSH CAPABILITY -->
 		<config-file parent="aps-environment" target="*/Entitlements-Debug.plist">
 		    <string>development</string>
 		</config-file>
 		<config-file parent="aps-environment" target="*/Entitlements-Release.plist">
 			<string>production</string>
 		</config-file>
-		
+
 		<resource-file src="src/ios/GoogleService-Info.plist" target="Resources/GoogleService-Info.plist" />
-		
+
         <header-file src="src/ios/FCMPlugin.h" />
         <source-file src="src/ios/FCMPlugin.m" />
-		
+
 		<header-file src="src/ios/AppDelegate+FCMPlugin.h" />
 		<source-file src="src/ios/AppDelegate+FCMPlugin.m" />
-		
+
 		<!-- FIREBASE COCOA PODS (not for the moment)-->
 		<!-- <framework src="Firebase/Messaging" type="podspec" spec="~> 0"/> -->
-		
+
 		<!-- FIREBASE LIBS -->
 		<header-file src="src/ios/firebase/Firebase.h" />
 		<framework src="src/ios/firebase/FirebaseAnalytics.framework" custom="true" />
@@ -113,7 +107,7 @@
 		<framework src="src/ios/firebase/GoogleIPhoneUtilities.framework" custom="true" />
 		<framework src="src/ios/firebase/GoogleSymbolUtilities.framework" custom="true" />
 		<framework src="src/ios/firebase/GoogleUtilities.framework" custom="true" />
-			
+
 		<!-- OTHER NEEDED LIBS -->
 		<framework src="libc++.tbd" />
 		<framework src="libz.tbd" />
@@ -122,9 +116,9 @@
 		<framework src="libz.tbd" />
 		<framework src="Security.framework" />
     </platform>
-	
+
 	<!-- COPY FCM CONFIG FILES TO PLATFORM AFTER PLUGIN INSTALL OR PLATFORM PREPARE -->
 	<hook src="scripts/fcm_config_files_process.js" type="after_plugin_add" />
 	<hook src="scripts/fcm_config_files_process.js" type="after_prepare" />
-	
+
 </plugin>

src/android/FCMPlugin.java

@@ -15,41 +15,55 @@
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.iid.FirebaseInstanceId;
 
+
 import java.util.Map;
 
 public class FCMPlugin extends CordovaPlugin {
- 
+
 	private static final String TAG = "FCMPlugin";
-	
+
 	public static CordovaWebView gWebView;
 	public static String notificationCallBack = "FCMPlugin.onNotificationReceived";
 	public static String tokenRefreshCallBack = "FCMPlugin.onTokenRefreshReceived";
 	public static Boolean notificationCallBackReady = false;
 	public static Map<String, Object> lastPush = null;
-	 
+
 	public FCMPlugin() {}
-	
+
 	public void initialize(CordovaInterface cordova, CordovaWebView webView) {
 		super.initialize(cordova, webView);
 		gWebView = webView;
 		Log.d(TAG, "==> FCMPlugin initialize");
 		FirebaseMessaging.getInstance().subscribeToTopic("android");
 		FirebaseMessaging.getInstance().subscribeToTopic("all");
 	}
-	 
+
 	public boolean execute(final String action, final JSONArray args, final CallbackContext callbackContext) throws JSONException {
 
 		Log.d(TAG,"==> FCMPlugin execute: "+ action);
-		
+
 		try{
 			// READY //
 			if (action.equals("ready")) {
 				//
 				callbackContext.success();
 			}
+			else if (action.equals("deleteInstanceId")) {
+				cordova.getThreadPool().execute(new Runnable() {
+
+					public void run() {
+                                try {
+                                    FirebaseInstanceId.getInstance().deleteInstanceId();
+                                    callbackContext.success();
+                                } catch (Exception e) {
+                                    callbackContext.error(e.getMessage());
+                                }
+                            }
+				});
+			}
 			// GET TOKEN //
 			else if (action.equals("getToken")) {
-				cordova.getActivity().runOnUiThread(new Runnable() {
+				cordova.getThreadPool().execute(new Runnable() {
 					public void run() {
 						try{
 							String token = FirebaseInstanceId.getInstance().getToken();
@@ -64,7 +78,7 @@ public void run() {
 			// NOTIFICATION CALLBACK REGISTER //
 			else if (action.equals("registerNotification")) {
 				notificationCallBackReady = true;
-				cordova.getActivity().runOnUiThread(new Runnable() {
+				cordova.getThreadPool().execute(new Runnable() {
 					public void run() {
 						if(lastPush != null) FCMPlugin.sendPushPayload( lastPush );
 						lastPush = null;
@@ -106,21 +120,21 @@ public void run() {
 			callbackContext.error(e.getMessage());
 			return false;
 		}
-		
+
 		//cordova.getThreadPool().execute(new Runnable() {
 		//	public void run() {
 		//	  //
 		//	}
 		//});
-		
-		//cordova.getActivity().runOnUiThread(new Runnable() {
+
+		//cordova.getThreadPool().execute(new Runnable() {
         //    public void run() {
         //      //
         //    }
         //});
 		return true;
 	}
-	
+
 	public static void sendPushPayload(Map<String, Object> payload) {
 		Log.d(TAG, "==> FCMPlugin sendPushPayload");
 		Log.d(TAG, "\tnotificationCallBackReady: " + notificationCallBackReady);
@@ -154,10 +168,10 @@ public static void sendTokenRefresh(String token) {
 			Log.d(TAG, "\tERROR sendRefreshToken: " + e.getMessage());
 		}
 	}
-  
+
   @Override
 	public void onDestroy() {
 		gWebView = null;
 		notificationCallBackReady = false;
 	}
-} 
+}

src/android/MyFirebaseMessagingService.java

@@ -21,6 +21,12 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
 
     private static final String TAG = "FCMPlugin";
 
+    @Override
+    public void onNewToken(String s) {
+        super.onNewToken(s);
+        Log.d("NEW_TOKEN",s);
+    }
+
     /**
      * Called when message is received.
      *

src/ios/FCMPlugin.h

@@ -14,6 +14,7 @@
 - (void)registerNotification:(CDVInvokedUrlCommand*)command;
 - (void)notifyOfMessage:(NSData*) payload;
 - (void)notifyOfTokenRefresh:(NSString*) token;
+- (void)unregister:(CDVInvokedUrlCommand*)command;
 - (void)appEnterBackground;
 - (void)appEnterForeground;