Add support for newer fcm methods (#475)

Author: hborisoff

AndroidSDKFcm/src/main/java/com/leanplum/FirebaseUtil.kt

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2021, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.leanplum
+
+import android.text.TextUtils
+import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
+import com.leanplum.internal.Log
+
+internal fun updateRegistrationId(provider: LeanplumCloudMessagingProvider) {
+  try {
+    Present.updateRegistrationId(provider)
+  } catch (e: NoSuchMethodError) {
+    Log.d("Using legacy firebase methods.")
+    Legacy.updateRegistrationId(provider)
+  }
+}
+
+internal fun unregister() {
+  try {
+    Present.unregister()
+  } catch (e: NoSuchMethodError) {
+    Log.d("Using legacy firebase methods.")
+    Legacy.unregister()
+  }
+}
+
+/**
+ * Present Firebase interface was added in version 20.3.0.
+ */
+private object Present {
+  fun updateRegistrationId(provider: LeanplumCloudMessagingProvider) {
+    FirebaseMessaging.getInstance().token.addOnCompleteListener {
+      if (it.isSuccessful) {
+        val token = it.result.toString()
+        if (!TextUtils.isEmpty(token)) {
+          provider.registrationId = token
+        }
+      } else {
+        Log.e("getToken failed:\n" + Log.getStackTraceString(it.exception))
+      }
+    }
+  }
+
+  fun unregister() {
+    try {
+      FirebaseMessaging.getInstance().deleteToken()
+      Log.i("Application was unregistered from FirebaseMessaging.")
+    } catch (e: Exception) {
+      Log.e("Failed to unregister from FirebaseMessaging.")
+    }
+  }
+}
+
+/**
+ * Legacy Firebase interface was removed in version 22.0.0.
+ */
+private object Legacy {
+  fun updateRegistrationId(provider: LeanplumCloudMessagingProvider) {
+    FirebaseInstanceId.getInstance().instanceId.addOnCompleteListener {
+      if (it.isSuccessful) {
+        val tokenId = it.result?.token
+        if (!TextUtils.isEmpty(tokenId)) {
+          provider.registrationId = tokenId
+        }
+      } else {
+        Log.e("getInstanceId failed:\n" + Log.getStackTraceString(it.exception))
+      }
+    }
+  }
+
+  fun unregister() {
+    try {
+      FirebaseInstanceId.getInstance().deleteInstanceId()
+      Log.i("Application was unregistered from FCM.")
+    } catch (e: Exception) {
+      Log.e("Failed to unregister from FCM.")
+    }
+  }
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020, Leanplum, Inc. All rights reserved.
+ * Copyright 2021, Leanplum, Inc. All rights reserved.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,16 +21,7 @@
 
 package com.leanplum;
 
-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.Constants;
-import com.leanplum.internal.Log;
-
-import androidx.annotation.NonNull;
 
 /**
  * Leanplum provider for work with Firebase.
@@ -58,31 +49,11 @@ public PushProviderType getType() {
 
   @Override
   public void updateRegistrationId() {
-    FirebaseInstanceId.getInstance().getInstanceId()
-        .addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {
-          @Override
-          public void onComplete(@NonNull Task<InstanceIdResult> task) {
-            if (!task.isSuccessful()) {
-              Exception exc = task.getException();
-              Log.e("getInstanceId failed:\n" + Log.getStackTraceString(exc));
-              return;
-            }
-            // Get new Instance ID token
-            String tokenId = task.getResult().getToken();
-            if (!TextUtils.isEmpty(tokenId)) {
-                setRegistrationId(tokenId);
-              }
-            }
-        });
+    FirebaseUtilKt.updateRegistrationId(this);
   }
 
   @Override
   public void unregister() {
-    try {
-      FirebaseInstanceId.getInstance().deleteInstanceId();
-      Log.i("Application was unregistered from FCM.");
-    } catch (Exception e) {
-      Log.e("Failed to unregister from FCM.");
-    }
+    FirebaseUtilKt.unregister();
   }
 }