E2 1802 fcm gcm (#345)

* Fix deprecated FCM Listener for new token

* merge

* gradle clean before build

* bump beta version

* FCM Refactor

* cleanedup GCM and p1 refactor manually tested with fcm

* Fully functional on start fetch and retrieval and cleanup with refacgoring

* Test cases and added checks for reducing network calls

Author: hrishileanplum

AndroidSDK/proguard-rules.pro

@@ -336,8 +336,6 @@
 -keep class com.leanplum.LeanplumPushService  { *; }
 -keep class com.leanplum.LeanplumFcmProvider { *; }
 -keep class com.leanplum.LeanplumCloudMessagingProvider{ *; }
--keep class com.leanplum.LeanplumGcmProvider { *; }
--keep class com.leanplum.LeanplumPushServiceGcm { *; }
 -keep class com.leanplum.LocationManagerImplementation { *; }
 
 -keep class com.leanplum.messagetemplates.BaseMessageOptions { *; }

AndroidSDKCore/proguard-rules.pro

@@ -336,12 +336,9 @@
 -keep class com.leanplum.LocationManagerImplementation { *; }
 
 -keep class com.leanplum.messagetemplates.BaseMessageOptions { *; }
--keep class com.leanplum.LeanplumPushServiceFcm { *; }
 -keep class com.leanplum.LeanplumPushService  { *; }
 -keep class com.leanplum.LeanplumFcmProvider { *; }
 -keep class com.leanplum.LeanplumCloudMessagingProvider{ *; }
--keep class com.leanplum.LeanplumGcmProvider { *; }
--keep class com.leanplum.LeanplumPushServiceGcm { *; }
 -keep class com.leanplum.LocationManagerImplementation { *; }
 
 -dontwarn android.support.v7.**

AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java

@@ -661,7 +661,7 @@ private static void startHelper(
     int timezoneOffsetSeconds = localTimeZone.getOffset(now.getTime()) / 1000;
 
     String registrationId = SharedPreferencesUtil.getString(context,
-        Constants.Defaults.LEANPLUM_PUSH, Constants.Defaults.PROPERTY_REGISTRATION_ID);
+        Constants.Defaults.LEANPLUM_PUSH, Constants.Defaults.PROPERTY_TOKEN_ID);
 
     HashMap<String, Object> params = new HashMap<>();
     params.put(Constants.Params.INCLUDE_DEFAULTS, Boolean.toString(false));
@@ -1608,7 +1608,7 @@ public void run() {
         try {
           HashMap<String, Object> params = new HashMap<>();
           params.put(Constants.Params.DEVICE_PUSH_TOKEN, registrationId);
-          RequestOld.post(Constants.Methods.SET_DEVICE_ATTRIBUTES, params).send();
+          RequestOld.post(Constants.Methods.SET_DEVICE_ATTRIBUTES, params).sendIfConnected();
         } catch (Throwable t) {
           Util.handleException(t);
         }

AndroidSDKCore/src/main/java/com/leanplum/internal/Constants.java

@@ -88,7 +88,7 @@ public static class Defaults {
     public static final String INBOX_KEY = "__leanplum_newsfeed";
     public static final String LEANPLUM_PUSH = "__leanplum_push__";
     public static final String APP_ID = "__app_id";
-    public static final String PROPERTY_REGISTRATION_ID = "registration_id";
+    public static final String PROPERTY_TOKEN_ID = "registration_id";
     public static final String PROPERTY_SENDER_IDS = "sender_ids";
     public static final String NOTIFICATION_CHANNELS_KEY = "__leanplum_notification_channels";
     public static final String DEFAULT_NOTIFICATION_CHANNEL_KEY = "__leanplum_default_notification_channels";

AndroidSDKFcm/build.gradle

@@ -28,7 +28,7 @@ dependencies {
     releaseApi project(':AndroidSDKPush')
 
     // Provided dependencies are optional dependencies and will not show up in pom file.
-    compileOnly('com.google.firebase:firebase-messaging:[10.0.0,)') {
+    compileOnly('com.google.firebase:firebase-messaging:[17.3.4,)') {
         exclude module: 'support-v4'
     }
 }

AndroidSDKFcm/javadoc/com/leanplum/LeanplumPushFcmListenerService.html

@@ -94,19 +94,6 @@
 <h2 title="Class LeanplumPushFcmListenerService" class="title">Class LeanplumPushFcmListenerService</h2>
 </div>
 <div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>FirebaseInstanceIdService</li>
-<li>
-<ul class="inheritance">
-<li>com.leanplum.LeanplumPushFcmListenerService</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">

AndroidSDKFcm/proguard-rules.pro

@@ -332,7 +332,6 @@
 }
 
 -keep class com.leanplum.utils.BitmapUtil { public private protected *; }
--keep class com.leanplum.LeanplumPushServiceFcm { *; }
 -keep class com.leanplum.LeanplumPushService  { *; }
 -keep class com.leanplum.LeanplumFcmProvider { *; }
 -keep class com.leanplum.LeanplumCloudMessagingProvider{ *; }

AndroidSDKFcm/src/main/AndroidManifest.xml

@@ -12,21 +12,6 @@
             </intent-filter>
         </service>
 
-        <!-- Leanplum FCM Registration Job Service. -->
-        <service android:name="com.leanplum.LeanplumFcmRegistrationJobService"
-                 android:permission="android.permission.BIND_JOB_SERVICE"/>
-
-
-        <!-- Leanplum FCM Instance ID Service. -->
-        <service
-            android:name="com.leanplum.LeanplumPushFcmListenerService"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-            </intent-filter>
-        </service>
-
         <!-- Leanplum Push Notification Receiver for FCM. -->
         <receiver
             android:name="com.leanplum.LeanplumPushReceiver"

AndroidSDKFcm/src/main/java/com/leanplum/LeanplumFcmProvider.java

@@ -22,14 +22,21 @@
 package com.leanplum;
 
 import android.content.Context;
+import android.nfc.Tag;
+import android.text.TextUtils;
 
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
 import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.InstanceIdResult;
 import com.leanplum.internal.LeanplumManifestHelper;
 import com.leanplum.internal.Log;
 import com.leanplum.internal.Util;
 
 import java.util.Collections;
 
+import androidx.annotation.NonNull;
+
 /**
  * Leanplum provider for work with Firebase.
  *
@@ -39,7 +46,26 @@ class LeanplumFcmProvider extends LeanplumCloudMessagingProvider {
 
   @Override
   public String getRegistrationId() {
-    return FirebaseInstanceId.getInstance().getToken();
+    return this.getStoredRegistrationPreferences(Leanplum.getContext());
+  }
+
+  @Override
+  public void getCurrentRegistrationIdAndUpdateBackend() {
+    FirebaseInstanceId.getInstance().getInstanceId()
+        .addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {
+          @Override
+          public void onComplete(@NonNull Task<InstanceIdResult> task) {
+            if (!task.isSuccessful()) {
+              Log.e("getInstanceId failed");
+              return;
+            }
+            // Get new Instance ID token
+            String tokenId = task.getResult().getToken();
+            if (!TextUtils.isEmpty(tokenId)) {
+                onRegistrationIdReceived(Leanplum.getContext(), tokenId);
+              }
+            }
+        });
   }
 
   @Override
@@ -64,16 +90,11 @@ public boolean isManifestSetup() {
           LeanplumManifestHelper.LP_PUSH_FCM_MESSAGING_SERVICE, false, null,
           Collections.singletonList(LeanplumManifestHelper.FCM_MESSAGING_EVENT), context.getPackageName());
 
-      boolean hasPushFirebaseListenerService = LeanplumManifestHelper.checkComponent(
-          LeanplumManifestHelper.ApplicationComponent.SERVICE,
-          LeanplumManifestHelper.LP_PUSH_FCM_LISTENER_SERVICE, false, null,
-          Collections.singletonList(LeanplumManifestHelper.FCM_INSTANCE_ID_EVENT), context.getPackageName());
-
       boolean hasRegistrationService = LeanplumManifestHelper.checkComponent(
           LeanplumManifestHelper.ApplicationComponent.SERVICE,
           LeanplumPushRegistrationService.class.getName(), false, null, null, context.getPackageName());
 
-      boolean hasServices = hasPushFirebaseMessagingService && hasPushFirebaseListenerService &&
+      boolean hasServices = hasPushFirebaseMessagingService &&
           hasRegistrationService;
 
       if (hasPushReceiver && hasServices) {