Fix Android Background Notification #1056

Author: EddyVerbruggen

demo/app/main-view-model.ts

@@ -965,10 +965,14 @@ export class HelloWorldModel extends Observable {
   }
 
   public doLoginByEmailLink(): void {
-    prompt(
-        "The email address to send the link to",
-        ""
-    ).then(promptResult => {
+    prompt({
+      title: "The email address to send the link to",
+      defaultText: "",
+      inputType: "email",
+      capitalizationType: "none",
+      okButtonText: "OK",
+      cancelButtonText: "Cancel"
+    }).then(promptResult => {
       if (!promptResult.result) {
         return;
       }
@@ -978,7 +982,7 @@ export class HelloWorldModel extends Observable {
         // note that you need to enable phone login in your firebase instance
         type: firebase.LoginType.EMAIL_LINK,
         emailLinkOptions: {
-          email: promptResult.text,
+          email: promptResult.text.trim(),
           url: "https://combidesk.com?foo=bar"
         }
       }).then(

src/firebase.android.ts

@@ -82,13 +82,12 @@ const dynamicLinksEnabled = lazy(() => typeof (com.google.firebase.dynamiclinks)
                   url: deepLink,
                   minimumAppVersion: minimumAppVersion
                 };
-              }
-              else {
+              } else {
                 setTimeout(function () {
-                    firebase._dynamicLinkCallback({
-                      url: deepLink,
-                      minimumAppVersion: minimumAppVersion
-                    });
+                  firebase._dynamicLinkCallback({
+                    url: deepLink,
+                    minimumAppVersion: minimumAppVersion
+                  });
                 });
               }
             }
@@ -101,11 +100,11 @@ const dynamicLinksEnabled = lazy(() => typeof (com.google.firebase.dynamiclinks)
   });
 
   appModule.on(appModule.resumeEvent, args => {
-      if (messagingEnabled()) {
-          firebaseMessaging.onAppModuleResumeEvent(args);
-      }
+    if (messagingEnabled()) {
+      firebaseMessaging.onAppModuleResumeEvent(args);
+    }
   });
-    })();
+})();
 
 firebase.toHashMap = obj => {
   const node = new java.util.HashMap();
@@ -590,7 +589,7 @@ firebase.getRemoteConfig = arg => {
           runGetRemoteConfig();
           appModule.off(appModule.resumeEvent, callback);
         };
-        appModule.on(appModule.resumeEvent, callback);        
+        appModule.on(appModule.resumeEvent, callback);
       }
     } catch (ex) {
       console.log("Error in firebase.getRemoteConfig: " + ex);

src/messaging/messaging.android.ts

@@ -50,31 +50,34 @@ export function onAppModuleResumeEvent(args: any) {
 
   const intent = args.android.getIntent();
   const extras = intent.getExtras();
-  // filter out any rubbish that doesn't have a 'from' key
-    if (extras !== null && extras.keySet().contains("from")) {
-      let result = {
-        foreground: false,
-        data: {}
-      };
-
-      const iterator = extras.keySet().iterator();
-      while (iterator.hasNext()) {
-        const key = iterator.next();
-        if (key !== "from" && key !== "collapse_key") {
-          result[key] = extras.get(key);
-          result.data[key] = extras.get(key);
-        }
-      }
 
-      if (firebase._receivedNotificationCallback === null) {
-        _launchNotification = result;
-      } else {
-        // add a little delay just to make sure clients alerting this message will see it as the UI needs to settle
-        setTimeout(() => {
-          firebase._receivedNotificationCallback(result);
-        });
+  if (extras !== null && extras.keySet().contains("from")) {
+    let result = {
+      foreground: false,
+      data: {}
+    };
+
+    const iterator = extras.keySet().iterator();
+    while (iterator.hasNext()) {
+      const key = iterator.next();
+      if (key !== "from" && key !== "collapse_key") {
+        result[key] = extras.get(key);
+        result.data[key] = extras.get(key);
       }
     }
+
+    // clear, otherwise the next resume we trigger this again
+    intent.removeExtra("from");
+
+    if (firebase._receivedNotificationCallback === null) {
+      _launchNotification = result;
+    } else {
+      // add a little delay just to make sure clients alerting this message will see it as the UI needs to settle
+      setTimeout(() => {
+        firebase._receivedNotificationCallback(result);
+      });
+    }
+  }
 }
 
 export function registerForInteractivePush(model?: PushNotificationModel): void {