Merge branch 'develop' into mo/feat/improved-pipeline

Author: MohamadJaara

.github/workflows/cherry-pick-pr-to-newer-release-cycle.yml

@@ -38,6 +38,7 @@ jobs:
               uses: actions/checkout@v4
               with:
                   fetch-depth: 0
+                  token: ${{ secrets.ANDROID_BOB_GH_TOKEN }}
 
             - name: Cherry pick to `develop`
               uses: wireapp/[email protected]

app/src/main/kotlin/com/wire/android/di/accountScoped/CellsModule.kt

@@ -26,14 +26,15 @@ import com.wire.kalium.cells.domain.usecase.CreateFolderUseCase
 import com.wire.kalium.cells.domain.usecase.DeleteCellAssetUseCase
 import com.wire.kalium.cells.domain.usecase.DownloadCellFileUseCase
 import com.wire.kalium.cells.domain.usecase.GetFoldersUseCase
-import com.wire.kalium.cells.domain.usecase.GetPaginatedNodesUseCase
 import com.wire.kalium.cells.domain.usecase.GetPaginatedFilesFlowUseCase
+import com.wire.kalium.cells.domain.usecase.GetPaginatedNodesUseCase
 import com.wire.kalium.cells.domain.usecase.MoveNodeUseCase
 import com.wire.kalium.cells.domain.usecase.ObserveAttachmentDraftsUseCase
 import com.wire.kalium.cells.domain.usecase.PublishAttachmentsUseCase
 import com.wire.kalium.cells.domain.usecase.RefreshCellAssetStateUseCase
 import com.wire.kalium.cells.domain.usecase.RemoveAttachmentDraftUseCase
 import com.wire.kalium.cells.domain.usecase.RemoveAttachmentDraftsUseCase
+import com.wire.kalium.cells.domain.usecase.RenameNodeUseCase
 import com.wire.kalium.cells.domain.usecase.RestoreNodeFromRecycleBinUseCase
 import com.wire.kalium.cells.domain.usecase.RetryAttachmentUploadUseCase
 import com.wire.kalium.cells.domain.usecase.SetWireCellForConversationUseCase
@@ -141,4 +142,9 @@ class CellsModule {
     @Provides
     fun provideRestoreNodeFromRecycleBinUseCase(cellsScope: CellsScope): RestoreNodeFromRecycleBinUseCase =
         cellsScope.restoreNodeFromRecycleBin
+
+    @ViewModelScoped
+    @Provides
+    fun provideRenameNodeUseCase(cellsScope: CellsScope): RenameNodeUseCase =
+        cellsScope.renameNodeUseCase
 }

app/src/main/kotlin/com/wire/android/navigation/WireMainNavGraph.kt

@@ -26,6 +26,7 @@ import com.wire.android.feature.cells.ui.destinations.CreateFolderScreenDestinat
 import com.wire.android.feature.cells.ui.destinations.MoveToFolderScreenDestination
 import com.wire.android.feature.cells.ui.destinations.PublicLinkScreenDestination
 import com.wire.android.feature.cells.ui.destinations.RecycleBinScreenDestination
+import com.wire.android.feature.cells.ui.destinations.RenameNodeScreenDestination
 import com.wire.android.feature.sketch.destinations.DrawingCanvasScreenDestination
 import com.wire.android.ui.NavGraphs
 
@@ -40,6 +41,7 @@ object WireMainNavGraph : NavGraphSpec {
         .plus(CreateFolderScreenDestination)
         .plus(MoveToFolderScreenDestination)
         .plus(RecycleBinScreenDestination)
+        .plus(RenameNodeScreenDestination)
     override val destinationsByRoute = destinations.associateBy { it.route }
     override val nestedNavGraphs = NavGraphs.wireRoot.nestedNavGraphs
 }

app/src/main/kotlin/com/wire/android/notification/broadcastreceivers/CoroutineReceiver.kt

@@ -0,0 +1,70 @@
+/*
+ * Wire
+ * Copyright (C) 2025 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.android.notification.broadcastreceivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.wire.android.appLogger
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeoutOrNull
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * A [BroadcastReceiver] that cancels execution if it takes too long to avoid ANR.
+ */
+abstract class CoroutineReceiver : BroadcastReceiver() {
+
+    private companion object {
+        // Maximum duration for which the receiver can be executed before ANR is triggered.
+        private val MaxDuration = 9.seconds
+    }
+
+    private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+
+    override fun onReceive(context: Context, intent: Intent?) {
+        if (intent == null) return
+
+        val result = goAsync()
+
+        scope.launch {
+            try {
+                withTimeoutOrNull(MaxDuration) {
+                    receive(context, intent)
+                } ?: onTimeout(
+                    context = context,
+                    intent = intent,
+                    exception = IllegalStateException(timeoutMessage())
+                )
+            } finally {
+                result.finish()
+            }
+        }
+    }
+
+    private fun timeoutMessage() = "${this::class.java.simpleName} has been suspended for more than $MaxDuration"
+
+    protected abstract suspend fun receive(context: Context, intent: Intent)
+
+    protected open fun onTimeout(context: Context, intent: Intent, exception: Exception) {
+        appLogger.e(timeoutMessage(), exception)
+    }
+}

app/src/main/kotlin/com/wire/android/notification/broadcastreceivers/NotificationReplyReceiver.kt

@@ -18,27 +18,26 @@
 
 package com.wire.android.notification.broadcastreceivers
 
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.widget.Toast
 import androidx.core.app.RemoteInput
+import com.wire.android.R
 import com.wire.android.di.KaliumCoreLogic
 import com.wire.android.di.NoSession
 import com.wire.android.notification.MessageNotificationManager
 import com.wire.android.notification.NotificationConstants
 import com.wire.android.util.dispatchers.DispatcherProvider
+import com.wire.kalium.common.functional.fold
 import com.wire.kalium.logic.CoreLogic
 import com.wire.kalium.logic.data.id.QualifiedID
 import com.wire.kalium.logic.data.id.QualifiedIdMapper
-import com.wire.kalium.common.functional.fold
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class NotificationReplyReceiver : BroadcastReceiver() { // requires zero argument constructor
+class NotificationReplyReceiver : CoroutineReceiver() { // requires zero argument constructor
 
     @Inject
     @KaliumCoreLogic
@@ -51,7 +50,7 @@ class NotificationReplyReceiver : BroadcastReceiver() { // requires zero argumen
     @NoSession
     lateinit var qualifiedIdMapper: QualifiedIdMapper
 
-    override fun onReceive(context: Context, intent: Intent) {
+    override suspend fun receive(context: Context, intent: Intent) {
         val remoteInput = RemoteInput.getResultsFromIntent(intent)
         val conversationId: String? = intent.getStringExtra(EXTRA_CONVERSATION_ID)
         val userId: String? = intent.getStringExtra(EXTRA_USER_ID)
@@ -62,26 +61,35 @@ class NotificationReplyReceiver : BroadcastReceiver() { // requires zero argumen
             val qualifiedConversationId = qualifiedIdMapper.fromStringToQualifiedID(conversationId)
 
             with(coreLogic.getSessionScope(qualifiedUserId)) {
-                // TODO better to move dispatcher logic into UseCase
-                CoroutineScope(coroutineContext + dispatcherProvider.io()).launch {
-                    launch {
-                        messages.sendTextMessage(qualifiedConversationId, replyText)
-                            .fold(
-                                { updateNotification(context, conversationId, qualifiedUserId, null) },
-                                { updateNotification(context, conversationId, qualifiedUserId, replyText) }
-                            )
-                    }
-                    launch {
-                        conversations.updateConversationReadDateUseCase(
-                            qualifiedConversationId,
-                            Clock.System.now()
+                syncExecutor.request {
+                    messages.sendTextMessage(qualifiedConversationId, replyText)
+                        .fold(
+                            { updateNotification(context, conversationId, qualifiedUserId, null) },
+                            { updateNotification(context, conversationId, qualifiedUserId, replyText) }
                         )
-                    }
+                    conversations.updateConversationReadDateUseCase(
+                        qualifiedConversationId,
+                        Clock.System.now()
+                    )
                 }
             }
         }
     }
 
+    override fun onTimeout(context: Context, intent: Intent, exception: Exception) {
+        super.onTimeout(context, intent, exception)
+
+        val conversationId: String? = intent.getStringExtra(EXTRA_CONVERSATION_ID)
+        val userId: String? = intent.getStringExtra(EXTRA_USER_ID)
+
+        if (conversationId != null && userId != null) {
+            val qualifiedUserId = qualifiedIdMapper.fromStringToQualifiedID(userId)
+            updateNotification(context, conversationId, qualifiedUserId, null)
+        }
+
+        Toast.makeText(context, R.string.label_general_error, Toast.LENGTH_SHORT).show()
+    }
+
     private fun updateNotification(context: Context, conversationId: String, userId: QualifiedID, replyText: String?) =
         MessageNotificationManager.updateNotificationAfterQuickReply(context, conversationId, userId, replyText)
 

app/src/main/kotlin/com/wire/android/ui/authentication/create/common/handle/UsernameTextField.kt

@@ -29,7 +29,7 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import com.wire.android.R
-import com.wire.android.ui.common.ShakeAnimation
+import com.wire.android.ui.common.animation.ShakeAnimation
 import com.wire.android.ui.common.error.CoreFailureErrorDialog
 import com.wire.android.ui.common.textfield.DefaultEmailDone
 import com.wire.android.ui.common.textfield.WireTextField

app/src/main/kotlin/com/wire/android/ui/common/groupname/GroupConversationNameComponent.kt

@@ -50,7 +50,7 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import com.wire.android.R
 import com.wire.android.ui.common.Icon
-import com.wire.android.ui.common.ShakeAnimation
+import com.wire.android.ui.common.animation.ShakeAnimation
 import com.wire.android.ui.common.button.WireButtonState
 import com.wire.android.ui.common.button.WirePrimaryButton
 import com.wire.android.ui.common.dimensions

app/src/main/kotlin/com/wire/android/ui/home/conversations/folder/NewConversationFolderScreen.kt

@@ -41,7 +41,7 @@ import com.ramcosta.composedestinations.spec.DestinationStyle
 import com.wire.android.R
 import com.wire.android.navigation.Navigator
 import com.wire.android.navigation.annotation.app.WireDestination
-import com.wire.android.ui.common.ShakeAnimation
+import com.wire.android.ui.common.animation.ShakeAnimation
 import com.wire.android.ui.common.button.WireButtonState.Default
 import com.wire.android.ui.common.button.WireButtonState.Disabled
 import com.wire.android.ui.common.button.WirePrimaryButton

app/src/main/kotlin/com/wire/android/ui/home/settings/account/displayname/ChangeDisplayNameScreen.kt

@@ -44,10 +44,11 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.ramcosta.composedestinations.result.ResultBackNavigator
 import com.ramcosta.composedestinations.spec.DestinationStyle
 import com.wire.android.R
+import com.wire.android.model.DisplayNameState
 import com.wire.android.navigation.Navigator
 import com.wire.android.navigation.annotation.app.WireDestination
 import com.wire.android.ui.common.Icon
-import com.wire.android.ui.common.ShakeAnimation
+import com.wire.android.ui.common.animation.ShakeAnimation
 import com.wire.android.ui.common.button.WireButtonState.Default
 import com.wire.android.ui.common.button.WireButtonState.Disabled
 import com.wire.android.ui.common.button.WirePrimaryButton

app/src/main/kotlin/com/wire/android/ui/home/settings/account/displayname/ChangeDisplayNameViewModel.kt

@@ -25,6 +25,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.wire.android.model.DisplayNameState
 import com.wire.android.ui.common.textfield.textAsFlow
 import com.wire.kalium.logic.feature.user.DisplayNameUpdateResult
 import com.wire.kalium.logic.feature.user.GetSelfUserUseCase