Merge pull request #51 from hansemannn/update-play-services

feat(android): update firebase to latest

Author: hansemannn

android/build.gradle

@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-  compile 'com.google.firebase:firebase-messaging:11.0.4'
+  compile 'com.google.firebase:firebase-messaging:17.5.0'
 }
 
 configurations.all {

android/lib/firebase-messaging-11.0.4.aar

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.5.0
+version: 2.0.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86
 description: titanium-firebase-cloud-messaging

android/lib/firebase-messaging-17.5.0.aar

@@ -31,12 +31,12 @@
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.RemoteMessage;
+import com.google.firebase.iid.InstanceIdResult;
+import com.google.android.gms.tasks.OnSuccessListener;
 import org.appcelerator.kroll.KrollDict;
-import org.appcelerator.kroll.common.Log;
 import java.util.HashMap;
 import org.appcelerator.kroll.KrollFunction;
 import java.util.Map;
-import android.content.Intent;
 import org.json.JSONObject;
 import ti.modules.titanium.android.notificationmanager.NotificationChannelProxy;
 
@@ -97,7 +97,15 @@ private KrollDict getLastData()
 	@Kroll.method
 	public void registerForPushNotifications()
 	{
-		FirebaseInstanceId.getInstance().getToken();
+		FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(
+			TiApplication.getAppRootOrCurrentActivity(), new OnSuccessListener<InstanceIdResult>() {
+				@Override
+				public void onSuccess(InstanceIdResult instanceIdResult)
+				{
+					String newToken = instanceIdResult.getToken();
+					onTokenRefresh(newToken);
+				}
+		});
 		parseBootIntent();
 	}
 

android/manifest

@@ -34,6 +34,16 @@ public class TiFirebaseMessagingService extends FirebaseMessagingService
 	private static final String TAG = "FirebaseMsgService";
 	private static final AtomicInteger atomic = new AtomicInteger(0);
 
+	@Override
+	public void onNewToken(String s) {
+		super.onNewToken(s);
+		CloudMessagingModule module = CloudMessagingModule.getInstance();
+		if (module != null) {
+			module.onTokenRefresh(s);
+		}
+		Log.d(TAG, "New token: " + s);
+	}
+
 	@Override
 	public void onMessageSent(String msgID)
 	{

android/src/firebase/cloudmessaging/CloudMessagingModule.java

@@ -6,26 +6,11 @@
 			<uses-permission android:name="android.permission.WAKE_LOCK"/>
 			<uses-permission android:name="android.permission.VIBRATE"/>
 			<application>
-				<service android:name="firebase.cloudmessaging.TiFirebaseMessagingService" android:exported="false">
+				<service android:name="firebase.cloudmessaging.TiFirebaseMessagingService" >
 					<intent-filter>
 						<action android:name="com.google.firebase.MESSAGING_EVENT"/>
 					</intent-filter>
 				</service>
-				<service android:name="firebase.cloudmessaging.TiFirebaseInstanceIDService" android:exported="false">
-					<intent-filter>
-						<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-					</intent-filter>
-				</service>
-
-				<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver" android:exported="false"/>
-				<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver" android:exported="true" android:permission="com.google.android.c2dm.permission.SEND">
-					<intent-filter>
-						<action android:name="com.google.android.c2dm.intent.RECEIVE"/>
-						<action android:name="com.google.android.c2dm.intent.REGISTRATION"/>
-						<category android:name="${tiapp.properties['id']}"/>
-					</intent-filter>
-				</receiver>
-
 				<activity android:name="firebase.cloudmessaging.PushHandlerActivity" android:exported="true"></activity>
 			</application>
 		</manifest>
@@ -35,6 +20,6 @@
 		<module>firebase.core</module>
 
 		<!-- Require Ti.PlayServices (https://github.com/appcelerator-modules/ti.playservices) -->
-		<module platform="android" version="11.0.40">ti.playservices</module>
+		<module platform="android" version="16.1.2">ti.playservices</module>
 	</modules>
 </ti:module>