ktlint + fixes

.editorconfig

@@ -0,0 +1,26 @@
+root = true
+
+[*{kt,kts}]
+
+# sometimes this is good for readibility
+ktlint_standard_string-template = disabled
+
+# sometimes this is good thing when a lot of code is packed
+ktlint_standard_no-empty-first-line-in-method-block = disabled
+
+# maybe in the future
+ktlint_standard_spacing-between-declarations-with-comments = disabled
+
+# this is no JS or TS
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+
+# not sure about this, but i dont like it :)
+ktlint_standard_colon-spacing = disabled
+
+# this is nitpicking
+ktlint_standard_import-ordering = disabled
+ktlint_standard_no-wildcard-imports = disabled
+
+# sometimes this is good thing
+ktlint_standard_filename = disabled

.github/workflows/build.yml

@@ -7,8 +7,6 @@ on:
       - main
       - release/*
   pull_request:
-  schedule:
-    - cron: '25 6 * * *'
 
 jobs:
   build:

.github/workflows/lint.yml

@@ -0,0 +1,18 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - develop
+      - release/*
+  pull_request:
+
+jobs:
+  ktlint:
+    name: ktlint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v4
+      - name: Run lint script
+        run: ./scripts/lint.sh

build.gradle.kts

@@ -39,4 +39,4 @@ allprojects {
 
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
-}
+}

buildSrc/build.gradle.kts

@@ -1,4 +1,4 @@
-plugins{
+plugins {
     `kotlin-dsl`
 }
 
@@ -16,4 +16,4 @@ val dokkaVersion: String by System.getProperties()
 dependencies {
     implementation("com.android.tools.build", "gradle", androidPluginVersion)
     implementation(kotlin("gradle-plugin", kotlinVersion))
-}
+}

buildSrc/src/main/kotlin/Constants.kt

@@ -38,4 +38,4 @@ object Constants {
         const val minSdkVersion = 21
         const val buildToolsVersion = "33.0.2"
     }
-}
+}

library/build.gradle.kts

@@ -50,6 +50,17 @@ android {
             suppressWarnings = false
         }
     }
+
+    // Custom ktlint script
+    tasks.register("ktlint") {
+        logger.lifecycle("ktlint")
+        exec {
+            commandLine = listOf("./../scripts/lint.sh", "--no-error")
+        }
+    }
+
+    // Make ktlint run before build
+    tasks.getByName("preBuild").dependsOn("ktlint")
 }
 
 dependencies {
@@ -65,4 +76,4 @@ dependencies {
     compileOnly("io.getlime.core:rest-model-base:1.2.0")
 }
 
-apply("android-release-aar.gradle")
+apply("android-release-aar.gradle")

library/src/main/java/com/wultra/android/powerauth/networking/Api.kt

@@ -43,7 +43,6 @@ import com.wultra.android.powerauth.networking.utils.getCurrentLocale
 import io.getlime.security.powerauth.core.EciesCryptogram
 import io.getlime.security.powerauth.core.EciesEncryptor
 import io.getlime.security.powerauth.networking.response.IGetEciesEncryptorListener
-import io.getlime.security.powerauth.networking.response.ITimeSynchronizationListener
 import io.getlime.security.powerauth.sdk.PowerAuthAuthentication
 import io.getlime.security.powerauth.sdk.PowerAuthSDK
 import io.getlime.security.powerauth.sdk.PowerAuthToken
@@ -52,7 +51,6 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient.Builder
 import okhttp3.RequestBody.Companion.toRequestBody
 import java.io.IOException
-import java.util.*
 
 interface IApiCallResponseListener<T> {
     fun onSuccess(result: T)
@@ -77,8 +75,8 @@ abstract class Api(
     @PublishedApi internal val gsonBuilder: GsonBuilder,
     @PublishedApi internal val appContext: Context,
     tokenProvider: IPowerAuthTokenProvider? = null,
-    @PublishedApi internal val userAgent: UserAgent = UserAgent.libraryDefault(appContext)) {
-
+    @PublishedApi internal val userAgent: UserAgent = UserAgent.libraryDefault(appContext)
+) {
     /**
      * Language sent in request header. Default value is "en".
      */
@@ -101,9 +99,9 @@ abstract class Api(
         endpoint: EndpointBasic<TRequestData, TResponseData>,
         headers: HashMap<String, String>? = null,
         okHttpInterceptor: OkHttpBuilderInterceptor? = null,
-        listener: IApiCallResponseListener<TResponseData>) {
-
-            makeCall(getBodyBytes(data), endpoint, headers ?: hashMapOf(), okHttpInterceptor, listener)
+        listener: IApiCallResponseListener<TResponseData>
+    ) {
+        makeCall(getBodyBytes(data), endpoint, headers ?: hashMapOf(), okHttpInterceptor, listener)
     }
 
     inline fun <reified TRequestData: BaseRequest, reified TResponseData: StatusResponse> post(
@@ -112,49 +110,50 @@ abstract class Api(
         authentication: PowerAuthAuthentication,
         headers: HashMap<String, String>? = null,
         okHttpInterceptor: OkHttpBuilderInterceptor? = null,
-        listener: IApiCallResponseListener<TResponseData>) {
+        listener: IApiCallResponseListener<TResponseData>
+    ) {
 
-            val bodyBytes = getBodyBytes(data)
+        val bodyBytes = getBodyBytes(data)
 
-            val authorizationHeader = powerAuthSDK.requestSignatureWithAuthentication(
-                appContext,
-                authentication,
-                "POST",
-                endpoint.uriId,
-                bodyBytes
-            )
+        val authorizationHeader = powerAuthSDK.requestSignatureWithAuthentication(
+            appContext,
+            authentication,
+            "POST",
+            endpoint.uriId,
+            bodyBytes
+        )
 
-            val newHeaders = headers ?: hashMapOf()
-            newHeaders[authorizationHeader.key] = authorizationHeader.value
+        val newHeaders = headers ?: hashMapOf()
+        newHeaders[authorizationHeader.key] = authorizationHeader.value
 
-            makeCall(bodyBytes, endpoint, newHeaders, okHttpInterceptor, listener)
+        makeCall(bodyBytes, endpoint, newHeaders, okHttpInterceptor, listener)
     }
 
     inline fun <reified TRequestData: BaseRequest, reified TResponseData: StatusResponse> post(
         data: TRequestData,
         endpoint: EndpointSignedWithToken<TRequestData, TResponseData>,
         headers: HashMap<String, String>? = null,
         okHttpInterceptor: OkHttpBuilderInterceptor? = null,
-        listener: IApiCallResponseListener<TResponseData>) {
-
-            tokenProvider.getTokenAsync(
-                endpoint.tokenName,
-                object : IPowerAuthTokenListener {
-                    override fun onReceived(token: PowerAuthToken) {
-
-                        val tokenHeader = token.generateHeader()
-                        val bodyBytes = getBodyBytes(data)
-                        val newHeaders = headers ?: hashMapOf()
-                        newHeaders[tokenHeader.key] = tokenHeader.value
-
-                        makeCall(bodyBytes, endpoint, newHeaders, okHttpInterceptor, listener)
-                    }
+        listener: IApiCallResponseListener<TResponseData>
+    ) {
+        tokenProvider.getTokenAsync(
+            endpoint.tokenName,
+            object : IPowerAuthTokenListener {
+                override fun onReceived(token: PowerAuthToken) {
+
+                    val tokenHeader = token.generateHeader()
+                    val bodyBytes = getBodyBytes(data)
+                    val newHeaders = headers ?: hashMapOf()
+                    newHeaders[tokenHeader.key] = tokenHeader.value
+
+                    makeCall(bodyBytes, endpoint, newHeaders, okHttpInterceptor, listener)
+                }
 
-                    override fun onFailed(e: Throwable) {
-                        listener.onFailure(ApiError(e))
-                    }
+                override fun onFailed(e: Throwable) {
+                    listener.onFailure(ApiError(e))
                 }
-            )
+            }
+        )
     }
 
     // PRIVATE API
@@ -172,7 +171,8 @@ abstract class Api(
         endpoint: Endpoint<TRequestData, TResponseData>,
         headers: HashMap<String, String>,
         okHttpInterceptor: OkHttpBuilderInterceptor? = null,
-        listener: IApiCallResponseListener<TResponseData>) {
+        listener: IApiCallResponseListener<TResponseData>
+    ) {
 
         var bytes = bodyBytes
 
@@ -272,7 +272,7 @@ abstract class Api(
     internal inline fun <reified TRequestData: BaseRequest, reified TResponseData: StatusResponse> getEncryptor(
         endpoint: Endpoint<TRequestData, TResponseData>,
         crossinline callback: (Result<EciesEncryptor?>) -> Unit
-        ) {
+    ) {
 
         val listener = object : IGetEciesEncryptorListener {
             override fun onGetEciesEncryptorSuccess(encryptor: EciesEncryptor) {
@@ -327,7 +327,7 @@ class UserAgent internal constructor(@PublishedApi internal val value: String? =
     @SerializedName("mac") val mac: String?,
     @SerializedName("nonce") val nonce: String?,
     @SerializedName("timestamp") val timestamp: Long?
-    )
+)
 
 /** Envelope for E2EE responses. */
 @PublishedApi
@@ -338,4 +338,4 @@ internal class E2EEResponse(
     @SerializedName("timestamp") val timestamp: Long?
 ) {
     fun toCryptogram() = EciesCryptogram(null, encryptedData, mac, null, nonce, timestamp ?: 0)
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/ECIESInterceptor.kt

@@ -31,4 +31,4 @@ interface ECIESInterceptor: Interceptor {
      * @param decrypted Decrypted payload
      */
     fun encryptedResponseReceived(url: URL, decrypted: ByteArray)
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/Endpoint.kt

@@ -72,4 +72,4 @@ enum class E2EEConfiguration {
     ACTIVATION_SCOPE,
     /** Endpoint is not encrypted. */
     NOT_ENCRYPTED
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/data/Requests.kt

@@ -26,4 +26,4 @@ open class BaseRequest
 /**
  * Common request format with data object inside the `requestObject` property.
  */
-abstract class ObjectRequest<T>(@SerializedName("requestObject") val requestObject: T): BaseRequest()
+abstract class ObjectRequest<T>(@SerializedName("requestObject") val requestObject: T): BaseRequest()

library/src/main/java/com/wultra/android/powerauth/networking/data/Responses.kt

@@ -35,4 +35,4 @@ open class StatusResponse(@SerializedName("status") val status: Status) {
 /**
  * Common response where data returned are inside the `responseObject` property.
  */
-abstract class ObjectResponse<T>(@SerializedName("responseObject") val responseObject: T, status: Status): StatusResponse(status)
+abstract class ObjectResponse<T>(@SerializedName("responseObject") val responseObject: T, status: Status): StatusResponse(status)

library/src/main/java/com/wultra/android/powerauth/networking/error/ApiError.kt

@@ -34,5 +34,4 @@ data class ApiError(val e: Throwable) {
             null
         }
     }
-
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/error/ApiErrorCode.kt

@@ -144,4 +144,4 @@ enum class ApiErrorCode(val message: String) {
          */
         fun errorCodeFromCodeString(code: String): ApiErrorCode? = map[code]
     }
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/error/ApiErrorException.kt

@@ -57,4 +57,4 @@ class ApiErrorException(
             return if (t is ApiErrorException) t else ApiErrorException(t)
         }
     }
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/error/ApiHttpException.kt

@@ -37,4 +37,4 @@ class ApiHttpException(
     /** Response code */
     val code: Int = response.code
     override val message: String = response.message
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/error/ErrorResponse.kt

@@ -21,4 +21,4 @@ import com.wultra.android.powerauth.networking.data.ObjectResponse
 /**
  * Model class for error response - the wrapper responseObject.
  */
-class ErrorResponse(responseObject: ErrorResponseObject, status: Status): ObjectResponse<ErrorResponseObject>(responseObject, status)
+class ErrorResponse(responseObject: ErrorResponseObject, status: Status): ObjectResponse<ErrorResponseObject>(responseObject, status)

library/src/main/java/com/wultra/android/powerauth/networking/error/ErrorResponseObject.kt

@@ -22,14 +22,14 @@ import com.google.gson.annotations.SerializedName
  * Model class for error response.
  */
 data class ErrorResponseObject(
-        @SerializedName("code")
-        val code: String,
-
-        @SerializedName("message")
-        val message: String) {
+    @SerializedName("code")
+    val code: String,
 
+    @SerializedName("message")
+    val message: String
+) {
     val errorCode: ApiErrorCode?
         get() {
             return ApiErrorCode.errorCodeFromCodeString(code)
         }
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/log/WPNLogListener.kt

@@ -21,4 +21,4 @@ interface WPNLogListener {
 
     /** Debug log */
     fun debug(message: String)
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/processing/GsonRequestBodyBytes.kt

@@ -50,4 +50,4 @@ internal class GsonRequestBodyBytes<T>(private val gson: Gson, private val adapt
     companion object {
         private val UTF_8 = Charset.forName("UTF-8")
     }
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/ssl/ISSLPinningProvider.kt

@@ -18,7 +18,6 @@ package com.wultra.android.powerauth.networking.ssl
 
 import okhttp3.OkHttpClient
 
-
 /**
  * SSL pinning provider configures HTTP client to verify SSL certificates
  */
@@ -29,4 +28,4 @@ interface ISSLPinningProvider {
      * @param builder OkHttpClient builder to configure
      */
     fun configureOkHttpClient(builder: OkHttpClient.Builder)
-}
+}

library/src/main/java/com/wultra/android/powerauth/networking/ssl/SSLValidationStrategy.kt

@@ -63,7 +63,6 @@ internal class DefaultSSLValidationStrategy: SSLValidationStrategy() {
         // Nothing to change, use default
         return builder
     }
-
 }
 internal class NoSSLValidationStrategy: SSLValidationStrategy() {
     override fun configure(builder: OkHttpClient.Builder): OkHttpClient.Builder {
@@ -73,12 +72,10 @@ internal class NoSSLValidationStrategy: SSLValidationStrategy() {
         builder.hostnameVerifier(noValidationStrategy.hostnameVerifier!!)
         return builder
     }
-
 }
 internal class PinningSSLValidationStrategy(private val provider: ISSLPinningProvider): SSLValidationStrategy() {
     override fun configure(builder: OkHttpClient.Builder): OkHttpClient.Builder {
         provider.configureOkHttpClient(builder)
         return builder
     }
 }
-