rm direct ref to OneSignal in PushRegistratorFCM

* Direct OneSignal refs in PushRegistratorFCM removed
   - OneSignal.appContext - this is now a constructor param
   - OneSignalRemoteParams.Params - This now has it's own Params class
   which is now a constructor param.

Author: jkasten2

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

@@ -1015,13 +1015,23 @@ private static PushRegistrator getPushRegistrator() {
          mPushRegistrator = new PushRegistratorADM();
       else if (OSUtils.isAndroidDeviceType()) {
          if (OSUtils.hasFCMLibrary())
-            mPushRegistrator = new PushRegistratorFCM();
+            mPushRegistrator = getPushRegistratorFCM();
       } else
          mPushRegistrator = new PushRegistratorHMS();
 
       return mPushRegistrator;
    }
 
+   @NonNull
+   static private PushRegistratorFCM getPushRegistratorFCM() {
+      OneSignalRemoteParams.FCMParams fcmRemoteParams = remoteParamController.getRemoteParams().fcmParams;
+      PushRegistratorFCM.Params fcmParams = null;
+      if (fcmRemoteParams != null) {
+         fcmParams = new PushRegistratorFCM.Params(fcmRemoteParams.projectId, fcmRemoteParams.appId, fcmRemoteParams.apiKey);
+      }
+      return new PushRegistratorFCM(appContext, fcmParams);
+   }
+
    private static void registerForPushToken() {
       getPushRegistrator().registerForPush(appContext, googleProjectNumber, new PushRegistrator.RegisteredHandler() {
          @Override

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

@@ -27,9 +27,11 @@
 
 package com.onesignal;
 
+import android.content.Context;
 import android.util.Base64;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
 import com.google.android.gms.tasks.Task;
@@ -45,17 +47,55 @@
 
 class PushRegistratorFCM extends PushRegistratorAbstractGoogle {
 
-   // project_info.project_id
-   private static final String FCM_DEFAULT_PROJECT_ID = "onesignal-shared-public";
-   // client.client_info.mobilesdk_app_id
-   private static final String FCM_DEFAULT_APP_ID = "1:754795614042:android:c682b8144a8dd52bc1ad63";
-   // client.api_key.current_key
-   private static final String FCM_DEFAULT_API_KEY_BASE64 = "QUl6YVN5QW5UTG41LV80TWMyYTJQLWRLVWVFLWFCdGd5Q3JqbFlV";
-
    private static final String FCM_APP_NAME = "ONESIGNAL_SDK_FCM_APP_NAME";
 
+   static class Params {
+      // project_info.project_id
+      private static final String FCM_DEFAULT_PROJECT_ID = "onesignal-shared-public";
+      // client.client_info.mobilesdk_app_id
+      private static final String FCM_DEFAULT_APP_ID = "1:754795614042:android:c682b8144a8dd52bc1ad63";
+      // client.api_key.current_key
+      private static final String FCM_DEFAULT_API_KEY_BASE64 = "QUl6YVN5QW5UTG41LV80TWMyYTJQLWRLVWVFLWFCdGd5Q3JqbFlV";
+
+      @NonNull private final String projectId;
+      @NonNull private final String appId;
+      @NonNull private final String apiKey;
+
+      Params() {
+         this(null, null, null);
+      }
+
+      Params(
+         @Nullable String projectId,
+         @Nullable String appId,
+         @Nullable String apiKey
+      ) {
+         this.projectId = projectId != null ? projectId : FCM_DEFAULT_PROJECT_ID;
+         this.appId = appId != null ? appId : FCM_DEFAULT_APP_ID;
+
+         String defaultApiKey = new String(Base64.decode(FCM_DEFAULT_API_KEY_BASE64, Base64.DEFAULT));
+         this.apiKey = apiKey != null ? apiKey : defaultApiKey;
+      }
+   }
+
    private FirebaseApp firebaseApp;
 
+   @NonNull private final Context context;
+   @NonNull private final Params params;
+
+   PushRegistratorFCM(
+       @NonNull Context context,
+       @Nullable Params params
+   ) {
+      this.context = context;
+
+      if (params == null) {
+         this.params = new Params();
+      } else {
+         this.params = params;
+      }
+   }
+
    @Override
    String getProviderName() {
       return "FCM";
@@ -125,32 +165,13 @@ private void initFirebaseApp(String senderId) {
       if (firebaseApp != null)
          return;
 
-      OneSignalRemoteParams.Params remoteParams = OneSignal.getRemoteParams();
       FirebaseOptions firebaseOptions =
          new FirebaseOptions.Builder()
             .setGcmSenderId(senderId)
-            .setApplicationId(getAppId(remoteParams))
-            .setApiKey(getApiKey(remoteParams))
-            .setProjectId(getProjectId(remoteParams))
+            .setApplicationId(params.appId)
+            .setApiKey(params.apiKey)
+            .setProjectId(params.projectId)
             .build();
-      firebaseApp = FirebaseApp.initializeApp(OneSignal.appContext, firebaseOptions, FCM_APP_NAME);
-   }
-
-   private static @NonNull String getAppId(OneSignalRemoteParams.Params remoteParams) {
-      if (remoteParams.fcmParams.appId != null)
-         return remoteParams.fcmParams.appId;
-      return FCM_DEFAULT_APP_ID;
-   }
-
-   private static @NonNull String getApiKey(OneSignalRemoteParams.Params remoteParams) {
-      if (remoteParams.fcmParams.apiKey != null)
-         return remoteParams.fcmParams.apiKey;
-      return new String(Base64.decode(FCM_DEFAULT_API_KEY_BASE64, Base64.DEFAULT));
-   }
-
-   private static @NonNull String getProjectId(OneSignalRemoteParams.Params remoteParams) {
-      if (remoteParams.fcmParams.projectId != null)
-         return remoteParams.fcmParams.projectId;
-      return FCM_DEFAULT_PROJECT_ID;
+      firebaseApp = FirebaseApp.initializeApp(context, firebaseOptions, FCM_APP_NAME);
    }
 }