Merge pull request #1758 from OneSignal/user-model/ktlint-fixes

[User Model] Make ktlint fixes

Author: brismithers

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)
     }
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/AndroidSupportV4Compat.kt

@@ -55,7 +55,7 @@ class AndroidSupportV4Compat {
                 context.getColor(id)
             } else {
                 context.resources.getColor(
-                    id
+                    id,
                 )
             }
         }
@@ -73,7 +73,7 @@ class AndroidSupportV4Compat {
 
         fun shouldShowRequestPermissionRationale(
             activity: Activity?,
-            permission: String?
+            permission: String?,
         ): Boolean {
             return ActivityCompatApi23.shouldShowRequestPermissionRationale(activity, permission)
         }
@@ -84,19 +84,19 @@ class AndroidSupportV4Compat {
         fun requestPermissions(activity: Activity, permissions: Array<String?>?, requestCode: Int) {
             if (activity is RequestPermissionsRequestCodeValidator) {
                 (activity as RequestPermissionsRequestCodeValidator).validateRequestPermissionsRequestCode(
-                    requestCode
+                    requestCode,
                 )
             }
             activity.requestPermissions(permissions!!, requestCode)
         }
 
         fun shouldShowRequestPermissionRationale(
             activity: Activity?,
-            permission: String?
+            permission: String?,
         ): Boolean {
             return androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale(
                 activity!!,
-                permission!!
+                permission!!,
             )
         }
     }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/AndroidUtils.kt

@@ -86,7 +86,7 @@ object AndroidUtils {
         try {
             ai = context.packageManager.getApplicationInfo(
                 context.packageName,
-                PackageManager.GET_META_DATA
+                PackageManager.GET_META_DATA,
             )
             return ai.metaData
         } catch (e: PackageManager.NameNotFoundException) {
@@ -190,7 +190,7 @@ object AndroidUtils {
             else -> intent = Intent(Intent.ACTION_VIEW, uri)
         }
         intent.addFlags(
-            Intent.FLAG_ACTIVITY_NEW_TASK
+            Intent.FLAG_ACTIVITY_NEW_TASK,
         )
         return intent
     }
@@ -210,7 +210,7 @@ object AndroidUtils {
                 .packageManager
                 .getPackageInfo(
                     applicationService.appContext.packageName,
-                    PackageManager.GET_PERMISSIONS
+                    PackageManager.GET_PERMISSIONS,
                 )
             val permissionList = listOf(*packageInfo.requestedPermissions)
 
@@ -221,7 +221,7 @@ object AndroidUtils {
             } else {
                 val permissionGrant = AndroidSupportV4Compat.ContextCompat.checkSelfPermission(
                     applicationService.appContext,
-                    permission
+                    permission,
                 )
                 permissionGrant != PackageManager.PERMISSION_DENIED
             }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONUtils.kt

@@ -153,7 +153,7 @@ object JSONUtils {
         return if (clazz == Float::class.java) {
             (`object` as Float?)?.let {
                 java.lang.Double.valueOf(
-                    it.toDouble()
+                    it.toDouble(),
                 )
             }
         } else {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/NetworkUtils.kt

@@ -6,7 +6,7 @@ object NetworkUtils {
         RETRYABLE,
         UNAUTHORIZED,
         MISSING,
-        CONFLICT
+        CONFLICT,
     }
 
     var MAX_NETWORK_REQUEST_ATTEMPT_COUNT = 3

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/OneSignalUtils.kt

@@ -9,17 +9,19 @@ object OneSignalUtils {
     const val sdkVersion: String = "050000"
 
     fun isValidEmail(email: String): Boolean {
-        if (email.isEmpty())
+        if (email.isEmpty()) {
             return false
+        }
 
         val emRegex = "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$"
         val pattern: Pattern = Pattern.compile(emRegex)
         return pattern.matcher(email).matches()
     }
 
     fun isValidPhoneNumber(number: String): Boolean {
-        if (number.isEmpty())
+        if (number.isEmpty()) {
             return false
+        }
 
         val emRegex = "^\\+?[1-9]\\d{1,14}\$"
         val pattern: Pattern = Pattern.compile(emRegex)