Skip to content

Commit

Permalink
Added inline logging (#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kober32
kober32 committed Mar 4, 2024
1 parent 7ea0eaa commit 34aaaee
Show file tree
Hide file tree
Showing 3 changed files with 102 additions and 10 deletions.
49 changes: 42 additions & 7 deletions library/src/main/java/com/wultra/android/digitalonboarding/ActivationService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ class ActivationService(

init {
if (!canRestoreSession) {
D.warning("Created ActivationService without restoration.")
processId = null
}
}
Expand All @@ -126,6 +127,8 @@ class ActivationService(
*/
fun status(callback: (Result<Status>) -> Unit) {

D.print("Retrieving the status")

val processId = guardProcessId(callback) ?: return

if (!verifyCanStartProcess(callback)) return
Expand All @@ -134,11 +137,16 @@ class ActivationService(
processId,
object : IApiCallResponseListener<GetStatusResponse> {
override fun onSuccess(result: GetStatusResponse) {
callback(Result.success(Status.fromResponse(result)))
val success = Status.fromResponse(result)
D.print("Status call success: ${success.name}")
callback(Result.success(success))
}

override fun onFailure(error: ApiError) {
callback(Result.failure(error.toException()))
error.toException().also {
D.error(it)
callback(Result.failure(it))
}
}
}
)
Expand All @@ -154,6 +162,7 @@ class ActivationService(
fun <T> start(credentials: T, callback: (Result<Unit>) -> Unit) {

if (processId != null) {
D.error("Activation can be started only when another activation is not in progress.")
callback(Result.failure(ActivationInProgressException))
return
}
Expand All @@ -165,11 +174,15 @@ class ActivationService(
object : IApiCallResponseListener<StartOnboardingResponse> {
override fun onSuccess(result: StartOnboardingResponse) {
processId = result.responseObject.processId
D.print("Start successful")
callback(Result.success(Unit))
}

override fun onFailure(error: ApiError) {
callback(Result.failure(error.toException()))
error.toException().also {
D.error(it)
callback(Result.failure(it))
}
}
}
)
Expand All @@ -192,15 +205,20 @@ class ActivationService(
object : IApiCallResponseListener<StatusResponse> {
override fun onSuccess(result: StatusResponse) {
this@ActivationService.processId = null
D.print("Cancel successful")
callback(Result.success(Unit))
}

override fun onFailure(error: ApiError) {
if (forceCancel) {
this@ActivationService.processId = null
D.warning("Cancel failed, but forceCancel was used - returning success anyway.")
callback(Result.success(Unit))
} else {
callback(Result.failure(error.toException()))
error.toException().also {
D.error(it)
callback(Result.failure(it))
}
}
}
}
Expand All @@ -210,6 +228,7 @@ class ActivationService(
/** Clears the stored data (without networking call). */
fun clear() {
processId = null
D.print("Clear successful")
}

/**
Expand All @@ -227,18 +246,26 @@ class ActivationService(
processId,
object : IApiCallResponseListener<StatusResponse> {
override fun onSuccess(result: StatusResponse) {
D.print("Clear successful")
callback(Result.success(Unit))
}

override fun onFailure(error: ApiError) {
callback(Result.failure(error.toException()))
error.toException().also {
D.error(it)
callback(Result.failure(it))
}
}
}
)
}

fun createPowerAuthActivationData(otp: String): ActivationData? {
val processId = processId ?: return null
val processId = processId
if (processId == null) {
D.error("Cannot create activation data - process not started (missing processId).")
return null
}
return ActivationDataWithOTP(processId, otp)
}

Expand All @@ -263,13 +290,15 @@ class ActivationService(
powerAuthSDK.createActivation(data, activationName) { result ->
result.onSuccess {
this.processId = null
D.print("PowerAuth activation created")
callback(Result.success(it))
}.onFailure {
// when no longer possible to retry activation
// reset the processID, because we cannot recover
if ((it as? FailedApiException)?.allowOnboardingOtpRetry() == false) {
this.processId = null
}
D.print("PowerAuth activation failed - $it")
callback(Result.failure(it))
}
}
Expand All @@ -279,6 +308,7 @@ class ActivationService(

val processId = this.processId
if (processId == null) {
D.error("ProcessId is required for the requested method but not available. This mean that the process was not started.")
callback(Result.failure(ActivationNotRunningException))
return null
}
Expand All @@ -288,6 +318,7 @@ class ActivationService(
private fun <T>verifyCanStartProcess(callback: (Result<T>) -> Unit): Boolean {

if (!powerAuthSDK.canStartActivation()) {
D.error("Cannot start the activation: PowerAuthSDK.canStartActivation() == false")
processId = null
callback(Result.failure(CannotActivateException))
return false
Expand All @@ -308,11 +339,15 @@ class ActivationService(
processId,
object : IApiCallResponseListener<OTPDetailResponse> {
override fun onSuccess(result: OTPDetailResponse) {
D.print("Get OTP successful")
callback(Result.success(result.responseObject.otpCode))
}

override fun onFailure(error: ApiError) {
callback(Result.failure(error.toException()))
error.toException().also {
D.error(it)
callback(Result.failure(it))
}
}
}
)
Expand Down
5 changes: 5 additions & 0 deletions library/src/main/java/com/wultra/android/digitalonboarding/Logger.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
package com.wultra.android.digitalonboarding

import android.util.Log
import com.wultra.android.powerauth.networking.error.ApiError

class Logger {

Expand Down Expand Up @@ -64,6 +65,10 @@ class Logger {
}
}

internal fun error(error: ApiError) {
error(error.toException())
}

internal fun error(throwable: Throwable) {
error(throwable.message ?: throwable.toString())
}
Expand Down
Loading

0 comments on commit 34aaaee

Please sign in to comment.