Upgraded firebase-messaging to inlcude 22.0.0

* Bumped the version range of firebase-messaging in
onesignal/build.gradle to [19.0.0, 22.99.99].
* Since FirebaseInstanceId was droped in the version switched it's
implementation to use reflection.
* Added reflection rule to the consumer-progruad-rules.pro so the gralde
`minifyEnabled` does not break the reflection code if someone has
locked their firebase-messaging version to a pre 22.0.0 version.

Author: jkasten2

OneSignalSDK/onesignal/build.gradle

@@ -5,7 +5,7 @@ ext {
 
     androidXVersion = '[1.0.0, 1.99.99]'
     androidWorkVersion = '[2.0.0, 2.99.99]'
-    firebaseMessagingVersion = '[19.0.0, 21.99.99]'
+    firebaseMessagingVersion = '[19.0.0, 22.99.99]'
     googleGMSVersion = '[17.0.0, 17.99.99]'
 }
 

OneSignalSDK/onesignal/consumer-proguard-rules.pro

@@ -6,6 +6,11 @@
     void disconnect();
 }
 
+# Need to keep as these 2 methods are called with reflection from com.onesignal.PushRegistratorFCM
+-keep class com.google.firebase.iid.FirebaseInstanceId {
+    static com.google.firebase.iid.FirebaseInstanceId getInstance(com.google.firebase.FirebaseApp);
+    java.lang.String getToken(java.lang.String, java.lang.String);
+}
 
 -keep class com.onesignal.ActivityLifecycleListenerCompat** {*;}
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/PushRegistratorFCM.java

@@ -36,10 +36,11 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.messaging.FirebaseMessaging;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.concurrent.ExecutionException;
 
 class PushRegistratorFCM extends PushRegistratorAbstractGoogle {
@@ -79,10 +80,34 @@ String getToken(String senderId) throws ExecutionException, InterruptedException
       return getTokenWithClassFirebaseInstanceId(senderId);
    }
 
+   // This method is only used if firebase-message older than 21.0.0 is in the app
+   // We are using reflection here so we can compile with firebase-message:22.0.0 and newer
+   //   - This version of Firebase has completely removed FirebaseInstanceId
+   @Deprecated
    @WorkerThread
    private String getTokenWithClassFirebaseInstanceId(String senderId) throws IOException {
-      FirebaseInstanceId instanceId = FirebaseInstanceId.getInstance(firebaseApp);
-      return instanceId.getToken(senderId, FirebaseMessaging.INSTANCE_ID_SCOPE);
+      // The following code is equivalent to:
+      //   FirebaseInstanceId instanceId = FirebaseInstanceId.getInstance(firebaseApp);
+      //   return instanceId.getToken(senderId, FirebaseMessaging.INSTANCE_ID_SCOPE);
+      Exception exception;
+      try {
+         Class<?> FirebaseInstanceIdClass = Class.forName("com.google.firebase.iid.FirebaseInstanceId");
+         Method getInstanceMethod = FirebaseInstanceIdClass.getMethod("getInstance", FirebaseApp.class);
+         Object instanceId = getInstanceMethod.invoke(null, firebaseApp);
+         Method getTokenMethod = instanceId.getClass().getMethod("getToken", String.class, String.class);
+         Object token = getTokenMethod.invoke(instanceId, senderId, "FCM");
+         return (String) token;
+      } catch (ClassNotFoundException e) {
+         exception = e;
+      } catch (NoSuchMethodException e) {
+         exception = e;
+      } catch (IllegalAccessException e) {
+         exception = e;
+      } catch (InvocationTargetException e) {
+         exception = e;
+      }
+
+      throw new Error("Reflection error on FirebaseInstanceId.getInstance(firebaseApp).getToken(senderId, FirebaseMessaging.INSTANCE_ID_SCOPE)", exception);
    }
 
    @WorkerThread