Update firebase integration to be based on latest demo app

obsidiansystems · Jul 20, 2020 · 40fe4f9 · 40fe4f9
1 parent 719f551
commit 40fe4f9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 30 deletions.
diff --git a/android-activity.cabal b/android-activity.cabal
@@ -11,7 +11,6 @@ category: Mobile
 build-type: Simple
 extra-source-files:
   java/systems/obsidian/HaskellActivity.java
-  java/systems/obsidian/LocalFirebaseInstanceIDService.java
   java/systems/obsidian/LocalFirebaseMessagingService.java
 cabal-version: >=1.10
 

diff --git a/cbits/HaskellActivity.c b/cbits/HaskellActivity.c
@@ -89,7 +89,7 @@ JNIEXPORT void JNICALL Java_systems_obsidian_HaskellActivity_haskellOnNewIntent
   }
 }
 
-JNIEXPORT void JNICALL Java_systems_obsidian_LocalFirebaseInstanceIDService_handleDeviceToken (JNIEnv *env, jobject thisObj, jstring token) {
+JNIEXPORT void JNICALL Java_systems_obsidian_LocalFirebaseMessagingService_handleDeviceToken (JNIEnv *env, jobject thisObj, jstring token) {
   if(gCallbacks && gCallbacks->firebaseInstanceIdService_sendRegistrationToServer) {
     const char *cstring_token = (*env)->GetStringUTFChars(env, token, 0);
     gCallbacks->firebaseInstanceIdService_sendRegistrationToServer(cstring_token);

diff --git a/java/systems/obsidian/LocalFirebaseInstanceIDService.java b/java/systems/obsidian/LocalFirebaseInstanceIDService.java
diff --git a/java/systems/obsidian/LocalFirebaseMessagingService.java b/java/systems/obsidian/LocalFirebaseMessagingService.java
@@ -1,3 +1,4 @@
+// File based on https://github.com/firebase/quickstart-android/blob/d454ecdbb664450d11812b9cfde91fca36c56a81/messaging/app/src/main/java/com/google/firebase/quickstart/fcm/java/MyFirebaseMessagingService.java
 package systems.obsidian;
 
 import android.util.Log;
@@ -6,7 +7,26 @@
 
 public class LocalFirebaseMessagingService extends FirebaseMessagingService {
 
+  private static final String TAG = "LocalFirebaseMessagingService";
+
+  private native void handleDeviceToken(String token);
   private native void handleNotification(String intent, String notificationdata);
+
+  /**
+    * Called if InstanceID token is updated. This may occur if the security of
+    * the previous token had been compromised. Note that this is called when the InstanceID token
+    * is initially generated so this is where you would retrieve the token.
+    */
+  @Override
+  public void onNewToken(String token) {
+    Log.d(TAG, "onNewToken: Refreshed token: " + token);
+
+    // If you want to send messages to this application instance or
+    // manage this apps subscriptions on the server side, send the
+    // Instance ID token to your app server.
+    handleDeviceToken(token);
+  }
+
   @Override
   public void onMessageReceived(RemoteMessage remoteMessage) {
     if (remoteMessage.getData().size() > 0) {