Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
}
}
Expand Down
2 changes: 1 addition & 1 deletion kalium
Submodule kalium updated 62 files
+1 −1 .github/workflows/pr-author-assigner.yml
+5 −1 core/data/src/commonMain/kotlin/com/wire/kalium/logic/data/id/PlainId.kt
+4 −6 core/data/src/commonMain/kotlin/com/wire/kalium/logic/data/id/QualifiedId.kt
+13 −15 core/data/src/commonMain/kotlin/com/wire/kalium/logic/data/message/Message.kt
+6 −9 core/data/src/commonMain/kotlin/com/wire/kalium/logic/data/user/UserModel.kt
+2 −0 core/util/src/commonMain/kotlin/com.wire.kalium.util/serialization/SerializationUtils.kt
+1 −1 data/network/src/commonMain/kotlin/com/wire/kalium/network/BackendMetaDataUtil.kt
+3 −3 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/FeatureConfigApiV0.kt
+3 −3 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v0/authenticated/UserSearchApiV0.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/AccessTokenApiV14.kt
+28 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/AssetApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/CallApiV14.kt
+25 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/ClientApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/ConnectionApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/ConversationApiV14.kt
+25 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/ConversationHistoryApiV14.kt
+25 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/E2EIApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/FeatureConfigApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/KeyPackageApiV14.kt
+28 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/LogoutApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/MLSMessageApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/MLSPublicKeyApiV14.kt
+28 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/MessageApiV14.kt
+30 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/NotificationApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/PreKeyApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/PropertiesApiV14.kt
+28 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/SelfApiV14.kt
+24 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/ServerTimeApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/TeamsApiV14.kt
+26 −0 .../network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/UpgradePersonalToTeamApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/UserDetailsApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/authenticated/UserSearchApiV14.kt
+172 −0 ...n/kotlin/com/wire/kalium/network/api/v14/authenticated/networkContainer/AuthenticatedNetworkContainerV14.kt
+25 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/unauthenticated/DomainLookupApiV14.kt
+25 −0 ...etwork/src/commonMain/kotlin/com/wire/kalium/network/api/v14/unauthenticated/GetDomainRegistrationApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/unauthenticated/LoginApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/unauthenticated/RegisterApiV14.kt
+26 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/unauthenticated/SSOLoginApiV14.kt
+25 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/api/v14/unauthenticated/VerificationCodeApiV14.kt
+89 −0 ...tlin/com/wire/kalium/network/api/v14/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV14.kt
+10 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/AuthenticatedNetworkContainer.kt
+9 −0 data/network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt
+91 −41 data/network/src/commonMain/kotlin/com/wire/kalium/network/utils/ObfuscateUtil.kt
+3 −0 data/persistence/build.gradle.kts
+22 −0 data/persistence/src/androidMain/kotlin/com/wire/kalium/persistence/util/IsDebug.kt
+23 −0 data/persistence/src/appleMain/kotlin/com/wire/kalium/persistence/util/IsDebug.kt
+17 −2 data/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt
+23 −0 data/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/util/IsDebug.kt
+20 −0 data/persistence/src/jsMain/kotlin/com/wire/kalium/persistence/util/IsDebug.kt
+20 −0 data/persistence/src/jvmMain/kotlin/com/wire/kalium/persistence/util/IsDebug.kt
+4 −5 domain/messaging/sending/src/commonMain/kotlin/com/wire/kalium/messaging/sending/BroadcastMessage.kt
+58 −58 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/event/Event.kt
+7 −4 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/event/EventRepository.kt
+2 −5 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/id/FederatedIdMapperImpl.kt
+1 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+1 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/debug/BreakSessionUseCase.kt
+1 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/debug/EstablishSessionUseCase.kt
+1 −1 ...in/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/ObserveE2EIConversationsVerificationStatusesUseCase.kt
+2 −3 logic/src/commonMain/kotlin/com/wire/kalium/logic/network/SessionManagerImpl.kt
+1 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/handler/MessageCompositeEditHandler.kt
+1 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/handler/MessageMultipartEditHandler.kt
+1 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/handler/MessageTextEditHandler.kt