Skip to content

Commit

Permalink
Fix kotlin/java constructor duplicities + ktlint
Browse files Browse the repository at this point in the history
  • Loading branch information
Hopsaheysa committed Feb 6, 2025
1 parent 636f42b commit e43a909
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 31 deletions.
2 changes: 1 addition & 1 deletion library/src/main/java/com/wultra/android/mtokensdk/Lazy.kt
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ class Lazy<T>(private val factory: () -> T) {
*/
val optional: T?
get() = instance
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import com.wultra.android.mtokensdk.operation.OperationsUtils
import com.wultra.android.mtokensdk.push.PushService
import com.wultra.android.powerauth.networking.UserAgent
import com.wultra.android.powerauth.networking.ssl.SSLValidationStrategy
import com.wultra.android.powerauth.networking.tokens.IPowerAuthTokenProvider
import io.getlime.security.powerauth.sdk.PowerAuthSDK
import okhttp3.OkHttpClient

Expand All @@ -35,6 +36,7 @@ import okhttp3.OkHttpClient
* @param appContext Application Context
* @param okHttpClient HTTP client instance for networking
* @param acceptLanguage The language code to set for the `Accept-Language` header.
* @param tokenProvider PowerAuthToken provider. If null is provided, default internal implementation is provided.
* @param userAgent Default user agent for each request.
* @param gsonBuilder Custom GSON builder for deserialization of request. If you want to provide your own
* deserialization logic, we recommend adding it to the instance obtained from the [OperationsUtils].defaultGsonBuilder().
Expand All @@ -44,6 +46,7 @@ fun PowerAuthSDK.createWultraMobileToken(
appContext: Context,
okHttpClient: OkHttpClient? = null,
acceptLanguage: String? = null,
tokeProvider: IPowerAuthTokenProvider? = null,
userAgent: UserAgent? = null,
gsonBuilder: GsonBuilder? = null
): WultraMobileToken {
Expand All @@ -52,6 +55,7 @@ fun PowerAuthSDK.createWultraMobileToken(
appContext,
okHttpClient,
acceptLanguage,
tokeProvider,
userAgent,
gsonBuilder
)
Expand All @@ -65,6 +69,7 @@ fun PowerAuthSDK.createWultraMobileToken(
* @param appContext Application Context
* @param okHttpClient OkHttpClient for API communication
* @param acceptLanguage The language code to set for the `Accept-Language` header.
* @param tokenProvider PowerAuthToken provider. If null is provided, default internal implementation is provided.
* @param userAgent Default user agent used for each request.
* @param gsonBuilder GSON builder for deserialization of request.
*
Expand All @@ -74,29 +79,15 @@ fun PowerAuthSDK.createWultraMobileToken(
*
* - **Extensible Configuration**: Supports custom `NetworkingConfig` for each service, enabling tailored setups.
*/
class WultraMobileToken private constructor(
class WultraMobileToken(
private val powerAuthSDK: PowerAuthSDK,
private val appContext: Context,
private val okHttpClient: OkHttpClient,
private var acceptLanguage: String,
private val userAgent: UserAgent,
private val gsonBuilder: GsonBuilder?
private val okHttpClient: OkHttpClient? = null,
private var acceptLanguage: String? = null,
private val tokenProvider: IPowerAuthTokenProvider? = null,
private val userAgent: UserAgent? = null,
private val gsonBuilder: GsonBuilder? = null
) {
constructor(
powerAuthSDK: PowerAuthSDK,
appContext: Context,
okHttpClient: OkHttpClient? = null,
acceptLanguage: String? = null,
userAgent: UserAgent? = null,
gsonBuilder: GsonBuilder? = null
) : this(
powerAuthSDK,
appContext,
okHttpClient ?: defaultOkHttpClient(),
acceptLanguage ?: "en",
userAgent ?: UserAgent.libraryDefault(appContext),
gsonBuilder
)

/**
* Default OkHttpClient
Expand All @@ -116,13 +107,13 @@ class WultraMobileToken private constructor(
OperationsService(
powerAuthSDK,
appContext,
okHttpClient,
okHttpClient ?: defaultOkHttpClient(),
powerAuthSDK.configuration.baseEndpointUrl,
null,
tokenProvider,
userAgent,
gsonBuilder
).apply {
acceptLanguage = this@WultraMobileToken.acceptLanguage
this@WultraMobileToken.acceptLanguage?.let { acceptLanguage = it }
}
}
}
Expand All @@ -131,12 +122,12 @@ class WultraMobileToken private constructor(
PushService(
powerAuthSDK,
appContext,
okHttpClient,
okHttpClient ?: defaultOkHttpClient(),
powerAuthSDK.configuration.baseEndpointUrl,
null,
tokenProvider,
userAgent
).apply {
acceptLanguage = this@WultraMobileToken.acceptLanguage
this@WultraMobileToken.acceptLanguage?.let { acceptLanguage = it }
}
}
}
Expand All @@ -145,18 +136,17 @@ class WultraMobileToken private constructor(
InboxService(
powerAuthSDK,
appContext,
okHttpClient,
okHttpClient ?: defaultOkHttpClient(),
powerAuthSDK.configuration.baseEndpointUrl,
null,
tokenProvider,
userAgent,
gsonBuilder
).apply {
acceptLanguage = this@WultraMobileToken.acceptLanguage
this@WultraMobileToken.acceptLanguage?.let { acceptLanguage = it }
}
}
}


/**
* Operations manager. Use for fetching pending lists, approving operations, etc.
*/
Expand Down

0 comments on commit e43a909

Please sign in to comment.