Add new remote params

.gitignore

@@ -25,3 +25,9 @@ gen/
 
 # Proguard folder generated by Eclipse
 proguard/
+
+# Examples
+
+Examples/AndroidStudio/
+Examples/OneSignalDemo/app/build/
+OneSignalSDK/app/build/

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java

@@ -27,10 +27,8 @@ public void onCreate() {
         OneSignal.setAppId(appId);
         OneSignal.setAppContext(this);
 
-        OneSignal.unsubscribeWhenNotificationsAreDisabled(true);
         OneSignal.setInFocusDisplaying(OneSignal.OSInFocusDisplayOption.Notification);
         OneSignal.pauseInAppMessages(true);
-        OneSignal.setLocationShared(false);
 
         Log.d(Tag.DEBUG, Text.ONESIGNAL_SDK_INIT);
     }

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java

@@ -446,7 +446,7 @@ public void onClick(View v) {
         locationSharedSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                OneSignal.setLocationShared(isChecked);
+                // TODO remove element, was replaced by remote params
             }
         });
     }

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/SplashActivityViewModel.java

@@ -85,17 +85,9 @@ public void onOSSubscriptionChanged(OSSubscriptionStateChanges stateChanges) {
     }
 
     private void setupOneSignalSDK() {
-        boolean privacyConsent = true;
-        OneSignal.setRequiresUserPrivacyConsent(privacyConsent);
-
-        boolean isLocationShared = OneSignalPrefs.getCachedLocationSharedStatus(context);
-        OneSignal.setLocationShared(isLocationShared);
-
         boolean isInAppMessagingPaused = OneSignalPrefs.getCachedInAppMessagingPausedStatus(context);
         OneSignal.pauseInAppMessages(isInAppMessagingPaused);
 
-        Log.d(Tag.DEBUG, Text.PRIVACY_CONSENT_REQUIRED_SET + ": " + privacyConsent);
-
         boolean isEmailCached = attemptSignIn(new EmailUpdateCallback() {
             @Override
             public void onSuccess() {
@@ -158,17 +150,7 @@ private void attemptEnterApplication() {
                 return;
         }
 
-        ((Activity) context).runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        intentTo.mainActivity();
-                    }
-                }, 1000);
-            }
-        });
+        ((Activity) context).runOnUiThread(() -> new Handler().postDelayed(() -> intentTo.mainActivity(), 1000));
     }
 
 }

OneSignalSDK/.gitignore

@@ -1,8 +1,9 @@
 .gradle
 local.properties
+Examples/OneSignalDemo/local.properties
 .DS_Store
 /build
 /captures
 *.gpg
 /**/.idea
-*.iml
+*.iml

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

@@ -28,8 +28,6 @@
  */
 
 import android.content.Context;
-import com.onesignal.OneSignal.NotificationOpenedHandler;
-import com.onesignal.OneSignal.NotificationWillShowInForegroundHandler;
 
 class DelayedConsentInitializationParameters {
 

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

@@ -64,7 +64,7 @@ private static void initGoogleLocation() {
                         .addApi(LocationServices.API)
                         .addConnectionCallbacks(googleApiClientListener)
                         .addOnConnectionFailedListener(googleApiClientListener)
-                        .setHandler(locationHandlerThread.mHandler)
+                        .setHandler(getLocationHandlerThread().mHandler)
                         .build();
 
                 GMSLocationController.googleApiClient = new GoogleApiClientCompatProxy(googleApiClient);

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

@@ -44,7 +44,7 @@ static void showUpdateGPSDialog() {
          @Override
          public void run() {
             final Activity activity = ActivityLifecycleHandler.curActivity;
-            if (activity == null || OneSignal.mDisableGmsMissingPrompt)
+            if (activity == null || OneSignal.getDisableGMSMissingPrompt())
                return;
 
             // Load resource strings so a developer can customize this dialog

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

@@ -125,7 +125,7 @@ private void init() {
                     .setPriority(LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY);
 
             OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "HMSLocationController Huawei LocationServices requestLocationUpdates!");
-            huaweiFusedLocationProviderClient.requestLocationUpdates(locationRequest, this, locationHandlerThread.getLooper());
+            huaweiFusedLocationProviderClient.requestLocationUpdates(locationRequest, this, getLocationHandlerThread().getLooper());
         }
 
         @Override

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

@@ -58,7 +58,18 @@ class LocationController {
    private static boolean locationCoarse;
 
    static final Object syncLock = new Object() {};
-   static LocationHandlerThread locationHandlerThread;
+
+   private static LocationHandlerThread locationHandlerThread;
+   static LocationHandlerThread getLocationHandlerThread() {
+      if (locationHandlerThread == null) {
+         synchronized (syncLock) {
+            if (locationHandlerThread == null)
+               locationHandlerThread = new LocationHandlerThread();
+         }
+      }
+      return locationHandlerThread;
+   }
+
    static Thread fallbackFailThread;
    static Context classContext;
    static Location lastLocation;
@@ -100,7 +111,7 @@ void onAnswered(OneSignal.PromptActionResult result) {}
    }
 
    static boolean scheduleUpdate(Context context) {
-      if (!hasLocationPermission(context) || !OneSignal.shareLocation)
+      if (!hasLocationPermission(context) || !OneSignal.isLocationShared())
          return false;
 
       long lastTime = System.currentTimeMillis() - getLastLocationTime();
@@ -175,7 +186,7 @@ static void getLocation(Context context, boolean promptLocation, boolean fallbac
       classContext = context;
       locationHandlers.put(handler.getType(), handler);
 
-      if (!OneSignal.shareLocation) {
+      if (!OneSignal.isLocationShared()) {
          sendAndClearPromptHandlers(promptLocation, OneSignal.PromptActionResult.ERROR);
          fireFailedComplete();
          return;
@@ -253,9 +264,6 @@ else if (permissionList.contains("android.permission.ACCESS_COARSE_LOCATION")) {
    static void startGetLocation() {
       OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "LocationController startGetLocation with lastLocation: " + lastLocation);
 
-      if (locationHandlerThread == null)
-         locationHandlerThread = new LocationHandlerThread();
-
       try {
          if (isGooglePlayServicesAvailable()) {
             GMSLocationController.startGetLocation();

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

@@ -69,7 +69,7 @@ static void clearOldestOverLimitStandard(Context context, int notifsToMakeRoomFo
       }
 
       // Clear the oldest based on the count in notifsToClear
-      for(Map.Entry<Long, Integer> mapData : activeNotifIds.entrySet()) {
+      for (Map.Entry<Long, Integer> mapData : activeNotifIds.entrySet()) {
          OneSignal.cancelNotification(mapData.getValue());
          if (--notifsToClear <= 0)
             break;

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

@@ -5,7 +5,6 @@
 
 class OSLogWrapper implements OSLogger {
 
-
     public void verbose(@NonNull String message) {
         OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, message);
     }
@@ -14,10 +13,20 @@ public void debug(@NonNull String message) {
         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, message);
     }
 
+    @Override
+    public void info(@NonNull String message) {
+        OneSignal.Log(OneSignal.LOG_LEVEL.INFO, message);
+    }
+
     public void warning(@NonNull String message) {
         OneSignal.Log(OneSignal.LOG_LEVEL.WARN, message);
     }
 
+    @Override
+    public void error(@NonNull String message) {
+        OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, message);
+    }
+
     public void error(@NonNull String message, @Nullable Throwable throwable) {
         OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, message, throwable);
     }

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

@@ -9,8 +9,12 @@ public interface OSLogger {
 
     void debug(@NonNull String message);
 
+    void info(@NonNull String message);
+
     void warning(@NonNull String message);
 
+    void error(@NonNull String message);
+
     void error(@NonNull String message, @Nullable Throwable throwable);
 
 }

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

@@ -0,0 +1,147 @@
+package com.onesignal;
+
+import com.onesignal.influence.OSTrackerFactory;
+
+class OSRemoteParamController {
+
+    private OneSignalRemoteParams.Params remoteParams = null;
+
+    OSRemoteParamController() {
+    }
+
+    /**
+     * Save RemoteParams result of android_params request
+     */
+    void saveRemoteParams(OneSignalRemoteParams.Params remoteParams,
+                          OSTrackerFactory trackerFactory,
+                          OSSharedPreferences preferences,
+                          OSLogger logger) {
+        this.remoteParams = remoteParams;
+
+        OneSignalPrefs.saveBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_GT_FIREBASE_TRACKING_ENABLED,
+                remoteParams.firebaseAnalytics
+        );
+        OneSignalPrefs.saveBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_RESTORE_TTL_FILTER,
+                remoteParams.restoreTTLFilter
+        );
+        OneSignalPrefs.saveBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_CLEAR_GROUP_SUMMARY_CLICK,
+                remoteParams.clearGroupOnSummaryClick
+        );
+        OneSignalPrefs.saveBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_RECEIVE_RECEIPTS_ENABLED,
+                remoteParams.receiveReceiptEnabled
+        );
+        OneSignalPrefs.saveBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_UNSUBSCRIBE_WHEN_NOTIFICATIONS_DISABLED,
+                remoteParams.unsubscribeWhenNotificationsDisabled
+        );
+        OneSignalPrefs.saveBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_DISABLE_GMS_MISSING_PROMPT,
+                remoteParams.disableGMSMissingPrompt
+        );
+        OneSignalPrefs.saveBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                preferences.getOutcomesV2KeyName(),
+                remoteParams.influenceParams.outcomesV2ServiceEnabled
+        );
+
+        logger.debug("OneSignal saveInfluenceParams: " + remoteParams.influenceParams.toString());
+        trackerFactory.saveInfluenceParams(remoteParams.influenceParams);
+
+        saveLocationShared(remoteParams.locationShared);
+        OneSignal.setSharedLocation(remoteParams.locationShared);
+        savePrivacyConsentRequired(remoteParams.requiresUserPrivacyConsent);
+    }
+
+    boolean isRemoteParamsCallDone() {
+        return remoteParams != null;
+    }
+
+    OneSignalRemoteParams.Params getRemoteParams() {
+        return remoteParams;
+    }
+
+    void clearRemoteParams() {
+        remoteParams = null;
+    }
+
+    boolean getFirebaseAnalyticsEnabled() {
+        return OneSignalPrefs.getBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_GT_FIREBASE_TRACKING_ENABLED,
+                false);
+    }
+
+    boolean getClearGroupSummaryClick() {
+        return OneSignalPrefs.getBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_CLEAR_GROUP_SUMMARY_CLICK,
+                true);
+    }
+
+    boolean unsubscribeWhenNotificationsAreDisabled() {
+        return OneSignalPrefs.getBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_UNSUBSCRIBE_WHEN_NOTIFICATIONS_DISABLED,
+                true);
+    }
+
+    boolean isGMSMissingPromptDisable() {
+        return OneSignalPrefs.getBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_DISABLE_GMS_MISSING_PROMPT,
+                false);
+    }
+
+    boolean isLocationShared() {
+        return OneSignalPrefs.getBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_LOCATION_SHARED,
+                true);
+    }
+
+    void saveLocationShared(boolean shared) {
+        OneSignalPrefs.saveBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_LOCATION_SHARED,
+                shared);
+    }
+
+    boolean isPrivacyConsentRequired() {
+        return OneSignalPrefs.getBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_REQUIRES_USER_PRIVACY_CONSENT,
+                true);
+    }
+
+
+    void savePrivacyConsentRequired(boolean required) {
+        OneSignalPrefs.saveBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_OS_REQUIRES_USER_PRIVACY_CONSENT,
+                required);
+    }
+
+    boolean getSavedUserConsentStatus() {
+        return OneSignalPrefs.getBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_ONESIGNAL_USER_PROVIDED_CONSENT,
+                false);
+    }
+
+    void saveUserConsentStatus(boolean consent) {
+        OneSignalPrefs.saveBool(
+                OneSignalPrefs.PREFS_ONESIGNAL,
+                OneSignalPrefs.PREFS_ONESIGNAL_USER_PROVIDED_CONSENT,
+                consent);
+    }
+}