Merge branch 'develop' into feature/bca/rust_flavor

vector-app/build.gradle

@@ -37,7 +37,7 @@ ext.versionMinor = 5
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 16
+ext.versionPatch = 20
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

vector-app/src/androidTest/java/im/vector/app/EspressoExt.kt

@@ -90,7 +90,7 @@ fun getString(@StringRes id: Int): String {
     return EspressoHelper.getCurrentActivity()!!.resources.getString(id)
 }
 
-fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 10_000, waitForDisplayed: Boolean = true): ViewAction {
+fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 20_000, waitForDisplayed: Boolean = true): ViewAction {
     return object : ViewAction {
         private val clock = DefaultClock()
 

vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt

@@ -28,7 +28,6 @@ import im.vector.app.espresso.tools.ScreenshotFailureRule
 import im.vector.app.features.MainActivity
 import im.vector.app.getString
 import im.vector.app.ui.robot.ElementRobot
-import im.vector.app.ui.robot.settings.labs.LabFeature
 import im.vector.app.ui.robot.settings.labs.LabFeaturesPreferences
 import im.vector.app.ui.robot.withDeveloperMode
 import org.junit.Rule
@@ -133,6 +132,10 @@ class UiAllScreensSanityTest {
             }
         }
 
+        // Some instability with the bottomsheet
+        // not sure what's the source, maybe the expanded state?
+        Thread.sleep(10_000)
+
         elementRobot.space { selectSpace(spaceName) }
 
         elementRobot.layoutPreferences {
@@ -175,7 +178,6 @@ class UiAllScreensSanityTest {
      * Testing multiple threads screens
      */
     private fun testThreadScreens() {
-        elementRobot.toggleLabFeature(LabFeature.THREAD_MESSAGES)
         elementRobot.newRoom {
             createNewRoom {
                 crawl()
@@ -189,6 +191,5 @@ class UiAllScreensSanityTest {
                 }
             }
         }
-        elementRobot.toggleLabFeature(LabFeature.THREAD_MESSAGES)
     }
 }

vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt

@@ -28,7 +28,6 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import im.vector.app.R
 import im.vector.app.espresso.tools.waitUntilActivityVisible
-import im.vector.app.espresso.tools.waitUntilDialogVisible
 import im.vector.app.espresso.tools.waitUntilViewVisible
 import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.home.room.detail.RoomDetailActivity
@@ -86,14 +85,17 @@ class SpaceCreateRobot {
         clickOn(R.id.nextButton)
         waitUntilViewVisible(withId(R.id.recyclerView))
         clickOn(R.id.nextButton)
+//        waitUntilActivityVisible<RoomDetailActivity> {
+//            waitUntilDialogVisible(withId(R.id.inviteByMxidButton))
+//        }
+//        // close invite dialog
+//        pressBack()
         waitUntilActivityVisible<RoomDetailActivity> {
-            waitUntilDialogVisible(withId(R.id.inviteByMxidButton))
+            pressBack()
         }
-        // close invite dialog
-        pressBack()
-        waitUntilViewVisible(withId(R.id.timelineRecyclerView))
+//        waitUntilViewVisible(withId(R.id.timelineRecyclerView))
         // close room
-        pressBack()
+//        pressBack()
         waitUntilViewVisible(withId(R.id.roomListContainer))
     }
 }

vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt

@@ -89,9 +89,8 @@ class SpaceMenuRobot {
         clickOnSheet(R.id.leaveSpace)
         waitUntilActivityVisible<SpaceLeaveAdvancedActivity> {
             waitUntilViewVisible(ViewMatchers.withId(R.id.roomList))
+            clickOn(R.id.spaceLeaveSelectAll)
+            clickOn(R.id.spaceLeaveButton)
         }
-        clickOn(R.id.spaceLeaveSelectAll)
-        clickOn(R.id.spaceLeaveButton)
-        waitUntilViewVisible(ViewMatchers.withId(R.id.groupListView))
     }
 }

vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt

@@ -70,11 +70,13 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.SupervisorJob
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.SyncConfig
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.sync.filter.SyncFilterParams
 import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
 import javax.inject.Singleton
 
@@ -159,6 +161,9 @@ import javax.inject.Singleton
                 metricPlugins = vectorPlugins.plugins(),
                 cryptoAnalyticsPlugin = vectorPlugins.cryptoMetricPlugin,
                 customEventTypesProvider = vectorCustomEventTypesProvider,
+                syncConfig = SyncConfig(
+                        syncFilterParams = SyncFilterParams(lazyLoadMembersForStateEvents = true, useThreadNotifications = true)
+                )
         )
     }