Merge pull request #181 from NativeScript/lini/update-firebase-and-cache

fix for Android data only notifications when app is closed

Author: lini

native-src/android/app/app.iml

@@ -111,22 +111,22 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="com.google.firebase:firebase-iid-11.6.2" level="project" />
+    <orderEntry type="library" name="com.google.firebase:firebase-iid-11.8.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-utils-25.2.0" level="project" />
-    <orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.6.2" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-basement-11.6.2" level="project" />
-    <orderEntry type="library" name="com.google.firebase:firebase-messaging-license-11.6.2" level="project" />
-    <orderEntry type="library" name="com.google.firebase:firebase-common-11.6.2" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.6.2" level="project" />
+    <orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.8.0" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-basement-11.8.0" level="project" />
+    <orderEntry type="library" name="com.google.firebase:firebase-messaging-license-11.8.0" level="project" />
+    <orderEntry type="library" name="com.google.firebase:firebase-common-11.8.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-ui-25.2.0" level="project" />
-    <orderEntry type="library" name="com.google.firebase:firebase-common-license-11.6.2" level="project" />
-    <orderEntry type="library" name="com.google.firebase:firebase-messaging-11.6.2" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.8.0" level="project" />
+    <orderEntry type="library" name="com.google.firebase:firebase-common-license-11.8.0" level="project" />
+    <orderEntry type="library" name="com.google.firebase:firebase-messaging-11.8.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-media-compat-25.2.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-compat-25.2.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.6.2" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.8.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-annotations:25.2.0@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-v4-25.2.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.6.2" level="project" />
     <orderEntry type="library" name="com.android.support:support-fragment-25.2.0" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.8.0" level="project" />
   </component>
 </module>

native-src/android/app/build.gradle

@@ -21,7 +21,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     // compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.google.firebase:firebase-messaging:11.6.2'
+    compile 'com.google.firebase:firebase-messaging:11.8.0'
 }
 
 gradle.buildFinished {

native-src/android/app/src/main/java/com/telerik/pushplugin/PushPlugin.java

@@ -124,14 +124,7 @@ public void onMessageReceived(RemoteMessage message) {
             Log.d(TAG, "Notification body: " + notif.getBody());
         }
 
-        boolean isCallbackRegistered = onMessageReceivedCallback != null;
-        Log.d(TAG, "Callback is registered: " + isCallbackRegistered);
-
-        // If the application has the callback registered
-        // execute the callback. Otherwise, let the OS handle the notification.
-        if (isCallbackRegistered) {
-            executeOnMessageReceivedCallback(data, notif);
-        }
+        executeOnMessageReceivedCallback(data, notif);
     }
 
     /**