Merge from user-model/main

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/build.gradle

@@ -15,7 +15,8 @@ buildscript {
         huaweiHMSLocationVersion = '4.0.0.300'
         kotlinVersion = '1.7.10'
         kotestVersion = '5.5.0'
-        ktlintVersion = '11.0.0'
+        ktlintPluginVersion = '11.3.1'
+        ktlintVersion = '0.48.2'
         detektVersion = '1.21.0'
         junitVersion = '4.13.2'
     }
@@ -32,7 +33,7 @@ buildscript {
         classpath "com.google.gms:google-services:$googleServicesGradlePluginVersion"
         classpath "com.huawei.agconnect:agcp:$huaweiAgconnectVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlintVersion"
+        classpath "org.jlleitschuh.gradle:ktlint-gradle:$ktlintPluginVersion"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"
     }
 }

OneSignalSDK/onesignal/core/build.gradle

@@ -90,4 +90,8 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
 }
 
+ktlint {
+    version = "$ktlintVersion"
+}
+
 apply from: '../maven-push.gradle'

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/Continue.kt

@@ -26,7 +26,7 @@ class ContinueResult<R> (
     /**
      * The throwable that was thrown by the coroutine.  This will be `null` if [isSuccess] is `true`.
      */
-    val throwable: Throwable?
+    val throwable: Throwable?,
 )
 
 /**

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/IOneSignal.kt

@@ -83,7 +83,7 @@ interface IOneSignal {
      *
      * @return true if the SDK could be successfully initialized, false otherwise.
      */
-    fun initWithContext(context: Context, appId: String?) : Boolean
+    fun initWithContext(context: Context, appId: String?): Boolean
 
     /**
      * Login to OneSignal under the user identified by the [externalId] provided. The act of

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

@@ -192,7 +192,7 @@ object OneSignal {
      * THIS IS AN INTERNAL INTERFACE AND SHOULD NOT BE USED DIRECTLY.
      */
     @JvmStatic
-    fun initWithContext(context: Context) : Boolean {
+    fun initWithContext(context: Context): Boolean {
         return oneSignal.initWithContext(context, null)
     }