Merge branch 'user-model/main' into user-model/ktlint-fixes

Author: brismithers

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/PairRecyclerViewAdapter.java

@@ -81,8 +81,10 @@ private void populateInterfaceElements(final int position) {
 
             if (Util.isBoolean(value))
                 value += " (bool)";
-            else if (Util.isNumeric(value))
-                value += " (num)";
+            else if (Util.isInteger(value))
+                value += " (int)";
+            else if (Util.isFloat(value))
+                value += " (float)";
             else
                 value += " (str)";
             pairValueTextView.setText(value);

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/adapter/SingleRecyclerViewAdapter.java

@@ -76,8 +76,10 @@ private void populateInterfaceElements(final int position) {
 
             if (Util.isBoolean(value))
                 value += " (bool)";
-            else if (Util.isNumeric(value))
-                value += " (num)";
+            else if (Util.isInteger(value))
+                value += " (int)";
+            else if (Util.isFloat(value))
+                value += " (float)";
             else
                 value += " (str)";
             singleTextView.setText(value);

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

@@ -719,7 +719,7 @@ public void onSuccess(Pair<String, Object> pair) {
                     triggerSet.remove(pair.first);
                     toaster.makeCustomViewToast("Deleted trigger " + pair.first, ToastType.SUCCESS);
                 } else {
-                    OneSignal.getInAppMessages().addTrigger(pair.first, pair.second);
+                    OneSignal.getInAppMessages().addTrigger(pair.first, pair.second.toString());
                     triggerSet.put(pair.first, pair.second);
                     toaster.makeCustomViewToast("Added trigger " + pair.first, ToastType.SUCCESS);
                 }

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Dialog.java

@@ -167,7 +167,9 @@ public void onClick(final DialogInterface dialog, int which) {
                 Object pairValue = pairStringValue;
                 if (Util.isBoolean(pairStringValue)) {
                     pairValue = Boolean.parseBoolean(pairStringValue.toLowerCase());
-                } else if (Util.isNumeric(pairStringValue)) {
+                } else if (Util.isInteger(pairStringValue)) {
+                    pairValue = Long.parseLong(pairStringValue);
+                } else if (Util.isFloat(pairStringValue)) {
                     pairValue = Double.parseDouble(pairStringValue);
                 }
 

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Util.java

@@ -7,7 +7,16 @@ public static boolean isBoolean(String string) {
         return (string.equals("true") || string.equals("false"));
     }
 
-    public static boolean isNumeric(String string) {
+    public static boolean isInteger(String string) {
+        try {
+            Long.parseLong(string);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+    public static boolean isFloat(String string) {
         try {
             Double.parseDouble(string);
             return true;

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt

@@ -5,6 +5,13 @@ import org.json.JSONArray
 import org.json.JSONObject
 
 class ConfigModel : Model() {
+    /**
+     * Whether this config has been initialized with remote data.
+     */
+    var isInitializedWithRemote: Boolean
+        get() = getBooleanProperty(::isInitializedWithRemote.name) { false }
+        set(value) { setBooleanProperty(::isInitializedWithRemote.name, value) }
+
     /**
      * The current OneSignal application ID provided to the SDK.
      */

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/impl/ConfigModelStoreListener.kt

@@ -68,6 +68,8 @@ internal class ConfigModelStoreListener(
                     val config = ConfigModel()
                     config.initializeFromModel(null, _configModelStore.model)
 
+                    config.isInitializedWithRemote = true
+
                     // these are always copied from the backend params
                     config.appId = appId
                     config.notificationChannels = params.notificationChannels

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/IInAppMessagesManager.kt

@@ -25,10 +25,9 @@ interface IInAppMessagesManager {
      * to the current user.
      *
      * @param key The key of the trigger that is to be set.
-     * @param value The value of the trigger. Although this is defined as [Any] its [Any.toString]
-     * will be used for evaluation purposes.
+     * @param value The value of the trigger.
      */
-    fun addTrigger(key: String, value: Any)
+    fun addTrigger(key: String, value: String)
 
     /**
      * Add multiple triggers for the current user.  Triggers are currently explicitly used to determine
@@ -38,11 +37,9 @@ interface IInAppMessagesManager {
      * triggers are not persisted to the backend. They only exist on the local device and are applicable
      * to the current user.
      *
-     * @param triggers The map of triggers that are to be added to the current user.  Although the
-     * value of the [Map] is defined as [Any] its [Any.toString] will be used for evaluation
-     * purposes.
+     * @param triggers The map of triggers that are to be added to the current user.
      */
-    fun addTriggers(triggers: Map<String, Any>)
+    fun addTriggers(triggers: Map<String, String>)
 
     /**
      * Remove the trigger with the provided key from the current user.

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/inAppMessages/internal/MisconfiguredIAMManager.kt

@@ -13,8 +13,8 @@ internal class MisconfiguredIAMManager : IInAppMessagesManager {
         get() = throw EXCEPTION
         set(value) = throw EXCEPTION
 
-    override fun addTrigger(key: String, value: Any) = throw EXCEPTION
-    override fun addTriggers(triggers: Map<String, Any>) = throw EXCEPTION
+    override fun addTrigger(key: String, value: String) = throw EXCEPTION
+    override fun addTriggers(triggers: Map<String, String>) = throw EXCEPTION
     override fun removeTrigger(key: String) = throw EXCEPTION
     override fun removeTriggers(keys: Collection<String>) = throw EXCEPTION
     override fun clearTriggers() = throw EXCEPTION

OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/DummyInAppMessagesManager.kt

@@ -6,10 +6,10 @@ import com.onesignal.inAppMessages.IInAppMessagesManager
 
 internal class DummyInAppMessagesManager : IInAppMessagesManager {
     override var paused: Boolean = true
-    override fun addTrigger(key: String, value: Any) {
+    override fun addTrigger(key: String, value: String) {
     }
 
-    override fun addTriggers(triggers: Map<String, Any>) {
+    override fun addTriggers(triggers: Map<String, String>) {
     }
 
     override fun removeTrigger(key: String) {