Skip to content

MBX-3238: Fix return value for updatePushToken method #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2024
Merged

MBX-3238: Fix return value for updatePushToken method #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import cloud.mindbox.mobile_sdk.services.BackgroundWorkManager
import cloud.mindbox.mobile_sdk.utils.Constants
import cloud.mindbox.mobile_sdk.utils.LoggingExceptionHandler
import cloud.mindbox.mobile_sdk.utils.MigrationManager
import cloud.mindbox.mobile_sdk.utils.loggingRunCatching
import com.jakewharton.threetenabp.AndroidThreeTen
import kotlinx.coroutines.*
import kotlinx.coroutines.Dispatchers.Default
Expand Down Expand Up @@ -309,23 +310,23 @@ object Mindbox : MindboxLog {
* @param pushService - the instance of [MindboxPushService], which handles push notifications.
*/
fun updatePushToken(context: Context, token: String, pushService: MindboxPushService) =
MindboxLoggerImpl.runCatching {
loggingRunCatching {
initComponents(context)
mindboxLogI("updatePushToken token: $token with provider $pushService")

if (token.trim().isEmpty()) {
mindboxLogW("Token is empty! Skipping update token.")
return@runCatching
return@loggingRunCatching
}

if (MindboxPreferences.isFirstInitialize) {
mindboxLogW("Mindbox init was never called. Skipping update token.")
return@runCatching
return@loggingRunCatching
}

if (pushService.tag != pushServiceHandler?.notificationProvider) {
mindboxLogW("Token provider ${pushService.tag} not matching with selected provider ${pushServiceHandler?.notificationProvider}. Skipping update token.")
return@runCatching
return@loggingRunCatching
}

mindboxScope.launch {
Expand Down
4 changes: 3 additions & 1 deletion sdk/src/main/java/cloud/mindbox/mobile_sdk/utils/LoggingExceptionHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ internal object LoggingExceptionHandler: ExceptionHandler() {
}
}

}
}

internal fun <T> loggingRunCatching(block: () -> T) = LoggingExceptionHandler.runCatching(block)
3 changes: 1 addition & 2 deletions sdk/src/main/java/cloud/mindbox/mobile_sdk/utils/MigrationManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package cloud.mindbox.mobile_sdk.utils

import android.content.Context
import cloud.mindbox.mobile_sdk.Mindbox
import cloud.mindbox.mobile_sdk.logger.MindboxLoggerImpl
import cloud.mindbox.mobile_sdk.logger.mindboxLogI
import cloud.mindbox.mobile_sdk.managers.SharedPreferencesManager
import cloud.mindbox.mobile_sdk.repository.MindboxPreferences
Expand All @@ -15,7 +14,7 @@ internal class MigrationManager(val context: Context) {
version282()
).filter { it.isNeeded }
.onEach { migration ->
MindboxLoggerImpl.runCatching {
loggingRunCatching {
mindboxLogI("Run migration '${migration.description}'")
migration.run()
}
Expand Down