From bf01a5a44227e7da2369eb86576720a448ccc86c Mon Sep 17 00:00:00 2001 From: Jakub Zerko Date: Fri, 9 Jan 2026 07:04:58 +0100 Subject: [PATCH 1/2] chore: logs cleanup --- .../wire/android/notification/WireNotificationManager.kt | 5 ++--- .../ui/connection/ConnectionActionButtonViewModel.kt | 7 +++---- kalium | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/com/wire/android/notification/WireNotificationManager.kt b/app/src/main/kotlin/com/wire/android/notification/WireNotificationManager.kt index a03a9ec1e58..84fbcd7a51d 100644 --- a/app/src/main/kotlin/com/wire/android/notification/WireNotificationManager.kt +++ b/app/src/main/kotlin/com/wire/android/notification/WireNotificationManager.kt @@ -30,7 +30,6 @@ import com.wire.android.util.CurrentScreenManager import com.wire.android.util.dispatchers.DispatcherProvider import com.wire.android.util.lifecycle.SyncLifecycleManager import com.wire.android.util.logging.logIfEmptyUserName -import com.wire.kalium.logger.obfuscateId import com.wire.kalium.logic.CoreLogic import com.wire.kalium.logic.data.id.ConversationId import com.wire.kalium.logic.data.id.QualifiedID @@ -149,12 +148,12 @@ class WireNotificationManager @Inject constructor( if (isJobRunningForUser) { // Return the currently existing job if it's active appLogger.d( - "$TAG Already processing notifications for user=${userId.value.obfuscateId()}, and joining original execution" + "$TAG Already processing notifications for user=${userId.toLogString()}, and joining original execution" ) currentJobForUser } else { // Create a new job for this user - appLogger.d("$TAG Starting to processing notifications for user=${userId.value.obfuscateId()}") + appLogger.d("$TAG Starting to processing notifications for user=${userId.toLogString()}") val newJob = scope.launch(start = CoroutineStart.LAZY) { triggerSyncForUserIfAuthenticated(userId) } diff --git a/app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt index 761de0b8bf8..aac1cea2f5c 100644 --- a/app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt @@ -32,7 +32,6 @@ import com.wire.android.ui.common.ActionsViewModel import com.wire.android.util.dispatchers.DispatcherProvider import com.wire.android.util.ui.UIText import com.wire.kalium.common.error.CoreFailure -import com.wire.kalium.logger.obfuscateId import com.wire.kalium.logic.data.id.ConversationId import com.wire.kalium.logic.data.id.QualifiedID import com.wire.kalium.logic.feature.connection.AcceptConnectionRequestUseCase @@ -102,17 +101,17 @@ internal class ConnectionActionButtonViewModelImpl @Inject constructor( } is SendConnectionRequestResult.Failure.MissingLegalHoldConsent -> { - appLogger.d(("Couldn't send a connect request to user ${userId.value.obfuscateId()} - missing legal hold consent")) + appLogger.d(("Couldn't send a connect request to user ${userId.toLogString()} - missing legal hold consent")) state = state.copy(missingLegalHoldConsentDialogState = MissingLegalHoldConsentDialogState.Visible(userId)) } is SendConnectionRequestResult.Failure.FederationDenied -> { - appLogger.d(("Couldn't send a connect request to user ${userId.value.obfuscateId()} - federation denied")) + appLogger.d(("Couldn't send a connect request to user ${userId.toLogString()} - federation denied")) _infoMessage.emit(UIText.StringResource(R.string.connection_request_sent_federation_denied_error, userName)) } is SendConnectionRequestResult.Failure -> { - appLogger.d(("Couldn't send a connect request to user ${userId.value.obfuscateId()}")) + appLogger.d(("Couldn't send a connect request to user ${userId.toLogString()}")) _infoMessage.emit(UIText.StringResource(R.string.connection_request_sent_error)) } } diff --git a/kalium b/kalium index cd57cddc8b0..2ead268767c 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit cd57cddc8b0a64f5d029d564bf23cf5bc50bf90b +Subproject commit 2ead268767c106777fd8deecd5a1bb24b1669983 From 0ef990d684a8be6f4b251350e23b633f797f38f3 Mon Sep 17 00:00:00 2001 From: Jakub Zerko Date: Fri, 9 Jan 2026 07:20:20 +0100 Subject: [PATCH 2/2] kalium update --- kalium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalium b/kalium index 2ead268767c..ca885dc0917 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 2ead268767c106777fd8deecd5a1bb24b1669983 +Subproject commit ca885dc0917b55759212e95ece5b3e9ba02204ad