Merge branch 'element-hq:develop' into develop

daedric7 · Aug 21, 2024 · 4ae46be · 4ae46be
2 parents 2f27ece + 1b1062b
commit 4ae46be
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 13 deletions.
diff --git a/...t/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt b/...t/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt
@@ -495,7 +495,7 @@ class RoomListPresenterTest {
     }
 
     @Test
-    fun `present - when room service returns no room, then contentState is Empty `() = runTest {
+    fun `present - when room service returns no room, then contentState is Empty`() = runTest {
         val scope = CoroutineScope(coroutineContext + SupervisorJob())
         val roomListService = FakeRoomListService()
         roomListService.postAllRoomsLoadingState(RoomList.LoadingState.Loaded(0))

diff --git a/.../main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt b/.../main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt
@@ -87,20 +87,22 @@ class ResetIdentityFlowNode @AssistedInject constructor(
     override fun onBuilt() {
         super.onBuilt()
 
-        resetIdentityFlowManager.whenResetIsDone {
-            plugins<Callback>().forEach { it.onDone() }
-        }
-
         lifecycle.addObserver(object : DefaultLifecycleObserver {
             override fun onStart(owner: LifecycleOwner) {
                 // If the custom tab was opened, we need to cancel the reset job
                 // when we come back to the node if the reset wasn't successful
-                cancelResetJob()
+                coroutineScope.launch {
+                    cancelResetJob()
+
+                    resetIdentityFlowManager.whenResetIsDone {
+                        plugins<Callback>().forEach { it.onDone() }
+                    }
+                }
             }
 
             override fun onDestroy(owner: LifecycleOwner) {
                 // Make sure we cancel the reset job when the node is destroyed, just in case
-                cancelResetJob()
+                coroutineScope.launch { cancelResetJob() }
             }
         })
     }
@@ -154,10 +156,10 @@ class ResetIdentityFlowNode @AssistedInject constructor(
             }
     }
 
-    private fun cancelResetJob() {
+    private suspend fun cancelResetJob() {
         resetJob?.cancel()
         resetJob = null
-        coroutineScope.launch { resetIdentityFlowManager.cancel() }
+        resetIdentityFlowManager.cancel()
     }
 
     @Composable
@@ -171,7 +173,7 @@ class ResetIdentityFlowNode @AssistedInject constructor(
         if (startResetState.isLoading()) {
             ProgressDialog(
                 properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true),
-                onDismissRequest = { cancelResetJob() }
+                onDismissRequest = { coroutineScope.launch { cancelResetJob() } }
             )
         }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -48,7 +48,7 @@ wysiwyg = "2.37.8"
 telephoto = "0.12.1"
 
 # DI
-dagger = "2.51.1"
+dagger = "2.52"
 anvil = "2.4.9"
 
 # Auto service

diff --git a/.../api/src/test/kotlin/io/element/android/libraries/mediaviewer/MediaViewerPresenterTest.kt b/.../api/src/test/kotlin/io/element/android/libraries/mediaviewer/MediaViewerPresenterTest.kt
@@ -70,7 +70,7 @@ class MediaViewerPresenterTest {
     }
 
     @Test
-    fun `present - check all actions `() = runTest {
+    fun `present - check all actions`() = runTest {
         val matrixMediaLoader = FakeMatrixMediaLoader()
         val mediaActions = FakeLocalMediaActions()
         val snackbarDispatcher = SnackbarDispatcher()

diff --git a/...mpl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt b/...mpl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
@@ -306,7 +306,7 @@ class DefaultPushHandlerTest {
     }
 
     @Test
-    fun `when diagnostic PushData is received, the diagnostic push handler is informed `() =
+    fun `when diagnostic PushData is received, the diagnostic push handler is informed`() =
         runTest {
             val aPushData = PushData(
                 eventId = DefaultTestPush.TEST_EVENT_ID,

diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistMethodNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistMethodNameTest.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.tests.konsist
+
+import com.lemonappdev.konsist.api.Konsist
+import com.lemonappdev.konsist.api.verify.assertTrue
+import org.junit.Test
+
+class KonsistMethodNameTest {
+    @Test
+    fun `Ensure that method name does not start or end with spaces`() {
+        Konsist.scopeFromProject()
+            .functions()
+            .assertTrue {
+                it.name.trim() == it.name
+            }
+    }
+}