Apply spotless

forage-android/src/main/java/com/joinforage/forage/android/core/services/Utils.kt

@@ -103,4 +103,4 @@ internal fun JSONObject.getStringOrNull(fieldName: String): String? {
 
 internal fun JSONObject.hasNonNull(fieldName: String): Boolean {
     return has(fieldName) && !isNull(fieldName)
-}
+}

forage-android/src/main/java/com/joinforage/forage/android/core/services/forageapi/encryptkey/EncryptionKeyService.kt

@@ -1,11 +1,11 @@
 package com.joinforage.forage.android.core.services.forageapi.encryptkey
 
 import com.joinforage.forage.android.core.services.ForageConstants
-import com.joinforage.forage.android.core.services.telemetry.Log
 import com.joinforage.forage.android.core.services.addTrailingSlash
 import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
 import com.joinforage.forage.android.core.services.forageapi.network.ForageError
 import com.joinforage.forage.android.core.services.forageapi.network.NetworkService
+import com.joinforage.forage.android.core.services.telemetry.Log
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient

forage-android/src/main/java/com/joinforage/forage/android/core/services/forageapi/payment/Payment.kt

@@ -1,9 +1,9 @@
 package com.joinforage.forage.android.core.services.forageapi.payment
 
-import com.joinforage.forage.android.core.services.getStringOrNull
-import com.joinforage.forage.android.core.services.hasNonNull
 import com.joinforage.forage.android.core.services.forageapi.paymentmethod.Balance
 import com.joinforage.forage.android.core.services.forageapi.paymentmethod.EbtBalance
+import com.joinforage.forage.android.core.services.getStringOrNull
+import com.joinforage.forage.android.core.services.hasNonNull
 import org.json.JSONArray
 import org.json.JSONObject
 

forage-android/src/main/java/com/joinforage/forage/android/core/services/forageapi/payment/PaymentService.kt

@@ -1,11 +1,11 @@
 package com.joinforage.forage.android.core.services.forageapi.payment
 
 import com.joinforage.forage.android.core.services.ForageConstants
-import com.joinforage.forage.android.core.services.telemetry.Log
 import com.joinforage.forage.android.core.services.addTrailingSlash
 import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
 import com.joinforage.forage.android.core.services.forageapi.network.ForageError
 import com.joinforage.forage.android.core.services.forageapi.network.NetworkService
+import com.joinforage.forage.android.core.services.telemetry.Log
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient

forage-android/src/main/java/com/joinforage/forage/android/core/services/forageapi/paymentmethod/PaymentMethod.kt

@@ -32,4 +32,4 @@ data class PaymentMethod(
         card = EbtCard(jsonObject.getJSONObject("card")),
         reusable = jsonObject.optBoolean("reusable", true)
     )
-}
+}

forage-android/src/main/java/com/joinforage/forage/android/core/services/forageapi/paymentmethod/PaymentMethodService.kt

@@ -1,11 +1,11 @@
 package com.joinforage.forage.android.core.services.forageapi.paymentmethod
 
 import com.joinforage.forage.android.core.services.ForageConstants
-import com.joinforage.forage.android.core.services.telemetry.Log
 import com.joinforage.forage.android.core.services.addTrailingSlash
 import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
 import com.joinforage.forage.android.core.services.forageapi.network.ForageError
 import com.joinforage.forage.android.core.services.forageapi.network.NetworkService
+import com.joinforage.forage.android.core.services.telemetry.Log
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient

forage-android/src/main/java/com/joinforage/forage/android/core/services/forageapi/polling/MessageStatusService.kt

@@ -1,11 +1,11 @@
 package com.joinforage.forage.android.core.services.forageapi.polling
 
 import com.joinforage.forage.android.core.services.ForageConstants
-import com.joinforage.forage.android.core.services.telemetry.Log
 import com.joinforage.forage.android.core.services.addTrailingSlash
 import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
 import com.joinforage.forage.android.core.services.forageapi.network.ForageError
 import com.joinforage.forage.android.core.services.forageapi.network.NetworkService
+import com.joinforage.forage.android.core.services.telemetry.Log
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient

forage-android/src/main/java/com/joinforage/forage/android/core/services/forageapi/polling/PollingService.kt

@@ -1,10 +1,10 @@
 package com.joinforage.forage.android.core.services.forageapi.polling
 
-import com.joinforage.forage.android.core.services.launchdarkly.LDManager
-import com.joinforage.forage.android.core.services.telemetry.Log
 import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
 import com.joinforage.forage.android.core.services.forageapi.network.ForageError
 import com.joinforage.forage.android.core.services.getJitterAmount
+import com.joinforage.forage.android.core.services.launchdarkly.LDManager
+import com.joinforage.forage.android.core.services.telemetry.Log
 import kotlinx.coroutines.delay
 
 internal class PollingService(

forage-android/src/main/java/com/joinforage/forage/android/core/services/vault/AbstractVaultSubmitter.kt

@@ -1,17 +1,17 @@
 package com.joinforage.forage.android.core.services.vault
 
 import android.content.Context
-import com.joinforage.forage.android.core.services.telemetry.Log
-import com.joinforage.forage.android.core.services.telemetry.UserAction
-import com.joinforage.forage.android.core.services.telemetry.VaultProxyResponseMonitor
-import com.joinforage.forage.android.core.services.forageapi.encryptkey.EncryptionKeys
-import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethod
 import com.joinforage.forage.android.core.services.ForageConstants
+import com.joinforage.forage.android.core.services.VaultType
+import com.joinforage.forage.android.core.services.forageapi.encryptkey.EncryptionKeys
 import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
 import com.joinforage.forage.android.core.services.forageapi.network.ForageError
 import com.joinforage.forage.android.core.services.forageapi.network.UnknownErrorApiResponse
-import com.joinforage.forage.android.core.services.VaultType
 import com.joinforage.forage.android.core.services.forageapi.paymentmethod.EbtCard
+import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethod
+import com.joinforage.forage.android.core.services.telemetry.Log
+import com.joinforage.forage.android.core.services.telemetry.UserAction
+import com.joinforage.forage.android.core.services.telemetry.VaultProxyResponseMonitor
 import com.joinforage.forage.android.core.ui.element.ForagePinElement
 
 internal val IncompletePinError = ForageApiResponse.Failure.fromError(
@@ -35,7 +35,7 @@ internal interface VaultSubmitter {
 internal abstract class AbstractVaultSubmitter(
     protected val context: Context,
     protected val foragePinEditText: ForagePinElement,
-    protected val logger: Log,
+    protected val logger: Log
 ) : VaultSubmitter {
 
     abstract val vaultType: VaultType
@@ -174,6 +174,5 @@ internal abstract class AbstractVaultSubmitter(
 
         internal fun deferPaymentCapturePath(paymentRef: String) =
             "/api/payments/$paymentRef/collect_pin/"
-
     }
 }

forage-android/src/main/java/com/joinforage/forage/android/core/services/vault/CapturePaymentRepository.kt

@@ -1,16 +1,16 @@
 package com.joinforage.forage.android.core.services.vault
 
 import com.joinforage.forage.android.core.services.forageapi.encryptkey.EncryptionKeyService
-import com.joinforage.forage.android.core.services.telemetry.Log
-import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethodService
-import com.joinforage.forage.android.core.services.forageapi.payment.PaymentService
-import com.joinforage.forage.android.core.services.forageapi.polling.PollingService
-import com.joinforage.forage.android.core.services.telemetry.UserAction
 import com.joinforage.forage.android.core.services.forageapi.encryptkey.EncryptionKeys
+import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
 import com.joinforage.forage.android.core.services.forageapi.payment.Payment
+import com.joinforage.forage.android.core.services.forageapi.payment.PaymentService
 import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethod
-import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
+import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethodService
 import com.joinforage.forage.android.core.services.forageapi.polling.Message
+import com.joinforage.forage.android.core.services.forageapi.polling.PollingService
+import com.joinforage.forage.android.core.services.telemetry.Log
+import com.joinforage.forage.android.core.services.telemetry.UserAction
 
 internal class CapturePaymentRepository(
     private val vaultSubmitter: VaultSubmitter,

forage-android/src/main/java/com/joinforage/forage/android/core/services/vault/CheckBalanceRepository.kt

@@ -1,14 +1,14 @@
 package com.joinforage.forage.android.core.services.vault
 
 import com.joinforage.forage.android.core.services.forageapi.encryptkey.EncryptionKeyService
-import com.joinforage.forage.android.core.services.telemetry.Log
-import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethodService
-import com.joinforage.forage.android.core.services.forageapi.polling.PollingService
-import com.joinforage.forage.android.core.services.telemetry.UserAction
 import com.joinforage.forage.android.core.services.forageapi.encryptkey.EncryptionKeys
-import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethod
 import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
+import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethod
+import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethodService
 import com.joinforage.forage.android.core.services.forageapi.polling.Message
+import com.joinforage.forage.android.core.services.forageapi.polling.PollingService
+import com.joinforage.forage.android.core.services.telemetry.Log
+import com.joinforage.forage.android.core.services.telemetry.UserAction
 import java.util.UUID
 
 internal class CheckBalanceRepository(

forage-android/src/main/java/com/joinforage/forage/android/core/services/vault/DeferPaymentCaptureRepository.kt

@@ -1,13 +1,13 @@
 package com.joinforage.forage.android.core.services.vault
 
 import com.joinforage.forage.android.core.services.forageapi.encryptkey.EncryptionKeyService
-import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethodService
-import com.joinforage.forage.android.core.services.forageapi.payment.PaymentService
-import com.joinforage.forage.android.core.services.telemetry.UserAction
 import com.joinforage.forage.android.core.services.forageapi.encryptkey.EncryptionKeys
+import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
 import com.joinforage.forage.android.core.services.forageapi.payment.Payment
+import com.joinforage.forage.android.core.services.forageapi.payment.PaymentService
 import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethod
-import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
+import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethodService
+import com.joinforage.forage.android.core.services.telemetry.UserAction
 import java.util.UUID
 
 internal class DeferPaymentCaptureRepository(

forage-android/src/main/java/com/joinforage/forage/android/core/services/vault/TokenizeCardService.kt

@@ -1,13 +1,13 @@
 package com.joinforage.forage.android.core.services.vault
 
 import com.joinforage.forage.android.core.services.ForageConstants
-import com.joinforage.forage.android.core.services.telemetry.Log
 import com.joinforage.forage.android.core.services.addTrailingSlash
-import com.joinforage.forage.android.core.services.forageapi.network.NetworkService
 import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
 import com.joinforage.forage.android.core.services.forageapi.network.ForageError
+import com.joinforage.forage.android.core.services.forageapi.network.NetworkService
 import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethodRequestBody
 import com.joinforage.forage.android.core.services.forageapi.paymentmethod.RequestBody
+import com.joinforage.forage.android.core.services.telemetry.Log
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.MediaType.Companion.toMediaTypeOrNull

forage-android/src/main/java/com/joinforage/forage/android/core/services/vault/VaultResponseParser.kt

@@ -10,4 +10,4 @@ internal interface VaultResponseParser {
 
     val vaultErrorMsg: String?
     val rawResponse: String
-}
+}

forage-android/src/main/java/com/joinforage/forage/android/core/ui/Utils.kt

@@ -1,7 +1,7 @@
 package com.joinforage.forage.android.core.ui
 
-import android.content.res.TypedArray
 import android.content.Context
+import android.content.res.TypedArray
 import android.util.TypedValue
 
 internal fun getThemeAccentColor(context: Context): Int {
@@ -33,4 +33,4 @@ internal fun TypedArray.getBoxCornerRadiusTopStart(boxCornerRadius: Float): Floa
 internal fun TypedArray.getBoxCornerRadius(styleIndex: Int, defaultBoxCornerRadius: Float): Float {
     val styledBoxCornerRadius = getDimension(styleIndex, 0f)
     return if (styledBoxCornerRadius == 0f) defaultBoxCornerRadius else styledBoxCornerRadius
-}
+}

forage-android/src/main/java/com/joinforage/forage/android/core/ui/VaultWrapper.kt

@@ -7,8 +7,8 @@ import android.util.TypedValue
 import android.view.View
 import android.widget.FrameLayout
 import com.joinforage.forage.android.core.services.VaultType
-import com.joinforage.forage.android.core.services.vault.AbstractVaultSubmitter
 import com.joinforage.forage.android.core.services.telemetry.Log
+import com.joinforage.forage.android.core.services.vault.AbstractVaultSubmitter
 import com.joinforage.forage.android.core.ui.element.ForagePinElement
 import com.joinforage.forage.android.core.ui.element.SimpleElementListener
 import com.joinforage.forage.android.core.ui.element.StatefulElementListener
@@ -43,7 +43,7 @@ internal abstract class VaultWrapper @JvmOverloads constructor(
     abstract fun getVaultSubmitter(
         foragePinElement: ForagePinElement,
         logger: Log
-    ) : AbstractVaultSubmitter
+    ): AbstractVaultSubmitter
 
     fun getThemeAccentColor(context: Context): Int {
         val outValue = TypedValue()

forage-android/src/main/java/com/joinforage/forage/android/core/ui/element/ForagePanElement.kt

@@ -291,4 +291,4 @@ abstract class ForagePanElement @JvmOverloads constructor(
         // remove format spacing
         return rawText.filter { it.isDigit() }
     }
-}
+}

forage-android/src/main/java/com/joinforage/forage/android/core/ui/element/ForagePinElement.kt

@@ -9,11 +9,11 @@ import android.widget.LinearLayout
 import com.joinforage.forage.android.R
 import com.joinforage.forage.android.core.ForageConfigNotSetException
 import com.joinforage.forage.android.core.services.VaultType
-import com.joinforage.forage.android.core.services.vault.AbstractVaultSubmitter
 import com.joinforage.forage.android.core.services.telemetry.Log
+import com.joinforage.forage.android.core.services.vault.AbstractVaultSubmitter
+import com.joinforage.forage.android.core.ui.VaultWrapper
 import com.joinforage.forage.android.core.ui.element.state.PinElementState
 import com.joinforage.forage.android.core.ui.getLogoImageViewLayout
-import com.joinforage.forage.android.core.ui.VaultWrapper
 
 /**
  * A [ForageElement] that securely collects a card PIN. You need a [ForagePINEditText] to call
@@ -104,7 +104,7 @@ abstract class ForagePinElement @JvmOverloads constructor(
             }
     }
 
-    internal abstract fun determineBackingVault(forageConfig: ForageConfig, logger: Log) : VaultWrapper
+    internal abstract fun determineBackingVault(forageConfig: ForageConfig, logger: Log): VaultWrapper
 
     override fun initWithForageConfig(forageConfig: ForageConfig) {
         // Must initialize DD at the beginning of each render function. DD requires the context,
@@ -130,7 +130,7 @@ abstract class ForagePinElement @JvmOverloads constructor(
         vault.clearText()
     }
 
-    internal fun getVaultSubmitter(logger: Log) : AbstractVaultSubmitter =
+    internal fun getVaultSubmitter(logger: Log): AbstractVaultSubmitter =
         vault.getVaultSubmitter(this, logger)
 
     // While the events that ForageElements expose mirrors the
@@ -183,4 +183,4 @@ abstract class ForagePinElement @JvmOverloads constructor(
     override fun setBoxStrokeWidthFocused(boxStrokeWidth: Int) {
         // no-ops for now
     }
-}
+}

forage-android/src/main/java/com/joinforage/forage/android/ecom/services/ForageSDK.kt

@@ -7,25 +7,25 @@ import com.joinforage.forage.android.core.ForageConfigNotSetException
 import com.joinforage.forage.android.core.ForageSDKInterface
 import com.joinforage.forage.android.core.TokenizeEBTCardParams
 import com.joinforage.forage.android.core.services.EnvConfig
-import com.joinforage.forage.android.core.ui.element.state.ElementState
-import com.joinforage.forage.android.core.services.telemetry.CustomerPerceivedResponseMonitor
-import com.joinforage.forage.android.core.services.telemetry.EventOutcome
-import com.joinforage.forage.android.core.services.telemetry.Log
-import com.joinforage.forage.android.core.services.telemetry.UserAction
 import com.joinforage.forage.android.core.services.forageapi.encryptkey.EncryptionKeyService
-import com.joinforage.forage.android.core.services.forageapi.polling.MessageStatusService
+import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
 import com.joinforage.forage.android.core.services.forageapi.network.OkHttpClientBuilder
-import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethodService
 import com.joinforage.forage.android.core.services.forageapi.payment.PaymentService
+import com.joinforage.forage.android.core.services.forageapi.paymentmethod.PaymentMethodService
+import com.joinforage.forage.android.core.services.forageapi.polling.MessageStatusService
 import com.joinforage.forage.android.core.services.forageapi.polling.PollingService
-import com.joinforage.forage.android.core.services.vault.TokenizeCardService
+import com.joinforage.forage.android.core.services.telemetry.CustomerPerceivedResponseMonitor
+import com.joinforage.forage.android.core.services.telemetry.EventOutcome
+import com.joinforage.forage.android.core.services.telemetry.Log
+import com.joinforage.forage.android.core.services.telemetry.UserAction
 import com.joinforage.forage.android.core.services.vault.CapturePaymentRepository
 import com.joinforage.forage.android.core.services.vault.CheckBalanceRepository
 import com.joinforage.forage.android.core.services.vault.DeferPaymentCaptureRepository
-import com.joinforage.forage.android.core.services.forageapi.network.ForageApiResponse
+import com.joinforage.forage.android.core.services.vault.TokenizeCardService
 import com.joinforage.forage.android.core.ui.element.AbstractForageElement
 import com.joinforage.forage.android.core.ui.element.ForageConfig
 import com.joinforage.forage.android.core.ui.element.ForagePinElement
+import com.joinforage.forage.android.core.ui.element.state.ElementState
 import com.joinforage.forage.android.ecom.ui.ForagePINEditText
 
 /**

forage-android/src/main/java/com/joinforage/forage/android/ecom/services/vault/bt/BTResponseParser.kt

@@ -30,7 +30,7 @@ class BTResponseParser(btRes: Result<Any?>) : VaultResponseParser {
         val resRegExp = BtResponseRegExp(vaultResponse)
         return try {
             // TODO: add DD metric to track frequency of proxy errors
-            if(resRegExp.containsProxyError) UnknownErrorApiResponse else null
+            if (resRegExp.containsProxyError) UnknownErrorApiResponse else null
         } catch (_: Exception) {
             null
         }
@@ -52,11 +52,12 @@ class BTResponseParser(btRes: Result<Any?>) : VaultResponseParser {
     }
 
     private fun parseSuccessfulResponse(vaultResponse: Result<Any?>): ForageApiResponse.Success<String>? {
-        return if (!isSuccessful) null
-        else {
+        return if (!isSuccessful) {
+            null
+        } else {
             // note: Result.toString() wraps the actual response as
             // "Success(<actual-value-here>)"
             ForageApiResponse.Success(vaultResponse.getOrNull().toString())
         }
     }
-}
+}

forage-android/src/main/java/com/joinforage/forage/android/ecom/services/vault/bt/BaseResponseRegExp.kt

@@ -21,4 +21,4 @@ open class BaseResponseRegExp(res: Result<Any?>) {
             statusCode = null
         }
     }
-}
+}