()
+ ?.let { PowerLevelsHelper(it) }
+ powerLevelsHelper!!.isUserAllowedToSend(aliceSession.myUserId, true, EventType.STATE_SPACE_PARENT)
+ }
+ }
+
+ commonTestHelper.waitWithLatch {
+ GlobalScope.launch {
+ aliceSession.spaceService().setSpaceParent(bobRoomId, spaceAInfo.spaceId, false, listOf(bobSession.sessionParams.homeServerHost ?: ""))
+ it.countDown()
+ }
+ }
+
+ commonTestHelper.waitWithLatch { latch ->
+ commonTestHelper.retryPeriodicallyWithLatch(latch) {
+ bobSession.getRoomSummary(bobRoomId)?.flattenParentIds?.contains(spaceAInfo.spaceId) == true
+ }
+ }
+
+ commonTestHelper.signOutAndClose(aliceSession)
+ commonTestHelper.signOutAndClose(bobSession)
}
}
diff --git a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
index 2103dc954d..3add757efa 100644
--- a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
+++ b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
@@ -17,10 +17,10 @@
package org.matrix.android.sdk.internal.network.interceptors
-import org.matrix.android.sdk.internal.di.MatrixScope
import okhttp3.Interceptor
import okhttp3.Response
import okio.Buffer
+import org.matrix.android.sdk.internal.di.MatrixScope
import timber.log.Timber
import java.io.IOException
import java.nio.charset.Charset
@@ -36,8 +36,8 @@ import javax.inject.Inject
* non-production environment.
*/
@MatrixScope
-internal class CurlLoggingInterceptor @Inject constructor()
- : Interceptor {
+internal class CurlLoggingInterceptor @Inject constructor() :
+ Interceptor {
/**
* Set any additional curl command options (see 'curl --help').
@@ -90,8 +90,8 @@ internal class CurlLoggingInterceptor @Inject constructor()
curlCmd += ((if (compressed) " --compressed " else " ") + "'" + request.url.toString()
// Replace localhost for emulator by localhost for shell
- .replace("://10.0.2.2:8080/".toRegex(), "://127.0.0.1:8080/")
- + "'")
+ .replace("://10.0.2.2:8080/".toRegex(), "://127.0.0.1:8080/") +
+ "'")
// Add Json formatting
curlCmd += " | python -m json.tool"
diff --git a/matrix-sdk-android/src/main/AndroidManifest.xml b/matrix-sdk-android/src/main/AndroidManifest.xml
index 220a168f60..de0731422c 100644
--- a/matrix-sdk-android/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android/src/main/AndroidManifest.xml
@@ -10,15 +10,6 @@
-
-
-
+
-
@@ -47,6 +47,7 @@
+
diff --git a/vector/proguard-rules.pro b/vector/proguard-rules.pro
index 46fae8338c..7fd72ba895 100644
--- a/vector/proguard-rules.pro
+++ b/vector/proguard-rules.pro
@@ -64,4 +64,15 @@
-keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactPropGroup ; }
-dontwarn com.facebook.react.**
--keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
\ No newline at end of file
+-keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
+
+-keepattributes InnerClasses
+
+# JWT dependencies
+-keep class io.jsonwebtoken.** { *; }
+-keepnames class io.jsonwebtoken.* { *; }
+-keepnames interface io.jsonwebtoken.* { *; }
+
+-keep class org.bouncycastle.** { *; }
+-keepnames class org.bouncycastle.** { *; }
+-dontwarn org.bouncycastle.**
\ No newline at end of file
diff --git a/vector/src/androidTest/java/im/vector/app/EspressoExt.kt b/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
index d247d88caa..fbcb9b8cb3 100644
--- a/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
+++ b/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
@@ -18,7 +18,10 @@ package im.vector.app
import android.app.Activity
import android.view.View
+import androidx.annotation.StringRes
+import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.Observer
+import androidx.test.espresso.Espresso
import androidx.test.espresso.IdlingRegistry
import androidx.test.espresso.IdlingResource
import androidx.test.espresso.PerformException
@@ -32,6 +35,12 @@ import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
import androidx.test.runner.lifecycle.ActivityLifecycleCallback
import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
import androidx.test.runner.lifecycle.Stage
+import com.adevinta.android.barista.interaction.BaristaClickInteractions
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.espresso.tools.waitUntilViewVisible
import org.hamcrest.Matcher
import org.hamcrest.Matchers
import org.hamcrest.StringDescription
@@ -49,6 +58,18 @@ object EspressoHelper {
}
return currentActivity
}
+
+ inline fun > getBottomSheetDialog(): BottomSheetDialogFragment? {
+ return (getCurrentActivity() as? FragmentActivity)
+ ?.supportFragmentManager
+ ?.fragments
+ ?.filterIsInstance()
+ ?.firstOrNull()
+ }
+}
+
+fun getString(@StringRes id: Int): String {
+ return EspressoHelper.getCurrentActivity()!!.resources.getString(id)
}
fun waitForView(viewMatcher: Matcher, timeout: Long = 10_000, waitForDisplayed: Boolean = true): ViewAction {
@@ -70,6 +91,8 @@ fun waitForView(viewMatcher: Matcher, timeout: Long = 10_000, waitForDispl
val endTime = startTime + timeout
val visibleMatcher = isDisplayed()
+ uiController.loopMainThreadForAtLeast(100)
+
do {
println("*** waitForView loop $view end:$endTime current:${System.currentTimeMillis()}")
val viewVisible = TreeIterables.breadthFirstViewTraversal(view)
@@ -129,7 +152,7 @@ fun activityIdlingResource(activityClass: Class<*>): IdlingResource {
private var callback: IdlingResource.ResourceCallback? = null
var hasResumed = false
- private var currentActivity : Activity? = null
+ private var currentActivity: Activity? = null
val uniqTS = System.currentTimeMillis()
override fun getName() = "activityIdlingResource_${activityClass.name}_$uniqTS"
@@ -205,3 +228,52 @@ fun allSecretsKnownIdling(session: Session): IdlingResource {
return res
}
+
+fun clickOnAndGoBack(@StringRes name: Int, block: () -> Unit) {
+ BaristaClickInteractions.clickOn(name)
+ block()
+ Espresso.pressBack()
+}
+
+inline fun > interactWithSheet(contentMatcher: Matcher, noinline block: () -> Unit = {}) {
+ waitUntilViewVisible(contentMatcher)
+ val behaviour = (EspressoHelper.getBottomSheetDialog()!!.dialog as BottomSheetDialog).behavior
+ withIdlingResource(BottomSheetResource(behaviour, BottomSheetBehavior.STATE_EXPANDED), block)
+ withIdlingResource(BottomSheetResource(behaviour, BottomSheetBehavior.STATE_HIDDEN)) {}
+}
+
+class BottomSheetResource(
+ private val bottomSheetBehavior: BottomSheetBehavior<*>,
+ @BottomSheetBehavior.State private val wantedState: Int
+) : IdlingResource, BottomSheetBehavior.BottomSheetCallback() {
+
+ private var isIdle: Boolean = false
+ private var resourceCallback: IdlingResource.ResourceCallback? = null
+
+ override fun onSlide(bottomSheet: View, slideOffset: Float) {}
+
+ override fun onStateChanged(bottomSheet: View, newState: Int) {
+ val wasIdle = isIdle
+ isIdle = newState == BottomSheetBehavior.STATE_EXPANDED
+ if (!wasIdle && isIdle) {
+ bottomSheetBehavior.removeBottomSheetCallback(this)
+ resourceCallback?.onTransitionToIdle()
+ }
+ }
+
+ override fun getName() = "BottomSheet awaiting state: $wantedState"
+
+ override fun isIdleNow() = isIdle
+
+ override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback) {
+ resourceCallback = callback
+
+ val state = bottomSheetBehavior.state
+ isIdle = state == wantedState
+ if (isIdle) {
+ resourceCallback!!.onTransitionToIdle()
+ } else {
+ bottomSheetBehavior.addBottomSheetCallback(this)
+ }
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
index 285f40aaf3..47e1e43be3 100644
--- a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
@@ -18,7 +18,7 @@ package im.vector.app
import android.net.Uri
import androidx.lifecycle.Observer
-import im.vector.app.ui.UiTestBase
+import im.vector.app.ui.robot.OnboardingRobot
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
@@ -39,7 +39,7 @@ abstract class VerificationTestBase {
val password = "password"
val homeServerUrl: String = "http://10.0.2.2:8080"
- protected val uiTestBase = UiTestBase()
+ protected val uiTestBase = OnboardingRobot()
fun createAccountAndSync(matrix: Matrix,
userName: String,
@@ -107,6 +107,7 @@ abstract class VerificationTestBase {
return result!!
}
+ @Suppress("EXPERIMENTAL_API_USAGE")
private fun syncSession(session: Session) {
val lock = CountDownLatch(1)
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
index 571bcf474c..982a421425 100644
--- a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
@@ -44,14 +44,14 @@ import org.junit.runner.RunWith
import org.matrix.android.sdk.api.Matrix
import org.matrix.android.sdk.api.auth.UIABaseAuth
import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
+import org.matrix.android.sdk.api.auth.UserPasswordAuth
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
import org.matrix.android.sdk.api.session.Session
import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
-import org.matrix.android.sdk.api.auth.UserPasswordAuth
-import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
import kotlin.coroutines.Continuation
import kotlin.coroutines.resume
diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt b/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
index bf60ad681f..178b9fb9f6 100644
--- a/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
+++ b/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
@@ -30,9 +30,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withClassName
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.espresso.matcher.ViewMatchers.withText
import im.vector.app.R
-import org.hamcrest.Matchers.`is`
import org.hamcrest.Matchers.allOf
import org.hamcrest.Matchers.instanceOf
+import org.hamcrest.Matchers.`is`
fun clickOnPreference(@StringRes textResId: Int) {
onView(withId(R.id.recycler_view))
diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt b/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
new file mode 100644
index 0000000000..2e329ebb6b
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.espresso.tools
+
+import android.content.ContentResolver
+import android.content.ContentValues
+import android.graphics.Bitmap
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.provider.MediaStore
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import org.junit.rules.TestWatcher
+import org.junit.runner.Description
+import timber.log.Timber
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.OutputStream
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+private val SCREENSHOT_FOLDER_LOCATION = "${Environment.DIRECTORY_PICTURES}/failure_screenshots"
+private val deviceLanguage = Locale.getDefault().language
+
+class ScreenshotFailureRule : TestWatcher() {
+ override fun failed(e: Throwable?, description: Description) {
+ val screenShotName = "$deviceLanguage-${description.methodName}-${SimpleDateFormat("EEE-MMMM-dd-HH:mm:ss").format(Date())}"
+ val bitmap = getInstrumentation().uiAutomation.takeScreenshot()
+ storeFailureScreenshot(bitmap, screenShotName)
+ }
+}
+
+/**
+ * Stores screenshots in sdcard/Pictures/failure_screenshots
+ */
+private fun storeFailureScreenshot(bitmap: Bitmap, screenshotName: String) {
+ val contentResolver = getInstrumentation().targetContext.applicationContext.contentResolver
+
+ val contentValues = ContentValues().apply {
+ put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg")
+ put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis())
+ }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ useMediaStoreScreenshotStorage(
+ contentValues,
+ contentResolver,
+ screenshotName,
+ SCREENSHOT_FOLDER_LOCATION,
+ bitmap
+ )
+ } else {
+ usePublicExternalScreenshotStorage(
+ contentValues,
+ contentResolver,
+ screenshotName,
+ SCREENSHOT_FOLDER_LOCATION,
+ bitmap
+ )
+ }
+}
+
+private fun useMediaStoreScreenshotStorage(
+ contentValues: ContentValues,
+ contentResolver: ContentResolver,
+ screenshotName: String,
+ screenshotLocation: String,
+ bitmap: Bitmap
+) {
+ contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, "$screenshotName.jpeg")
+ contentValues.put(MediaStore.Images.Media.RELATIVE_PATH, screenshotLocation)
+ val uri: Uri? = contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
+ if (uri != null) {
+ contentResolver.openOutputStream(uri)?.let { saveScreenshotToStream(bitmap, it) }
+ contentResolver.update(uri, contentValues, null, null)
+ }
+}
+
+@Suppress("DEPRECATION")
+private fun usePublicExternalScreenshotStorage(
+ contentValues: ContentValues,
+ contentResolver: ContentResolver,
+ screenshotName: String,
+ screenshotLocation: String,
+ bitmap: Bitmap
+) {
+ val directory = File(Environment.getExternalStoragePublicDirectory(screenshotLocation).toString())
+ if (!directory.exists()) {
+ directory.mkdirs()
+ }
+ val file = File(directory, "$screenshotName.jpeg")
+ saveScreenshotToStream(bitmap, FileOutputStream(file))
+ contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
+}
+
+private fun saveScreenshotToStream(bitmap: Bitmap, outputStream: OutputStream) {
+ outputStream.use {
+ try {
+ bitmap.compress(Bitmap.CompressFormat.JPEG, 50, it)
+ } catch (e: IOException) {
+ Timber.e("Screenshot was not stored at this time")
+ }
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt b/vector/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt
index 2cdca62c74..7744d4b720 100644
--- a/vector/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt
+++ b/vector/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt
@@ -17,9 +17,18 @@
package im.vector.app.espresso.tools
import android.app.Activity
+import android.view.View
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.matcher.ViewMatchers
import im.vector.app.activityIdlingResource
+import im.vector.app.waitForView
import im.vector.app.withIdlingResource
+import org.hamcrest.Matcher
-inline fun waitUntilActivityVisible(noinline block: (() -> Unit)) {
+inline fun waitUntilActivityVisible(noinline block: (() -> Unit) = {}) {
withIdlingResource(activityIdlingResource(T::class.java), block)
}
+
+fun waitUntilViewVisible(viewMatcher: Matcher) {
+ Espresso.onView(ViewMatchers.isRoot()).perform(waitForView(viewMatcher))
+}
diff --git a/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt b/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
index 79090c42dd..a880b17e0c 100644
--- a/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
@@ -17,6 +17,10 @@
package im.vector.app.features.reactions.data
import im.vector.app.InstrumentedTest
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.runBlocking
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.FixMethodOrder
@@ -30,64 +34,80 @@ import kotlin.system.measureTimeMillis
@FixMethodOrder(MethodSorters.JVM)
class EmojiDataSourceTest : InstrumentedTest {
+ private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+
@Test
fun checkParsingTime() {
val time = measureTimeMillis {
- EmojiDataSource(context().resources)
+ createEmojiDataSource()
}
-
assertTrue("Too long to parse", time < 100)
}
@Test
fun checkNumberOfResult() {
- val emojiDataSource = EmojiDataSource(context().resources)
- assertTrue("Wrong number of emojis", emojiDataSource.rawData.emojis.size >= 500)
- assertTrue("Wrong number of categories", emojiDataSource.rawData.categories.size >= 8)
+ val emojiDataSource = createEmojiDataSource()
+ val rawData = runBlocking {
+ emojiDataSource.rawData.await()
+ }
+ assertTrue("Wrong number of emojis", rawData.emojis.size >= 500)
+ assertTrue("Wrong number of categories", rawData.categories.size >= 8)
}
@Test
fun searchTestEmptySearch() {
- val emojiDataSource = EmojiDataSource(context().resources)
-
- assertTrue("Empty search should return at least 500 results", emojiDataSource.filterWith("").size >= 500)
+ val emojiDataSource = createEmojiDataSource()
+ val result = runBlocking {
+ emojiDataSource.filterWith("")
+ }
+ assertTrue("Empty search should return at least 500 results", result.size >= 500)
}
@Test
fun searchTestNoResult() {
- val emojiDataSource = EmojiDataSource(context().resources)
-
- assertTrue("Should not have result", emojiDataSource.filterWith("noresult").isEmpty())
+ val emojiDataSource = createEmojiDataSource()
+ val result = runBlocking {
+ emojiDataSource.filterWith("noresult")
+ }
+ assertTrue("Should not have result", result.isEmpty())
}
@Test
fun searchTestOneResult() {
- val emojiDataSource = EmojiDataSource(context().resources)
-
- assertEquals("Should have 1 result", 1, emojiDataSource.filterWith("france").size)
+ val emojiDataSource = createEmojiDataSource()
+ val result = runBlocking {
+ emojiDataSource.filterWith("france")
+ }
+ assertEquals("Should have 1 result", 1, result.size)
}
@Test
fun searchTestManyResult() {
- val emojiDataSource = EmojiDataSource(context().resources)
-
- assertTrue("Should have many result", emojiDataSource.filterWith("fra").size > 1)
+ val emojiDataSource = createEmojiDataSource()
+ val result = runBlocking {
+ emojiDataSource.filterWith("fra")
+ }
+ assertTrue("Should have many result", result.size > 1)
}
@Test
fun testTada() {
- val emojiDataSource = EmojiDataSource(context().resources)
-
- val result = emojiDataSource.filterWith("tada")
-
+ val emojiDataSource = createEmojiDataSource()
+ val result = runBlocking {
+ emojiDataSource.filterWith("tada")
+ }
assertEquals("Should find tada emoji", 1, result.size)
assertEquals("Should find tada emoji", "🎉", result[0].emoji)
}
@Test
fun testQuickReactions() {
- val emojiDataSource = EmojiDataSource(context().resources)
-
- assertEquals("Should have 8 quick reactions", 8, emojiDataSource.getQuickReactions().size)
+ val emojiDataSource = createEmojiDataSource()
+ val result = runBlocking {
+ emojiDataSource.getQuickReactions()
+ }
+ assertEquals("Should have 8 quick reactions", 8, result.size)
}
+
+ private fun createEmojiDataSource() = EmojiDataSource(coroutineScope, context().resources)
}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index 26365e0c72..f998a9f23c 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -16,51 +16,19 @@
package im.vector.app.ui
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.Espresso.pressBack
-import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
-import androidx.test.espresso.action.ViewActions.longClick
-import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
-import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
-import androidx.test.espresso.matcher.ViewMatchers.isRoot
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
import androidx.test.ext.junit.rules.ActivityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.LargeTest
-import com.schibsted.spain.barista.assertion.BaristaListAssertions.assertListItemCount
-import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickBack
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.longClickOn
-import com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogNegativeButton
-import com.schibsted.spain.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton
-import com.schibsted.spain.barista.interaction.BaristaEditTextInteractions.writeTo
-import com.schibsted.spain.barista.interaction.BaristaListInteractions.clickListItem
-import com.schibsted.spain.barista.interaction.BaristaListInteractions.clickListItemChild
-import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions.clickMenu
-import com.schibsted.spain.barista.interaction.BaristaMenuClickInteractions.openMenu
-import im.vector.app.EspressoHelper
import im.vector.app.R
-import im.vector.app.SleepViewAction
-import im.vector.app.activityIdlingResource
-import im.vector.app.espresso.tools.clickOnPreference
-import im.vector.app.espresso.tools.waitUntilActivityVisible
+import im.vector.app.espresso.tools.ScreenshotFailureRule
import im.vector.app.features.MainActivity
-import im.vector.app.features.createdirect.CreateDirectRoomActivity
-import im.vector.app.features.home.HomeActivity
-import im.vector.app.features.home.room.detail.RoomDetailActivity
-import im.vector.app.features.login.LoginActivity
-import im.vector.app.features.roomdirectory.RoomDirectoryActivity
-import im.vector.app.initialSyncIdlingResource
-import im.vector.app.waitForView
-import im.vector.app.withIdlingResource
+import im.vector.app.getString
+import im.vector.app.ui.robot.ElementRobot
+import im.vector.app.ui.robot.withDeveloperMode
import org.junit.Rule
import org.junit.Test
+import org.junit.rules.RuleChain
import org.junit.runner.RunWith
-import java.lang.Thread.sleep
import java.util.UUID
/**
@@ -71,9 +39,11 @@ import java.util.UUID
class UiAllScreensSanityTest {
@get:Rule
- val activityRule = ActivityScenarioRule(MainActivity::class.java)
+ val testRule = RuleChain
+ .outerRule(ActivityScenarioRule(MainActivity::class.java))
+ .around(ScreenshotFailureRule())
- private val uiTestBase = UiTestBase()
+ private val elementRobot = ElementRobot()
// Last passing:
// 2020-11-09
@@ -83,417 +53,63 @@ class UiAllScreensSanityTest {
fun allScreensTest() {
// Create an account
val userId = "UiTest_" + UUID.randomUUID().toString()
- uiTestBase.createAccount(userId = userId)
+ elementRobot.signUp(userId)
- withIdlingResource(activityIdlingResource(HomeActivity::class.java)) {
- assertDisplayed(R.id.roomListContainer)
- closeSoftKeyboard()
+ elementRobot.settings {
+ general { crawl() }
+ notifications { crawl() }
+ preferences { crawl() }
+ voiceAndVideo()
+ ignoredUsers()
+ securityAndPrivacy { crawl() }
+ labs()
+ advancedSettings { crawl() }
+ helpAndAbout { crawl() }
}
- val activity = EspressoHelper.getCurrentActivity()!!
- val uiSession = (activity as HomeActivity).activeSessionHolder.getActiveSession()
-
- withIdlingResource(initialSyncIdlingResource(uiSession)) {
- assertDisplayed(R.id.roomListContainer)
+ elementRobot.newDirectMessage {
+ verifyQrCodeButton()
+ verifyInviteFriendsButton()
}
- assertDisplayed(R.id.bottomNavigationView)
+ elementRobot.newRoom {
+ createNewRoom {
+ crawl()
+ createRoom {
+ val message = "Hello world!"
+ postMessage(message)
+ crawl()
+ crawlMessage(message)
+ openSettings { crawl() }
+ }
+ }
+ }
- // Settings
- navigateToSettings()
+ elementRobot.withDeveloperMode {
+ settings {
+ advancedSettings { crawlDeveloperOptions() }
+ }
+ roomList {
+ openRoom(getString(R.string.room_displayname_empty_room)) {
+ val message = "Test view source"
+ postMessage(message)
+ openMessageMenu(message) {
+ viewSource()
+ }
+ }
+ }
+ }
- // Create DM
- clickOn(R.id.bottom_action_people)
- createDm()
+ elementRobot.roomList {
+ verifyCreatedRoom()
+ }
- // Create Room
- // First navigate to the other tab
- clickOn(R.id.bottom_action_rooms)
- createRoom()
-
- assertDisplayed(R.id.bottomNavigationView)
-
- // Long click on the room
- onView(withId(R.id.roomListView))
- .perform(
- actionOnItem(
- hasDescendant(withText(R.string.room_displayname_empty_room)),
- longClick()
- )
- )
- pressBack()
-
- uiTestBase.signout()
-
- // We have sent a message in a e2e room, accept to loose it
- clickOn(R.id.exitAnywayButton)
- // Dark pattern
- clickDialogNegativeButton()
+ elementRobot.signout(expectSignOutWarning = true)
// Login again on the same account
- waitUntilActivityVisible {
- assertDisplayed(R.id.loginSplashLogo)
- }
-
- uiTestBase.login(userId)
- ignoreVerification()
-
- uiTestBase.signout()
- clickDialogPositiveButton()
-
+ elementRobot.login(userId)
+ elementRobot.dismissVerificationIfPresent()
// TODO Deactivate account instead of logout?
- }
-
- private fun ignoreVerification() {
- sleep(6000)
- val activity = EspressoHelper.getCurrentActivity()!!
-
- val popup = activity.findViewById(com.tapadoo.alerter.R.id.llAlertBackground)
- activity.runOnUiThread {
- popup.performClick()
- }
-
- assertDisplayed(R.id.bottomSheetFragmentContainer)
-
- onView(isRoot()).perform(SleepViewAction.sleep(2000))
-
- clickOn(R.string.skip)
- assertDisplayed(R.string.are_you_sure)
- clickOn(R.string.skip)
- }
-
- private fun createRoom() {
- clickOn(R.id.createGroupRoomButton)
- waitUntilActivityVisible {
- assertDisplayed(R.id.publicRoomsList)
- }
- clickOn(R.string.create_new_room)
-
- // Create
- assertListItemCount(R.id.createRoomForm, 10)
- clickListItemChild(R.id.createRoomForm, 9, R.id.form_submit_button)
-
- waitUntilActivityVisible {
- assertDisplayed(R.id.roomDetailContainer)
- }
-
- clickOn(R.id.attachmentButton)
- clickBack()
-
- // Send a message
- writeTo(R.id.composerEditText, "Hello world!")
- clickOn(R.id.sendButton)
-
- navigateToRoomSettings()
-
- // Long click on the message
- longClickOnMessageTest()
-
- // Menu
- openMenu()
- pressBack()
- clickMenu(R.id.voice_call)
- pressBack()
- clickMenu(R.id.video_call)
- pressBack()
- clickMenu(R.id.search)
- pressBack()
-
- pressBack()
- }
-
- private fun longClickOnMessageTest() {
- // Test quick reaction
- longClickOnMessage()
- // Add quick reaction
- clickOn("\uD83D\uDC4D️") // 👍
-
- sleep(1000)
-
- // Open reactions
- longClickOn("\uD83D\uDC4D️") // 👍
- pressBack()
-
- // Test add reaction
- longClickOnMessage()
- clickOn(R.string.message_add_reaction)
- // Filter
- // TODO clickMenu(R.id.search)
- clickListItem(R.id.emojiRecyclerView, 4)
-
- // Test Edit mode
- longClickOnMessage()
- clickOn(R.string.edit)
- // TODO Cancel action
- writeTo(R.id.composerEditText, "Hello universe!")
- // Wait a bit for the keyboard layout to update
- sleep(30)
- clickOn(R.id.sendButton)
- // Open edit history
- longClickOnMessage("Hello universe! (edited)")
- clickOn(R.string.message_view_edit_history)
- pressBack()
- }
-
- private fun longClickOnMessage(text: String = "Hello world!") {
- onView(withId(R.id.timelineRecyclerView))
- .perform(
- actionOnItem(
- hasDescendant(withText(text)),
- longClick()
- )
- )
- }
-
- private fun navigateToRoomSettings() {
- clickOn(R.id.roomToolbarTitleView)
- assertDisplayed(R.id.roomProfileAvatarView)
-
- // Room settings
- clickListItem(R.id.matrixProfileRecyclerView, 3)
- navigateToRoomParameters()
- pressBack()
-
- // Notifications
- clickListItem(R.id.matrixProfileRecyclerView, 5)
- pressBack()
-
- assertDisplayed(R.id.roomProfileAvatarView)
-
- // People
- clickListItem(R.id.matrixProfileRecyclerView, 7)
- assertDisplayed(R.id.inviteUsersButton)
- navigateToRoomPeople()
- // Fab
- navigateToInvite()
- pressBack()
- pressBack()
-
- assertDisplayed(R.id.roomProfileAvatarView)
-
- // Uploads
- clickListItem(R.id.matrixProfileRecyclerView, 9)
- // File tab
- clickOn(R.string.uploads_files_title)
- pressBack()
-
- assertDisplayed(R.id.roomProfileAvatarView)
-
- // Leave
- clickListItem(R.id.matrixProfileRecyclerView, 13)
- clickDialogNegativeButton()
-
- // Advanced
- // Room addresses
- clickListItem(R.id.matrixProfileRecyclerView, 15)
- onView(isRoot()).perform(waitForView(withText(R.string.room_alias_published_alias_title)))
- pressBack()
-
- // Room permissions
- clickListItem(R.id.matrixProfileRecyclerView, 17)
- onView(isRoot()).perform(waitForView(withText(R.string.room_permissions_title)))
- clickOn(R.string.room_permissions_change_room_avatar)
- clickDialogNegativeButton()
- // Toggle
- clickOn(R.string.show_advanced)
- clickOn(R.string.hide_advanced)
- pressBack()
-
- // Menu share
- // clickMenu(R.id.roomProfileShareAction)
- // pressBack()
-
- pressBack()
- }
-
- private fun navigateToRoomParameters() {
- // Room history readability
- clickListItem(R.id.roomSettingsRecyclerView, 4)
- pressBack()
-
- // Room access
- clickListItem(R.id.roomSettingsRecyclerView, 6)
- pressBack()
- }
-
- private fun navigateToInvite() {
- assertDisplayed(R.id.inviteUsersButton)
- clickOn(R.id.inviteUsersButton)
- closeSoftKeyboard()
- pressBack()
- }
-
- private fun navigateToRoomPeople() {
- // Open first user
- clickListItem(R.id.roomSettingsRecyclerView, 1)
- assertDisplayed(R.id.memberProfilePowerLevelView)
-
- // Verification
- clickListItem(R.id.matrixProfileRecyclerView, 1)
- clickBack()
-
- // Role
- clickListItem(R.id.matrixProfileRecyclerView, 3)
- clickDialogNegativeButton()
-
- clickBack()
- }
-
- private fun createDm() {
- clickOn(R.id.createChatRoomButton)
-
- withIdlingResource(activityIdlingResource(CreateDirectRoomActivity::class.java)) {
- onView(withId(R.id.userListRecyclerView))
- .perform(waitForView(withText(R.string.qr_code)))
- onView(withId(R.id.userListRecyclerView))
- .perform(waitForView(withText(R.string.invite_friends)))
- }
-
- closeSoftKeyboard()
- pressBack()
- pressBack()
- }
-
- private fun navigateToSettings() {
- clickOn(R.id.groupToolbarAvatarImageView)
- clickOn(R.id.homeDrawerHeaderSettingsView)
-
- clickOn(R.string.settings_general_title)
- navigateToSettingsGeneral()
- pressBack()
-
- clickOn(R.string.settings_notifications)
- navigateToSettingsNotifications()
- pressBack()
-
- clickOn(R.string.settings_preferences)
- navigateToSettingsPreferences()
- pressBack()
-
- clickOn(R.string.preference_voice_and_video)
- pressBack()
-
- clickOn(R.string.settings_ignored_users)
- pressBack()
-
- clickOn(R.string.settings_security_and_privacy)
- navigateToSettingsSecurity()
- pressBack()
-
- clickOn(R.string.room_settings_labs_pref_title)
- pressBack()
-
- clickOn(R.string.settings_advanced_settings)
- navigateToSettingsAdvanced()
- pressBack()
-
- clickOn(R.string.preference_root_help_about)
- navigateToSettingsHelp()
- pressBack()
-
- pressBack()
- }
-
- private fun navigateToSettingsHelp() {
- /*
- clickOn(R.string.settings_app_info_link_title)
- Cannot go back...
- pressBack()
- clickOn(R.string.settings_copyright)
- pressBack()
- clickOn(R.string.settings_app_term_conditions)
- pressBack()
- clickOn(R.string.settings_privacy_policy)
- pressBack()
- */
- clickOn(R.string.settings_third_party_notices)
- clickDialogPositiveButton()
- }
-
- private fun navigateToSettingsAdvanced() {
- clickOnPreference(R.string.settings_notifications_targets)
- pressBack()
-
- clickOnPreference(R.string.settings_push_rules)
- pressBack()
-
- /* TODO P2 test developer screens
- // Enable developer mode
- clickOnSwitchPreference("SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY")
-
- clickOnPreference(R.string.settings_account_data)
- clickOn("m.push_rules")
- pressBack()
- pressBack()
- clickOnPreference(R.string.settings_key_requests)
- pressBack()
-
- // Disable developer mode
- clickOnSwitchPreference("SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY")
- */
- }
-
- private fun navigateToSettingsSecurity() {
- clickOnPreference(R.string.settings_active_sessions_show_all)
- pressBack()
-
- clickOnPreference(R.string.encryption_message_recovery)
- // TODO go deeper here
- pressBack()
- /* Cannot exit
- clickOnPreference(R.string.encryption_export_e2e_room_keys)
- pressBack()
- */
- }
-
- private fun navigateToSettingsPreferences() {
- clickOn(R.string.settings_interface_language)
- onView(isRoot())
- .perform(waitForView(withText("Dansk (Danmark)")))
- pressBack()
- clickOn(R.string.settings_theme)
- clickDialogNegativeButton()
- clickOn(R.string.font_size)
- clickDialogNegativeButton()
- }
-
- private fun navigateToSettingsNotifications() {
- clickOn(R.string.settings_notification_advanced)
- pressBack()
- /*
- clickOn(R.string.settings_noisy_notifications_preferences)
- TODO Cannot go back
- pressBack()
- clickOn(R.string.settings_silent_notifications_preferences)
- pressBack()
- clickOn(R.string.settings_call_notifications_preferences)
- pressBack()
- */
- clickOnPreference(R.string.settings_notification_troubleshoot)
- pressBack()
- }
-
- private fun navigateToSettingsGeneral() {
- clickOn(R.string.settings_profile_picture)
- clickDialogPositiveButton()
- clickOn(R.string.settings_display_name)
- clickDialogNegativeButton()
- clickOn(R.string.settings_password)
- clickDialogNegativeButton()
- clickOn(R.string.settings_emails_and_phone_numbers_title)
- pressBack()
- clickOn(R.string.settings_discovery_manage)
- clickOn(R.string.add_identity_server)
- pressBack()
- pressBack()
- // Homeserver
- clickOnPreference(R.string.settings_home_server)
- pressBack()
- // Identity server
- clickOnPreference(R.string.settings_identity_server)
- pressBack()
- // Deactivate account
- clickOnPreference(R.string.settings_deactivate_my_account)
- pressBack()
+ elementRobot.signout(expectSignOutWarning = false)
}
}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt
new file mode 100644
index 0000000000..505dfb33e9
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot
+
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import com.adevinta.android.barista.assertion.BaristaListAssertions
+import com.adevinta.android.barista.interaction.BaristaClickInteractions
+import com.adevinta.android.barista.interaction.BaristaListInteractions
+import im.vector.app.R
+import im.vector.app.espresso.tools.waitUntilActivityVisible
+import im.vector.app.espresso.tools.waitUntilViewVisible
+import im.vector.app.features.home.room.detail.RoomDetailActivity
+
+class CreateNewRoomRobot(
+ var createdRoom: Boolean = false
+) {
+
+ fun createRoom(block: RoomDetailRobot.() -> Unit) {
+ createdRoom = true
+ BaristaListAssertions.assertListItemCount(R.id.createRoomForm, 12)
+ BaristaListInteractions.clickListItemChild(R.id.createRoomForm, 11, R.id.form_submit_button)
+ waitUntilActivityVisible {
+ waitUntilViewVisible(withId(R.id.composerEditText))
+ }
+ block(RoomDetailRobot())
+ pressBack()
+ }
+
+ fun crawl() {
+ // Room access bottom sheet
+ BaristaClickInteractions.clickOn(R.string.room_settings_room_access_private_title)
+ pressBack()
+ }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt
similarity index 56%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt
rename to vector/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt
index b5d4ef4dbb..14c2d6284e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2021 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.
@@ -13,19 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.matrix.android.sdk.api.session.initsync
-import androidx.lifecycle.LiveData
+package im.vector.app.ui.robot
-interface InitialSyncProgressService {
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogNegativeButton
- fun getInitialSyncProgressStatus(): LiveData
+class DialogRobot(
+ var returnedToPreviousScreen: Boolean = false
+) {
- sealed class Status {
- object Idle : Status()
- data class Progressing(
- val initSyncStep: InitSyncStep,
- val percentProgress: Int = 0
- ) : Status()
+ fun negativeAction() {
+ clickDialogNegativeButton()
+ returnedToPreviousScreen = true
}
}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
new file mode 100644
index 0000000000..a3bc5b26fc
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot
+
+import android.view.View
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogNegativeButton
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton
+import com.adevinta.android.barista.interaction.BaristaDrawerInteractions.openDrawer
+import im.vector.app.EspressoHelper
+import im.vector.app.R
+import im.vector.app.espresso.tools.waitUntilActivityVisible
+import im.vector.app.espresso.tools.waitUntilViewVisible
+import im.vector.app.features.createdirect.CreateDirectRoomActivity
+import im.vector.app.features.home.HomeActivity
+import im.vector.app.features.login.LoginActivity
+import im.vector.app.initialSyncIdlingResource
+import im.vector.app.ui.robot.settings.SettingsRobot
+import im.vector.app.withIdlingResource
+import timber.log.Timber
+
+class ElementRobot {
+
+ fun signUp(userId: String) {
+ val onboardingRobot = OnboardingRobot()
+ onboardingRobot.createAccount(userId = userId)
+ waitForHome()
+ }
+
+ fun login(userId: String) {
+ val onboardingRobot = OnboardingRobot()
+ onboardingRobot.login(userId = userId)
+ waitForHome()
+ }
+
+ private fun waitForHome() {
+ waitUntilActivityVisible {
+ waitUntilViewVisible(withId(R.id.roomListContainer))
+ }
+ val activity = EspressoHelper.getCurrentActivity()!!
+ val uiSession = (activity as HomeActivity).activeSessionHolder.getActiveSession()
+ withIdlingResource(initialSyncIdlingResource(uiSession)) {
+ waitUntilViewVisible(withId(R.id.bottomNavigationView))
+ }
+ }
+
+ fun settings(block: SettingsRobot.() -> Unit) {
+ openDrawer()
+ clickOn(R.id.homeDrawerHeaderSettingsView)
+ block(SettingsRobot())
+ pressBack()
+ waitUntilViewVisible(withId(R.id.bottomNavigationView))
+ }
+
+ fun newDirectMessage(block: NewDirectMessageRobot.() -> Unit) {
+ clickOn(R.id.bottom_action_people)
+ clickOn(R.id.createChatRoomButton)
+ waitUntilActivityVisible {
+ waitUntilViewVisible(withId(R.id.userListSearch))
+ }
+ // close keyboard
+ pressBack()
+ block(NewDirectMessageRobot())
+ pressBack()
+ waitUntilViewVisible(withId(R.id.bottomNavigationView))
+ }
+
+ fun newRoom(block: NewRoomRobot.() -> Unit) {
+ clickOn(R.id.bottom_action_rooms)
+ RoomListRobot().newRoom { block() }
+ waitUntilViewVisible(withId(R.id.bottomNavigationView))
+ }
+
+ fun roomList(block: RoomListRobot.() -> Unit) {
+ clickOn(R.id.bottom_action_rooms)
+ block(RoomListRobot())
+ waitUntilViewVisible(withId(R.id.bottomNavigationView))
+ }
+
+ fun signout(expectSignOutWarning: Boolean) {
+ clickOn(R.id.groupToolbarAvatarImageView)
+ clickOn(R.id.homeDrawerHeaderSignoutView)
+
+ val isShowingSignOutWarning = kotlin.runCatching {
+ waitUntilViewVisible(withId(R.id.exitAnywayButton))
+ }.isSuccess
+
+ if (expectSignOutWarning != isShowingSignOutWarning) {
+ Timber.w("Unexpected sign out flow, expected warning to be: ${expectSignOutWarning.toWarningType()} but was ${isShowingSignOutWarning.toWarningType()}")
+ }
+
+ if (isShowingSignOutWarning) {
+ // We have sent a message in a e2e room, accept to loose it
+ clickOn(R.id.exitAnywayButton)
+ // Dark pattern
+ waitUntilViewVisible(withId(android.R.id.button2))
+ clickDialogNegativeButton()
+ } else {
+ waitUntilViewVisible(withId(android.R.id.button1))
+ clickDialogPositiveButton()
+ }
+
+ waitUntilActivityVisible {
+ assertDisplayed(R.id.loginSplashLogo)
+ }
+ }
+
+ fun dismissVerificationIfPresent() {
+ kotlin.runCatching {
+ Thread.sleep(6000)
+ val activity = EspressoHelper.getCurrentActivity()!!
+ val popup = activity.findViewById(com.tapadoo.alerter.R.id.llAlertBackground)!!
+ activity.runOnUiThread { popup.performClick() }
+
+ waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
+ waitUntilViewVisible(ViewMatchers.withText(R.string.skip))
+ clickOn(R.string.skip)
+ assertDisplayed(R.string.are_you_sure)
+ clickOn(R.string.skip)
+ waitUntilViewVisible(withId(R.id.bottomSheetFragmentContainer))
+ }.onFailure { Timber.w("Verification popup missing", it) }
+ }
+}
+
+private fun Boolean.toWarningType() = if (this) "shown" else "skipped"
+
+fun ElementRobot.withDeveloperMode(block: ElementRobot.() -> Unit) {
+ settings { toggleDeveloperMode() }
+ block()
+ settings { toggleDeveloperMode() }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt
new file mode 100644
index 0000000000..fd579c0d9f
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot
+
+import androidx.test.espresso.Espresso.pressBack
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaListInteractions.clickListItem
+import im.vector.app.R
+import java.lang.Thread.sleep
+
+class MessageMenuRobot(
+ var autoClosed: Boolean = false
+) {
+
+ fun viewSource() {
+ clickOn(R.string.view_source)
+ // wait for library
+ sleep(1000)
+ pressBack()
+ autoClosed = true
+ }
+
+ fun editHistory() {
+ clickOn(R.string.message_view_edit_history)
+ pressBack()
+ autoClosed = true
+ }
+
+ fun addQuickReaction(quickReaction: String) {
+ clickOn(quickReaction)
+ autoClosed = true
+ }
+
+ fun addReactionFromEmojiPicker() {
+ clickOn(R.string.message_add_reaction)
+ // Wait for emoji to load, it's async now
+ sleep(2000)
+ clickListItem(R.id.emojiRecyclerView, 4)
+ autoClosed = true
+ }
+
+ fun edit() {
+ clickOn(R.string.edit)
+ autoClosed = true
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt
new file mode 100644
index 0000000000..34c43c73f7
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot
+
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.matcher.ViewMatchers
+import im.vector.app.R
+import im.vector.app.waitForView
+
+class NewDirectMessageRobot {
+
+ fun verifyQrCodeButton() {
+ Espresso.onView(ViewMatchers.withId(R.id.userListRecyclerView))
+ .perform(waitForView(ViewMatchers.withText(R.string.qr_code)))
+ }
+
+ fun verifyInviteFriendsButton() {
+ Espresso.onView(ViewMatchers.withId(R.id.userListRecyclerView))
+ .perform(waitForView(ViewMatchers.withText(R.string.invite_friends)))
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt
new file mode 100644
index 0000000000..09ff1162c0
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot
+
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import im.vector.app.R
+import im.vector.app.espresso.tools.waitUntilViewVisible
+
+class NewRoomRobot(
+ var createdRoom: Boolean = false
+) {
+
+ fun createNewRoom(block: CreateNewRoomRobot.() -> Unit) {
+ clickOn(R.string.create_new_room)
+ waitUntilViewVisible(withId(R.id.createRoomForm))
+ val createNewRoomRobot = CreateNewRoomRobot()
+ block(createNewRoomRobot)
+ createdRoom = createNewRoomRobot.createdRoom
+ if (!createNewRoomRobot.createdRoom) {
+ pressBack()
+ }
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
similarity index 76%
rename from vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt
rename to vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
index ed174b50a2..fef5d4a1a2 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiTestBase.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
@@ -14,23 +14,22 @@
* limitations under the License.
*/
-package im.vector.app.ui
+package im.vector.app.ui.robot
import androidx.test.espresso.Espresso.closeSoftKeyboard
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.matcher.ViewMatchers.isRoot
import androidx.test.espresso.matcher.ViewMatchers.withId
-import com.schibsted.spain.barista.assertion.BaristaEnabledAssertions.assertDisabled
-import com.schibsted.spain.barista.assertion.BaristaEnabledAssertions.assertEnabled
-import com.schibsted.spain.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
-import com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn
-import com.schibsted.spain.barista.interaction.BaristaEditTextInteractions.writeTo
+import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertDisabled
+import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertEnabled
+import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaEditTextInteractions.writeTo
import im.vector.app.R
-import im.vector.app.espresso.tools.waitUntilActivityVisible
-import im.vector.app.features.home.HomeActivity
import im.vector.app.waitForView
-class UiTestBase {
+class OnboardingRobot {
+
fun createAccount(userId: String, password: String = "password", homeServerUrl: String = "http://10.0.2.2:8080") {
initSession(true, userId, password, homeServerUrl)
}
@@ -76,15 +75,5 @@ class UiTestBase {
closeSoftKeyboard()
clickOn(R.id.loginSubmit)
-
- // Wait
- waitUntilActivityVisible {
- assertDisplayed(R.id.homeDetailFragmentContainer)
- }
- }
-
- fun signout() {
- clickOn(R.id.groupToolbarAvatarImageView)
- clickOn(R.id.homeDrawerHeaderSignoutView)
}
}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
new file mode 100644
index 0000000000..24fe5adf64
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import com.adevinta.android.barista.interaction.BaristaClickInteractions
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.longClickOn
+import com.adevinta.android.barista.interaction.BaristaEditTextInteractions.writeTo
+import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions.clickMenu
+import com.adevinta.android.barista.interaction.BaristaMenuClickInteractions.openMenu
+import im.vector.app.R
+import im.vector.app.espresso.tools.waitUntilViewVisible
+import im.vector.app.features.home.room.detail.timeline.action.MessageActionsBottomSheet
+import im.vector.app.features.reactions.data.EmojiDataSource
+import im.vector.app.interactWithSheet
+import im.vector.app.waitForView
+import java.lang.Thread.sleep
+
+class RoomDetailRobot {
+
+ fun postMessage(content: String) {
+ writeTo(R.id.composerEditText, content)
+ waitUntilViewVisible(withId(R.id.sendButton))
+ clickOn(R.id.sendButton)
+ waitUntilViewVisible(withText(content))
+ }
+
+ fun crawl() {
+ clickOn(R.id.attachmentButton)
+ BaristaClickInteractions.clickBack()
+
+ // Menu
+ openMenu()
+ pressBack()
+ clickMenu(R.id.voice_call)
+ pressBack()
+ clickMenu(R.id.video_call)
+ pressBack()
+ clickMenu(R.id.search)
+ pressBack()
+ }
+
+ fun crawlMessage(message: String) {
+ // Test quick reaction
+ val quickReaction = EmojiDataSource.quickEmojis[0] // 👍
+ openMessageMenu(message) {
+ addQuickReaction(quickReaction)
+ }
+ // Open reactions
+ longClickOn(quickReaction)
+ // wait for bottom sheet
+ pressBack()
+ // Test add reaction
+ openMessageMenu(message) {
+ addReactionFromEmojiPicker()
+ }
+ // Test Edit mode
+ openMessageMenu(message) {
+ edit()
+ }
+ // TODO Cancel action
+ writeTo(R.id.composerEditText, "Hello universe!")
+ // Wait a bit for the keyboard layout to update
+ waitUntilViewVisible(withId(R.id.sendButton))
+ clickOn(R.id.sendButton)
+ // Wait for the UI to update
+ waitUntilViewVisible(withText("Hello universe! (edited)"))
+ // Open edit history
+ openMessageMenu("Hello universe! (edited)") {
+ editHistory()
+ }
+ }
+
+ fun openMessageMenu(message: String, block: MessageMenuRobot.() -> Unit) {
+ onView(withId(R.id.timelineRecyclerView))
+ .perform(
+ RecyclerViewActions.actionOnItem(
+ ViewMatchers.hasDescendant(ViewMatchers.withText(message)),
+ ViewActions.longClick()
+ )
+ )
+ interactWithSheet(contentMatcher = withId(R.id.bottomSheetRecyclerView)) {
+ val messageMenuRobot = MessageMenuRobot()
+ block(messageMenuRobot)
+ if (!messageMenuRobot.autoClosed) {
+ pressBack()
+ }
+ }
+ }
+
+ fun openSettings(block: RoomSettingsRobot.() -> Unit) {
+ clickOn(R.id.roomToolbarTitleView)
+ waitForView(withId(R.id.roomProfileAvatarView))
+ sleep(1000)
+ block(RoomSettingsRobot())
+ pressBack()
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt
new file mode 100644
index 0000000000..dc07f06202
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot
+
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import im.vector.app.R
+import im.vector.app.espresso.tools.waitUntilActivityVisible
+import im.vector.app.features.roomdirectory.RoomDirectoryActivity
+
+class RoomListRobot {
+
+ fun openRoom(roomName: String, block: RoomDetailRobot.() -> Unit) {
+ clickOn(roomName)
+ block(RoomDetailRobot())
+ pressBack()
+ }
+
+ fun verifyCreatedRoom() {
+ onView(ViewMatchers.withId(R.id.roomListView))
+ .perform(
+ RecyclerViewActions.actionOnItem(
+ ViewMatchers.hasDescendant(withText(R.string.room_displayname_empty_room)),
+ ViewActions.longClick()
+ )
+ )
+ pressBack()
+ }
+
+ fun newRoom(block: NewRoomRobot.() -> Unit) {
+ clickOn(R.id.createGroupRoomButton)
+ waitUntilActivityVisible {
+ BaristaVisibilityAssertions.assertDisplayed(R.id.publicRoomsList)
+ }
+ val newRoomRobot = NewRoomRobot()
+ block(newRoomRobot)
+ if (!newRoomRobot.createdRoom) {
+ pressBack()
+ }
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt
new file mode 100644
index 0000000000..15186fe0c8
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot
+
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogNegativeButton
+import com.adevinta.android.barista.interaction.BaristaListInteractions.clickListItem
+import im.vector.app.R
+import im.vector.app.espresso.tools.waitUntilActivityVisible
+import im.vector.app.espresso.tools.waitUntilViewVisible
+import im.vector.app.features.roommemberprofile.RoomMemberProfileActivity
+
+class RoomSettingsRobot {
+
+ fun crawl() {
+ // Room settings
+ clickListItem(R.id.matrixProfileRecyclerView, 3)
+ navigateToRoomParameters()
+ pressBack()
+
+ // Notifications
+ clickListItem(R.id.matrixProfileRecyclerView, 5)
+ pressBack()
+
+ assertDisplayed(R.id.roomProfileAvatarView)
+
+ // People
+ clickListItem(R.id.matrixProfileRecyclerView, 7)
+ assertDisplayed(R.id.inviteUsersButton)
+ navigateToRoomPeople()
+ // Fab
+ navigateToInvite()
+ pressBack()
+ pressBack()
+
+ assertDisplayed(R.id.roomProfileAvatarView)
+
+ // Uploads
+ clickListItem(R.id.matrixProfileRecyclerView, 9)
+ // File tab
+ clickOn(R.string.uploads_files_title)
+ waitUntilViewVisible(withText(R.string.uploads_media_title))
+ pressBack()
+ waitUntilViewVisible(withId(R.id.matrixProfileRecyclerView))
+
+ assertDisplayed(R.id.roomProfileAvatarView)
+
+ // Leave
+ leaveRoom {
+ negativeAction()
+ }
+
+ // Advanced
+ // Room addresses
+
+ clickListItem(R.id.matrixProfileRecyclerView, 15)
+ waitUntilViewVisible(withText(R.string.room_alias_published_alias_title))
+ pressBack()
+
+ // Room permissions
+ clickListItem(R.id.matrixProfileRecyclerView, 17)
+ waitUntilViewVisible(withText(R.string.room_permissions_title))
+ clickOn(R.string.room_permissions_change_room_avatar)
+ waitUntilViewVisible(withId(android.R.id.button2))
+ clickDialogNegativeButton()
+ waitUntilViewVisible(withText(R.string.room_permissions_title))
+ // Toggle
+ clickOn(R.string.show_advanced)
+ clickOn(R.string.hide_advanced)
+ pressBack()
+
+ // Menu share
+ // clickMenu(R.id.roomProfileShareAction)
+ // pressBack()
+ }
+
+ private fun leaveRoom(block: DialogRobot.() -> Unit) {
+ clickListItem(R.id.matrixProfileRecyclerView, 13)
+ waitUntilViewVisible(withId(android.R.id.button2))
+ val dialogRobot = DialogRobot()
+ block(dialogRobot)
+ if (dialogRobot.returnedToPreviousScreen) {
+ waitUntilViewVisible(withId(R.id.matrixProfileRecyclerView))
+ }
+ }
+
+ private fun navigateToRoomParameters() {
+ // Room history readability
+ clickListItem(R.id.roomSettingsRecyclerView, 4)
+ pressBack()
+
+ // Room access
+ clickListItem(R.id.roomSettingsRecyclerView, 6)
+ pressBack()
+ }
+
+ private fun navigateToInvite() {
+ assertDisplayed(R.id.inviteUsersButton)
+ clickOn(R.id.inviteUsersButton)
+ ViewActions.closeSoftKeyboard()
+ pressBack()
+ }
+
+ private fun navigateToRoomPeople() {
+ // Open first user
+ clickListItem(R.id.roomSettingsRecyclerView, 1)
+ waitUntilActivityVisible {
+ waitUntilViewVisible(withId(R.id.memberProfilePowerLevelView))
+ }
+
+ // Verification
+ clickListItem(R.id.matrixProfileRecyclerView, 1)
+ waitUntilViewVisible(withId(R.id.bottomSheetRecyclerView))
+ pressBack()
+ waitUntilViewVisible(withId(R.id.matrixProfileRecyclerView))
+
+ // Role
+ clickListItem(R.id.matrixProfileRecyclerView, 3)
+ waitUntilViewVisible(withId(android.R.id.button2))
+ clickDialogNegativeButton()
+ waitUntilViewVisible(withId(R.id.matrixProfileRecyclerView))
+ pressBack()
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt
new file mode 100644
index 0000000000..4aeb8903dd
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot.settings
+
+import androidx.test.espresso.Espresso.pressBack
+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.clickOnPreference
+import im.vector.app.espresso.tools.waitUntilViewVisible
+
+class SettingsAdvancedRobot {
+
+ fun crawl() {
+ clickOnPreference(R.string.settings_notifications_targets)
+ pressBack()
+
+ clickOnPreference(R.string.settings_push_rules)
+ pressBack()
+ }
+
+ fun toggleDeveloperMode() {
+ clickOn(R.string.settings_developer_mode_summary)
+ }
+
+ fun crawlDeveloperOptions() {
+ clickOnPreference(R.string.settings_account_data)
+ waitUntilViewVisible(withText("m.push_rules"))
+ clickOn("m.push_rules")
+ pressBack()
+ pressBack()
+ clickOnPreference(R.string.settings_key_requests)
+ pressBack()
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt
new file mode 100644
index 0000000000..9082eaa889
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot.settings
+
+import androidx.test.espresso.Espresso.pressBack
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogNegativeButton
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton
+import im.vector.app.R
+import im.vector.app.espresso.tools.clickOnPreference
+
+class SettingsGeneralRobot {
+
+ fun crawl() {
+ clickOn(R.string.settings_profile_picture)
+ clickDialogPositiveButton()
+ clickOn(R.string.settings_display_name)
+ clickDialogNegativeButton()
+ clickOn(R.string.settings_password)
+ clickDialogNegativeButton()
+ clickOn(R.string.settings_emails_and_phone_numbers_title)
+ pressBack()
+ clickOn(R.string.settings_discovery_manage)
+ clickOn(R.string.add_identity_server)
+ pressBack()
+ pressBack()
+ // Homeserver
+ clickOnPreference(R.string.settings_home_server)
+ pressBack()
+ // Identity server
+ clickOnPreference(R.string.settings_identity_server)
+ pressBack()
+ // Deactivate account
+ clickOnPreference(R.string.settings_deactivate_my_account)
+ pressBack()
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt
new file mode 100644
index 0000000000..75f610d016
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot.settings
+
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogPositiveButton
+import im.vector.app.R
+
+class SettingsHelpRobot {
+
+ fun crawl() {
+ /*
+ clickOn(R.string.settings_app_info_link_title)
+ Cannot go back...
+ pressBack()
+ clickOn(R.string.settings_copyright)
+ pressBack()
+ clickOn(R.string.settings_app_term_conditions)
+ pressBack()
+ clickOn(R.string.settings_privacy_policy)
+ pressBack()
+ */
+ clickOn(R.string.settings_third_party_notices)
+ clickDialogPositiveButton()
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt
new file mode 100644
index 0000000000..448552ba8e
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot.settings
+
+import androidx.test.espresso.Espresso.pressBack
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import im.vector.app.BuildConfig
+import im.vector.app.R
+import im.vector.app.espresso.tools.clickOnPreference
+
+class SettingsNotificationsRobot {
+
+ fun crawl() {
+ if (BuildConfig.USE_NOTIFICATION_SETTINGS_V2) {
+ clickOn(R.string.settings_notification_default)
+ pressBack()
+ clickOn(R.string.settings_notification_mentions_and_keywords)
+ // TODO Test adding a keyword?
+ pressBack()
+ clickOn(R.string.settings_notification_other)
+ pressBack()
+ } else {
+ clickOn(R.string.settings_notification_advanced)
+ pressBack()
+ }
+ /*
+ clickOn(R.string.settings_noisy_notifications_preferences)
+ TODO Cannot go back
+ pressBack()
+ clickOn(R.string.settings_silent_notifications_preferences)
+ pressBack()
+ clickOn(R.string.settings_call_notifications_preferences)
+ pressBack()
+ */
+ clickOnPreference(R.string.settings_notification_troubleshoot)
+ pressBack()
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt
new file mode 100644
index 0000000000..438bbac5a5
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot.settings
+
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import com.adevinta.android.barista.interaction.BaristaDialogInteractions.clickDialogNegativeButton
+import im.vector.app.R
+import im.vector.app.espresso.tools.waitUntilViewVisible
+
+class SettingsPreferencesRobot {
+
+ fun crawl() {
+ clickOn(R.string.settings_interface_language)
+ waitUntilViewVisible(withText("Dansk (Danmark)"))
+ pressBack()
+ clickOn(R.string.settings_theme)
+ clickDialogNegativeButton()
+ clickOn(R.string.font_size)
+ clickDialogNegativeButton()
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt
new file mode 100644
index 0000000000..a9c053f6c3
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot.settings
+
+import im.vector.app.R
+import im.vector.app.clickOnAndGoBack
+
+class SettingsRobot {
+
+ fun toggleDeveloperMode() {
+ advancedSettings {
+ toggleDeveloperMode()
+ }
+ }
+
+ fun general(block: SettingsGeneralRobot.() -> Unit) {
+ clickOnAndGoBack(R.string.settings_general_title) { block(SettingsGeneralRobot()) }
+ }
+
+ fun notifications(block: SettingsNotificationsRobot.() -> Unit) {
+ clickOnAndGoBack(R.string.settings_notifications) { block(SettingsNotificationsRobot()) }
+ }
+
+ fun preferences(block: SettingsPreferencesRobot.() -> Unit) {
+ clickOnAndGoBack(R.string.settings_preferences) { block(SettingsPreferencesRobot()) }
+ }
+
+ fun voiceAndVideo(block: () -> Unit = {}) {
+ clickOnAndGoBack(R.string.preference_voice_and_video) { block() }
+ }
+
+ fun ignoredUsers(block: () -> Unit = {}) {
+ clickOnAndGoBack(R.string.settings_ignored_users) { block() }
+ }
+
+ fun securityAndPrivacy(block: SettingsSecurityRobot.() -> Unit) {
+ clickOnAndGoBack(R.string.settings_security_and_privacy) { block(SettingsSecurityRobot()) }
+ }
+
+ fun labs(block: () -> Unit = {}) {
+ clickOnAndGoBack(R.string.room_settings_labs_pref_title) { block() }
+ }
+
+ fun advancedSettings(block: SettingsAdvancedRobot.() -> Unit) {
+ clickOnAndGoBack(R.string.settings_advanced_settings) {
+ block(SettingsAdvancedRobot())
+ }
+ }
+
+ fun helpAndAbout(block: SettingsHelpRobot.() -> Unit) {
+ clickOnAndGoBack(R.string.preference_root_help_about) { block(SettingsHelpRobot()) }
+ }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
new file mode 100644
index 0000000000..f2607bbc1c
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.ui.robot.settings
+
+import androidx.test.espresso.Espresso
+import im.vector.app.R
+import im.vector.app.espresso.tools.clickOnPreference
+
+class SettingsSecurityRobot {
+
+ fun crawl() {
+ clickOnPreference(R.string.settings_active_sessions_show_all)
+ Espresso.pressBack()
+
+ clickOnPreference(R.string.encryption_message_recovery)
+ // TODO go deeper here
+ Espresso.pressBack()
+ /* Cannot exit
+ clickOnPreference(R.string.encryption_export_e2e_room_keys)
+ pressBack()
+ */
+ }
+}
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index 4b5228d199..960994b169 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -24,9 +24,9 @@ import android.os.Build
import androidx.core.app.NotificationCompat
import androidx.core.app.Person
import androidx.core.content.getSystemService
+import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.di.ScreenComponent
import im.vector.app.core.extensions.registerStartForActivityResult
import im.vector.app.core.platform.VectorBaseActivity
import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
@@ -50,6 +50,7 @@ import org.matrix.android.sdk.internal.crypto.verification.qrcode.toQrCodeData
import timber.log.Timber
import javax.inject.Inject
+@AndroidEntryPoint
class DebugMenuActivity : VectorBaseActivity() {
override fun getBinding() = ActivityDebugMenuBinding.inflate(layoutInflater)
@@ -57,10 +58,6 @@ class DebugMenuActivity : VectorBaseActivity() {
@Inject
lateinit var activeSessionHolder: ActiveSessionHolder
- override fun injectWith(injector: ScreenComponent) {
- injector.inject(this)
- }
-
private lateinit var buffer: ByteArray
override fun initUiAndData() {
@@ -235,8 +232,8 @@ class DebugMenuActivity : VectorBaseActivity() {
private val qrStartForActivityResult = registerStartForActivityResult { activityResult ->
if (activityResult.resultCode == Activity.RESULT_OK) {
- toast("QrCode: " + QrCodeScannerActivity.getResultText(activityResult.data)
- + " is QRCode: " + QrCodeScannerActivity.getResultIsQrCode(activityResult.data))
+ toast("QrCode: " + QrCodeScannerActivity.getResultText(activityResult.data) +
+ " is QRCode: " + QrCodeScannerActivity.getResultIsQrCode(activityResult.data))
// Also update the current QR Code (reverse operation)
// renderQrCode(QrCodeScannerActivity.getResultText(data) ?: "")
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
index 048c64bc3a..a35bb40f8f 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
@@ -22,6 +22,7 @@ import android.os.Build
import android.widget.Toast
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
+import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R
import im.vector.app.core.platform.VectorBaseActivity
import im.vector.app.core.utils.checkPermissions
@@ -31,6 +32,7 @@ import im.vector.app.core.utils.registerForPermissionsResult
import im.vector.app.databinding.ActivityDebugPermissionBinding
import timber.log.Timber
+@AndroidEntryPoint
class DebugPermissionActivity : VectorBaseActivity() {
override fun getBinding() = ActivityDebugPermissionBinding.inflate(layoutInflater)
diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
index 408aebb186..a7b74f3b59 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
@@ -23,9 +23,9 @@ import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass
import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.app.core.epoxy.VectorEpoxyModel
-import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
import me.gujun.android.span.image
import me.gujun.android.span.span
+import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
@EpoxyModelClass(layout = im.vector.app.R.layout.item_sas_emoji)
abstract class SasEmojiItem : VectorEpoxyModel() {
diff --git a/vector/src/fdroid/AndroidManifest.xml b/vector/src/fdroid/AndroidManifest.xml
index 3a7c107138..ea9fa023ab 100644
--- a/vector/src/fdroid/AndroidManifest.xml
+++ b/vector/src/fdroid/AndroidManifest.xml
@@ -1,9 +1,11 @@
+
$event")
- }
- } else {
- if (notifiableEvent is NotifiableMessageEvent) {
- if (notifiableEvent.senderName.isNullOrEmpty()) {
- notifiableEvent.senderName = data["sender_display_name"] ?: data["sender"] ?: ""
- }
- if (notifiableEvent.roomName.isNullOrEmpty()) {
- notifiableEvent.roomName = findRoomNameBestEffort(data, session) ?: ""
- }
- }
-
- notifiableEvent.isPushGatewayEvent = true
- notifiableEvent.matrixID = session.myUserId
- notificationDrawerManager.onNotifiableEventReceived(notifiableEvent)
- notificationDrawerManager.refreshNotificationDrawer()
- }
- }
- }
-
- private fun findRoomNameBestEffort(data: Map, session: Session?): String? {
- var roomName: String? = data["room_name"]
- val roomId = data["room_id"]
- if (null == roomName && null != roomId) {
- // Try to get the room name from our store
- roomName = session?.getRoom(roomId)?.roomSummary()?.displayName
- }
- return roomName
- }
-
- /**
- * Try to create an event from the FCM data
- *
- * @param data the FCM data
- * @return the event or null if required data are missing
- */
- private fun parseEvent(data: Map?): Event? {
- return Event(
- eventId = data?.get("event_id") ?: return null,
- senderId = data["sender"],
- roomId = data["room_id"] ?: return null,
- type = data["type"] ?: return null,
- originServerTs = System.currentTimeMillis()
- )
- }
}
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
index f3bdcafb1c..52ad4be087 100755
--- a/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
@@ -75,7 +75,7 @@ object FcmHelper {
.addOnSuccessListener { token ->
storeFcmToken(activity, token)
if (registerPusher) {
- pushersManager.registerPusherWithFcmKey(token)
+ pushersManager.enqueueRegisterPusherWithFcmKey(token)
}
}
.addOnFailureListener { e ->
@@ -108,6 +108,6 @@ object FcmHelper {
@Suppress("UNUSED_PARAMETER")
fun onEnterBackground(context: Context, vectorPreferences: VectorPreferences, activeSessionHolder: ActiveSessionHolder) {
- // TODO FCM fallback
+ // No op
}
}
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index df85e31208..e5d4753235 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -4,7 +4,10 @@
package="im.vector.app">
-
+
+
@@ -83,13 +86,19 @@
android:name="android.max_aspect"
android:value="9.9" />
+
+
+
@@ -103,10 +112,13 @@
+
+
@@ -120,10 +132,13 @@
android:scheme="element" />
+
+
@@ -143,7 +158,6 @@
android:name=".features.media.VectorAttachmentViewerActivity"
android:theme="@style/Theme.Vector.Black.Transparent"
tools:ignore="Instantiatable" />
-
-
@@ -180,7 +193,13 @@
-
+
+
+
+
@@ -196,8 +215,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+ android:excludeFromRecents="true"
+ android:launchMode="singleTask"
+ android:supportsPictureInPicture="true"
+ android:taskAffinity=".features.call.VectorCallActivity" />
@@ -360,7 +390,9 @@
A media button receiver receives and helps translate hardware media playback buttons,
such as those found on wired and wireless headsets, into the appropriate callbacks in your app.
-->
-
+
@@ -370,9 +402,15 @@
+ android:name="androidx.startup.InitializationProvider"
+ android:authorities="${applicationId}.androidx-startup"
+ android:exported="false"
+ tools:node="merge">
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/vector/src/main/assets/open_source_licenses.html b/vector/src/main/assets/open_source_licenses.html
index 490de1f23a..529b7da2f1 100755
--- a/vector/src/main/assets/open_source_licenses.html
+++ b/vector/src/main/assets/open_source_licenses.html
@@ -194,6 +194,37 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
+
+ -
+ hyuwah/DraggableView
+
+ hyuwah/DraggableView is licensed under the MIT License
+ Copyright (c) 2018 Muhammad Wahyudin
+
+
+
+
+Copyright (c) 2018 Muhammad Wahyudin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
-
com.github.piasy:BigImageViewer
@@ -248,25 +279,9 @@ SOFTWARE.
Copyright 2012 The Dagger Authors
-
- rxkotlin
+ FlowBinding
- Copyright io.reactivex.
-
- -
- rxandroid
-
- Copyright io.reactivex.
-
- -
- rxrelay
-
- Copyright 2014 Netflix, Inc.
- Copyright 2015 Jake Wharton
-
- -
- rxbinding
-
- Copyright (C) 2015 Jake Wharton
+ Copyright 2019 Yang Chen
-
Epoxy
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index 06174b9573..9ed9dd5b23 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -16,16 +16,20 @@
package im.vector.app
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
import arrow.core.Option
import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.utils.BehaviorDataSource
import im.vector.app.features.session.coroutineScope
import im.vector.app.features.ui.UiStateRepository
-import io.reactivex.disposables.CompositeDisposable
+import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.session.Session
@@ -52,19 +56,32 @@ class AppStateHandler @Inject constructor(
private val sessionDataSource: ActiveSessionDataSource,
private val uiStateRepository: UiStateRepository,
private val activeSessionHolder: ActiveSessionHolder
-) : LifecycleObserver {
+) : DefaultLifecycleObserver {
- private val compositeDisposable = CompositeDisposable()
+ private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
private val selectedSpaceDataSource = BehaviorDataSource>(Option.empty())
- val selectedRoomGroupingObservable = selectedSpaceDataSource.observe()
+ val selectedRoomGroupingObservable = selectedSpaceDataSource.stream()
- fun getCurrentRoomGroupingMethod(): RoomGroupingMethod? = selectedSpaceDataSource.currentValue?.orNull()
+ fun getCurrentRoomGroupingMethod(): RoomGroupingMethod? {
+ // XXX we should somehow make it live :/ just a work around
+ // For example just after creating a space and switching to it the
+ // name in the app Bar could show Empty Room, and it will not update unless you
+ // switch space
+ return selectedSpaceDataSource.currentValue?.orNull()?.let {
+ if (it is RoomGroupingMethod.BySpace) {
+ // try to refresh sum?
+ it.spaceSummary?.roomId?.let { activeSessionHolder.getSafeActiveSession()?.getRoomSummary(it) }?.let {
+ RoomGroupingMethod.BySpace(it)
+ } ?: it
+ } else it
+ }
+ }
fun setCurrentSpace(spaceId: String?, session: Session? = null) {
val uSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
- if (selectedSpaceDataSource.currentValue?.orNull() is RoomGroupingMethod.BySpace
- && spaceId == selectedSpaceDataSource.currentValue?.orNull()?.space()?.roomId) return
+ if (selectedSpaceDataSource.currentValue?.orNull() is RoomGroupingMethod.BySpace &&
+ spaceId == selectedSpaceDataSource.currentValue?.orNull()?.space()?.roomId) return
val spaceSum = spaceId?.let { uSession.getRoomSummary(spaceId) }
selectedSpaceDataSource.post(Option.just(RoomGroupingMethod.BySpace(spaceSum)))
if (spaceId != null) {
@@ -78,8 +95,8 @@ class AppStateHandler @Inject constructor(
fun setCurrentGroup(groupId: String?, session: Session? = null) {
val uSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
- if (selectedSpaceDataSource.currentValue?.orNull() is RoomGroupingMethod.ByLegacyGroup
- && groupId == selectedSpaceDataSource.currentValue?.orNull()?.group()?.groupId) return
+ if (selectedSpaceDataSource.currentValue?.orNull() is RoomGroupingMethod.ByLegacyGroup &&
+ groupId == selectedSpaceDataSource.currentValue?.orNull()?.group()?.groupId) return
val activeGroup = groupId?.let { uSession.getGroupSummary(groupId) }
selectedSpaceDataSource.post(Option.just(RoomGroupingMethod.ByLegacyGroup(activeGroup)))
if (groupId != null) {
@@ -92,9 +109,9 @@ class AppStateHandler @Inject constructor(
}
private fun observeActiveSession() {
- sessionDataSource.observe()
+ sessionDataSource.stream()
.distinctUntilChanged()
- .subscribe {
+ .onEach {
// sessionDataSource could already return a session while activeSession holder still returns null
it.orNull()?.let { session ->
if (uiStateRepository.isGroupingMethodSpace(session.sessionId)) {
@@ -103,9 +120,8 @@ class AppStateHandler @Inject constructor(
setCurrentGroup(uiStateRepository.getSelectedGroup(session.sessionId), session)
}
}
- }.also {
- compositeDisposable.add(it)
}
+ .launchIn(coroutineScope)
}
fun safeActiveSpaceId(): String? {
@@ -116,14 +132,12 @@ class AppStateHandler @Inject constructor(
return (selectedSpaceDataSource.currentValue?.orNull() as? RoomGroupingMethod.ByLegacyGroup)?.groupSummary?.groupId
}
- @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
- fun entersForeground() {
+ override fun onResume(owner: LifecycleOwner) {
observeActiveSession()
}
- @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
- fun entersBackground() {
- compositeDisposable.clear()
+ override fun onPause(owner: LifecycleOwner) {
+ coroutineScope.coroutineContext.cancelChildren()
val session = activeSessionHolder.getSafeActiveSession() ?: return
when (val currentMethod = selectedSpaceDataSource.currentValue?.orNull() ?: RoomGroupingMethod.BySpace(null)) {
is RoomGroupingMethod.BySpace -> {
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index be8447d409..c1d9eef125 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -27,23 +27,21 @@ import android.os.HandlerThread
import android.os.StrictMode
import androidx.core.provider.FontRequest
import androidx.core.provider.FontsContractCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.ProcessLifecycleOwner
import androidx.multidex.MultiDex
import com.airbnb.epoxy.EpoxyAsyncUtil
import com.airbnb.epoxy.EpoxyController
+import com.airbnb.mvrx.Mavericks
import com.facebook.stetho.Stetho
import com.gabrielittner.threetenbp.LazyThreeTen
import com.vanniktech.emoji.EmojiManager
import com.vanniktech.emoji.google.GoogleEmojiProvider
+import dagger.hilt.android.HiltAndroidApp
import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.di.DaggerVectorComponent
-import im.vector.app.core.di.HasVectorInjector
-import im.vector.app.core.di.VectorComponent
import im.vector.app.core.extensions.configureAndStart
-import im.vector.app.core.rx.RxConfig
+import im.vector.app.core.extensions.startSyncing
import im.vector.app.features.call.webrtc.WebRtcCallManager
import im.vector.app.features.configuration.VectorConfiguration
import im.vector.app.features.disclaimer.doNotShowDisclaimerDialog
@@ -53,6 +51,7 @@ import im.vector.app.features.notifications.NotificationDrawerManager
import im.vector.app.features.notifications.NotificationUtils
import im.vector.app.features.pin.PinLocker
import im.vector.app.features.popup.PopupAlertManager
+import im.vector.app.features.rageshake.VectorFileLogger
import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
import im.vector.app.features.room.VectorRoomDisplayNameFallbackProvider
import im.vector.app.features.settings.VectorLocale
@@ -73,9 +72,9 @@ import java.util.concurrent.Executors
import javax.inject.Inject
import androidx.work.Configuration as WorkConfiguration
+@HiltAndroidApp
class VectorApplication :
Application(),
- HasVectorInjector,
MatrixConfiguration.Provider,
WorkConfiguration.Provider {
@@ -92,21 +91,19 @@ class VectorApplication :
@Inject lateinit var versionProvider: VersionProvider
@Inject lateinit var notificationUtils: NotificationUtils
@Inject lateinit var appStateHandler: AppStateHandler
- @Inject lateinit var rxConfig: RxConfig
@Inject lateinit var popupAlertManager: PopupAlertManager
@Inject lateinit var pinLocker: PinLocker
@Inject lateinit var callManager: WebRtcCallManager
@Inject lateinit var invitesAcceptor: InvitesAcceptor
-
- lateinit var vectorComponent: VectorComponent
+ @Inject lateinit var vectorFileLogger: VectorFileLogger
// font thread handler
private var fontThreadHandler: Handler? = null
private val powerKeyReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent) {
- if (intent.action == Intent.ACTION_SCREEN_OFF
- && vectorPreferences.useFlagPinCode()) {
+ if (intent.action == Intent.ACTION_SCREEN_OFF &&
+ vectorPreferences.useFlagPinCode()) {
pinLocker.screenIsOff()
}
}
@@ -116,11 +113,8 @@ class VectorApplication :
enableStrictModeIfNeeded()
super.onCreate()
appContext = this
- vectorComponent = DaggerVectorComponent.factory().create(this)
- vectorComponent.inject(this)
invitesAcceptor.initialize()
vectorUncaughtExceptionHandler.activate(this)
- rxConfig.setupRxPlugin()
// Remove Log handler statically added by Jitsi
Timber.forest()
@@ -130,14 +124,14 @@ class VectorApplication :
if (BuildConfig.DEBUG) {
Timber.plant(Timber.DebugTree())
}
- Timber.plant(vectorComponent.vectorFileLogger())
+ Timber.plant(vectorFileLogger)
if (BuildConfig.DEBUG) {
Stetho.initializeWithDefaults(this)
}
logInfo()
LazyThreeTen.init(this)
-
+ Mavericks.initialize(debugMode = false)
EpoxyController.defaultDiffingHandler = EpoxyAsyncUtil.getAsyncBackgroundHandler()
EpoxyController.defaultModelBuildingHandler = EpoxyAsyncUtil.getAsyncBackgroundHandler()
registerActivityLifecycleCallbacks(VectorActivityLifecycleCallbacks(popupAlertManager))
@@ -162,14 +156,17 @@ class VectorApplication :
// Do not display the name change popup
doNotShowDisclaimerDialog(this)
}
+
if (authenticationService.hasAuthenticatedSessions() && !activeSessionHolder.hasActiveSession()) {
val lastAuthenticatedSession = authenticationService.getLastAuthenticatedSession()!!
activeSessionHolder.setActiveSession(lastAuthenticatedSession)
- lastAuthenticatedSession.configureAndStart(applicationContext)
+ lastAuthenticatedSession.configureAndStart(applicationContext, startSyncing = false)
}
- ProcessLifecycleOwner.get().lifecycle.addObserver(object : LifecycleObserver {
- @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
- fun entersForeground() {
+
+ ProcessLifecycleOwner.get().lifecycle.addObserver(startSyncOnFirstStart)
+
+ ProcessLifecycleOwner.get().lifecycle.addObserver(object : DefaultLifecycleObserver {
+ override fun onResume(owner: LifecycleOwner) {
Timber.i("App entered foreground")
FcmHelper.onEnterForeground(appContext, activeSessionHolder)
activeSessionHolder.getSafeActiveSession()?.also {
@@ -177,8 +174,7 @@ class VectorApplication :
}
}
- @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
- fun entersBackground() {
+ override fun onPause(owner: LifecycleOwner) {
Timber.i("App entered background") // call persistInfo
notificationDrawerManager.persistInfo()
FcmHelper.onEnterBackground(appContext, vectorPreferences, activeSessionHolder)
@@ -199,6 +195,14 @@ class VectorApplication :
EmojiManager.install(GoogleEmojiProvider())
}
+ private val startSyncOnFirstStart = object : DefaultLifecycleObserver {
+ override fun onStart(owner: LifecycleOwner) {
+ Timber.i("App process started")
+ authenticationService.getLastAuthenticatedSession()?.startSyncing(appContext)
+ ProcessLifecycleOwner.get().lifecycle.removeObserver(this)
+ }
+ }
+
private fun enableStrictModeIfNeeded() {
if (BuildConfig.ENABLE_STRICT_MODE_LOGS) {
StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder()
@@ -221,10 +225,6 @@ class VectorApplication :
.build()
}
- override fun injector(): VectorComponent {
- return vectorComponent
- }
-
private fun logInfo() {
val appVersion = versionProvider.getVersion(longFormat = true, useBuildNumber = true)
val sdkVersion = Matrix.getSdkVersion()
diff --git a/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt b/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
index f5a5e240c6..f99048501d 100644
--- a/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
+++ b/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
@@ -17,10 +17,10 @@
package im.vector.app.core.contacts
import android.content.Context
-import android.database.Cursor
import android.net.Uri
import android.provider.ContactsContract
import androidx.annotation.WorkerThread
+import im.vector.lib.multipicker.utils.getColumnIndexOrNull
import timber.log.Timber
import javax.inject.Inject
import kotlin.system.measureTimeMillis
@@ -57,16 +57,20 @@ class ContactsDataSource @Inject constructor(
)
?.use { cursor ->
if (cursor.count > 0) {
+ val idColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.Contacts._ID) ?: return@use
+ val displayNameColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.Contacts.DISPLAY_NAME) ?: return@use
+ val photoUriColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.Data.PHOTO_URI)
while (cursor.moveToNext()) {
- val id = cursor.getLong(ContactsContract.Contacts._ID) ?: continue
- val displayName = cursor.getString(ContactsContract.Contacts.DISPLAY_NAME) ?: continue
+ val id = cursor.getLong(idColumnIndex)
+ val displayName = cursor.getString(displayNameColumnIndex)
val mappedContactBuilder = MappedContactBuilder(
id = id,
displayName = displayName
)
- cursor.getString(ContactsContract.Data.PHOTO_URI)
+ photoUriColumnIndex
+ ?.let { cursor.getString(it) }
?.let { Uri.parse(it) }
?.let { mappedContactBuilder.photoURI = it }
@@ -85,12 +89,15 @@ class ContactsDataSource @Inject constructor(
null,
null,
null)
- ?.use { innerCursor ->
- while (innerCursor.moveToNext()) {
- val mappedContactBuilder = innerCursor.getLong(ContactsContract.CommonDataKinds.Phone.CONTACT_ID)
- ?.let { map[it] }
+ ?.use { cursor ->
+ val idColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Phone.CONTACT_ID) ?: return@use
+ val phoneNumberColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Phone.NUMBER) ?: return@use
+
+ while (cursor.moveToNext()) {
+ val mappedContactBuilder = cursor.getLong(idColumnIndex)
+ .let { map[it] }
?: continue
- innerCursor.getString(ContactsContract.CommonDataKinds.Phone.NUMBER)
+ cursor.getString(phoneNumberColumnIndex)
?.let {
mappedContactBuilder.msisdns.add(
MappedMsisdn(
@@ -114,14 +121,17 @@ class ContactsDataSource @Inject constructor(
null,
null,
null)
- ?.use { innerCursor ->
- while (innerCursor.moveToNext()) {
+ ?.use { cursor ->
+ val idColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Email.CONTACT_ID) ?: return@use
+ val emailColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Email.DATA) ?: return@use
+
+ while (cursor.moveToNext()) {
// This would allow you get several email addresses
// if the email addresses were stored in an array
- val mappedContactBuilder = innerCursor.getLong(ContactsContract.CommonDataKinds.Email.CONTACT_ID)
- ?.let { map[it] }
+ val mappedContactBuilder = cursor.getLong(idColumnIndex)
+ .let { map[it] }
?: continue
- innerCursor.getString(ContactsContract.CommonDataKinds.Email.DATA)
+ cursor.getString(emailColumnIndex)
?.let {
mappedContactBuilder.emails.add(
MappedEmail(
@@ -140,16 +150,4 @@ class ContactsDataSource @Inject constructor(
.filter { it.emails.isNotEmpty() || it.msisdns.isNotEmpty() }
.map { it.build() }
}
-
- private fun Cursor.getString(column: String): String? {
- return getColumnIndex(column)
- .takeIf { it != -1 }
- ?.let { getString(it) }
- }
-
- private fun Cursor.getLong(column: String): Long? {
- return getColumnIndex(column)
- .takeIf { it != -1 }
- ?.let { getLong(it) }
- }
}
diff --git a/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt b/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt
index c8736f3ab1..6371035a17 100644
--- a/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt
@@ -23,8 +23,8 @@ import org.threeten.bp.format.DateTimeFormatter
import javax.inject.Inject
class DefaultDateFormatterProvider @Inject constructor(private val context: Context,
- private val localeProvider: LocaleProvider)
- : DateFormatterProvider {
+ private val localeProvider: LocaleProvider) :
+ DateFormatterProvider {
override val dateWithMonthFormatter: DateTimeFormatter by lazy {
val pattern = DateFormat.getBestDateTimePattern(localeProvider.current(), "d MMMMM")
diff --git a/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
index e739cac95f..6b7b5f7f62 100644
--- a/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
@@ -18,6 +18,7 @@ package im.vector.app.core.di
import arrow.core.Option
import im.vector.app.ActiveSessionDataSource
+import im.vector.app.core.services.GuardServiceStarter
import im.vector.app.features.call.webrtc.WebRtcCallManager
import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
@@ -36,7 +37,8 @@ class ActiveSessionHolder @Inject constructor(private val sessionObservableStore
private val callManager: WebRtcCallManager,
private val pushRuleTriggerListener: PushRuleTriggerListener,
private val sessionListener: SessionListener,
- private val imageManager: ImageManager
+ private val imageManager: ImageManager,
+ private val guardServiceStarter: GuardServiceStarter
) {
private var activeSession: AtomicReference = AtomicReference()
@@ -52,6 +54,7 @@ class ActiveSessionHolder @Inject constructor(private val sessionObservableStore
pushRuleTriggerListener.startWithSession(session)
session.callSignalingService().addCallListener(callManager)
imageManager.onSessionStarted(session)
+ guardServiceStarter.start()
}
fun clearActiveSession() {
diff --git a/vector/src/main/java/im/vector/app/core/di/ActivityEntryPoint.kt b/vector/src/main/java/im/vector/app/core/di/ActivityEntryPoint.kt
new file mode 100644
index 0000000000..c5f7317ebe
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/di/ActivityEntryPoint.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.di
+
+import androidx.fragment.app.FragmentFactory
+import androidx.lifecycle.ViewModelProvider
+import dagger.hilt.EntryPoint
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+
+@InstallIn(ActivityComponent::class)
+@EntryPoint
+interface ActivityEntryPoint {
+ fun fragmentFactory(): FragmentFactory
+ fun viewModelFactory(): ViewModelProvider.Factory
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index cce0c2a66f..b8d00fac5a 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -21,6 +21,8 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentFactory
import dagger.Binds
import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
import dagger.multibindings.IntoMap
import im.vector.app.features.attachments.preview.AttachmentsPreviewFragment
import im.vector.app.features.contactsbook.ContactsBookFragment
@@ -76,7 +78,6 @@ import im.vector.app.features.login2.LoginFragmentSigninPassword2
import im.vector.app.features.login2.LoginFragmentSigninUsername2
import im.vector.app.features.login2.LoginFragmentSignupPassword2
import im.vector.app.features.login2.LoginFragmentSignupUsername2
-import im.vector.app.features.login2.created.AccountCreatedFragment
import im.vector.app.features.login2.LoginFragmentToAny2
import im.vector.app.features.login2.LoginGenericTextInputFormFragment2
import im.vector.app.features.login2.LoginResetPasswordFragment2
@@ -88,10 +89,12 @@ import im.vector.app.features.login2.LoginSplashSignUpSignInSelectionFragment2
import im.vector.app.features.login2.LoginSsoOnlyFragment2
import im.vector.app.features.login2.LoginWaitForEmailFragment2
import im.vector.app.features.login2.LoginWebFragment2
+import im.vector.app.features.login2.created.AccountCreatedFragment
import im.vector.app.features.login2.terms.LoginTermsFragment2
import im.vector.app.features.matrixto.MatrixToRoomSpaceFragment
import im.vector.app.features.matrixto.MatrixToUserFragment
import im.vector.app.features.pin.PinFragment
+import im.vector.app.features.poll.create.CreatePollFragment
import im.vector.app.features.qrcode.QrCodeScannerFragment
import im.vector.app.features.reactions.EmojiChooserFragment
import im.vector.app.features.reactions.EmojiSearchResultFragment
@@ -106,19 +109,17 @@ import im.vector.app.features.roomprofile.RoomProfileFragment
import im.vector.app.features.roomprofile.alias.RoomAliasFragment
import im.vector.app.features.roomprofile.banned.RoomBannedMemberListFragment
import im.vector.app.features.roomprofile.members.RoomMemberListFragment
+import im.vector.app.features.roomprofile.notifications.RoomNotificationSettingsFragment
import im.vector.app.features.roomprofile.permissions.RoomPermissionsFragment
import im.vector.app.features.roomprofile.settings.RoomSettingsFragment
-import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleChooseRestrictedFragment
import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleFragment
+import im.vector.app.features.roomprofile.settings.joinrule.advanced.RoomJoinRuleChooseRestrictedFragment
import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment
import im.vector.app.features.roomprofile.uploads.files.RoomUploadsFilesFragment
import im.vector.app.features.roomprofile.uploads.media.RoomUploadsMediaFragment
-import im.vector.app.features.settings.notifications.VectorSettingsAdvancedNotificationPreferenceFragment
import im.vector.app.features.settings.VectorSettingsGeneralFragment
import im.vector.app.features.settings.VectorSettingsHelpAboutFragment
import im.vector.app.features.settings.VectorSettingsLabsFragment
-import im.vector.app.features.settings.notifications.VectorSettingsNotificationPreferenceFragment
-import im.vector.app.features.settings.notifications.VectorSettingsNotificationsTroubleshootFragment
import im.vector.app.features.settings.VectorSettingsPinFragment
import im.vector.app.features.settings.VectorSettingsPreferencesFragment
import im.vector.app.features.settings.VectorSettingsSecurityPrivacyFragment
@@ -133,6 +134,9 @@ import im.vector.app.features.settings.devtools.OutgoingKeyRequestListFragment
import im.vector.app.features.settings.homeserver.HomeserverSettingsFragment
import im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment
import im.vector.app.features.settings.locale.LocalePickerFragment
+import im.vector.app.features.settings.notifications.VectorSettingsAdvancedNotificationPreferenceFragment
+import im.vector.app.features.settings.notifications.VectorSettingsNotificationPreferenceFragment
+import im.vector.app.features.settings.notifications.VectorSettingsNotificationsTroubleshootFragment
import im.vector.app.features.settings.push.PushGatewaysFragment
import im.vector.app.features.settings.push.PushRulesFragment
import im.vector.app.features.settings.threepids.ThreePidsSettingsFragment
@@ -141,9 +145,11 @@ import im.vector.app.features.signout.soft.SoftLogoutFragment
import im.vector.app.features.spaces.SpaceListFragment
import im.vector.app.features.spaces.create.ChoosePrivateSpaceTypeFragment
import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment
+import im.vector.app.features.spaces.create.CreateSpaceAdd3pidInvitesFragment
import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
+import im.vector.app.features.spaces.leave.SpaceLeaveAdvancedFragment
import im.vector.app.features.spaces.manage.SpaceAddRoomFragment
import im.vector.app.features.spaces.manage.SpaceManageRoomsFragment
import im.vector.app.features.spaces.manage.SpaceSettingsFragment
@@ -154,6 +160,7 @@ import im.vector.app.features.usercode.ShowUserCodeFragment
import im.vector.app.features.userdirectory.UserListFragment
import im.vector.app.features.widgets.WidgetFragment
+@InstallIn(ActivityComponent::class)
@Module
interface FragmentModule {
/**
@@ -717,6 +724,11 @@ interface FragmentModule {
@FragmentKey(RoomBannedMemberListFragment::class)
fun bindRoomBannedMemberListFragment(fragment: RoomBannedMemberListFragment): Fragment
+ @Binds
+ @IntoMap
+ @FragmentKey(RoomNotificationSettingsFragment::class)
+ fun bindRoomNotificationSettingsFragment(fragment: RoomNotificationSettingsFragment): Fragment
+
@Binds
@IntoMap
@FragmentKey(SearchFragment::class)
@@ -787,6 +799,11 @@ interface FragmentModule {
@FragmentKey(ChoosePrivateSpaceTypeFragment::class)
fun bindChoosePrivateSpaceTypeFragment(fragment: ChoosePrivateSpaceTypeFragment): Fragment
+ @Binds
+ @IntoMap
+ @FragmentKey(CreateSpaceAdd3pidInvitesFragment::class)
+ fun bindCreateSpaceAdd3pidInvitesFragment(fragment: CreateSpaceAdd3pidInvitesFragment): Fragment
+
@Binds
@IntoMap
@FragmentKey(SpaceAddRoomFragment::class)
@@ -816,4 +833,14 @@ interface FragmentModule {
@IntoMap
@FragmentKey(RoomJoinRuleChooseRestrictedFragment::class)
fun bindRoomJoinRuleChooseRestrictedFragment(fragment: RoomJoinRuleChooseRestrictedFragment): Fragment
+
+ @Binds
+ @IntoMap
+ @FragmentKey(SpaceLeaveAdvancedFragment::class)
+ fun bindSpaceLeaveAdvancedFragment(fragment: SpaceLeaveAdvancedFragment): Fragment
+
+ @Binds
+ @IntoMap
+ @FragmentKey(CreatePollFragment::class)
+ fun bindCreatePollFragment(fragment: CreatePollFragment): Fragment
}
diff --git a/vector/src/main/java/im/vector/app/core/di/HiltMavericksViewModelFactory.kt b/vector/src/main/java/im/vector/app/core/di/HiltMavericksViewModelFactory.kt
new file mode 100644
index 0000000000..13702053e8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/di/HiltMavericksViewModelFactory.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.di
+
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.MavericksViewModel
+import com.airbnb.mvrx.MavericksViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import dagger.hilt.DefineComponent
+import dagger.hilt.EntryPoint
+import dagger.hilt.EntryPoints
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+/**
+ * To connect Mavericks ViewModel creation with Hilt's dependency injection, add the following Factory and companion object to your MavericksViewModel.
+ *
+ * Example:
+ *
+ * class MyViewModel @AssistedInject constructor(...): MavericksViewModel(...) {
+ *
+ * @AssistedFactory
+ * interface Factory : AssistedViewModelFactory {
+ * ...
+ * }
+ *
+ * companion object : MavericksViewModelFactory by hiltMavericksViewModelFactory()
+ * }
+ */
+
+inline fun , S : MavericksState> hiltMavericksViewModelFactory() = HiltMavericksViewModelFactory(VM::class.java)
+
+class HiltMavericksViewModelFactory, S : MavericksState>(
+ private val viewModelClass: Class>
+) : MavericksViewModelFactory {
+
+ override fun create(viewModelContext: ViewModelContext, state: S): VM {
+ // We want to create the ViewModelComponent. In order to do that, we need to get its parent: ActivityComponent.
+ val componentBuilder = EntryPoints.get(viewModelContext.app(), CreateMavericksViewModelComponent::class.java).mavericksViewModelComponentBuilder()
+ val viewModelComponent = componentBuilder.build()
+ val viewModelFactoryMap = EntryPoints.get(viewModelComponent, HiltMavericksEntryPoint::class.java).viewModelFactories
+ val viewModelFactory = viewModelFactoryMap[viewModelClass]
+
+ @Suppress("UNCHECKED_CAST")
+ val castedViewModelFactory = viewModelFactory as? MavericksAssistedViewModelFactory
+ return castedViewModelFactory?.create(state) as VM
+ }
+
+ override fun initialState(viewModelContext: ViewModelContext): S? {
+ return super.initialState(viewModelContext)
+ }
+}
+
+/**
+ * Hilt's ViewModelComponent's parent is ActivityRetainedComponent but there is no easy way to access it. SingletonComponent should be sufficient
+ * because the ViewModel that gets created is the only object with a reference to the created component so the lifecycle of it will
+ * still be correct.
+ */
+@MavericksViewModelScoped
+@DefineComponent(parent = SingletonComponent::class)
+interface MavericksViewModelComponent
+
+@DefineComponent.Builder
+interface MavericksViewModelComponentBuilder {
+ fun build(): MavericksViewModelComponent
+}
+
+@EntryPoint
+@InstallIn(SingletonComponent::class)
+interface CreateMavericksViewModelComponent {
+ fun mavericksViewModelComponentBuilder(): MavericksViewModelComponentBuilder
+}
+
+@EntryPoint
+@InstallIn(MavericksViewModelComponent::class)
+interface HiltMavericksEntryPoint {
+ val viewModelFactories: Map>, MavericksAssistedViewModelFactory<*, *>>
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/HomeModule.kt b/vector/src/main/java/im/vector/app/core/di/HomeModule.kt
new file mode 100644
index 0000000000..1af67cdc83
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/di/HomeModule.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.di
+
+import android.os.Handler
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+import im.vector.app.features.home.room.detail.timeline.TimelineEventControllerHandler
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineAsyncHelper
+
+@Module
+@InstallIn(ActivityComponent::class)
+object HomeModule {
+ @Provides
+ @JvmStatic
+ @TimelineEventControllerHandler
+ fun providesTimelineBackgroundHandler(): Handler {
+ return TimelineAsyncHelper.getBackgroundHandler()
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/MavericksAssistedViewModelFactory.kt b/vector/src/main/java/im/vector/app/core/di/MavericksAssistedViewModelFactory.kt
new file mode 100644
index 0000000000..7cd6245d64
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/di/MavericksAssistedViewModelFactory.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.di
+
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.MavericksViewModel
+
+/**
+ * This factory allows Mavericks to supply the initial or restored [MavericksState] to Hilt.
+ *
+ * Add this interface inside of your [MavericksViewModel] class then create the following Hilt module:
+ *
+ * @Module
+ * @InstallIn(MavericksViewModelComponent::class)
+ * interface ViewModelsModule {
+ * @Binds
+ * @IntoMap
+ * @ViewModelKey(MyViewModel::class)
+ * fun myViewModelFactory(factory: MyViewModel.Factory): AssistedViewModelFactory<*, *>
+ * }
+ *
+ * If you already have a ViewModelsModule then all you have to do is add the multibinding entry for your new [MavericksViewModel].
+ */
+interface MavericksAssistedViewModelFactory, S : MavericksState> {
+ fun create(initialState: S): VM
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
new file mode 100644
index 0000000000..c827bd0b35
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
@@ -0,0 +1,555 @@
+/*
+ * Copyright 2019 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 im.vector.app.core.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.multibindings.IntoMap
+import im.vector.app.features.auth.ReAuthViewModel
+import im.vector.app.features.call.VectorCallViewModel
+import im.vector.app.features.call.conference.JitsiCallViewModel
+import im.vector.app.features.call.transfer.CallTransferViewModel
+import im.vector.app.features.contactsbook.ContactsBookViewModel
+import im.vector.app.features.createdirect.CreateDirectRoomViewModel
+import im.vector.app.features.crypto.keysbackup.settings.KeysBackupSettingsViewModel
+import im.vector.app.features.crypto.quads.SharedSecureStorageViewModel
+import im.vector.app.features.crypto.recover.BootstrapSharedViewModel
+import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
+import im.vector.app.features.crypto.verification.choose.VerificationChooseMethodViewModel
+import im.vector.app.features.crypto.verification.emoji.VerificationEmojiCodeViewModel
+import im.vector.app.features.devtools.RoomDevToolViewModel
+import im.vector.app.features.discovery.DiscoverySettingsViewModel
+import im.vector.app.features.discovery.change.SetIdentityServerViewModel
+import im.vector.app.features.home.HomeActivityViewModel
+import im.vector.app.features.home.HomeDetailViewModel
+import im.vector.app.features.home.PromoteRestrictedViewModel
+import im.vector.app.features.home.UnknownDeviceDetectorSharedViewModel
+import im.vector.app.features.home.UnreadMessagesSharedViewModel
+import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsViewModel
+import im.vector.app.features.home.room.detail.composer.TextComposerViewModel
+import im.vector.app.features.home.room.detail.search.SearchViewModel
+import im.vector.app.features.home.room.detail.timeline.action.MessageActionsViewModel
+import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryViewModel
+import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsViewModel
+import im.vector.app.features.home.room.detail.upgrade.MigrateRoomViewModel
+import im.vector.app.features.home.room.list.RoomListViewModel
+import im.vector.app.features.homeserver.HomeServerCapabilitiesViewModel
+import im.vector.app.features.invite.InviteUsersToRoomViewModel
+import im.vector.app.features.login.LoginViewModel
+import im.vector.app.features.login2.LoginViewModel2
+import im.vector.app.features.login2.created.AccountCreatedViewModel
+import im.vector.app.features.matrixto.MatrixToBottomSheetViewModel
+import im.vector.app.features.poll.create.CreatePollViewModel
+import im.vector.app.features.rageshake.BugReportViewModel
+import im.vector.app.features.reactions.EmojiSearchResultViewModel
+import im.vector.app.features.room.RequireActiveMembershipViewModel
+import im.vector.app.features.roomdirectory.RoomDirectoryViewModel
+import im.vector.app.features.roomdirectory.createroom.CreateRoomViewModel
+import im.vector.app.features.roomdirectory.picker.RoomDirectoryPickerViewModel
+import im.vector.app.features.roomdirectory.roompreview.RoomPreviewViewModel
+import im.vector.app.features.roommemberprofile.RoomMemberProfileViewModel
+import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheetViewModel
+import im.vector.app.features.roomprofile.RoomProfileViewModel
+import im.vector.app.features.roomprofile.alias.RoomAliasViewModel
+import im.vector.app.features.roomprofile.alias.detail.RoomAliasBottomSheetViewModel
+import im.vector.app.features.roomprofile.banned.RoomBannedMemberListViewModel
+import im.vector.app.features.roomprofile.members.RoomMemberListViewModel
+import im.vector.app.features.roomprofile.notifications.RoomNotificationSettingsViewModel
+import im.vector.app.features.roomprofile.permissions.RoomPermissionsViewModel
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewModel
+import im.vector.app.features.roomprofile.settings.joinrule.advanced.RoomJoinRuleChooseRestrictedViewModel
+import im.vector.app.features.roomprofile.uploads.RoomUploadsViewModel
+import im.vector.app.features.settings.account.deactivation.DeactivateAccountViewModel
+import im.vector.app.features.settings.crosssigning.CrossSigningSettingsViewModel
+import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheetViewModel
+import im.vector.app.features.settings.devices.DevicesViewModel
+import im.vector.app.features.settings.devtools.AccountDataViewModel
+import im.vector.app.features.settings.devtools.GossipingEventsPaperTrailViewModel
+import im.vector.app.features.settings.devtools.KeyRequestListViewModel
+import im.vector.app.features.settings.devtools.KeyRequestViewModel
+import im.vector.app.features.settings.homeserver.HomeserverSettingsViewModel
+import im.vector.app.features.settings.ignored.IgnoredUsersViewModel
+import im.vector.app.features.settings.locale.LocalePickerViewModel
+import im.vector.app.features.settings.push.PushGatewaysViewModel
+import im.vector.app.features.settings.threepids.ThreePidsSettingsViewModel
+import im.vector.app.features.share.IncomingShareViewModel
+import im.vector.app.features.signout.soft.SoftLogoutViewModel
+import im.vector.app.features.spaces.SpaceListViewModel
+import im.vector.app.features.spaces.SpaceMenuViewModel
+import im.vector.app.features.spaces.create.CreateSpaceViewModel
+import im.vector.app.features.spaces.explore.SpaceDirectoryViewModel
+import im.vector.app.features.spaces.invite.SpaceInviteBottomSheetViewModel
+import im.vector.app.features.spaces.leave.SpaceLeaveAdvancedViewModel
+import im.vector.app.features.spaces.manage.SpaceAddRoomsViewModel
+import im.vector.app.features.spaces.manage.SpaceManageRoomsViewModel
+import im.vector.app.features.spaces.manage.SpaceManageSharedViewModel
+import im.vector.app.features.spaces.people.SpacePeopleViewModel
+import im.vector.app.features.spaces.preview.SpacePreviewViewModel
+import im.vector.app.features.spaces.share.ShareSpaceViewModel
+import im.vector.app.features.terms.ReviewTermsViewModel
+import im.vector.app.features.usercode.UserCodeSharedViewModel
+import im.vector.app.features.userdirectory.UserListViewModel
+import im.vector.app.features.widgets.WidgetViewModel
+import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewModel
+import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
+import im.vector.app.features.workers.signout.SignoutCheckViewModel
+
+@InstallIn(MavericksViewModelComponent::class)
+@Module
+interface MavericksViewModelModule {
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomListViewModel::class)
+ fun roomListViewModelFactory(factory: RoomListViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SpaceManageRoomsViewModel::class)
+ fun spaceManageRoomsViewModelFactory(factory: SpaceManageRoomsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SpaceManageSharedViewModel::class)
+ fun spaceManageSharedViewModelFactory(factory: SpaceManageSharedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SpaceListViewModel::class)
+ fun spaceListViewModelFactory(factory: SpaceListViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(ReAuthViewModel::class)
+ fun reAuthViewModelFactory(factory: ReAuthViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(VectorCallViewModel::class)
+ fun vectorCallViewModelFactory(factory: VectorCallViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(JitsiCallViewModel::class)
+ fun jitsiCallViewModelFactory(factory: JitsiCallViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomDirectoryViewModel::class)
+ fun roomDirectoryViewModelFactory(factory: RoomDirectoryViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(ViewReactionsViewModel::class)
+ fun viewReactionsViewModelFactory(factory: ViewReactionsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomWidgetPermissionViewModel::class)
+ fun roomWidgetPermissionViewModelFactory(factory: RoomWidgetPermissionViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(WidgetViewModel::class)
+ fun widgetViewModelFactory(factory: WidgetViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(ServerBackupStatusViewModel::class)
+ fun serverBackupStatusViewModelFactory(factory: ServerBackupStatusViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SignoutCheckViewModel::class)
+ fun signoutCheckViewModelFactory(factory: SignoutCheckViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomDirectoryPickerViewModel::class)
+ fun roomDirectoryPickerViewModelFactory(factory: RoomDirectoryPickerViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomDevToolViewModel::class)
+ fun roomDevToolViewModelFactory(factory: RoomDevToolViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(MigrateRoomViewModel::class)
+ fun migrateRoomViewModelFactory(factory: MigrateRoomViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(IgnoredUsersViewModel::class)
+ fun ignoredUsersViewModelFactory(factory: IgnoredUsersViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(CallTransferViewModel::class)
+ fun callTransferViewModelFactory(factory: CallTransferViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(ContactsBookViewModel::class)
+ fun contactsBookViewModelFactory(factory: ContactsBookViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(CreateDirectRoomViewModel::class)
+ fun createDirectRoomViewModelFactory(factory: CreateDirectRoomViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomNotificationSettingsViewModel::class)
+ fun roomNotificationSettingsViewModelFactory(factory: RoomNotificationSettingsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(KeysBackupSettingsViewModel::class)
+ fun keysBackupSettingsViewModelFactory(factory: KeysBackupSettingsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SharedSecureStorageViewModel::class)
+ fun sharedSecureStorageViewModelFactory(factory: SharedSecureStorageViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(PromoteRestrictedViewModel::class)
+ fun promoteRestrictedViewModelFactory(factory: PromoteRestrictedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(UserListViewModel::class)
+ fun userListViewModelFactory(factory: UserListViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(UserCodeSharedViewModel::class)
+ fun userCodeSharedViewModelFactory(factory: UserCodeSharedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(ReviewTermsViewModel::class)
+ fun reviewTermsViewModelFactory(factory: ReviewTermsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(ShareSpaceViewModel::class)
+ fun shareSpaceViewModelFactory(factory: ShareSpaceViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SpacePreviewViewModel::class)
+ fun spacePreviewViewModelFactory(factory: SpacePreviewViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SpacePeopleViewModel::class)
+ fun spacePeopleViewModelFactory(factory: SpacePeopleViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SpaceAddRoomsViewModel::class)
+ fun spaceAddRoomsViewModelFactory(factory: SpaceAddRoomsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SpaceLeaveAdvancedViewModel::class)
+ fun spaceLeaveAdvancedViewModelFactory(factory: SpaceLeaveAdvancedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SpaceInviteBottomSheetViewModel::class)
+ fun spaceInviteBottomSheetViewModelFactory(factory: SpaceInviteBottomSheetViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SpaceDirectoryViewModel::class)
+ fun spaceDirectoryViewModelFactory(factory: SpaceDirectoryViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(CreateSpaceViewModel::class)
+ fun createSpaceViewModelFactory(factory: CreateSpaceViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SpaceMenuViewModel::class)
+ fun spaceMenuViewModelFactory(factory: SpaceMenuViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SoftLogoutViewModel::class)
+ fun softLogoutViewModelFactory(factory: SoftLogoutViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(IncomingShareViewModel::class)
+ fun incomingShareViewModelFactory(factory: IncomingShareViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(ThreePidsSettingsViewModel::class)
+ fun threePidsSettingsViewModelFactory(factory: ThreePidsSettingsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(PushGatewaysViewModel::class)
+ fun pushGatewaysViewModelFactory(factory: PushGatewaysViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(HomeserverSettingsViewModel::class)
+ fun homeserverSettingsViewModelFactory(factory: HomeserverSettingsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(LocalePickerViewModel::class)
+ fun localePickerViewModelFactory(factory: LocalePickerViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(GossipingEventsPaperTrailViewModel::class)
+ fun gossipingEventsPaperTrailViewModelFactory(factory: GossipingEventsPaperTrailViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(AccountDataViewModel::class)
+ fun accountDataViewModelFactory(factory: AccountDataViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(DevicesViewModel::class)
+ fun devicesViewModelFactory(factory: DevicesViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(KeyRequestListViewModel::class)
+ fun keyRequestListViewModelFactory(factory: KeyRequestListViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(KeyRequestViewModel::class)
+ fun keyRequestViewModelFactory(factory: KeyRequestViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(CrossSigningSettingsViewModel::class)
+ fun crossSigningSettingsViewModelFactory(factory: CrossSigningSettingsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(DeactivateAccountViewModel::class)
+ fun deactivateAccountViewModelFactory(factory: DeactivateAccountViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomUploadsViewModel::class)
+ fun roomUploadsViewModelFactory(factory: RoomUploadsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomJoinRuleChooseRestrictedViewModel::class)
+ fun roomJoinRuleChooseRestrictedViewModelFactory(factory: RoomJoinRuleChooseRestrictedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomSettingsViewModel::class)
+ fun roomSettingsViewModelFactory(factory: RoomSettingsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomPermissionsViewModel::class)
+ fun roomPermissionsViewModelFactory(factory: RoomPermissionsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomMemberListViewModel::class)
+ fun roomMemberListViewModelFactory(factory: RoomMemberListViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomBannedMemberListViewModel::class)
+ fun roomBannedMemberListViewModelFactory(factory: RoomBannedMemberListViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomAliasViewModel::class)
+ fun roomAliasViewModelFactory(factory: RoomAliasViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomAliasBottomSheetViewModel::class)
+ fun roomAliasBottomSheetViewModelFactory(factory: RoomAliasBottomSheetViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomProfileViewModel::class)
+ fun roomProfileViewModelFactory(factory: RoomProfileViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomMemberProfileViewModel::class)
+ fun roomMemberProfileViewModelFactory(factory: RoomMemberProfileViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RoomPreviewViewModel::class)
+ fun roomPreviewViewModelFactory(factory: RoomPreviewViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(CreateRoomViewModel::class)
+ fun createRoomViewModelFactory(factory: CreateRoomViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(RequireActiveMembershipViewModel::class)
+ fun requireActiveMembershipViewModelFactory(factory: RequireActiveMembershipViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(EmojiSearchResultViewModel::class)
+ fun emojiSearchResultViewModelFactory(factory: EmojiSearchResultViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(BugReportViewModel::class)
+ fun bugReportViewModelFactory(factory: BugReportViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(MatrixToBottomSheetViewModel::class)
+ fun matrixToBottomSheetViewModelFactory(factory: MatrixToBottomSheetViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(AccountCreatedViewModel::class)
+ fun accountCreatedViewModelFactory(factory: AccountCreatedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(LoginViewModel2::class)
+ fun loginViewModel2Factory(factory: LoginViewModel2.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(LoginViewModel::class)
+ fun loginViewModelFactory(factory: LoginViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(HomeServerCapabilitiesViewModel::class)
+ fun homeServerCapabilitiesViewModelFactory(factory: HomeServerCapabilitiesViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(InviteUsersToRoomViewModel::class)
+ fun inviteUsersToRoomViewModelFactory(factory: InviteUsersToRoomViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(ViewEditHistoryViewModel::class)
+ fun viewEditHistoryViewModelFactory(factory: ViewEditHistoryViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(MessageActionsViewModel::class)
+ fun messageActionsViewModelFactory(factory: MessageActionsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(VerificationChooseMethodViewModel::class)
+ fun verificationChooseMethodViewModelFactory(factory: VerificationChooseMethodViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(VerificationEmojiCodeViewModel::class)
+ fun verificationEmojiCodeViewModelFactory(factory: VerificationEmojiCodeViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SearchViewModel::class)
+ fun searchViewModelFactory(factory: SearchViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(UnreadMessagesSharedViewModel::class)
+ fun unreadMessagesSharedViewModelFactory(factory: UnreadMessagesSharedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(UnknownDeviceDetectorSharedViewModel::class)
+ fun unknownDeviceDetectorSharedViewModelFactory(factory: UnknownDeviceDetectorSharedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(DiscoverySettingsViewModel::class)
+ fun discoverySettingsViewModelFactory(factory: DiscoverySettingsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(TextComposerViewModel::class)
+ fun textComposerViewModelFactory(factory: TextComposerViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(SetIdentityServerViewModel::class)
+ fun setIdentityServerViewModelFactory(factory: SetIdentityServerViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(BreadcrumbsViewModel::class)
+ fun breadcrumbsViewModelFactory(factory: BreadcrumbsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(HomeDetailViewModel::class)
+ fun homeDetailViewModelFactory(factory: HomeDetailViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(DeviceVerificationInfoBottomSheetViewModel::class)
+ fun deviceVerificationInfoBottomSheetViewModelFactory(factory: DeviceVerificationInfoBottomSheetViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(DeviceListBottomSheetViewModel::class)
+ fun deviceListBottomSheetViewModelFactory(factory: DeviceListBottomSheetViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(HomeActivityViewModel::class)
+ fun homeActivityViewModelFactory(factory: HomeActivityViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(BootstrapSharedViewModel::class)
+ fun bootstrapSharedViewModelFactory(factory: BootstrapSharedViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(VerificationBottomSheetViewModel::class)
+ fun verificationBottomSheetViewModelFactory(factory: VerificationBottomSheetViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+ @Binds
+ @IntoMap
+ @MavericksViewModelKey(CreatePollViewModel::class)
+ fun createPollViewModelFactory(factory: CreatePollViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenScope.kt b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelScoped.kt
similarity index 71%
rename from vector/src/main/java/im/vector/app/core/di/ScreenScope.kt
rename to vector/src/main/java/im/vector/app/core/di/MavericksViewModelScoped.kt
index c39d6a947e..58b9246fe5 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenScope.kt
+++ b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelScoped.kt
@@ -1,11 +1,11 @@
/*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 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
+ * 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,
@@ -18,7 +18,8 @@ package im.vector.app.core.di
import javax.inject.Scope
+/**
+ * Scope annotation for bindings that should exist for the life of an MavericksViewModel.
+ */
@Scope
-@MustBeDocumented
-@Retention(AnnotationRetention.RUNTIME)
-annotation class ScreenScope
+annotation class MavericksViewModelScoped
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
deleted file mode 100644
index 2ec330efe6..0000000000
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright 2019 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 im.vector.app.core.di
-
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.FragmentFactory
-import androidx.lifecycle.ViewModelProvider
-import dagger.BindsInstance
-import dagger.Component
-import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
-import im.vector.app.core.error.ErrorFormatter
-import im.vector.app.core.preference.UserAvatarPreference
-import im.vector.app.features.MainActivity
-import im.vector.app.features.auth.ReAuthActivity
-import im.vector.app.features.call.CallControlsBottomSheet
-import im.vector.app.features.call.VectorCallActivity
-import im.vector.app.features.call.conference.VectorJitsiActivity
-import im.vector.app.features.call.transfer.CallTransferActivity
-import im.vector.app.features.createdirect.CreateDirectRoomActivity
-import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity
-import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity
-import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
-import im.vector.app.features.crypto.recover.BootstrapBottomSheet
-import im.vector.app.features.crypto.verification.VerificationBottomSheet
-import im.vector.app.features.debug.DebugMenuActivity
-import im.vector.app.features.devtools.RoomDevToolActivity
-import im.vector.app.features.home.HomeActivity
-import im.vector.app.features.home.HomeModule
-import im.vector.app.features.home.room.detail.JoinReplacementRoomBottomSheet
-import im.vector.app.features.home.room.detail.RoomDetailActivity
-import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
-import im.vector.app.features.home.room.detail.search.SearchActivity
-import im.vector.app.features.home.room.detail.timeline.action.MessageActionsBottomSheet
-import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet
-import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet
-import im.vector.app.features.home.room.detail.upgrade.MigrateRoomBottomSheet
-import im.vector.app.features.home.room.detail.widget.RoomWidgetsBottomSheet
-import im.vector.app.features.home.room.filtered.FilteredRoomsActivity
-import im.vector.app.features.home.room.list.RoomListModule
-import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
-import im.vector.app.features.invite.AutoAcceptInvites
-import im.vector.app.features.invite.InviteUsersToRoomActivity
-import im.vector.app.features.invite.VectorInviteView
-import im.vector.app.features.link.LinkHandlerActivity
-import im.vector.app.features.login.LoginActivity
-import im.vector.app.features.login2.LoginActivity2
-import im.vector.app.features.matrixto.MatrixToBottomSheet
-import im.vector.app.features.media.BigImageViewerActivity
-import im.vector.app.features.media.VectorAttachmentViewerActivity
-import im.vector.app.features.navigation.Navigator
-import im.vector.app.features.permalink.PermalinkHandlerActivity
-import im.vector.app.features.pin.PinLocker
-import im.vector.app.features.qrcode.QrCodeScannerActivity
-import im.vector.app.features.rageshake.BugReportActivity
-import im.vector.app.features.rageshake.BugReporter
-import im.vector.app.features.rageshake.RageShake
-import im.vector.app.features.reactions.EmojiReactionPickerActivity
-import im.vector.app.features.reactions.widget.ReactionButton
-import im.vector.app.features.roomdirectory.RoomDirectoryActivity
-import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity
-import im.vector.app.features.roommemberprofile.RoomMemberProfileActivity
-import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
-import im.vector.app.features.roomprofile.RoomProfileActivity
-import im.vector.app.features.roomprofile.alias.detail.RoomAliasBottomSheet
-import im.vector.app.features.roomprofile.settings.historyvisibility.RoomHistoryVisibilityBottomSheet
-import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleActivity
-import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleBottomSheet
-import im.vector.app.features.settings.VectorSettingsActivity
-import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheet
-import im.vector.app.features.share.IncomingShareActivity
-import im.vector.app.features.signout.soft.SoftLogoutActivity
-import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
-import im.vector.app.features.spaces.SpaceCreationActivity
-import im.vector.app.features.spaces.SpaceExploreActivity
-import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
-import im.vector.app.features.spaces.invite.SpaceInviteBottomSheet
-import im.vector.app.features.spaces.manage.SpaceManageActivity
-import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
-import im.vector.app.features.terms.ReviewTermsActivity
-import im.vector.app.features.ui.UiStateRepository
-import im.vector.app.features.usercode.UserCodeActivity
-import im.vector.app.features.widgets.WidgetActivity
-import im.vector.app.features.widgets.permissions.RoomWidgetPermissionBottomSheet
-import im.vector.app.features.workers.signout.SignOutBottomSheetDialogFragment
-
-@Component(
- dependencies = [
- VectorComponent::class
- ],
- modules = [
- ViewModelModule::class,
- FragmentModule::class,
- HomeModule::class,
- RoomListModule::class,
- ScreenModule::class
- ]
-)
-@ScreenScope
-interface ScreenComponent {
-
- /* ==========================================================================================
- * Shortcut to VectorComponent elements
- * ========================================================================================== */
-
- fun activeSessionHolder(): ActiveSessionHolder
- fun fragmentFactory(): FragmentFactory
- fun viewModelFactory(): ViewModelProvider.Factory
- fun bugReporter(): BugReporter
- fun rageShake(): RageShake
- fun navigator(): Navigator
- fun pinLocker(): PinLocker
- fun errorFormatter(): ErrorFormatter
- fun uiStateRepository(): UiStateRepository
- fun unrecognizedCertificateDialog(): UnrecognizedCertificateDialog
- fun autoAcceptInvites(): AutoAcceptInvites
-
- /* ==========================================================================================
- * Activities
- * ========================================================================================== */
-
- fun inject(activity: HomeActivity)
- fun inject(activity: RoomDetailActivity)
- fun inject(activity: RoomProfileActivity)
- fun inject(activity: RoomMemberProfileActivity)
- fun inject(activity: VectorSettingsActivity)
- fun inject(activity: KeysBackupManageActivity)
- fun inject(activity: EmojiReactionPickerActivity)
- fun inject(activity: LoginActivity)
- fun inject(activity: LoginActivity2)
- fun inject(activity: LinkHandlerActivity)
- fun inject(activity: MainActivity)
- fun inject(activity: RoomDirectoryActivity)
- fun inject(activity: KeysBackupSetupActivity)
- fun inject(activity: BugReportActivity)
- fun inject(activity: FilteredRoomsActivity)
- fun inject(activity: CreateRoomActivity)
- fun inject(activity: CreateDirectRoomActivity)
- fun inject(activity: IncomingShareActivity)
- fun inject(activity: SoftLogoutActivity)
- fun inject(activity: PermalinkHandlerActivity)
- fun inject(activity: QrCodeScannerActivity)
- fun inject(activity: DebugMenuActivity)
- fun inject(activity: SharedSecureStorageActivity)
- fun inject(activity: BigImageViewerActivity)
- fun inject(activity: InviteUsersToRoomActivity)
- fun inject(activity: ReviewTermsActivity)
- fun inject(activity: WidgetActivity)
- fun inject(activity: VectorCallActivity)
- fun inject(activity: VectorAttachmentViewerActivity)
- fun inject(activity: VectorJitsiActivity)
- fun inject(activity: SearchActivity)
- fun inject(activity: UserCodeActivity)
- fun inject(activity: CallTransferActivity)
- fun inject(activity: ReAuthActivity)
- fun inject(activity: RoomDevToolActivity)
- fun inject(activity: SpaceCreationActivity)
- fun inject(activity: SpaceExploreActivity)
- fun inject(activity: SpaceManageActivity)
- fun inject(activity: RoomJoinRuleActivity)
-
- /* ==========================================================================================
- * BottomSheets
- * ========================================================================================== */
-
- fun inject(bottomSheet: MessageActionsBottomSheet)
- fun inject(bottomSheet: ViewReactionsBottomSheet)
- fun inject(bottomSheet: ViewEditHistoryBottomSheet)
- fun inject(bottomSheet: DisplayReadReceiptsBottomSheet)
- fun inject(bottomSheet: RoomListQuickActionsBottomSheet)
- fun inject(bottomSheet: RoomAliasBottomSheet)
- fun inject(bottomSheet: RoomHistoryVisibilityBottomSheet)
- fun inject(bottomSheet: RoomJoinRuleBottomSheet)
- fun inject(bottomSheet: VerificationBottomSheet)
- fun inject(bottomSheet: DeviceVerificationInfoBottomSheet)
- fun inject(bottomSheet: DeviceListBottomSheet)
- fun inject(bottomSheet: BootstrapBottomSheet)
- fun inject(bottomSheet: RoomWidgetPermissionBottomSheet)
- fun inject(bottomSheet: RoomWidgetsBottomSheet)
- fun inject(bottomSheet: CallControlsBottomSheet)
- fun inject(bottomSheet: SignOutBottomSheetDialogFragment)
- fun inject(bottomSheet: MatrixToBottomSheet)
- fun inject(bottomSheet: ShareSpaceBottomSheet)
- fun inject(bottomSheet: SpaceSettingsMenuBottomSheet)
- fun inject(bottomSheet: InviteRoomSpaceChooserBottomSheet)
- fun inject(bottomSheet: SpaceInviteBottomSheet)
- fun inject(bottomSheet: JoinReplacementRoomBottomSheet)
- fun inject(bottomSheet: MigrateRoomBottomSheet)
-
- /* ==========================================================================================
- * Others
- * ========================================================================================== */
-
- fun inject(view: VectorInviteView)
- fun inject(preference: UserAvatarPreference)
- fun inject(button: ReactionButton)
-
- /* ==========================================================================================
- * Factory
- * ========================================================================================== */
-
- @Component.Factory
- interface Factory {
- fun create(vectorComponent: VectorComponent,
- @BindsInstance context: AppCompatActivity
- ): ScreenComponent
- }
-}
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt b/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt
index 5f50f186d0..2dab05378c 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt
@@ -1,11 +1,11 @@
/*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 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
+ * 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,
@@ -20,9 +20,13 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.RecyclerView
import dagger.Module
import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+import dagger.hilt.android.scopes.ActivityScoped
import im.vector.app.core.glide.GlideApp
@Module
+@InstallIn(ActivityComponent::class)
object ScreenModule {
@Provides
@@ -31,6 +35,6 @@ object ScreenModule {
@Provides
@JvmStatic
- @ScreenScope
+ @ActivityScoped
fun providesSharedViewPool() = RecyclerView.RecycledViewPool()
}
diff --git a/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt b/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt
new file mode 100644
index 0000000000..52316751e6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.di
+
+import dagger.hilt.EntryPoint
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.features.call.webrtc.WebRtcCallManager
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.pin.PinLocker
+import im.vector.app.features.rageshake.BugReporter
+import im.vector.app.features.session.SessionListener
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.ui.UiStateRepository
+import kotlinx.coroutines.CoroutineScope
+
+@InstallIn(SingletonComponent::class)
+@EntryPoint
+interface SingletonEntryPoint {
+
+ fun sessionListener(): SessionListener
+
+ fun avatarRenderer(): AvatarRenderer
+
+ fun activeSessionHolder(): ActiveSessionHolder
+
+ fun unrecognizedCertificateDialog(): UnrecognizedCertificateDialog
+
+ fun navigator(): Navigator
+
+ fun errorFormatter(): ErrorFormatter
+
+ fun bugReporter(): BugReporter
+
+ fun vectorPreferences(): VectorPreferences
+
+ fun uiStateRepository(): UiStateRepository
+
+ fun pinLocker(): PinLocker
+
+ fun webRtcCallManager(): WebRtcCallManager
+
+ fun appCoroutineScope(): CoroutineScope
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorModule.kt b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
similarity index 50%
rename from vector/src/main/java/im/vector/app/core/di/VectorModule.kt
rename to vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
index 006a2f5aa0..a3d8f39b30 100644
--- a/vector/src/main/java/im/vector/app/core/di/VectorModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
@@ -16,6 +16,7 @@
package im.vector.app.core.di
+import android.app.Application
import android.content.Context
import android.content.Context.MODE_PRIVATE
import android.content.SharedPreferences
@@ -23,6 +24,9 @@ import android.content.res.Resources
import dagger.Binds
import dagger.Module
import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import im.vector.app.core.dispatchers.CoroutineDispatchers
import im.vector.app.core.error.DefaultErrorFormatter
import im.vector.app.core.error.ErrorFormatter
import im.vector.app.features.invite.AutoAcceptInvites
@@ -33,68 +37,20 @@ import im.vector.app.features.pin.PinCodeStore
import im.vector.app.features.pin.SharedPrefPinCodeStore
import im.vector.app.features.ui.SharedPreferencesUiStateRepository
import im.vector.app.features.ui.UiStateRepository
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
import org.matrix.android.sdk.api.Matrix
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 javax.inject.Singleton
+@InstallIn(SingletonComponent::class)
@Module
-abstract class VectorModule {
-
- @Module
- companion object {
-
- @Provides
- @JvmStatic
- fun providesResources(context: Context): Resources {
- return context.resources
- }
-
- @Provides
- @JvmStatic
- fun providesSharedPreferences(context: Context): SharedPreferences {
- return context.getSharedPreferences("im.vector.riot", MODE_PRIVATE)
- }
-
- @Provides
- @JvmStatic
- fun providesMatrix(context: Context): Matrix {
- return Matrix.getInstance(context)
- }
-
- @Provides
- @JvmStatic
- fun providesCurrentSession(activeSessionHolder: ActiveSessionHolder): Session {
- // TODO: handle session injection better
- return activeSessionHolder.getActiveSession()
- }
-
- @Provides
- @JvmStatic
- fun providesLegacySessionImporter(matrix: Matrix): LegacySessionImporter {
- return matrix.legacySessionImporter()
- }
-
- @Provides
- @JvmStatic
- fun providesAuthenticationService(matrix: Matrix): AuthenticationService {
- return matrix.authenticationService()
- }
-
- @Provides
- @JvmStatic
- fun providesRawService(matrix: Matrix): RawService {
- return matrix.rawService()
- }
-
- @Provides
- @JvmStatic
- fun providesHomeServerHistoryService(matrix: Matrix): HomeServerHistoryService {
- return matrix.homeServerHistoryService()
- }
- }
+abstract class VectorBindModule {
@Binds
abstract fun bindNavigator(navigator: DefaultNavigator): Navigator
@@ -111,3 +67,76 @@ abstract class VectorModule {
@Binds
abstract fun bindAutoAcceptInvites(autoAcceptInvites: CompileTimeAutoAcceptInvites): AutoAcceptInvites
}
+
+@InstallIn(SingletonComponent::class)
+@Module
+object VectorStaticModule {
+
+ @Provides
+ @JvmStatic
+ fun providesContext(application: Application): Context {
+ return application.applicationContext
+ }
+
+ @Provides
+ @JvmStatic
+ fun providesResources(context: Context): Resources {
+ return context.resources
+ }
+
+ @Provides
+ @JvmStatic
+ fun providesSharedPreferences(context: Context): SharedPreferences {
+ return context.getSharedPreferences("im.vector.riot", MODE_PRIVATE)
+ }
+
+ @Provides
+ @JvmStatic
+ fun providesMatrix(context: Context): Matrix {
+ return Matrix.getInstance(context)
+ }
+
+ @Provides
+ @JvmStatic
+ fun providesCurrentSession(activeSessionHolder: ActiveSessionHolder): Session {
+ // TODO: handle session injection better
+ return activeSessionHolder.getActiveSession()
+ }
+
+ @Provides
+ @JvmStatic
+ fun providesLegacySessionImporter(matrix: Matrix): LegacySessionImporter {
+ return matrix.legacySessionImporter()
+ }
+
+ @Provides
+ @JvmStatic
+ fun providesAuthenticationService(matrix: Matrix): AuthenticationService {
+ return matrix.authenticationService()
+ }
+
+ @Provides
+ @JvmStatic
+ fun providesRawService(matrix: Matrix): RawService {
+ return matrix.rawService()
+ }
+
+ @Provides
+ @JvmStatic
+ fun providesHomeServerHistoryService(matrix: Matrix): HomeServerHistoryService {
+ return matrix.homeServerHistoryService()
+ }
+
+ @Provides
+ @JvmStatic
+ @Singleton
+ fun providesApplicationCoroutineScope(): CoroutineScope {
+ return CoroutineScope(SupervisorJob() + Dispatchers.Main)
+ }
+
+ @Provides
+ @JvmStatic
+ fun providesCoroutineDispatchers(): CoroutineDispatchers {
+ return CoroutineDispatchers(io = Dispatchers.IO, computation = Dispatchers.Default)
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
deleted file mode 100644
index 4a3379cb5a..0000000000
--- a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2019 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 im.vector.app.core.di
-
-import android.content.Context
-import android.content.res.Resources
-import dagger.BindsInstance
-import dagger.Component
-import im.vector.app.ActiveSessionDataSource
-import im.vector.app.AppStateHandler
-import im.vector.app.EmojiCompatFontProvider
-import im.vector.app.EmojiCompatWrapper
-import im.vector.app.VectorApplication
-import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
-import im.vector.app.core.error.ErrorFormatter
-import im.vector.app.core.network.WifiDetector
-import im.vector.app.core.pushers.PushersManager
-import im.vector.app.core.utils.AssetReader
-import im.vector.app.core.utils.DimensionConverter
-import im.vector.app.features.call.webrtc.WebRtcCallManager
-import im.vector.app.features.configuration.VectorConfiguration
-import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
-import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
-import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.CurrentSpaceSuggestedRoomListDataSource
-import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
-import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
-import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
-import im.vector.app.features.html.EventHtmlRenderer
-import im.vector.app.features.html.VectorHtmlCompressor
-import im.vector.app.features.invite.AutoAcceptInvites
-import im.vector.app.features.login.ReAuthHelper
-import im.vector.app.features.navigation.Navigator
-import im.vector.app.features.notifications.NotifiableEventResolver
-import im.vector.app.features.notifications.NotificationBroadcastReceiver
-import im.vector.app.features.notifications.NotificationDrawerManager
-import im.vector.app.features.notifications.NotificationUtils
-import im.vector.app.features.notifications.PushRuleTriggerListener
-import im.vector.app.features.pin.PinCodeStore
-import im.vector.app.features.pin.PinLocker
-import im.vector.app.features.popup.PopupAlertManager
-import im.vector.app.features.rageshake.BugReporter
-import im.vector.app.features.rageshake.VectorFileLogger
-import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
-import im.vector.app.features.reactions.data.EmojiDataSource
-import im.vector.app.features.session.SessionListener
-import im.vector.app.features.settings.VectorPreferences
-import im.vector.app.features.ui.UiStateRepository
-import org.matrix.android.sdk.api.Matrix
-import org.matrix.android.sdk.api.auth.AuthenticationService
-import org.matrix.android.sdk.api.auth.HomeServerHistoryService
-import org.matrix.android.sdk.api.raw.RawService
-import org.matrix.android.sdk.api.session.Session
-import javax.inject.Singleton
-
-@Component(modules = [VectorModule::class])
-@Singleton
-interface VectorComponent {
-
- fun inject(notificationBroadcastReceiver: NotificationBroadcastReceiver)
-
- fun inject(vectorApplication: VectorApplication)
-
- fun matrix(): Matrix
-
- fun matrixItemColorProvider(): MatrixItemColorProvider
-
- fun sessionListener(): SessionListener
-
- fun currentSession(): Session
-
- fun notificationUtils(): NotificationUtils
-
- fun notificationDrawerManager(): NotificationDrawerManager
-
- fun appContext(): Context
-
- fun resources(): Resources
-
- fun assetReader(): AssetReader
-
- fun dimensionConverter(): DimensionConverter
-
- fun vectorConfiguration(): VectorConfiguration
-
- fun avatarRenderer(): AvatarRenderer
-
- fun activeSessionHolder(): ActiveSessionHolder
-
- fun unrecognizedCertificateDialog(): UnrecognizedCertificateDialog
-
- fun emojiCompatFontProvider(): EmojiCompatFontProvider
-
- fun emojiCompatWrapper(): EmojiCompatWrapper
-
- fun eventHtmlRenderer(): EventHtmlRenderer
-
- fun vectorHtmlCompressor(): VectorHtmlCompressor
-
- fun navigator(): Navigator
-
- fun errorFormatter(): ErrorFormatter
-
- fun appStateHandler(): AppStateHandler
-
- fun currentSpaceSuggestedRoomListDataSource(): CurrentSpaceSuggestedRoomListDataSource
-
- fun roomDetailPendingActionStore(): RoomDetailPendingActionStore
-
- fun activeSessionObservableStore(): ActiveSessionDataSource
-
- fun incomingVerificationRequestHandler(): IncomingVerificationRequestHandler
-
- fun incomingKeyRequestHandler(): KeyRequestHandler
-
- fun authenticationService(): AuthenticationService
-
- fun rawService(): RawService
-
- fun homeServerHistoryService(): HomeServerHistoryService
-
- fun bugReporter(): BugReporter
-
- fun vectorUncaughtExceptionHandler(): VectorUncaughtExceptionHandler
-
- fun pushRuleTriggerListener(): PushRuleTriggerListener
-
- fun pusherManager(): PushersManager
-
- fun notifiableEventResolver(): NotifiableEventResolver
-
- fun vectorPreferences(): VectorPreferences
-
- fun wifiDetector(): WifiDetector
-
- fun vectorFileLogger(): VectorFileLogger
-
- fun uiStateRepository(): UiStateRepository
-
- fun pinCodeStore(): PinCodeStore
-
- fun emojiDataSource(): EmojiDataSource
-
- fun alertManager(): PopupAlertManager
-
- fun reAuthHelper(): ReAuthHelper
-
- fun pinLocker(): PinLocker
-
- fun autoAcceptInvites(): AutoAcceptInvites
-
- fun webRtcCallManager(): WebRtcCallManager
-
- fun roomSummaryHolder(): RoomSummariesHolder
-
- @Component.Factory
- interface Factory {
- fun create(@BindsInstance context: Context): VectorComponent
- }
-}
diff --git a/vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt b/vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt
index 5f0ee30821..2782edd558 100644
--- a/vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt
@@ -17,6 +17,7 @@
package im.vector.app.core.di
import androidx.lifecycle.ViewModel
+import com.airbnb.mvrx.MavericksViewModel
import dagger.MapKey
import kotlin.reflect.KClass
@@ -24,3 +25,8 @@ import kotlin.reflect.KClass
@Retention(AnnotationRetention.RUNTIME)
@MapKey
annotation class ViewModelKey(val value: KClass)
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.FUNCTION)
+@MapKey
+annotation class MavericksViewModelKey(val value: KClass>)
diff --git a/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
index 4e07c1e2ca..4f8329c026 100644
--- a/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
@@ -20,6 +20,8 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import dagger.Binds
import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
import dagger.multibindings.IntoMap
import im.vector.app.core.platform.ConfigurationViewModel
import im.vector.app.features.call.SharedKnownCallsViewModel
@@ -42,6 +44,7 @@ import im.vector.app.features.spaces.SpacePreviewSharedActionViewModel
import im.vector.app.features.spaces.people.SpacePeopleSharedActionViewModel
import im.vector.app.features.userdirectory.UserListSharedActionViewModel
+@InstallIn(ActivityComponent::class)
@Module
interface ViewModelModule {
diff --git a/vector/src/main/java/im/vector/app/core/dispatchers/CoroutineDispatchers.kt b/vector/src/main/java/im/vector/app/core/dispatchers/CoroutineDispatchers.kt
new file mode 100644
index 0000000000..008ca4a9ce
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/dispatchers/CoroutineDispatchers.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.dispatchers
+
+import kotlinx.coroutines.CoroutineDispatcher
+import javax.inject.Inject
+
+data class CoroutineDispatchers @Inject constructor(
+ val io: CoroutineDispatcher,
+ val computation: CoroutineDispatcher)
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRadioActionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRadioActionItem.kt
index 91361aa89d..8899532d04 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRadioActionItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRadioActionItem.kt
@@ -27,6 +27,7 @@ import im.vector.app.core.epoxy.ClickListener
import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.app.core.epoxy.VectorEpoxyModel
import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.setAttributeTintedImageResource
import im.vector.app.core.extensions.setTextOrHide
/**
@@ -62,7 +63,7 @@ abstract class BottomSheetRadioActionItem : VectorEpoxyModel(R.id.matrixItemTitle)
val subtitleView by bind(R.id.matrixItemSubtitle)
+ val powerLabel by bind(R.id.matrixItemPowerLevelLabel)
+ val presenceImageView by bind(R.id.matrixItemPresenceImageView)
val avatarImageView by bind(R.id.matrixItemAvatar)
val avatarDecorationImageView by bind(R.id.matrixItemAvatarDecoration)
val editableView by bind(R.id.matrixItemEditable)
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt
index b7fd597789..12189dc8f4 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt
@@ -17,7 +17,6 @@
package im.vector.app.core.epoxy.profiles
-import android.widget.TextView
import androidx.core.view.isVisible
import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass
@@ -25,7 +24,7 @@ import im.vector.app.R
import im.vector.app.core.extensions.setTextOrHide
@EpoxyModelClass(layout = R.layout.item_profile_matrix_item)
-abstract class ProfileMatrixItemWithPowerLevel : BaseProfileMatrixItem() {
+abstract class ProfileMatrixItemWithPowerLevel : ProfileMatrixItem() {
@EpoxyAttribute var powerLevelLabel: CharSequence? = null
@@ -34,8 +33,4 @@ abstract class ProfileMatrixItemWithPowerLevel : BaseProfileMatrixItem(R.id.matrixItemPowerLevelLabel)
- }
}
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevelWithPresence.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevelWithPresence.kt
new file mode 100644
index 0000000000..92216cbb38
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevelWithPresence.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 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 im.vector.app.core.epoxy.profiles
+
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import org.matrix.android.sdk.api.session.presence.model.UserPresence
+
+@EpoxyModelClass(layout = R.layout.item_profile_matrix_item)
+abstract class ProfileMatrixItemWithPowerLevelWithPresence : ProfileMatrixItemWithPowerLevel() {
+
+ @EpoxyAttribute var userPresence: UserPresence? = null
+
+ override fun bind(holder: Holder) {
+ super.bind(holder)
+ holder.presenceImageView.render(userPresence = userPresence)
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/NotificationSettingsFooterItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/NotificationSettingsFooterItem.kt
new file mode 100644
index 0000000000..4608f2b1ce
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/NotificationSettingsFooterItem.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.epoxy.profiles.notifications
+
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextWithColoredPart
+
+@EpoxyModelClass(layout = R.layout.item_notifications_footer)
+abstract class NotificationSettingsFooterItem : VectorEpoxyModel() {
+
+ @EpoxyAttribute
+ var encrypted: Boolean = false
+
+ @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+ var clickListener: ClickListener? = null
+
+ override fun bind(holder: Holder) {
+ super.bind(holder)
+ val accountSettingsString = holder.view.context.getString(R.string.room_settings_room_notifications_account_settings)
+ val manageNotificationsString = holder.view.context.getString(
+ R.string.room_settings_room_notifications_manage_notifications,
+ accountSettingsString
+ )
+ val manageNotificationsBuilder = StringBuilder(manageNotificationsString)
+ if (encrypted) {
+ val encryptionNotice = holder.view.context.getString(R.string.room_settings_room_notifications_encryption_notice)
+ manageNotificationsBuilder.appendLine().append(encryptionNotice)
+ }
+
+ holder.textView.setTextWithColoredPart(
+ manageNotificationsBuilder.toString(),
+ accountSettingsString,
+ underline = true
+ ) {
+ clickListener?.invoke(holder.textView)
+ }
+ }
+
+ class Holder : VectorEpoxyHolder() {
+ val textView by bind(R.id.footerText)
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/RadioButtonItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/RadioButtonItem.kt
new file mode 100644
index 0000000000..721d84e050
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/RadioButtonItem.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.epoxy.profiles.notifications
+
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.setAttributeTintedImageResource
+
+@EpoxyModelClass(layout = R.layout.item_radio)
+abstract class RadioButtonItem : VectorEpoxyModel() {
+
+ @EpoxyAttribute
+ var title: CharSequence? = null
+
+ @StringRes
+ @EpoxyAttribute
+ var titleRes: Int? = null
+
+ @EpoxyAttribute
+ var selected = false
+
+ @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+ lateinit var listener: ClickListener
+
+ override fun bind(holder: Holder) {
+ super.bind(holder)
+ holder.view.onClick(listener)
+ if (titleRes != null) {
+ holder.titleText.setText(titleRes!!)
+ } else {
+ holder.titleText.text = title
+ }
+
+ if (selected) {
+ holder.radioImage.setAttributeTintedImageResource(R.drawable.ic_radio_on, R.attr.colorPrimary)
+ holder.radioImage.contentDescription = holder.view.context.getString(R.string.a11y_checked)
+ } else {
+ holder.radioImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_radio_off))
+ holder.radioImage.contentDescription = holder.view.context.getString(R.string.a11y_unchecked)
+ }
+ }
+
+ class Holder : VectorEpoxyHolder() {
+ val titleText by bind(R.id.actionTitle)
+ val radioImage by bind(R.id.radioIcon)
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/TextHeaderItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/TextHeaderItem.kt
new file mode 100644
index 0000000000..2dfe7be2e6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/notifications/TextHeaderItem.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.epoxy.profiles.notifications
+
+import android.widget.TextView
+import androidx.annotation.StringRes
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+
+@EpoxyModelClass(layout = R.layout.item_text_header)
+abstract class TextHeaderItem : VectorEpoxyModel() {
+
+ @EpoxyAttribute
+ var text: String? = null
+
+ @StringRes
+ @EpoxyAttribute
+ var textRes: Int? = null
+
+ override fun bind(holder: Holder) {
+ super.bind(holder)
+ val textResource = textRes
+ if (textResource != null) {
+ holder.textView.setText(textResource)
+ } else {
+ holder.textView.text = text
+ }
+ }
+
+ class Holder : VectorEpoxyHolder() {
+ val textView by bind(R.id.headerText)
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index f0ba79e31c..6494f31336 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -58,49 +58,49 @@ class DefaultErrorFormatter @Inject constructor(
}
is Failure.ServerError -> {
when {
- throwable.error.code == MatrixError.M_CONSENT_NOT_GIVEN -> {
+ throwable.error.code == MatrixError.M_CONSENT_NOT_GIVEN -> {
// Special case for terms and conditions
stringProvider.getString(R.string.error_terms_not_accepted)
}
- throwable.isInvalidPassword() -> {
+ throwable.isInvalidPassword() -> {
stringProvider.getString(R.string.auth_invalid_login_param)
}
- throwable.error.code == MatrixError.M_USER_IN_USE -> {
+ throwable.error.code == MatrixError.M_USER_IN_USE -> {
stringProvider.getString(R.string.login_signup_error_user_in_use)
}
- throwable.error.code == MatrixError.M_BAD_JSON -> {
+ throwable.error.code == MatrixError.M_BAD_JSON -> {
stringProvider.getString(R.string.login_error_bad_json)
}
- throwable.error.code == MatrixError.M_NOT_JSON -> {
+ throwable.error.code == MatrixError.M_NOT_JSON -> {
stringProvider.getString(R.string.login_error_not_json)
}
- throwable.error.code == MatrixError.M_THREEPID_DENIED -> {
+ throwable.error.code == MatrixError.M_THREEPID_DENIED -> {
stringProvider.getString(R.string.login_error_threepid_denied)
}
- throwable.error.code == MatrixError.M_LIMIT_EXCEEDED -> {
+ throwable.error.code == MatrixError.M_LIMIT_EXCEEDED -> {
limitExceededError(throwable.error)
}
- throwable.error.code == MatrixError.M_TOO_LARGE -> {
+ throwable.error.code == MatrixError.M_TOO_LARGE -> {
stringProvider.getString(R.string.error_file_too_big_simple)
}
- throwable.error.code == MatrixError.M_THREEPID_NOT_FOUND -> {
+ throwable.error.code == MatrixError.M_THREEPID_NOT_FOUND -> {
stringProvider.getString(R.string.login_reset_password_error_not_found)
}
- throwable.error.code == MatrixError.M_USER_DEACTIVATED -> {
+ throwable.error.code == MatrixError.M_USER_DEACTIVATED -> {
stringProvider.getString(R.string.auth_invalid_login_deactivated_account)
}
- throwable.error.code == MatrixError.M_THREEPID_IN_USE
- && throwable.error.message == "Email is already in use" -> {
+ throwable.error.code == MatrixError.M_THREEPID_IN_USE &&
+ throwable.error.message == "Email is already in use" -> {
stringProvider.getString(R.string.account_email_already_used_error)
}
- throwable.error.code == MatrixError.M_THREEPID_IN_USE
- && throwable.error.message == "MSISDN is already in use" -> {
+ throwable.error.code == MatrixError.M_THREEPID_IN_USE &&
+ throwable.error.message == "MSISDN is already in use" -> {
stringProvider.getString(R.string.account_phone_number_already_used_error)
}
- throwable.error.code == MatrixError.M_THREEPID_AUTH_FAILED -> {
+ throwable.error.code == MatrixError.M_THREEPID_AUTH_FAILED -> {
stringProvider.getString(R.string.error_threepid_auth_failed)
}
- else -> {
+ else -> {
throwable.error.message.takeIf { it.isNotEmpty() }
?: throwable.error.code.takeIf { it.isNotEmpty() }
}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt
index 07a684abef..dbe90dfdc1 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt
@@ -57,7 +57,7 @@ fun CharSequence.isMsisdn(): Boolean {
* - "fi.le.txt".insertBeforeLast("_foo") will return "fi.le_foo.txt"
* - null.insertBeforeLast("_foo") will return "_foo"
*/
-fun String?.insertBeforeLast(insert: String, delimiter: String = ".") : String {
+fun String?.insertBeforeLast(insert: String, delimiter: String = "."): String {
if (this == null) return insert
val idx = lastIndexOf(delimiter)
return if (idx == -1) {
@@ -66,3 +66,7 @@ fun String?.insertBeforeLast(insert: String, delimiter: String = ".") : String {
replaceRange(idx, idx, insert)
}
}
+
+inline fun Any?.takeAs(): R? {
+ return takeIf { it is R } as R?
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Context.kt b/vector/src/main/java/im/vector/app/core/extensions/Context.kt
index c1c435edf2..59847da7c9 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Context.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Context.kt
@@ -17,14 +17,9 @@
package im.vector.app.core.extensions
import android.content.Context
-import im.vector.app.core.di.HasVectorInjector
-import im.vector.app.core.di.VectorComponent
+import dagger.hilt.EntryPoints
+import im.vector.app.core.di.SingletonEntryPoint
-fun Context.vectorComponent(): VectorComponent {
- val appContext = applicationContext
- if (appContext is HasVectorInjector) {
- return appContext.injector()
- } else {
- throw IllegalStateException("Your application context doesn't implement HasVectorInjector")
- }
+fun Context.singletonEntryPoint(): SingletonEntryPoint {
+ return EntryPoints.get(applicationContext, SingletonEntryPoint::class.java)
}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
index 05b70def3d..0eb9dcdaf9 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
@@ -18,6 +18,7 @@ package im.vector.app.core.extensions
import android.text.Editable
import android.text.InputType
+import android.text.Spanned
import android.view.MotionEvent
import android.view.View
import android.view.inputmethod.EditorInfo
@@ -57,3 +58,38 @@ fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_searc
return@OnTouchListener false
})
}
+
+fun EditText.setTextIfDifferent(newText: CharSequence?): Boolean {
+ if (!isTextDifferent(newText, text)) {
+ // Previous text is the same. No op
+ return false
+ }
+ setText(newText)
+ // Since the text changed we move the cursor to the end of the new text.
+ // This allows us to fill in text programmatically with a different value,
+ // but if the user is typing and the view is rebound we won't lose their cursor position.
+ setSelection(newText?.length ?: 0)
+ return true
+}
+
+private fun isTextDifferent(str1: CharSequence?, str2: CharSequence?): Boolean {
+ if (str1 === str2) {
+ return false
+ }
+ if (str1 == null || str2 == null) {
+ return true
+ }
+ val length = str1.length
+ if (length != str2.length) {
+ return true
+ }
+ if (str1 is Spanned) {
+ return str1 != str2
+ }
+ for (i in 0 until length) {
+ if (str1[i] != str2[i]) {
+ return true
+ }
+ }
+ return false
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Parcelable.kt b/vector/src/main/java/im/vector/app/core/extensions/Parcelable.kt
index 6ca0144601..65f59f7b73 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Parcelable.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Parcelable.kt
@@ -18,8 +18,8 @@ package im.vector.app.core.extensions
import android.os.Bundle
import android.os.Parcelable
-import com.airbnb.mvrx.MvRx
+import com.airbnb.mvrx.Mavericks
fun Parcelable?.toMvRxBundle(): Bundle? {
- return this?.let { Bundle().apply { putParcelable(MvRx.KEY_ARG, it) } }
+ return this?.let { Bundle().apply { putParcelable(Mavericks.KEY_ARG, it) } }
}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Session.kt b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
index 699247ab6d..90b08ef92b 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Session.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
@@ -26,13 +26,15 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
import org.matrix.android.sdk.api.session.sync.FilterService
import timber.log.Timber
-fun Session.configureAndStart(context: Context) {
+fun Session.configureAndStart(context: Context, startSyncing: Boolean = true) {
Timber.i("Configure and start session for $myUserId")
open()
setFilter(FilterService.FilterPreset.ElementFilter)
- startSyncing(context)
+ if (startSyncing) {
+ startSyncing(context)
+ }
refreshPushers()
- context.vectorComponent().webRtcCallManager().checkForProtocolsSupportIfNeeded()
+ context.singletonEntryPoint().webRtcCallManager().checkForProtocolsSupportIfNeeded()
}
fun Session.startSyncing(context: Context) {
@@ -62,15 +64,15 @@ fun Session.startSyncing(context: Context) {
* Tell is the session has unsaved e2e keys in the backup
*/
fun Session.hasUnsavedKeys(): Boolean {
- return cryptoService().inboundGroupSessionsCount(false) > 0
- && cryptoService().keysBackupService().state != KeysBackupState.ReadyToBackUp
+ return cryptoService().inboundGroupSessionsCount(false) > 0 &&
+ cryptoService().keysBackupService().state != KeysBackupState.ReadyToBackUp
}
fun Session.cannotLogoutSafely(): Boolean {
// has some encrypted chat
- return hasUnsavedKeys()
+ return hasUnsavedKeys() ||
// has local cross signing keys
- || (cryptoService().crossSigningService().allPrivateKeysKnown()
+ (cryptoService().crossSigningService().allPrivateKeysKnown() &&
// That are not backed up
- && !sharedSecretStorageService.isRecoverySetup())
+ !sharedSecretStorageService.isRecoverySetup())
}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
index bb991ac32c..adb655f169 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
@@ -39,13 +39,15 @@ import im.vector.app.features.themes.ThemeUtils
/**
* Set a text in the TextView, or set visibility to GONE if the text is null
*/
-fun TextView.setTextOrHide(newText: CharSequence?, hideWhenBlank: Boolean = true) {
- if (newText == null
- || (newText.isBlank() && hideWhenBlank)) {
+fun TextView.setTextOrHide(newText: CharSequence?, hideWhenBlank: Boolean = true, vararg relatedViews: View = emptyArray()) {
+ if (newText == null ||
+ (newText.isBlank() && hideWhenBlank)) {
isVisible = false
+ relatedViews.forEach { it.isVisible = false }
} else {
this.text = newText
isVisible = true
+ relatedViews.forEach { it.isVisible = true }
}
}
@@ -65,6 +67,23 @@ fun TextView.setTextWithColoredPart(@StringRes fullTextRes: Int,
val coloredPart = resources.getString(coloredTextRes)
// Insert colored part into the full text
val fullText = resources.getString(fullTextRes, coloredPart)
+
+ setTextWithColoredPart(fullText, coloredPart, colorAttribute, underline, onClick)
+}
+
+/**
+ * Set text with a colored part
+ * @param fullText The full text.
+ * @param coloredPart The colored part of the text
+ * @param colorAttribute attribute of the color. Default to colorPrimary
+ * @param underline true to also underline the text. Default to false
+ * @param onClick attributes to handle click on the colored part if needed
+ */
+fun TextView.setTextWithColoredPart(fullText: String,
+ coloredPart: String,
+ @AttrRes colorAttribute: Int = R.attr.colorPrimary,
+ underline: Boolean = false,
+ onClick: (() -> Unit)? = null) {
val color = ThemeUtils.getColor(context, colorAttribute)
val foregroundSpan = ForegroundColorSpan(color)
diff --git a/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt b/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
index 48e3a488ed..43ff186e99 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
@@ -22,7 +22,7 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
fun TimelineEvent.canReact(): Boolean {
// Only event of type EventType.MESSAGE or EventType.STICKER are supported for the moment
- return root.getClearType() in listOf(EventType.MESSAGE, EventType.STICKER)
- && root.sendState == SendState.SYNCED
- && !root.isRedacted()
+ return root.getClearType() in listOf(EventType.MESSAGE, EventType.STICKER) &&
+ root.sendState == SendState.SYNCED &&
+ !root.isRedacted()
}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/UriExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/UriExtensions.kt
new file mode 100644
index 0000000000..ec7a03bdbb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/extensions/UriExtensions.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.extensions
+
+import android.net.Uri
+
+const val IGNORED_SCHEMA = "ignored"
+
+fun Uri.isIgnored() = scheme == IGNORED_SCHEMA
+
+fun createIgnoredUri(path: String): Uri = Uri.parse("$IGNORED_SCHEMA://$path")
diff --git a/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
index 92dc76670f..54fcac42d1 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
@@ -16,12 +16,20 @@
package im.vector.app.core.extensions
+import android.graphics.drawable.Drawable
import android.text.InputType
import android.view.View
import android.view.ViewGroup
import android.widget.EditText
+import android.widget.ImageView
+import androidx.annotation.AttrRes
+import androidx.annotation.DrawableRes
import androidx.appcompat.widget.SearchView
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
+import androidx.core.view.isVisible
import im.vector.app.R
+import im.vector.app.features.themes.ThemeUtils
/**
* Remove left margin of a SearchView
@@ -50,3 +58,25 @@ fun View.getMeasurements(): Pair {
val height = measuredHeight
return width to height
}
+
+fun ImageView.setDrawableOrHide(drawableRes: Drawable?) {
+ setImageDrawable(drawableRes)
+ isVisible = drawableRes != null
+}
+
+fun View.setAttributeTintedBackground(@DrawableRes drawableRes: Int, @AttrRes tint: Int) {
+ val drawable = ContextCompat.getDrawable(context, drawableRes)!!
+ DrawableCompat.setTint(drawable, ThemeUtils.getColor(context, tint))
+ background = drawable
+}
+
+fun ImageView.setAttributeTintedImageResource(@DrawableRes drawableRes: Int, @AttrRes tint: Int) {
+ val drawable = ContextCompat.getDrawable(context, drawableRes)!!
+ DrawableCompat.setTint(drawable, ThemeUtils.getColor(context, tint))
+ setImageDrawable(drawable)
+}
+
+fun View.setAttributeBackground(@AttrRes attributeId: Int) {
+ val attribute = ThemeUtils.getAttribute(context, attributeId)!!
+ setBackgroundResource(attribute.resourceId)
+}
diff --git a/vector/src/main/java/im/vector/app/core/flow/TimingOperators.kt b/vector/src/main/java/im/vector/app/core/flow/TimingOperators.kt
new file mode 100644
index 0000000000..621a80d96e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/flow/TimingOperators.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.flow
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.ClosedReceiveChannelException
+import kotlinx.coroutines.channels.ReceiveChannel
+import kotlinx.coroutines.channels.produce
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.selects.select
+
+@ExperimentalCoroutinesApi
+fun Flow.chunk(durationInMillis: Long): Flow> {
+ require(durationInMillis > 0) { "Duration should be greater than 0" }
+ return flow {
+ coroutineScope {
+ val events = ArrayList()
+ val ticker = fixedPeriodTicker(durationInMillis)
+ try {
+ val upstreamValues = produce(capacity = Channel.CONFLATED) {
+ collect { value -> send(value) }
+ }
+ while (isActive) {
+ var hasTimedOut = false
+ select {
+ upstreamValues.onReceive {
+ events.add(it)
+ }
+ ticker.onReceive {
+ hasTimedOut = true
+ }
+ }
+ if (hasTimedOut && events.isNotEmpty()) {
+ emit(events.toList())
+ events.clear()
+ }
+ }
+ } catch (e: ClosedReceiveChannelException) {
+ // drain remaining events
+ if (events.isNotEmpty()) emit(events.toList())
+ } finally {
+ ticker.cancel()
+ }
+ }
+ }
+}
+
+@ExperimentalCoroutinesApi
+fun Flow.throttleFirst(windowDuration: Long): Flow = flow {
+ var windowStartTime = System.currentTimeMillis()
+ var emitted = false
+ collect { value ->
+ val currentTime = System.currentTimeMillis()
+ val delta = currentTime - windowStartTime
+ if (delta >= windowDuration) {
+ windowStartTime += delta / windowDuration * windowDuration
+ emitted = false
+ }
+ if (!emitted) {
+ emit(value)
+ emitted = true
+ }
+ }
+}
+
+fun tickerFlow(scope: CoroutineScope, delayMillis: Long, initialDelayMillis: Long = delayMillis): Flow {
+ return scope.fixedPeriodTicker(delayMillis, initialDelayMillis).consumeAsFlow()
+}
+
+private fun CoroutineScope.fixedPeriodTicker(delayMillis: Long, initialDelayMillis: Long = delayMillis): ReceiveChannel {
+ require(delayMillis >= 0) { "Expected non-negative delay, but has $delayMillis ms" }
+ require(initialDelayMillis >= 0) { "Expected non-negative initial delay, but has $initialDelayMillis ms" }
+ return produce(capacity = 0) {
+ delay(initialDelayMillis)
+ while (true) {
+ channel.send(Unit)
+ delay(delayMillis)
+ }
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/glide/AvatarPlaceholder.kt b/vector/src/main/java/im/vector/app/core/glide/AvatarPlaceholder.kt
index 32968c4f80..e61f81de55 100644
--- a/vector/src/main/java/im/vector/app/core/glide/AvatarPlaceholder.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/AvatarPlaceholder.kt
@@ -26,7 +26,7 @@ import com.bumptech.glide.load.model.ModelLoader
import com.bumptech.glide.load.model.ModelLoaderFactory
import com.bumptech.glide.load.model.MultiModelLoaderFactory
import com.bumptech.glide.signature.ObjectKey
-import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.core.extensions.singletonEntryPoint
import org.matrix.android.sdk.api.util.MatrixItem
data class AvatarPlaceholder(val matrixItem: MatrixItem)
@@ -42,8 +42,8 @@ class AvatarPlaceholderModelLoaderFactory(private val context: Context) : ModelL
}
}
-class AvatarPlaceholderModelLoader(private val context: Context)
- : ModelLoader {
+class AvatarPlaceholderModelLoader(private val context: Context) :
+ ModelLoader {
override fun buildLoadData(model: AvatarPlaceholder, width: Int, height: Int, options: Options): ModelLoader.LoadData? {
return ModelLoader.LoadData(ObjectKey(model), AvatarPlaceholderDataFetcher(context, model))
@@ -54,10 +54,10 @@ class AvatarPlaceholderModelLoader(private val context: Context)
}
}
-class AvatarPlaceholderDataFetcher(context: Context, private val data: AvatarPlaceholder)
- : DataFetcher {
+class AvatarPlaceholderDataFetcher(context: Context, private val data: AvatarPlaceholder) :
+ DataFetcher {
- private val avatarRenderer = context.vectorComponent().avatarRenderer()
+ private val avatarRenderer = context.singletonEntryPoint().avatarRenderer()
override fun loadData(priority: Priority, callback: DataFetcher.DataCallback) {
val avatarPlaceholder = avatarRenderer.getPlaceholderDrawable(data.matrixItem)
diff --git a/vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt b/vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt
index 74c9d4f0f6..59bffd95fd 100644
--- a/vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt
@@ -19,7 +19,6 @@ package im.vector.app.core.glide
import android.content.Context
import android.graphics.drawable.Drawable
import android.util.Log
-
import com.bumptech.glide.Glide
import com.bumptech.glide.GlideBuilder
import com.bumptech.glide.Registry
diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index 5fae815dfb..6b42e3fff8 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -25,7 +25,7 @@ import com.bumptech.glide.load.model.ModelLoader
import com.bumptech.glide.load.model.ModelLoaderFactory
import com.bumptech.glide.load.model.MultiModelLoaderFactory
import com.bumptech.glide.signature.ObjectKey
-import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.core.extensions.singletonEntryPoint
import im.vector.app.core.files.LocalFilesHelper
import im.vector.app.features.media.ImageContentRenderer
import im.vector.app.features.session.coroutineScope
@@ -48,8 +48,8 @@ class VectorGlideModelLoaderFactory(private val context: Context) : ModelLoaderF
}
}
-class VectorGlideModelLoader(private val context: Context)
- : ModelLoader {
+class VectorGlideModelLoader(private val context: Context) :
+ ModelLoader {
override fun handles(model: ImageContentRenderer.Data): Boolean {
// Always handle
return true
@@ -63,11 +63,11 @@ class VectorGlideModelLoader(private val context: Context)
class VectorGlideDataFetcher(context: Context,
private val data: ImageContentRenderer.Data,
private val width: Int,
- private val height: Int)
- : DataFetcher {
+ private val height: Int) :
+ DataFetcher {
private val localFilesHelper = LocalFilesHelper(context)
- private val activeSessionHolder = context.vectorComponent().activeSessionHolder()
+ private val activeSessionHolder = context.singletonEntryPoint().activeSessionHolder()
private val client = activeSessionHolder.getSafeActiveSession()?.getOkHttpClient() ?: OkHttpClient()
diff --git a/vector/src/main/java/im/vector/app/core/intent/Filename.kt b/vector/src/main/java/im/vector/app/core/intent/Filename.kt
index 5d118c19a1..a38602e4a5 100644
--- a/vector/src/main/java/im/vector/app/core/intent/Filename.kt
+++ b/vector/src/main/java/im/vector/app/core/intent/Filename.kt
@@ -19,15 +19,17 @@ package im.vector.app.core.intent
import android.content.Context
import android.net.Uri
import android.provider.OpenableColumns
+import im.vector.lib.multipicker.utils.getColumnIndexOrNull
fun getFilenameFromUri(context: Context?, uri: Uri): String? {
if (context != null && uri.scheme == "content") {
- val cursor = context.contentResolver.query(uri, null, null, null, null)
- cursor?.use {
- if (it.moveToFirst()) {
- return it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME))
- }
- }
+ context.contentResolver.query(uri, null, null, null, null)
+ ?.use { cursor ->
+ if (cursor.moveToFirst()) {
+ return cursor.getColumnIndexOrNull(OpenableColumns.DISPLAY_NAME)
+ ?.let { cursor.getString(it) }
+ }
+ }
}
return uri.path?.substringAfterLast('/')
}
diff --git a/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt b/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
index ee2933f542..e7e91dbfd9 100755
--- a/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
@@ -28,8 +28,8 @@ import im.vector.app.core.epoxy.ClickListener
import im.vector.app.core.epoxy.onClick
import im.vector.app.databinding.ViewButtonStateBinding
-class ButtonStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
- : FrameLayout(context, attrs, defStyle) {
+class ButtonStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
+ FrameLayout(context, attrs, defStyle) {
sealed class State {
object Button : State()
diff --git a/vector/src/main/java/im/vector/app/core/platform/LifecycleAwareLazy.kt b/vector/src/main/java/im/vector/app/core/platform/LifecycleAwareLazy.kt
new file mode 100644
index 0000000000..54add00459
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/platform/LifecycleAwareLazy.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.platform
+
+import androidx.annotation.MainThread
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+
+fun LifecycleOwner.lifecycleAwareLazy(initializer: () -> T): Lazy = LifecycleAwareLazy(this, initializer)
+
+private object UninitializedValue
+
+class LifecycleAwareLazy(
+ private val owner: LifecycleOwner,
+ initializer: () -> T
+) : Lazy, DefaultLifecycleObserver {
+
+ private var initializer: (() -> T)? = initializer
+
+ private var _value: Any? = UninitializedValue
+
+ @Suppress("UNCHECKED_CAST")
+ override val value: T
+ @MainThread
+ get() {
+ if (_value === UninitializedValue) {
+ _value = initializer!!()
+ attachToLifecycle()
+ }
+ return _value as T
+ }
+
+ override fun onDestroy(owner: LifecycleOwner) {
+ _value = UninitializedValue
+ detachFromLifecycle()
+ }
+
+ private fun attachToLifecycle() {
+ if (getLifecycleOwner().lifecycle.currentState == Lifecycle.State.DESTROYED) {
+ throw IllegalStateException("Initialization failed because lifecycle has been destroyed!")
+ }
+ getLifecycleOwner().lifecycle.addObserver(this)
+ }
+
+ private fun detachFromLifecycle() {
+ getLifecycleOwner().lifecycle.removeObserver(this)
+ }
+
+ private fun getLifecycleOwner() = when (owner) {
+ is Fragment -> owner.viewLifecycleOwner
+ else -> owner
+ }
+
+ override fun isInitialized(): Boolean = _value !== UninitializedValue
+
+ override fun toString(): String = if (isInitialized()) value.toString() else "Lazy value not initialized yet."
+}
diff --git a/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt b/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt
index 139ccc8c05..8d4c5d8950 100644
--- a/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt
@@ -24,8 +24,8 @@ import im.vector.app.R
private const val DEFAULT_MAX_HEIGHT = 200
-class MaxHeightScrollView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
- : NestedScrollView(context, attrs, defStyle) {
+class MaxHeightScrollView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
+ NestedScrollView(context, attrs, defStyle) {
var maxHeight: Int = 0
set(value) {
diff --git a/vector/src/main/java/im/vector/app/core/platform/PendingIntentCompat.kt b/vector/src/main/java/im/vector/app/core/platform/PendingIntentCompat.kt
new file mode 100644
index 0000000000..832c11888c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/platform/PendingIntentCompat.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.platform
+
+import android.app.PendingIntent
+import android.os.Build
+
+object PendingIntentCompat {
+ val FLAG_IMMUTABLE = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ PendingIntent.FLAG_IMMUTABLE
+ } else {
+ 0
+ }
+
+ val FLAG_MUTABLE = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ PendingIntent.FLAG_MUTABLE
+ } else {
+ 0
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
index 066bd165a9..a70b2d66e6 100644
--- a/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
@@ -15,15 +15,11 @@
*/
package im.vector.app.core.platform
-import androidx.annotation.CallSuper
import androidx.core.view.isGone
import androidx.core.view.isVisible
-import im.vector.app.core.di.ScreenComponent
import im.vector.app.core.extensions.hideKeyboard
import im.vector.app.databinding.ActivityBinding
-import org.matrix.android.sdk.api.session.Session
-
/**
* Simple activity with a toolbar, a waiting overlay, and a fragment container and a session.
*/
@@ -33,13 +29,6 @@ abstract class SimpleFragmentActivity : VectorBaseActivity() {
final override fun getCoordinatorLayout() = views.coordinatorLayout
- lateinit var session: Session
-
- @CallSuper
- override fun injectWith(injector: ScreenComponent) {
- session = injector.activeSessionHolder().getActiveSession()
- }
-
override fun initUiAndData() {
configureToolbar(views.toolbar)
waitingView = views.waitingView.waitingView
diff --git a/vector/src/main/java/im/vector/app/core/platform/StateView.kt b/vector/src/main/java/im/vector/app/core/platform/StateView.kt
index a935c56c51..b3d42dc38f 100755
--- a/vector/src/main/java/im/vector/app/core/platform/StateView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/StateView.kt
@@ -26,8 +26,8 @@ import im.vector.app.R
import im.vector.app.core.extensions.updateConstraintSet
import im.vector.app.databinding.ViewStateBinding
-class StateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
- : FrameLayout(context, attrs, defStyle) {
+class StateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
+ FrameLayout(context, attrs, defStyle) {
sealed class State {
object Content : State()
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index 61abbd445b..0fd660effb 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -16,6 +16,7 @@
package im.vector.app.core.platform
+import android.annotation.SuppressLint
import android.app.Activity
import android.content.Context
import android.content.res.Configuration
@@ -39,19 +40,17 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentFactory
import androidx.fragment.app.FragmentManager
import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
import androidx.viewbinding.ViewBinding
+import com.airbnb.mvrx.MavericksView
import com.bumptech.glide.util.Util
import com.google.android.material.appbar.MaterialToolbar
import com.google.android.material.snackbar.Snackbar
-import com.jakewharton.rxbinding3.view.clicks
+import dagger.hilt.android.EntryPointAccessors
import im.vector.app.BuildConfig
import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.di.DaggerScreenComponent
-import im.vector.app.core.di.HasScreenInjector
-import im.vector.app.core.di.HasVectorInjector
-import im.vector.app.core.di.ScreenComponent
-import im.vector.app.core.di.VectorComponent
+import im.vector.app.core.di.ActivityEntryPoint
import im.vector.app.core.dialogs.DialogLocker
import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
import im.vector.app.core.extensions.exhaustive
@@ -60,7 +59,8 @@ import im.vector.app.core.extensions.observeNotNull
import im.vector.app.core.extensions.registerStartForActivityResult
import im.vector.app.core.extensions.restart
import im.vector.app.core.extensions.setTextOrHide
-import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.core.extensions.singletonEntryPoint
+import im.vector.app.core.flow.throttleFirst
import im.vector.app.core.utils.toast
import im.vector.app.features.MainActivity
import im.vector.app.features.MainActivityArgs
@@ -79,16 +79,15 @@ import im.vector.app.features.settings.VectorPreferences
import im.vector.app.features.themes.ActivityOtherThemes
import im.vector.app.features.themes.ThemeUtils
import im.vector.app.receivers.DebugReceiver
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.failure.GlobalError
+import reactivecircus.flowbinding.android.view.clicks
import timber.log.Timber
-import java.util.concurrent.TimeUnit
-import kotlin.system.measureTimeMillis
+import javax.inject.Inject
-abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
+abstract class VectorBaseActivity : AppCompatActivity(), MavericksView {
/* ==========================================================================================
* View
* ========================================================================================== */
@@ -106,13 +105,12 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
protected fun VectorViewModel<*, *, T>.observeViewEvents(observer: (T) -> Unit) {
viewEvents
- .observe()
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe {
+ .stream()
+ .onEach {
hideWaitingView()
observer(it)
}
- .disposeOnDestroy()
+ .launchIn(lifecycleScope)
}
/* ==========================================================================================
@@ -121,10 +119,9 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
protected fun View.debouncedClicks(onClicked: () -> Unit) {
clicks()
- .throttleFirst(300, TimeUnit.MILLISECONDS)
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe { onClicked() }
- .disposeOnDestroy()
+ .throttleFirst(300)
+ .onEach { onClicked() }
+ .launchIn(lifecycleScope)
}
/* ==========================================================================================
@@ -135,8 +132,9 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
private lateinit var sessionListener: SessionListener
protected lateinit var bugReporter: BugReporter
private lateinit var pinLocker: PinLocker
- lateinit var rageShake: RageShake
+ @Inject
+ lateinit var rageShake: RageShake
lateinit var navigator: Navigator
private set
private lateinit var fragmentFactory: FragmentFactory
@@ -152,11 +150,8 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
// For debug only
private var debugReceiver: DebugReceiver? = null
- private val uiDisposables = CompositeDisposable()
private val restorables = ArrayList()
- private lateinit var screenComponent: ScreenComponent
-
override fun attachBaseContext(base: Context) {
val vectorConfiguration = VectorConfiguration(this)
super.attachBaseContext(vectorConfiguration.getLocalisedContext(base))
@@ -179,32 +174,22 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
return this
}
- protected fun Disposable.disposeOnDestroy() {
- uiDisposables.add(this)
- }
-
@CallSuper
override fun onCreate(savedInstanceState: Bundle?) {
Timber.i("onCreate Activity ${javaClass.simpleName}")
- val vectorComponent = getVectorComponent()
- screenComponent = DaggerScreenComponent.factory().create(vectorComponent, this)
- val timeForInjection = measureTimeMillis {
- injectWith(screenComponent)
- }
- Timber.v("Injecting dependencies into ${javaClass.simpleName} took $timeForInjection ms")
+ val singletonEntryPoint = singletonEntryPoint()
+ val activityEntryPoint = EntryPointAccessors.fromActivity(this, ActivityEntryPoint::class.java)
ThemeUtils.setActivityTheme(this, getOtherThemes())
- fragmentFactory = screenComponent.fragmentFactory()
+ fragmentFactory = activityEntryPoint.fragmentFactory()
supportFragmentManager.fragmentFactory = fragmentFactory
+ viewModelFactory = activityEntryPoint.viewModelFactory()
super.onCreate(savedInstanceState)
- viewModelFactory = screenComponent.viewModelFactory()
configurationViewModel = viewModelProvider.get(ConfigurationViewModel::class.java)
- bugReporter = screenComponent.bugReporter()
- pinLocker = screenComponent.pinLocker()
- // Shake detector
- rageShake = screenComponent.rageShake()
- navigator = screenComponent.navigator()
- activeSessionHolder = screenComponent.activeSessionHolder()
- vectorPreferences = vectorComponent.vectorPreferences()
+ bugReporter = singletonEntryPoint.bugReporter()
+ pinLocker = singletonEntryPoint.pinLocker()
+ navigator = singletonEntryPoint.navigator()
+ activeSessionHolder = singletonEntryPoint.activeSessionHolder()
+ vectorPreferences = singletonEntryPoint.vectorPreferences()
configurationViewModel.activityRestarter.observe(this) {
if (!it.hasBeenHandled) {
// Recreate the Activity because configuration has changed
@@ -216,7 +201,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
navigator.openPinCode(this, pinStartForActivityResult, PinMode.AUTH)
}
}
- sessionListener = vectorComponent.sessionListener()
+ sessionListener = singletonEntryPoint.sessionListener()
sessionListener.globalErrorLiveData.observeEvent(this) {
handleGlobalError(it)
}
@@ -267,11 +252,12 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
activeSessionHolder.getActiveSession().sessionParams.homeServerHost ?: "")
is GlobalError.CertificateError ->
handleCertificateError(globalError)
+ GlobalError.ExpiredAccount -> Unit // TODO Handle account expiration
}.exhaustive
}
private fun handleCertificateError(certificateError: GlobalError.CertificateError) {
- vectorComponent()
+ singletonEntryPoint()
.unrecognizedCertificateDialog()
.show(this,
certificateError.fingerprint,
@@ -311,8 +297,6 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
override fun onDestroy() {
super.onDestroy()
Timber.i("onDestroy Activity ${javaClass.simpleName}")
-
- uiDisposables.dispose()
}
private val pinStartForActivityResult = registerStartForActivityResult { activityResult ->
@@ -401,12 +385,6 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
bugReporter.inMultiWindowMode = isInMultiWindowMode
}
- override fun injector(): ScreenComponent {
- return screenComponent
- }
-
- protected open fun injectWith(injector: ScreenComponent) = Unit
-
protected fun createFragment(fragmentClass: Class, args: Bundle?): Fragment {
return fragmentFactory.instantiate(classLoader, fragmentClass.name).apply {
arguments = args
@@ -417,10 +395,6 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
* PRIVATE METHODS
* ========================================================================================== */
- internal fun getVectorComponent(): VectorComponent {
- return (application as HasVectorInjector).injector()
- }
-
/**
* Force to render the activity in fullscreen
*/
@@ -430,7 +404,12 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
// New API instead of SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN and SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
window.setDecorFitsSystemWindows(false)
// New API instead of SYSTEM_UI_FLAG_IMMERSIVE
- window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_SWIPE
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+ } else {
+ @SuppressLint("WrongConstant")
+ window.decorView.windowInsetsController?.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_SWIPE
+ }
// New API instead of FLAG_TRANSLUCENT_STATUS
window.statusBarColor = ContextCompat.getColor(this, im.vector.lib.attachmentviewer.R.color.half_transparent_status_bar)
// New API instead of FLAG_TRANSLUCENT_NAVIGATION
@@ -575,6 +554,8 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasSc
open fun initUiAndData() = Unit
+ override fun invalidate() = Unit
+
@StringRes
open fun getTitleRes() = -1
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
index b9b5bc8ca5..20697c6d11 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
@@ -26,31 +26,26 @@ import android.view.ViewGroup
import android.widget.FrameLayout
import androidx.annotation.CallSuper
import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
import androidx.viewbinding.ViewBinding
-import com.airbnb.mvrx.MvRx
-import com.airbnb.mvrx.MvRxView
-import com.airbnb.mvrx.MvRxViewId
+import com.airbnb.mvrx.Mavericks
+import com.airbnb.mvrx.MavericksView
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.jakewharton.rxbinding3.view.clicks
-import im.vector.app.core.di.DaggerScreenComponent
-import im.vector.app.core.di.ScreenComponent
+import dagger.hilt.android.EntryPointAccessors
+import im.vector.app.core.di.ActivityEntryPoint
+import im.vector.app.core.flow.throttleFirst
import im.vector.app.core.utils.DimensionConverter
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import reactivecircus.flowbinding.android.view.clicks
import timber.log.Timber
-import java.util.concurrent.TimeUnit
/**
- * Add MvRx capabilities to bottomsheetdialog (like BaseMvRxFragment)
+ * Add Mavericks capabilities, handle DI and bindings.
*/
-abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment(), MvRxView {
-
- private val mvrxViewIdProperty = MvRxViewId()
- final override val mvrxViewId: String by mvrxViewIdProperty
- private lateinit var screenComponent: ScreenComponent
+abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment(), MavericksView {
/* ==========================================================================================
* View
@@ -113,29 +108,19 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomShe
@CallSuper
override fun onDestroyView() {
- uiDisposables.clear()
_binding = null
super.onDestroyView()
}
@CallSuper
override fun onDestroy() {
- uiDisposables.dispose()
super.onDestroy()
}
override fun onAttach(context: Context) {
- screenComponent = DaggerScreenComponent.factory().create(vectorBaseActivity.getVectorComponent(), vectorBaseActivity)
- viewModelFactory = screenComponent.viewModelFactory()
+ val activityEntryPoint = EntryPointAccessors.fromActivity(vectorBaseActivity, ActivityEntryPoint::class.java)
+ viewModelFactory = activityEntryPoint.viewModelFactory()
super.onAttach(context)
- injectWith(screenComponent)
- }
-
- protected open fun injectWith(injector: ScreenComponent) = Unit
-
- override fun onCreate(savedInstanceState: Bundle?) {
- mvrxViewIdProperty.restoreFrom(savedInstanceState)
- super.onCreate(savedInstanceState)
}
override fun onResume() {
@@ -154,11 +139,6 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomShe
}
}
- override fun onSaveInstanceState(outState: Bundle) {
- super.onSaveInstanceState(outState)
- mvrxViewIdProperty.saveTo(outState)
- }
-
override fun onStart() {
super.onStart()
// This ensures that invalidate() is called for static screens that don't
@@ -179,18 +159,7 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomShe
}
protected fun setArguments(args: Parcelable? = null) {
- arguments = args?.let { Bundle().apply { putParcelable(MvRx.KEY_ARG, it) } }
- }
-
- /* ==========================================================================================
- * Disposable
- * ========================================================================================== */
-
- private val uiDisposables = CompositeDisposable()
-
- protected fun Disposable.disposeOnDestroyView(): Disposable {
- uiDisposables.add(this)
- return this
+ arguments = args?.let { Bundle().apply { putParcelable(Mavericks.KEY_ARG, it) } }
}
/* ==========================================================================================
@@ -199,10 +168,9 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomShe
protected fun View.debouncedClicks(onClicked: () -> Unit) {
clicks()
- .throttleFirst(300, TimeUnit.MILLISECONDS)
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe { onClicked() }
- .disposeOnDestroyView()
+ .throttleFirst(300)
+ .onEach { onClicked() }
+ .launchIn(viewLifecycleOwner.lifecycleScope)
}
/* ==========================================================================================
@@ -211,11 +179,10 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomShe
protected fun VectorViewModel<*, *, T>.observeViewEvents(observer: (T) -> Unit) {
viewEvents
- .observe()
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe {
+ .stream()
+ .onEach {
observer(it)
}
- .disposeOnDestroyView()
+ .launchIn(viewLifecycleOwner.lifecycleScope)
}
}
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index 2c9452c4fd..f4e1fe84e1 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -27,29 +27,30 @@ import android.view.ViewGroup
import androidx.annotation.CallSuper
import androidx.annotation.MainThread
import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
import androidx.viewbinding.ViewBinding
-import com.airbnb.mvrx.BaseMvRxFragment
+import com.airbnb.mvrx.MavericksView
import com.bumptech.glide.util.Util.assertMainThread
import com.google.android.material.appbar.MaterialToolbar
import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.jakewharton.rxbinding3.view.clicks
+import dagger.hilt.android.EntryPointAccessors
import im.vector.app.R
-import im.vector.app.core.di.DaggerScreenComponent
-import im.vector.app.core.di.HasScreenInjector
-import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.di.ActivityEntryPoint
import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.singletonEntryPoint
import im.vector.app.core.extensions.toMvRxBundle
+import im.vector.app.core.flow.throttleFirst
import im.vector.app.features.navigation.Navigator
import im.vector.lib.ui.styles.dialogs.MaterialProgressDialog
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import reactivecircus.flowbinding.android.view.clicks
import timber.log.Timber
-import java.util.concurrent.TimeUnit
-abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector {
+abstract class VectorBaseFragment : Fragment(), MavericksView {
protected val vectorBaseActivity: VectorBaseActivity<*> by lazy {
activity as VectorBaseActivity<*>
@@ -59,8 +60,6 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScr
* Navigator and other common objects
* ========================================================================================== */
- private lateinit var screenComponent: ScreenComponent
-
protected lateinit var navigator: Navigator
protected lateinit var errorFormatter: ErrorFormatter
protected lateinit var unrecognizedCertificateDialog: UnrecognizedCertificateDialog
@@ -94,12 +93,13 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScr
* ========================================================================================== */
override fun onAttach(context: Context) {
- screenComponent = DaggerScreenComponent.factory().create(vectorBaseActivity.getVectorComponent(), vectorBaseActivity)
- navigator = screenComponent.navigator()
- errorFormatter = screenComponent.errorFormatter()
- unrecognizedCertificateDialog = screenComponent.unrecognizedCertificateDialog()
- viewModelFactory = screenComponent.viewModelFactory()
- childFragmentManager.fragmentFactory = screenComponent.fragmentFactory()
+ val singletonEntryPoint = context.singletonEntryPoint()
+ val activityEntryPoint = EntryPointAccessors.fromActivity(vectorBaseActivity, ActivityEntryPoint::class.java)
+ navigator = singletonEntryPoint.navigator()
+ errorFormatter = singletonEntryPoint.errorFormatter()
+ unrecognizedCertificateDialog = singletonEntryPoint.unrecognizedCertificateDialog()
+ viewModelFactory = activityEntryPoint.viewModelFactory()
+ childFragmentManager.fragmentFactory = activityEntryPoint.fragmentFactory()
super.onAttach(context)
}
@@ -148,7 +148,6 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScr
@CallSuper
override fun onDestroyView() {
Timber.i("onDestroyView Fragment ${javaClass.simpleName}")
- uiDisposables.clear()
_binding = null
super.onDestroyView()
}
@@ -156,14 +155,9 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScr
@CallSuper
override fun onDestroy() {
Timber.i("onDestroy Fragment ${javaClass.simpleName}")
- uiDisposables.dispose()
super.onDestroy()
}
- override fun injector(): ScreenComponent {
- return screenComponent
- }
-
/* ==========================================================================================
* Restorable
* ========================================================================================== */
@@ -225,29 +219,18 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScr
}
}
- /* ==========================================================================================
- * Disposable
- * ========================================================================================== */
-
- private val uiDisposables = CompositeDisposable()
-
- protected fun Disposable.disposeOnDestroyView() {
- uiDisposables.add(this)
- }
-
/* ==========================================================================================
* ViewEvents
* ========================================================================================== */
protected fun VectorViewModel<*, *, T>.observeViewEvents(observer: (T) -> Unit) {
viewEvents
- .observe()
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe {
+ .stream()
+ .onEach {
dismissLoadingDialog()
observer(it)
}
- .disposeOnDestroyView()
+ .launchIn(viewLifecycleOwner.lifecycleScope)
}
/* ==========================================================================================
@@ -256,10 +239,9 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScr
protected fun View.debouncedClicks(onClicked: () -> Unit) {
clicks()
- .throttleFirst(300, TimeUnit.MILLISECONDS)
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe { onClicked() }
- .disposeOnDestroyView()
+ .throttleFirst(300)
+ .onEach { onClicked() }
+ .launchIn(viewLifecycleOwner.lifecycleScope)
}
/* ==========================================================================================
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt
index 2d499db531..9ab46557a5 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt
@@ -25,5 +25,5 @@ interface VectorSharedAction
/**
* Parent class to handle navigation events, action events, or other any events
*/
-open class VectorSharedActionViewModel(private val store: MutableDataSource = PublishDataSource())
- : ViewModel(), MutableDataSource by store
+open class VectorSharedActionViewModel(private val store: MutableDataSource = PublishDataSource()) :
+ ViewModel(), MutableDataSource by store
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt
index d6f43beaf7..c9d58f9545 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt
@@ -16,53 +16,17 @@
package im.vector.app.core.platform
-import com.airbnb.mvrx.Async
-import com.airbnb.mvrx.BaseMvRxViewModel
-import com.airbnb.mvrx.Fail
-import com.airbnb.mvrx.Loading
-import com.airbnb.mvrx.MvRxState
-import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.MavericksViewModel
import im.vector.app.core.utils.DataSource
import im.vector.app.core.utils.PublishDataSource
-import io.reactivex.Observable
-import io.reactivex.Single
-abstract class VectorViewModel
(initialState: S)
- : BaseMvRxViewModel(initialState, false) {
-
- interface Factory {
- fun create(state: S): BaseMvRxViewModel
- }
+abstract class VectorViewModel(initialState: S) :
+ MavericksViewModel(initialState) {
// Used to post transient events to the View
protected val _viewEvents = PublishDataSource()
val viewEvents: DataSource = _viewEvents
- /**
- * This method does the same thing as the execute function, but it doesn't subscribe to the stream
- * so you can use this in a switchMap or a flatMap
- */
- // False positive
- @Suppress("USELESS_CAST", "NULLABLE_TYPE_PARAMETER_AGAINST_NOT_NULL_TYPE_PARAMETER")
- fun Single.toAsync(stateReducer: S.(Async) -> S): Single> {
- setState { stateReducer(Loading()) }
- return map { Success(it) as Async }
- .onErrorReturn { Fail(it) }
- .doOnSuccess { setState { stateReducer(it) } }
- }
-
- /**
- * This method does the same thing as the execute function, but it doesn't subscribe to the stream
- * so you can use this in a switchMap or a flatMap
- */
- // False positive
- @Suppress("USELESS_CAST", "NULLABLE_TYPE_PARAMETER_AGAINST_NOT_NULL_TYPE_PARAMETER")
- fun Observable.toAsync(stateReducer: S.(Async) -> S): Observable> {
- setState { stateReducer(Loading()) }
- return map { Success(it) as Async }
- .onErrorReturn { Fail(it) }
- .doOnNext { setState { stateReducer(it) } }
- }
-
abstract fun handle(action: VA)
}
diff --git a/vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt b/vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt
new file mode 100644
index 0000000000..b57bb27671
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.preference
+
+import android.content.Context
+import android.text.Editable
+import android.util.AttributeSet
+import android.view.inputmethod.EditorInfo
+import android.widget.Button
+import android.widget.EditText
+import androidx.core.view.children
+import androidx.preference.PreferenceViewHolder
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
+import com.google.android.material.textfield.TextInputLayout
+import im.vector.app.R
+import im.vector.app.core.epoxy.addTextChangedListenerOnce
+import im.vector.app.core.platform.SimpleTextWatcher
+
+class KeywordPreference : VectorPreference {
+
+ interface Listener {
+ fun onFocusDidChange(hasFocus: Boolean)
+ fun didAddKeyword(keyword: String)
+ fun didRemoveKeyword(keyword: String)
+ }
+
+ private var keywordsEnabled = true
+ private var isCurrentKeywordValid = true
+
+ private var _keywords: LinkedHashSet = linkedSetOf()
+
+ var keywords: Set
+ get() {
+ return _keywords
+ }
+ set(value) {
+ // Updates existing `LinkedHashSet` vs assign a new set.
+ // This preserves the order added while on the screen (avoids keywords jumping around).
+ _keywords.removeAll(_keywords.filter { !value.contains(it) })
+ _keywords.addAll(value.sorted())
+ notifyChanged()
+ }
+
+ var listener: Listener? = null
+
+ constructor(context: Context) : super(context)
+
+ constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+ constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
+
+ init {
+ layoutResource = R.layout.vector_preference_chip_group
+ }
+
+ override fun setEnabled(enabled: Boolean) {
+ super.setEnabled(enabled)
+ keywordsEnabled = enabled
+ notifyChanged()
+ }
+
+ override fun onBindViewHolder(holder: PreferenceViewHolder) {
+ super.onBindViewHolder(holder)
+
+ holder.itemView.setOnClickListener(null)
+ holder.itemView.setOnLongClickListener(null)
+
+ val chipEditText = holder.findViewById(R.id.chipEditText) as? EditText ?: return
+ val chipGroup = holder.findViewById(R.id.chipGroup) as? ChipGroup ?: return
+ val addKeywordButton = holder.findViewById(R.id.addKeywordButton) as? Button ?: return
+ val chipTextInputLayout = holder.findViewById(R.id.chipTextInputLayout) as? TextInputLayout ?: return
+
+ chipEditText.text = null
+ chipGroup.removeAllViews()
+
+ keywords.forEach {
+ addChipToGroup(it, chipGroup)
+ }
+
+ chipEditText.isEnabled = keywordsEnabled
+ chipGroup.isEnabled = keywordsEnabled
+ chipGroup.children.forEach { it.isEnabled = keywordsEnabled }
+
+ chipEditText.addTextChangedListenerOnce(onTextChangeListener(chipTextInputLayout, addKeywordButton))
+ chipEditText.setOnEditorActionListener { _, actionId, _ ->
+ if (actionId != EditorInfo.IME_ACTION_DONE) {
+ return@setOnEditorActionListener false
+ }
+ return@setOnEditorActionListener addKeyword(chipEditText)
+ }
+ chipEditText.setOnFocusChangeListener { _, hasFocus ->
+ listener?.onFocusDidChange(hasFocus)
+ }
+
+ addKeywordButton.setOnClickListener {
+ addKeyword(chipEditText)
+ }
+ }
+
+ private fun addKeyword(chipEditText: EditText): Boolean {
+ val keyword = chipEditText.text.toString().trim()
+
+ if (!isCurrentKeywordValid || keyword.isEmpty()) {
+ return false
+ }
+
+ listener?.didAddKeyword(keyword)
+ onPreferenceChangeListener?.onPreferenceChange(this, _keywords)
+ notifyChanged()
+ chipEditText.text = null
+ return true
+ }
+
+ private fun onTextChangeListener(chipTextInputLayout: TextInputLayout, addKeywordButton: Button) = object : SimpleTextWatcher() {
+ override fun afterTextChanged(s: Editable) {
+ val keyword = s.toString().trim()
+ val errorMessage = when {
+ keyword.startsWith(".") -> {
+ context.getString(R.string.settings_notification_keyword_contains_dot)
+ }
+ keyword.contains("\\") -> {
+ context.getString(R.string.settings_notification_keyword_contains_invalid_character, "\\")
+ }
+ keyword.contains("/") -> {
+ context.getString(R.string.settings_notification_keyword_contains_invalid_character, "/")
+ }
+ else -> null
+ }
+
+ chipTextInputLayout.isErrorEnabled = errorMessage != null
+ chipTextInputLayout.error = errorMessage
+ val keywordValid = errorMessage == null
+ addKeywordButton.isEnabled = keywordsEnabled && keywordValid
+ this@KeywordPreference.isCurrentKeywordValid = keywordValid
+ }
+ }
+
+ private fun addChipToGroup(keyword: String, chipGroup: ChipGroup) {
+ val chip = Chip(context, null, R.attr.vctr_keyword_style)
+ chip.text = keyword
+ chipGroup.addView(chip)
+
+ chip.setOnCloseIconClickListener {
+ if (!keywordsEnabled) {
+ return@setOnCloseIconClickListener
+ }
+ listener?.didRemoveKeyword(keyword)
+ onPreferenceChangeListener?.onPreferenceChange(this, _keywords)
+ notifyChanged()
+ }
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt b/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
index 3bb50c6284..3095f98ea5 100755
--- a/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt
@@ -23,7 +23,7 @@ import android.widget.ProgressBar
import androidx.preference.Preference
import androidx.preference.PreferenceViewHolder
import im.vector.app.R
-import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.core.extensions.singletonEntryPoint
import im.vector.app.features.home.AvatarRenderer
import org.matrix.android.sdk.api.session.user.model.User
import org.matrix.android.sdk.api.util.MatrixItem
@@ -33,7 +33,7 @@ class UserAvatarPreference : Preference {
private var mAvatarView: ImageView? = null
private var mLoadingProgressBar: ProgressBar? = null
- private var avatarRenderer: AvatarRenderer = context.vectorComponent().avatarRenderer()
+ private var avatarRenderer: AvatarRenderer = context.singletonEntryPoint().avatarRenderer()
private var userItem: MatrixItem.UserItem? = null
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index 5896122393..27d6d05708 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -21,6 +21,7 @@ import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.resources.AppNameProvider
import im.vector.app.core.resources.LocaleProvider
import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.session.pushers.PushersService
import java.util.UUID
import javax.inject.Inject
import kotlin.math.abs
@@ -44,23 +45,45 @@ class PushersManager @Inject constructor(
)
}
- fun registerPusherWithFcmKey(pushKey: String): UUID {
+ fun enqueueRegisterPusherWithFcmKey(pushKey: String): UUID {
val currentSession = activeSessionHolder.getActiveSession()
- val profileTag = DEFAULT_PUSHER_FILE_TAG + "_" + abs(currentSession.myUserId.hashCode())
+ return currentSession.enqueueAddHttpPusher(createHttpPusher(pushKey))
+ }
- return currentSession.addHttpPusher(
- pushKey,
- stringProvider.getString(R.string.pusher_app_id),
- profileTag,
- localeProvider.current().language,
- appNameProvider.getAppName(),
- currentSession.sessionParams.deviceId ?: "MOBILE",
- stringProvider.getString(R.string.pusher_http_url),
- append = false,
- withEventIdOnly = true
+ suspend fun registerPusherWithFcmKey(pushKey: String) {
+ val currentSession = activeSessionHolder.getActiveSession()
+ currentSession.addHttpPusher(createHttpPusher(pushKey))
+ }
+
+ private fun createHttpPusher(pushKey: String) = PushersService.HttpPusher(
+ pushKey,
+ stringProvider.getString(R.string.pusher_app_id),
+ profileTag = DEFAULT_PUSHER_FILE_TAG + "_" + abs(activeSessionHolder.getActiveSession().myUserId.hashCode()),
+ localeProvider.current().language,
+ appNameProvider.getAppName(),
+ activeSessionHolder.getActiveSession().sessionParams.deviceId ?: "MOBILE",
+ stringProvider.getString(R.string.pusher_http_url),
+ append = false,
+ withEventIdOnly = true
+ )
+
+ suspend fun registerEmailForPush(email: String) {
+ val currentSession = activeSessionHolder.getActiveSession()
+ val appName = appNameProvider.getAppName()
+ currentSession.addEmailPusher(
+ email = email,
+ lang = localeProvider.current().language,
+ emailBranding = appName,
+ appDisplayName = appName,
+ deviceDisplayName = currentSession.sessionParams.deviceId ?: "MOBILE"
)
}
+ suspend fun unregisterEmailPusher(email: String) {
+ val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
+ currentSession.removeEmailPusher(email)
+ }
+
suspend fun unregisterPusher(pushKey: String) {
val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
currentSession.removeHttpPusher(pushKey, stringProvider.getString(R.string.pusher_app_id))
diff --git a/vector/src/main/java/im/vector/app/core/rx/RxConfig.kt b/vector/src/main/java/im/vector/app/core/rx/RxConfig.kt
deleted file mode 100644
index ab0ffb7802..0000000000
--- a/vector/src/main/java/im/vector/app/core/rx/RxConfig.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2019 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 im.vector.app.core.rx
-
-import im.vector.app.features.settings.VectorPreferences
-import io.reactivex.plugins.RxJavaPlugins
-import timber.log.Timber
-import javax.inject.Inject
-
-class RxConfig @Inject constructor(
- private val vectorPreferences: VectorPreferences
-) {
-
- /**
- * Make sure unhandled Rx error does not crash the app in production
- */
- fun setupRxPlugin() {
- RxJavaPlugins.setErrorHandler { throwable ->
- Timber.e(throwable, "RxError")
- // is InterruptedException -> fine, some blocking code was interrupted by a dispose call
- if (throwable !is InterruptedException) {
- // Avoid crash in production, except if user wants it
- if (vectorPreferences.failFast()) {
- throw throwable
- }
- }
- }
- }
-}
diff --git a/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
index f23eb07424..524ff37914 100644
--- a/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
+++ b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
@@ -62,6 +62,10 @@ class CallRingPlayerIncoming(
val ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
ringtone = RingtoneManager.getRingtone(applicationContext, ringtoneUri)
Timber.v("Play ringtone for incoming call")
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ ringtone?.isLooping = true
+ }
ringtone?.play()
}
@@ -98,13 +102,10 @@ class CallRingPlayerOutgoing(
private var player: MediaPlayer? = null
fun start() {
- val audioManager: AudioManager? = applicationContext.getSystemService()
+ applicationContext.getSystemService()?.mode = AudioManager.MODE_IN_COMMUNICATION
player?.release()
player = createPlayer()
-
- // Check if sound is enabled
- val ringerMode = audioManager?.ringerMode
- if (player != null && ringerMode == AudioManager.RINGER_MODE_NORMAL) {
+ if (player != null) {
try {
if (player?.isPlaying == false) {
player?.start()
@@ -116,8 +117,6 @@ class CallRingPlayerOutgoing(
Timber.e(failure, "## VOIP Failed to start ringing outgoing")
player = null
}
- } else {
- Timber.v("## VOIP Can't play $player ode $ringerMode")
}
}
diff --git a/vector/src/main/java/im/vector/app/core/services/CallService.kt b/vector/src/main/java/im/vector/app/core/services/CallService.kt
index d8cf8cf6b8..d194434641 100644
--- a/vector/src/main/java/im/vector/app/core/services/CallService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/CallService.kt
@@ -25,14 +25,16 @@ import android.view.KeyEvent
import androidx.core.app.NotificationManagerCompat
import androidx.core.content.ContextCompat
import androidx.media.session.MediaButtonReceiver
-import com.airbnb.mvrx.MvRx
-import im.vector.app.core.extensions.vectorComponent
+import com.airbnb.mvrx.Mavericks
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.singletonEntryPoint
import im.vector.app.features.call.CallArgs
import im.vector.app.features.call.VectorCallActivity
import im.vector.app.features.call.telecom.CallConnection
import im.vector.app.features.call.webrtc.WebRtcCall
import im.vector.app.features.call.webrtc.WebRtcCallManager
import im.vector.app.features.call.webrtc.getOpponentAsMatrixItem
+import im.vector.app.features.displayname.getBestName
import im.vector.app.features.home.AvatarRenderer
import im.vector.app.features.notifications.NotificationUtils
import im.vector.app.features.popup.IncomingCallAlert
@@ -41,23 +43,25 @@ import org.matrix.android.sdk.api.logger.LoggerTag
import org.matrix.android.sdk.api.session.room.model.call.EndCallReason
import org.matrix.android.sdk.api.util.MatrixItem
import timber.log.Timber
+import javax.inject.Inject
private val loggerTag = LoggerTag("CallService", LoggerTag.VOIP)
/**
* Foreground service to manage calls
*/
+@AndroidEntryPoint
class CallService : VectorService() {
private val connections = mutableMapOf()
- private val knownCalls = mutableSetOf()
+ private val knownCalls = mutableMapOf()
private val connectedCallIds = mutableSetOf()
- private lateinit var notificationManager: NotificationManagerCompat
- private lateinit var notificationUtils: NotificationUtils
- private lateinit var callManager: WebRtcCallManager
- private lateinit var avatarRenderer: AvatarRenderer
- private lateinit var alertManager: PopupAlertManager
+ lateinit var notificationManager: NotificationManagerCompat
+ @Inject lateinit var notificationUtils: NotificationUtils
+ @Inject lateinit var callManager: WebRtcCallManager
+ @Inject lateinit var avatarRenderer: AvatarRenderer
+ @Inject lateinit var alertManager: PopupAlertManager
private var callRingPlayerIncoming: CallRingPlayerIncoming? = null
private var callRingPlayerOutgoing: CallRingPlayerOutgoing? = null
@@ -79,10 +83,6 @@ class CallService : VectorService() {
override fun onCreate() {
super.onCreate()
notificationManager = NotificationManagerCompat.from(this)
- notificationUtils = vectorComponent().notificationUtils()
- callManager = vectorComponent().webRtcCallManager()
- avatarRenderer = vectorComponent().avatarRenderer()
- alertManager = vectorComponent().alertManager()
callRingPlayerIncoming = CallRingPlayerIncoming(applicationContext, notificationUtils)
callRingPlayerOutgoing = CallRingPlayerOutgoing(applicationContext)
}
@@ -165,7 +165,7 @@ class CallService : VectorService() {
val incomingCallAlert = IncomingCallAlert(callId,
shouldBeDisplayedIn = { activity ->
if (activity is VectorCallActivity) {
- activity.intent.getParcelableExtra(MvRx.KEY_ARG)?.callId != call.callId
+ activity.intent.getParcelableExtra(Mavericks.KEY_ARG)?.callId != call.callId
} else true
}
).apply {
@@ -190,7 +190,7 @@ class CallService : VectorService() {
} else {
notificationManager.notify(callId.hashCode(), notification)
}
- knownCalls.add(callInformation)
+ knownCalls[callId] = callInformation
}
private fun handleCallTerminated(intent: Intent) {
@@ -198,20 +198,22 @@ class CallService : VectorService() {
val endCallReason = intent.getSerializableExtra(EXTRA_END_CALL_REASON) as EndCallReason
val rejected = intent.getBooleanExtra(EXTRA_END_CALL_REJECTED, false)
alertManager.cancelAlert(callId)
- val terminatedCall = knownCalls.firstOrNull { it.callId == callId }
+ val terminatedCall = knownCalls.remove(callId)
if (terminatedCall == null) {
- Timber.tag(loggerTag.value).v("Call terminated for unknown call $callId$")
+ Timber.tag(loggerTag.value).v("Call terminated for unknown call $callId")
handleUnexpectedState(callId)
return
}
- knownCalls.remove(terminatedCall)
+ val notification = notificationUtils.buildCallEndedNotification(false)
+ val notificationId = callId.hashCode()
+ startForeground(notificationId, notification)
if (knownCalls.isEmpty()) {
+ Timber.tag(loggerTag.value).v("No more call, stop the service")
+ stopForeground(true)
mediaSession?.isActive = false
myStopSelf()
}
val wasConnected = connectedCallIds.remove(callId)
- val notification = notificationUtils.buildCallEndedNotification(terminatedCall.isVideoCall)
- notificationManager.notify(callId.hashCode(), notification)
if (!wasConnected && !terminatedCall.isOutgoing && !rejected && endCallReason != EndCallReason.ANSWERED_ELSEWHERE) {
val missedCallNotification = notificationUtils.buildCallMissedNotification(terminatedCall)
notificationManager.notify(MISSED_CALL_TAG, terminatedCall.nativeRoomId.hashCode(), missedCallNotification)
@@ -243,7 +245,7 @@ class CallService : VectorService() {
} else {
notificationManager.notify(callId.hashCode(), notification)
}
- knownCalls.add(callInformation)
+ knownCalls[callId] = callInformation
}
/**
@@ -267,18 +269,19 @@ class CallService : VectorService() {
} else {
notificationManager.notify(callId.hashCode(), notification)
}
- knownCalls.add(callInformation)
+ knownCalls[callId] = callInformation
}
private fun handleUnexpectedState(callId: String?) {
Timber.tag(loggerTag.value).v("Fallback to clear everything")
callRingPlayerIncoming?.stop()
callRingPlayerOutgoing?.stop()
- if (callId != null) {
- notificationManager.cancel(callId.hashCode())
- }
val notification = notificationUtils.buildCallEndedNotification(false)
- startForeground(DEFAULT_NOTIFICATION_ID, notification)
+ if (callId != null) {
+ startForeground(callId.hashCode(), notification)
+ } else {
+ startForeground(DEFAULT_NOTIFICATION_ID, notification)
+ }
if (knownCalls.isEmpty()) {
mediaSession?.isActive = false
myStopSelf()
@@ -294,7 +297,7 @@ class CallService : VectorService() {
callId = this.callId,
nativeRoomId = this.nativeRoomId,
opponentUserId = this.mxCall.opponentUserId,
- opponentMatrixItem = vectorComponent().activeSessionHolder().getSafeActiveSession()?.let {
+ opponentMatrixItem = singletonEntryPoint().activeSessionHolder().getSafeActiveSession()?.let {
this.getOpponentAsMatrixItem(it)
},
isVideoCall = this.mxCall.isVideoCall,
@@ -371,7 +374,7 @@ class CallService : VectorService() {
putExtra(EXTRA_END_CALL_REASON, endCallReason)
putExtra(EXTRA_END_CALL_REJECTED, rejected)
}
- ContextCompat.startForegroundService(context, intent)
+ context.startService(intent)
}
}
diff --git a/vector/src/main/java/im/vector/app/core/di/HasVectorInjector.kt b/vector/src/main/java/im/vector/app/core/services/GuardServiceStarter.kt
similarity index 80%
rename from vector/src/main/java/im/vector/app/core/di/HasVectorInjector.kt
rename to vector/src/main/java/im/vector/app/core/services/GuardServiceStarter.kt
index 79254defcc..71c6816cea 100644
--- a/vector/src/main/java/im/vector/app/core/di/HasVectorInjector.kt
+++ b/vector/src/main/java/im/vector/app/core/services/GuardServiceStarter.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 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.
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package im.vector.app.core.di
+package im.vector.app.core.services
-interface HasVectorInjector {
-
- fun injector(): VectorComponent
+interface GuardServiceStarter {
+ fun start() {}
+ fun stop() {}
}
diff --git a/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
index 2a00e94976..a6f6d8d82f 100644
--- a/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
@@ -30,13 +30,16 @@ import androidx.work.WorkManager
import androidx.work.WorkRequest
import androidx.work.Worker
import androidx.work.WorkerParameters
+import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R
-import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.core.platform.PendingIntentCompat
import im.vector.app.features.notifications.NotificationUtils
import im.vector.app.features.settings.BackgroundSyncMode
import org.matrix.android.sdk.internal.session.sync.job.SyncService
import timber.log.Timber
+import javax.inject.Inject
+@AndroidEntryPoint
class VectorSyncService : SyncService() {
companion object {
@@ -71,12 +74,7 @@ class VectorSyncService : SyncService() {
}
}
- private lateinit var notificationUtils: NotificationUtils
-
- override fun onCreate() {
- super.onCreate()
- notificationUtils = vectorComponent().notificationUtils()
- }
+ @Inject lateinit var notificationUtils: NotificationUtils
override fun getDefaultSyncDelaySeconds() = BackgroundSyncMode.DEFAULT_SYNC_DELAY_SECONDS
@@ -86,7 +84,7 @@ class VectorSyncService : SyncService() {
val notificationSubtitleRes = if (isInitialSync) {
R.string.notification_initial_sync
} else {
- R.string.notification_listening_for_events
+ R.string.notification_listening_for_notifications
}
val notification = notificationUtils.buildForegroundServiceNotification(notificationSubtitleRes, false)
startForeground(NotificationUtils.NOTIFICATION_ID_FOREGROUND_SERVICE, notification)
@@ -202,9 +200,9 @@ private fun Context.rescheduleSyncService(sessionId: String,
startService(intent)
} else {
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- PendingIntent.getForegroundService(this, 0, intent, 0)
+ PendingIntent.getForegroundService(this, 0, intent, PendingIntentCompat.FLAG_IMMUTABLE)
} else {
- PendingIntent.getService(this, 0, intent, 0)
+ PendingIntent.getService(this, 0, intent, PendingIntentCompat.FLAG_IMMUTABLE)
}
val firstMillis = System.currentTimeMillis() + syncDelaySeconds * 1000L
val alarmMgr = getSystemService()!!
diff --git a/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt b/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt
index e276e24851..ac6ced002e 100644
--- a/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt
+++ b/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt
@@ -21,7 +21,6 @@ import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.media.AudioManager
-import android.os.Build
import timber.log.Timber
import java.lang.ref.WeakReference
@@ -69,11 +68,7 @@ class WiredHeadsetStateReceiver : BroadcastReceiver() {
fun createAndRegister(context: Context, listener: HeadsetEventListener): WiredHeadsetStateReceiver {
val receiver = WiredHeadsetStateReceiver()
receiver.delegate = WeakReference(listener)
- val action = if (Build.VERSION.SDK_INT >= 21) {
- AudioManager.ACTION_HEADSET_PLUG
- } else {
- Intent.ACTION_HEADSET_PLUG
- }
+ val action = AudioManager.ACTION_HEADSET_PLUG
context.registerReceiver(receiver, IntentFilter(action))
return receiver
}
diff --git a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGeneric.kt b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGeneric.kt
index e773993b21..bd7a07c640 100644
--- a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGeneric.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGeneric.kt
@@ -26,7 +26,6 @@ import im.vector.app.core.extensions.cleanup
import im.vector.app.core.extensions.configureWith
import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
import im.vector.app.databinding.BottomSheetGenericListBinding
-
import javax.inject.Inject
/**
diff --git a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
index f0715e6bba..6e92549809 100644
--- a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
@@ -20,8 +20,8 @@ import com.airbnb.epoxy.TypedEpoxyController
/**
* Epoxy controller for generic bottom sheet actions
*/
-abstract class BottomSheetGenericController
- : TypedEpoxyController() {
+abstract class BottomSheetGenericController :
+ TypedEpoxyController() {
var listener: Listener? = null
diff --git a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericState.kt b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericState.kt
index 38c81a7ef6..0f57600b13 100644
--- a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericState.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericState.kt
@@ -16,6 +16,6 @@
package im.vector.app.core.ui.bottomsheet
-import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MavericksState
-abstract class BottomSheetGenericState : MvRxState
+abstract class BottomSheetGenericState : MavericksState
diff --git a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericViewModel.kt b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericViewModel.kt
index 6cc2c4c981..bde87a5588 100644
--- a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericViewModel.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericViewModel.kt
@@ -16,12 +16,12 @@
package im.vector.app.core.ui.bottomsheet
-import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MavericksState
import im.vector.app.core.platform.EmptyAction
import im.vector.app.core.platform.EmptyViewEvents
import im.vector.app.core.platform.VectorViewModel
-abstract class BottomSheetGenericViewModel(initialState: State) :
+abstract class BottomSheetGenericViewModel(initialState: State) :
VectorViewModel(initialState) {
override fun handle(action: EmptyAction) {
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
index eb683631fd..fe59c82ce9 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
@@ -15,6 +15,8 @@
*/
package im.vector.app.core.ui.list
+import android.graphics.Typeface
+import android.view.Gravity
import androidx.annotation.ColorInt
import androidx.annotation.DrawableRes
import com.airbnb.epoxy.EpoxyAttribute
@@ -47,6 +49,12 @@ abstract class GenericButtonItem : VectorEpoxyModel()
@DrawableRes
var iconRes: Int? = null
+ @EpoxyAttribute
+ var gravity: Int = Gravity.CENTER
+
+ @EpoxyAttribute
+ var bold: Boolean = false
+
override fun bind(holder: Holder) {
super.bind(holder)
holder.button.text = text
@@ -58,6 +66,10 @@ abstract class GenericButtonItem : VectorEpoxyModel()
holder.button.icon = null
}
+ holder.button.gravity = gravity or Gravity.CENTER_VERTICAL
+ val textStyle = if (bold) Typeface.BOLD else Typeface.NORMAL
+ holder.button.setTypeface(null, textStyle)
+
holder.button.onClick(buttonClickAction)
}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt
deleted file mode 100644
index 256f2d963e..0000000000
--- a/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2020 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 im.vector.app.core.ui.views
-
-import android.content.Context
-import android.text.SpannableString
-import android.text.method.LinkMovementMethod
-import android.text.style.ClickableSpan
-import android.util.AttributeSet
-import android.view.View
-import android.widget.RelativeLayout
-import androidx.core.view.isVisible
-import im.vector.app.R
-import im.vector.app.core.utils.tappableMatchingText
-import im.vector.app.databinding.ViewActiveConferenceViewBinding
-import im.vector.app.features.home.room.detail.RoomDetailViewState
-import im.vector.app.features.themes.ThemeUtils
-import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.widgets.model.Widget
-import org.matrix.android.sdk.api.session.widgets.model.WidgetType
-
-class ActiveConferenceView @JvmOverloads constructor(
- context: Context,
- attrs: AttributeSet? = null,
- defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
-
- interface Callback {
- fun onTapJoinAudio(jitsiWidget: Widget)
- fun onTapJoinVideo(jitsiWidget: Widget)
- fun onDelete(jitsiWidget: Widget)
- }
-
- var callback: Callback? = null
- private var jitsiWidget: Widget? = null
-
- private lateinit var views: ViewActiveConferenceViewBinding
-
- init {
- setupView()
- }
-
- private fun setupView() {
- inflate(context, R.layout.view_active_conference_view, this)
- views = ViewActiveConferenceViewBinding.bind(this)
- setBackgroundColor(ThemeUtils.getColor(context, R.attr.colorPrimary))
-
- // "voice" and "video" texts are underlined and clickable
- val voiceString = context.getString(R.string.ongoing_conference_call_voice)
- val videoString = context.getString(R.string.ongoing_conference_call_video)
-
- val fullMessage = context.getString(R.string.ongoing_conference_call, voiceString, videoString)
-
- val styledText = SpannableString(fullMessage)
- styledText.tappableMatchingText(voiceString, object : ClickableSpan() {
- override fun onClick(widget: View) {
- jitsiWidget?.let {
- callback?.onTapJoinAudio(it)
- }
- }
- })
- styledText.tappableMatchingText(videoString, object : ClickableSpan() {
- override fun onClick(widget: View) {
- jitsiWidget?.let {
- callback?.onTapJoinVideo(it)
- }
- }
- })
-
- views.activeConferenceInfo.apply {
- text = styledText
- movementMethod = LinkMovementMethod.getInstance()
- }
-
- views.deleteWidgetButton.setOnClickListener {
- jitsiWidget?.let { callback?.onDelete(it) }
- }
- }
-
- fun render(state: RoomDetailViewState) {
- val summary = state.asyncRoomSummary()
- if (summary?.membership == Membership.JOIN) {
- // We only display banner for 'live' widgets
- jitsiWidget = state.activeRoomWidgets()?.firstOrNull {
- // for now only jitsi?
- it.type == WidgetType.Jitsi
- }
-
- isVisible = jitsiWidget != null
- // if sent by me or if i can moderate?
- views.deleteWidgetButton.isVisible = state.isAllowedToManageWidgets
- } else {
- isVisible = false
- }
- }
-}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
index 97194f2c03..a3e8b3780c 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
@@ -26,6 +26,7 @@ import androidx.core.view.isGone
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import im.vector.app.R
+import im.vector.app.core.extensions.setDrawableOrHide
import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.databinding.ViewBottomSheetActionButtonBinding
import im.vector.app.features.themes.ThemeUtils
@@ -80,7 +81,7 @@ class BottomSheetActionButton @JvmOverloads constructor(
var rightIcon: Drawable? = null
set(value) {
field = value
- views.bottomSheetActionIcon.setImageDrawable(value)
+ views.bottomSheetActionIcon.setDrawableOrHide(value)
}
var tint: Int? = null
@@ -95,6 +96,12 @@ class BottomSheetActionButton @JvmOverloads constructor(
value?.let { views.bottomSheetActionTitle.setTextColor(it) }
}
+ var isBetaAction: Boolean? = null
+ set(value) {
+ field = value
+ views.bottomSheetActionBeta.isVisible = field ?: false
+ }
+
init {
inflate(context, R.layout.view_bottom_sheet_action_button, this)
views = ViewBottomSheetActionButtonBinding.bind(this)
@@ -109,6 +116,8 @@ class BottomSheetActionButton @JvmOverloads constructor(
tint = getColor(R.styleable.BottomSheetActionButton_tint, ThemeUtils.getColor(context, android.R.attr.textColor))
titleTextColor = getColor(R.styleable.BottomSheetActionButton_titleTextColor, ThemeUtils.getColor(context, R.attr.colorPrimary))
+
+ isBetaAction = getBoolean(R.styleable.BottomSheetActionButton_betaAction, false)
}
}
}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsView.kt
index d1332f18dc..2f7eecc22c 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsView.kt
@@ -18,7 +18,9 @@ package im.vector.app.core.ui.views
import android.content.Context
import android.util.AttributeSet
-import android.widget.RelativeLayout
+import android.util.TypedValue
+import android.widget.FrameLayout
+import androidx.appcompat.content.res.AppCompatResources
import im.vector.app.R
import im.vector.app.databinding.ViewCurrentCallsBinding
import im.vector.app.features.call.webrtc.WebRtcCall
@@ -29,7 +31,7 @@ class CurrentCallsView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
+) : FrameLayout(context, attrs, defStyleAttr) {
interface Callback {
fun onTapToReturnToCall()
@@ -42,25 +44,33 @@ class CurrentCallsView @JvmOverloads constructor(
inflate(context, R.layout.view_current_calls, this)
views = ViewCurrentCallsBinding.bind(this)
setBackgroundColor(ThemeUtils.getColor(context, R.attr.colorPrimary))
+ val outValue = TypedValue().also {
+ context.theme.resolveAttribute(android.R.attr.selectableItemBackground, it, true)
+ }
+ foreground = AppCompatResources.getDrawable(context, outValue.resourceId)
setOnClickListener { callback?.onTapToReturnToCall() }
}
fun render(calls: List, formattedDuration: String) {
- val connectedCalls = calls.filter {
- it.mxCall.state is CallState.Connected
- }
- val heldCalls = connectedCalls.filter {
- it.isLocalOnHold || it.remoteOnHold
- }
- if (connectedCalls.isEmpty()) return
- views.currentCallsInfo.text = if (connectedCalls.size == heldCalls.size) {
- resources.getQuantityString(R.plurals.call_only_paused, heldCalls.size, heldCalls.size)
- } else {
- if (heldCalls.isEmpty()) {
- resources.getString(R.string.call_only_active, formattedDuration)
- } else {
- resources.getQuantityString(R.plurals.call_one_active_and_other_paused, heldCalls.size, formattedDuration, heldCalls.size)
+ val tapToReturnFormat = if (calls.size == 1) {
+ val firstCall = calls.first()
+ when (firstCall.mxCall.state) {
+ is CallState.Idle,
+ is CallState.CreateOffer,
+ is CallState.LocalRinging,
+ is CallState.Dialing -> {
+ resources.getString(R.string.call_ringing)
+ }
+ is CallState.Answering -> {
+ resources.getString(R.string.call_connecting)
+ }
+ else -> {
+ resources.getString(R.string.call_one_active, formattedDuration)
+ }
}
+ } else {
+ resources.getQuantityString(R.plurals.call_active_status, calls.size, calls.size)
}
+ views.currentCallsInfo.text = resources.getString(R.string.call_tap_to_return, tapToReturnFormat)
}
}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsViewPresenter.kt b/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsViewPresenter.kt
new file mode 100644
index 0000000000..13db5ddcb3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsViewPresenter.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.ui.views
+
+import androidx.core.view.isVisible
+import im.vector.app.features.call.webrtc.WebRtcCall
+
+class CurrentCallsViewPresenter {
+
+ private var currentCallsView: CurrentCallsView? = null
+ private var currentCall: WebRtcCall? = null
+ private var calls: List = emptyList()
+
+ private val tickListener = object : WebRtcCall.Listener {
+ override fun onTick(formattedDuration: String) {
+ currentCallsView?.render(calls, formattedDuration)
+ }
+ }
+
+ fun updateCall(currentCall: WebRtcCall?, calls: List) {
+ this.currentCall?.removeListener(tickListener)
+ this.currentCall = currentCall
+ this.currentCall?.addListener(tickListener)
+ this.calls = calls
+ val hasActiveCall = calls.isNotEmpty()
+ currentCallsView?.isVisible = hasActiveCall
+ currentCallsView?.render(calls, currentCall?.formattedDuration() ?: "")
+ }
+
+ fun bind(activeCallView: CurrentCallsView, interactionListener: CurrentCallsView.Callback) {
+ this.currentCallsView = activeCallView
+ this.currentCallsView?.callback = interactionListener
+ this.currentCall?.addListener(tickListener)
+ }
+
+ fun unBind() {
+ this.currentCallsView?.callback = null
+ this.currentCall?.removeListener(tickListener)
+ currentCallsView = null
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/FailedMessagesWarningView.kt b/vector/src/main/java/im/vector/app/core/ui/views/FailedMessagesWarningView.kt
index f9518552a3..755230b5bf 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/FailedMessagesWarningView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/FailedMessagesWarningView.kt
@@ -19,7 +19,6 @@ package im.vector.app.core.ui.views
import android.content.Context
import android.util.AttributeSet
import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.isVisible
import im.vector.app.R
import im.vector.app.databinding.ViewFailedMessagesWarningBinding
@@ -49,8 +48,4 @@ class FailedMessagesWarningView @JvmOverloads constructor(
views.failedMessagesDeleteAllButton.setOnClickListener { callback?.onDeleteAllClicked() }
views.failedMessagesRetryButton.setOnClickListener { callback?.onRetryClicked() }
}
-
- fun render(hasFailedMessages: Boolean) {
- isVisible = hasFailedMessages
- }
}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt b/vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt
new file mode 100644
index 0000000000..fa1e2c1403
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/views/JoinConferenceView.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2020 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 im.vector.app.core.ui.views
+
+import android.animation.Animator
+import android.animation.ArgbEvaluator
+import android.animation.ValueAnimator
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import androidx.core.content.ContextCompat
+import im.vector.app.R
+import im.vector.app.databinding.ViewJoinConferenceBinding
+
+class JoinConferenceView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+ var views: ViewJoinConferenceBinding? = null
+ var onJoinClicked: (() -> Unit)? = null
+ var backgroundAnimator: Animator? = null
+
+ init {
+ inflate(context, R.layout.view_join_conference, this)
+ }
+
+ @SuppressLint("Recycle")
+ override fun onAttachedToWindow() {
+ super.onAttachedToWindow()
+ views = ViewJoinConferenceBinding.bind(this)
+ views?.joinConferenceButton?.setOnClickListener { onJoinClicked?.invoke() }
+ val colorFrom = ContextCompat.getColor(context, R.color.palette_element_green)
+ val colorTo = ContextCompat.getColor(context, R.color.join_conference_animated_color)
+ // Animate button color to highlight
+ backgroundAnimator = ValueAnimator.ofObject(ArgbEvaluator(), colorFrom, colorTo).apply {
+ repeatMode = ValueAnimator.REVERSE
+ repeatCount = ValueAnimator.INFINITE
+ duration = 500
+ addUpdateListener { animator ->
+ val color = animator.animatedValue as Int
+ views?.joinConferenceButton?.setBackgroundColor(color)
+ }
+ }
+ backgroundAnimator?.start()
+ }
+
+ override fun onDetachedFromWindow() {
+ super.onDetachedFromWindow()
+ views = null
+ backgroundAnimator?.cancel()
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt b/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt
index 153cac2ac7..94c1ab6576 100755
--- a/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt
@@ -25,7 +25,6 @@ import androidx.core.view.isVisible
import im.vector.app.R
import im.vector.app.core.di.DefaultSharedPreferences
import im.vector.app.databinding.ViewKeysBackupBannerBinding
-
import timber.log.Timber
/**
@@ -137,8 +136,8 @@ class KeysBackupBanner @JvmOverloads constructor(
}
private fun renderSetup(nbOfKeys: Int) {
- if (nbOfKeys == 0
- || DefaultSharedPreferences.getInstance(context).getBoolean(BANNER_SETUP_DO_NOT_SHOW_AGAIN, false)) {
+ if (nbOfKeys == 0 ||
+ DefaultSharedPreferences.getInstance(context).getBoolean(BANNER_SETUP_DO_NOT_SHOW_AGAIN, false)) {
// Do not display the setup banner if there is no keys to backup, or if the user has already closed it
isVisible = false
} else {
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/KnownCallsViewHolder.kt b/vector/src/main/java/im/vector/app/core/ui/views/KnownCallsViewHolder.kt
deleted file mode 100644
index d49cf929b6..0000000000
--- a/vector/src/main/java/im/vector/app/core/ui/views/KnownCallsViewHolder.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2020 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 im.vector.app.core.ui.views
-
-import androidx.core.view.isVisible
-import com.google.android.material.card.MaterialCardView
-import im.vector.app.core.epoxy.onClick
-import im.vector.app.features.call.utils.EglUtils
-import im.vector.app.features.call.webrtc.WebRtcCall
-import org.matrix.android.sdk.api.session.call.CallState
-import org.webrtc.RendererCommon
-import org.webrtc.SurfaceViewRenderer
-
-class KnownCallsViewHolder {
-
- private var activeCallPiP: SurfaceViewRenderer? = null
- private var currentCallsView: CurrentCallsView? = null
- private var pipWrapper: MaterialCardView? = null
- private var currentCall: WebRtcCall? = null
- private var calls: List = emptyList()
-
- private var activeCallPipInitialized = false
-
- private val tickListener = object : WebRtcCall.Listener {
- override fun onTick(formattedDuration: String) {
- currentCallsView?.render(calls, formattedDuration)
- }
- }
-
- fun updateCall(currentCall: WebRtcCall?, calls: List) {
- activeCallPiP?.let {
- this.currentCall?.detachRenderers(listOf(it))
- }
- this.currentCall?.removeListener(tickListener)
- this.currentCall = currentCall
- this.currentCall?.addListener(tickListener)
- this.calls = calls
- val hasActiveCall = currentCall?.mxCall?.state is CallState.Connected
- if (hasActiveCall) {
- val isVideoCall = currentCall?.mxCall?.isVideoCall == true
- if (isVideoCall) initIfNeeded()
- currentCallsView?.isVisible = !isVideoCall
- currentCallsView?.render(calls, currentCall?.formattedDuration() ?: "")
- pipWrapper?.isVisible = isVideoCall
- activeCallPiP?.isVisible = isVideoCall
- activeCallPiP?.let {
- currentCall?.attachViewRenderers(null, it, null)
- }
- } else {
- currentCallsView?.isVisible = false
- activeCallPiP?.isVisible = false
- pipWrapper?.isVisible = false
- activeCallPiP?.let {
- currentCall?.detachRenderers(listOf(it))
- }
- }
- }
-
- private fun initIfNeeded() {
- if (!activeCallPipInitialized && activeCallPiP != null) {
- activeCallPiP?.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL)
- EglUtils.rootEglBase?.let { eglBase ->
- activeCallPiP?.init(eglBase.eglBaseContext, null)
- activeCallPiP?.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_BALANCED)
- activeCallPiP?.setEnableHardwareScaler(true /* enabled */)
- activeCallPiP?.setZOrderMediaOverlay(true)
- activeCallPipInitialized = true
- }
- }
- }
-
- fun bind(activeCallPiP: SurfaceViewRenderer,
- activeCallView: CurrentCallsView,
- pipWrapper: MaterialCardView,
- interactionListener: CurrentCallsView.Callback) {
- this.activeCallPiP = activeCallPiP
- this.currentCallsView = activeCallView
- this.pipWrapper = pipWrapper
- this.currentCallsView?.callback = interactionListener
- pipWrapper.onClick {
- interactionListener.onTapToReturnToCall()
- }
- this.currentCall?.addListener(tickListener)
- }
-
- fun unBind() {
- activeCallPiP?.let {
- currentCall?.detachRenderers(listOf(it))
- }
- if (activeCallPipInitialized) {
- activeCallPiP?.release()
- }
- this.currentCallsView?.callback = null
- this.currentCall?.removeListener(tickListener)
- pipWrapper?.setOnClickListener(null)
- activeCallPiP = null
- currentCallsView = null
- pipWrapper = null
- }
-}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt b/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt
index 463d94b288..94809d2981 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt
@@ -30,7 +30,6 @@ import im.vector.app.core.extensions.exhaustive
import im.vector.app.core.utils.DimensionConverter
import im.vector.app.databinding.ViewNotificationAreaBinding
import im.vector.app.features.themes.ThemeUtils
-
import me.gujun.android.span.span
import me.saket.bettermovementmethod.BetterLinkMovementMethod
import org.matrix.android.sdk.api.failure.MatrixError
@@ -50,7 +49,7 @@ class NotificationAreaView @JvmOverloads constructor(
var delegate: Delegate? = null
private var state: State = State.Initial
- private lateinit var views : ViewNotificationAreaBinding
+ private lateinit var views: ViewNotificationAreaBinding
init {
setupView()
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
index 2f6c4b45cf..a984707bf7 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
@@ -35,8 +35,8 @@ import im.vector.app.databinding.ViewPasswordStrengthBarBinding
class PasswordStrengthBar @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
- defStyleAttr: Int = 0)
- : LinearLayout(context, attrs, defStyleAttr) {
+ defStyleAttr: Int = 0) :
+ LinearLayout(context, attrs, defStyleAttr) {
private val views: ViewPasswordStrengthBarBinding
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/PresenceStateImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/PresenceStateImageView.kt
new file mode 100644
index 0000000000..301f8afdc9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/views/PresenceStateImageView.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2021 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 im.vector.app.core.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.view.isVisible
+import im.vector.app.R
+import org.matrix.android.sdk.api.session.presence.model.PresenceEnum
+import org.matrix.android.sdk.api.session.presence.model.UserPresence
+
+/**
+ * Custom ImageView to dynamically render Presence state in multiple screens
+ */
+class PresenceStateImageView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyleAttr: Int = 0
+) : AppCompatImageView(context, attrs, defStyleAttr) {
+
+ fun render(showPresence: Boolean = true, userPresence: UserPresence?) {
+ isVisible = showPresence && userPresence != null
+
+ when (userPresence?.presence) {
+ PresenceEnum.ONLINE -> {
+ setImageResource(R.drawable.ic_presence_online)
+ contentDescription = context.getString(R.string.a11y_presence_online)
+ }
+ PresenceEnum.UNAVAILABLE -> {
+ setImageResource(R.drawable.ic_presence_offline)
+ contentDescription = context.getString(R.string.a11y_presence_unavailable)
+ }
+ PresenceEnum.OFFLINE -> {
+ setImageResource(R.drawable.ic_presence_offline)
+ contentDescription = context.getString(R.string.a11y_presence_offline)
+ }
+ }
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
index 02b351737e..3a79e7e328 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
@@ -37,7 +37,7 @@ class ReadReceiptsView @JvmOverloads constructor(
defStyleAttr: Int = 0
) : LinearLayout(context, attrs, defStyleAttr) {
- private val views : ViewReadReceiptsBinding
+ private val views: ViewReadReceiptsBinding
init {
setupView()
diff --git a/vector/src/main/java/im/vector/app/core/utils/CountUpTimer.kt b/vector/src/main/java/im/vector/app/core/utils/CountUpTimer.kt
index a029f4eec9..b58d0fb3f6 100644
--- a/vector/src/main/java/im/vector/app/core/utils/CountUpTimer.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/CountUpTimer.kt
@@ -16,23 +16,36 @@
package im.vector.app.core.utils
-import io.reactivex.Observable
-import java.util.concurrent.TimeUnit
+import im.vector.app.core.flow.tickerFlow
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.atomic.AtomicLong
class CountUpTimer(private val intervalInMs: Long = 1_000) {
+ private val coroutineScope = CoroutineScope(Dispatchers.Main)
private val elapsedTime: AtomicLong = AtomicLong()
private val resumed: AtomicBoolean = AtomicBoolean(false)
- private val disposable = Observable.interval(intervalInMs / 10, TimeUnit.MILLISECONDS)
- .filter { resumed.get() }
- .map { elapsedTime.addAndGet(intervalInMs / 10) }
- .filter { it % intervalInMs == 0L }
- .subscribe {
- tickListener?.onTick(it)
- }
+ init {
+ startCounter()
+ }
+
+ private fun startCounter() {
+ tickerFlow(coroutineScope, intervalInMs / 10)
+ .filter { resumed.get() }
+ .map { elapsedTime.addAndGet(intervalInMs / 10) }
+ .filter { it % intervalInMs == 0L }
+ .onEach {
+ tickListener?.onTick(it)
+ }.launchIn(coroutineScope)
+ }
var tickListener: TickListener? = null
@@ -49,7 +62,7 @@ class CountUpTimer(private val intervalInMs: Long = 1_000) {
}
fun stop() {
- disposable.dispose()
+ coroutineScope.cancel()
}
interface TickListener {
diff --git a/vector/src/main/java/im/vector/app/core/utils/DataSource.kt b/vector/src/main/java/im/vector/app/core/utils/DataSource.kt
index fc4ee330bb..f83eda68e9 100644
--- a/vector/src/main/java/im/vector/app/core/utils/DataSource.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/DataSource.kt
@@ -16,13 +16,12 @@
package im.vector.app.core.utils
-import com.jakewharton.rxrelay2.BehaviorRelay
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
interface DataSource {
- fun observe(): Observable
+ fun stream(): Flow
}
interface MutableDataSource : DataSource {
@@ -34,25 +33,17 @@ interface MutableDataSource : DataSource {
*/
open class BehaviorDataSource(private val defaultValue: T? = null) : MutableDataSource {
- private val behaviorRelay = createRelay()
+ private val mutableFlow = MutableSharedFlow(replay = 1)
val currentValue: T?
- get() = behaviorRelay.value
+ get() = mutableFlow.replayCache.firstOrNull()
- override fun observe(): Observable {
- return behaviorRelay.hide().observeOn(AndroidSchedulers.mainThread())
+ override fun stream(): Flow {
+ return mutableFlow
}
override fun post(value: T) {
- behaviorRelay.accept(value!!)
- }
-
- private fun createRelay(): BehaviorRelay {
- return if (defaultValue == null) {
- BehaviorRelay.create()
- } else {
- BehaviorRelay.createDefault(defaultValue)
- }
+ mutableFlow.tryEmit(value)
}
}
@@ -61,13 +52,13 @@ open class BehaviorDataSource(private val defaultValue: T? = null) : MutableD
*/
open class PublishDataSource : MutableDataSource {
- private val publishRelay = PublishRelay.create()
+ private val mutableFlow = MutableSharedFlow(replay = 0, extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
- override fun observe(): Observable {
- return publishRelay.hide().observeOn(AndroidSchedulers.mainThread())
+ override fun stream(): Flow {
+ return mutableFlow
}
override fun post(value: T) {
- publishRelay.accept(value!!)
+ mutableFlow.tryEmit(value)
}
}
diff --git a/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
index 7806f2603d..ad62b0fcb1 100644
--- a/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt
@@ -20,6 +20,7 @@ import android.content.Context
import android.webkit.WebView
import android.webkit.WebViewClient
import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import im.vector.app.R
/**
* Open a web view above the current activity.
@@ -38,3 +39,17 @@ fun Context.displayInWebView(url: String) {
.setPositiveButton(android.R.string.ok, null)
.show()
}
+
+fun Context.showIdentityServerConsentDialog(configuredIdentityServer: String?, policyLinkCallback: () -> Unit, consentCallBack: (() -> Unit)) {
+ MaterialAlertDialogBuilder(this)
+ .setTitle(getString(R.string.identity_server_consent_dialog_title_2, configuredIdentityServer ?: ""))
+ .setMessage(R.string.identity_server_consent_dialog_content_2)
+ .setPositiveButton(R.string.yes) { _, _ ->
+ consentCallBack.invoke()
+ }
+ .setNeutralButton(R.string.identity_server_consent_dialog_neutral_policy) { _, _ ->
+ policyLinkCallback.invoke()
+ }
+ .setNegativeButton(R.string.no, null)
+ .show()
+}
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index d0535b667f..bdaf520ba1 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -36,6 +36,7 @@ import androidx.activity.result.ActivityResultLauncher
import androidx.browser.customtabs.CustomTabColorSchemeParams
import androidx.browser.customtabs.CustomTabsIntent
import androidx.browser.customtabs.CustomTabsSession
+import androidx.core.app.ShareCompat
import androidx.core.content.FileProvider
import androidx.core.content.getSystemService
import im.vector.app.BuildConfig
@@ -297,23 +298,19 @@ fun openMedia(activity: Activity, savedMediaPath: String, mimeType: String) {
}
fun shareMedia(context: Context, file: File, mediaMimeType: String?) {
- var mediaUri: Uri? = null
- try {
- mediaUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileProvider", file)
+ val mediaUri = try {
+ FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileProvider", file)
} catch (e: Exception) {
Timber.e(e, "onMediaAction Selected File cannot be shared")
+ return
}
- if (null != mediaUri) {
- val sendIntent = Intent()
- sendIntent.action = Intent.ACTION_SEND
- // Grant temporary read permission to the content URI
- sendIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
- sendIntent.type = mediaMimeType
- sendIntent.putExtra(Intent.EXTRA_STREAM, mediaUri)
+ val sendIntent = ShareCompat.IntentBuilder(context)
+ .setType(mediaMimeType)
+ .setStream(mediaUri)
+ .getIntent()
- sendShareIntent(context, sendIntent)
- }
+ sendShareIntent(context, sendIntent)
}
fun shareText(context: Context, text: String) {
diff --git a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
index 9f1497a40a..ba396ed252 100644
--- a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
@@ -52,8 +52,7 @@ private var permissionDialogDisplayed = false
* So when the user does not grant the permission and check the box do not ask again, this boolean will be false.
* Only useful if the first boolean is false
*/
-fun ComponentActivity.registerForPermissionsResult(lambda: (allGranted: Boolean, deniedPermanently: Boolean) -> Unit)
- : ActivityResultLauncher> {
+fun ComponentActivity.registerForPermissionsResult(lambda: (allGranted: Boolean, deniedPermanently: Boolean) -> Unit): ActivityResultLauncher> {
return registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
onPermissionResult(result, lambda)
}
diff --git a/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt
index e039e0bde5..070c953a3f 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt
@@ -59,8 +59,8 @@ class SnapOnScrollListener(
}
override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
- if (behavior == Behavior.NOTIFY_ON_SCROLL_STATE_IDLE
- && newState == RecyclerView.SCROLL_STATE_IDLE) {
+ if (behavior == Behavior.NOTIFY_ON_SCROLL_STATE_IDLE &&
+ newState == RecyclerView.SCROLL_STATE_IDLE) {
maybeNotifySnapPositionChange(recyclerView)
}
}
diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index b12c1b7369..966b38828e 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -48,8 +48,8 @@ import im.vector.app.features.notifications.NotificationUtils
*/
fun isIgnoringBatteryOptimizations(context: Context): Boolean {
// no issue before Android M, battery optimisations did not exist
- return Build.VERSION.SDK_INT < Build.VERSION_CODES.M
- || context.getSystemService()?.isIgnoringBatteryOptimizations(context.packageName) == true
+ return Build.VERSION.SDK_INT < Build.VERSION_CODES.M ||
+ context.getSystemService()?.isIgnoringBatteryOptimizations(context.packageName) == true
}
fun isAirplaneModeOn(context: Context): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index 583aae260b..8e0995b426 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -24,9 +24,9 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import com.bumptech.glide.Glide
import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.di.ScreenComponent
import im.vector.app.core.error.ErrorFormatter
import im.vector.app.core.extensions.startSyncing
import im.vector.app.core.platform.VectorBaseActivity
@@ -45,10 +45,10 @@ import im.vector.app.features.signout.soft.SoftLogoutActivity
import im.vector.app.features.signout.soft.SoftLogoutActivity2
import im.vector.app.features.themes.ActivityOtherThemes
import im.vector.app.features.ui.UiStateRepository
-import kotlinx.parcelize.Parcelize
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
+import kotlinx.parcelize.Parcelize
import org.matrix.android.sdk.api.failure.GlobalError
import timber.log.Timber
import javax.inject.Inject
@@ -67,6 +67,7 @@ data class MainActivityArgs(
* This Activity, when started with argument, is also doing some cleanup when user signs out,
* clears cache, is logged out, or is soft logged out
*/
+@AndroidEntryPoint
class MainActivity : VectorBaseActivity(), UnlockedActivity {
companion object {
@@ -98,10 +99,6 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity
@Inject lateinit var pinLocker: PinLocker
@Inject lateinit var popupAlertManager: PopupAlertManager
- override fun injectWith(injector: ScreenComponent) {
- injector.inject(this)
- }
-
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
args = parseArgs()
@@ -220,20 +217,20 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity
private fun startNextActivityAndFinish(ignoreClearCredentials: Boolean = false) {
val intent = when {
- args.clearCredentials
- && !ignoreClearCredentials
- && (!args.isUserLoggedOut || args.isAccountDeactivated) -> {
+ args.clearCredentials &&
+ !ignoreClearCredentials &&
+ (!args.isUserLoggedOut || args.isAccountDeactivated) -> {
// User has explicitly asked to log out or deactivated his account
navigator.openLogin(this, null)
null
}
- args.isSoftLogout ->
+ args.isSoftLogout ->
// The homeserver has invalidated the token, with a soft logout
getSoftLogoutActivityIntent()
- args.isUserLoggedOut ->
+ args.isUserLoggedOut ->
// the homeserver has invalidated the token (password changed, device deleted, other security reasons)
SignedOutActivity.newIntent(this)
- sessionHolder.hasActiveSession() ->
+ sessionHolder.hasActiveSession() ->
// We have a session.
// Check it can be opened
if (sessionHolder.getActiveSession().isOpenable) {
@@ -242,7 +239,7 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity
// The token is still invalid
getSoftLogoutActivityIntent()
}
- else -> {
+ else -> {
// First start, or no active session
navigator.openLogin(this, null)
null
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
index c0d4669108..6c349d18dc 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
@@ -53,8 +53,8 @@ private const val ANIMATION_DURATION = 250
*/
class AttachmentTypeSelectorView(context: Context,
inflater: LayoutInflater,
- var callback: Callback?)
- : PopupWindow(context) {
+ var callback: Callback?) :
+ PopupWindow(context) {
interface Callback {
fun onTypeSelected(type: Type)
@@ -75,6 +75,7 @@ class AttachmentTypeSelectorView(context: Context,
views.attachmentStickersButton.configure(Type.STICKER)
views.attachmentAudioButton.configure(Type.AUDIO)
views.attachmentContactButton.configure(Type.CONTACT)
+ views.attachmentPollButton.configure(Type.POLL)
width = LinearLayout.LayoutParams.MATCH_PARENT
height = LinearLayout.LayoutParams.WRAP_CONTENT
animationStyle = 0
@@ -103,11 +104,12 @@ class AttachmentTypeSelectorView(context: Context,
animateWindowInCircular(anchor, contentView)
}
animateButtonIn(views.attachmentGalleryButton, ANIMATION_DURATION / 2)
- animateButtonIn(views.attachmentCameraButton, ANIMATION_DURATION / 2)
- animateButtonIn(views.attachmentFileButton, ANIMATION_DURATION / 4)
- animateButtonIn(views.attachmentAudioButton, ANIMATION_DURATION / 2)
+ animateButtonIn(views.attachmentCameraButton, ANIMATION_DURATION / 4)
+ animateButtonIn(views.attachmentFileButton, ANIMATION_DURATION / 2)
+ animateButtonIn(views.attachmentAudioButton, 0)
animateButtonIn(views.attachmentContactButton, ANIMATION_DURATION / 4)
- animateButtonIn(views.attachmentStickersButton, 0)
+ animateButtonIn(views.attachmentStickersButton, ANIMATION_DURATION / 2)
+ animateButtonIn(views.attachmentPollButton, ANIMATION_DURATION / 4)
}
override fun dismiss() {
@@ -212,6 +214,7 @@ class AttachmentTypeSelectorView(context: Context,
FILE(PERMISSIONS_EMPTY),
STICKER(PERMISSIONS_EMPTY),
AUDIO(PERMISSIONS_EMPTY),
- CONTACT(PERMISSIONS_FOR_PICKING_CONTACT)
+ CONTACT(PERMISSIONS_FOR_PICKING_CONTACT),
+ POLL(PERMISSIONS_EMPTY)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt b/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
index 0502f2b0ad..9805b6f755 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
@@ -27,9 +27,9 @@ private val listOfPreviewableMimeTypes = listOf(
fun ContentAttachmentData.isPreviewable(): Boolean {
// Preview supports image and video
- return (type == ContentAttachmentData.Type.IMAGE
- && listOfPreviewableMimeTypes.contains(getSafeMimeType() ?: ""))
- || type == ContentAttachmentData.Type.VIDEO
+ return (type == ContentAttachmentData.Type.IMAGE &&
+ listOfPreviewableMimeTypes.contains(getSafeMimeType() ?: "")) ||
+ type == ContentAttachmentData.Type.VIDEO
}
data class GroupedContentAttachmentData(
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
index 6c25f688bd..939dd9f11d 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
@@ -20,6 +20,7 @@ package im.vector.app.features.attachments.preview
import android.content.Context
import android.content.Intent
import com.google.android.material.appbar.MaterialToolbar
+import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R
import im.vector.app.core.extensions.addFragment
import im.vector.app.core.platform.ToolbarConfigurable
@@ -28,6 +29,7 @@ import im.vector.app.databinding.ActivitySimpleBinding
import im.vector.app.features.themes.ActivityOtherThemes
import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+@AndroidEntryPoint
class AttachmentsPreviewActivity : VectorBaseActivity(), ToolbarConfigurable {
companion object {
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt
index 28d617e613..0a0e700ce9 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt
@@ -20,8 +20,8 @@ package im.vector.app.features.attachments.preview
import im.vector.app.core.extensions.exhaustive
import im.vector.app.core.platform.VectorViewModel
-class AttachmentsPreviewViewModel(initialState: AttachmentsPreviewViewState)
- : VectorViewModel(initialState) {
+class AttachmentsPreviewViewModel(initialState: AttachmentsPreviewViewState) :
+ VectorViewModel(initialState) {
override fun handle(action: AttachmentsPreviewAction) {
when (action) {
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewState.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewState.kt
index cee2a7ddd7..8b8208fc4f 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewState.kt
@@ -17,14 +17,14 @@
package im.vector.app.features.attachments.preview
-import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MavericksState
import org.matrix.android.sdk.api.session.content.ContentAttachmentData
data class AttachmentsPreviewViewState(
val attachments: List,
val currentAttachmentIndex: Int = 0,
val sendImagesWithOriginalSize: Boolean = false
-) : MvRxState {
+) : MavericksState {
constructor(args: AttachmentsPreviewArgs) : this(attachments = args.attachments)
}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt
index 853f9f8997..672cde977d 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt
@@ -24,7 +24,7 @@ import org.matrix.android.sdk.api.util.MimeTypes.isMimeTypeImage
* All images are editable, expect Gif
*/
fun ContentAttachmentData.isEditable(): Boolean {
- return type == ContentAttachmentData.Type.IMAGE
- && getSafeMimeType()?.isMimeTypeImage() == true
- && getSafeMimeType() != MimeTypes.Gif
+ return type == ContentAttachmentData.Type.IMAGE &&
+ getSafeMimeType()?.isMimeTypeImage() == true &&
+ getSafeMimeType() != MimeTypes.Gif
}
diff --git a/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt b/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt
index ce23111a95..e3c9795b13 100644
--- a/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt
@@ -26,11 +26,11 @@ import androidx.browser.customtabs.CustomTabsCallback
import androidx.browser.customtabs.CustomTabsClient
import androidx.browser.customtabs.CustomTabsServiceConnection
import androidx.browser.customtabs.CustomTabsSession
-import com.airbnb.mvrx.MvRx
+import com.airbnb.mvrx.Mavericks
import com.airbnb.mvrx.viewModel
import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R
-import im.vector.app.core.di.ScreenComponent
import im.vector.app.core.extensions.addFragment
import im.vector.app.core.platform.SimpleFragmentActivity
import im.vector.app.core.utils.openUrlInChromeCustomTab
@@ -42,7 +42,8 @@ import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
import timber.log.Timber
import javax.inject.Inject
-class ReAuthActivity : SimpleFragmentActivity(), ReAuthViewModel.Factory {
+@AndroidEntryPoint
+class ReAuthActivity : SimpleFragmentActivity() {
@Parcelize
data class Args(
@@ -59,14 +60,6 @@ class ReAuthActivity : SimpleFragmentActivity(), ReAuthViewModel.Factory {
private var customTabsSession: CustomTabsSession? = null
@Inject lateinit var authenticationService: AuthenticationService
- @Inject lateinit var reAuthViewModelFactory: ReAuthViewModel.Factory
-
- override fun create(initialState: ReAuthState) = reAuthViewModelFactory.create(initialState)
-
- override fun injectWith(injector: ScreenComponent) {
- super.injectWith(injector)
- injector.inject(this)
- }
private val sharedViewModel: ReAuthViewModel by viewModel()
@@ -78,7 +71,7 @@ class ReAuthActivity : SimpleFragmentActivity(), ReAuthViewModel.Factory {
val title = intent.extras?.getString(EXTRA_REASON_TITLE) ?: getString(R.string.re_authentication_activity_title)
supportActionBar?.setTitle(title) ?: run { setTitle(title) }
-// val authArgs = intent.getParcelableExtra(MvRx.KEY_ARG)
+// val authArgs = intent.getParcelableExtra(Mavericks.KEY_ARG)
// For the sso flow we can for now only rely on the fallback flow, that handles all
// the UI, due to the sandbox nature of CCT (chrome custom tab) we cannot get much information
@@ -221,7 +214,7 @@ class ReAuthActivity : SimpleFragmentActivity(), ReAuthViewModel.Factory {
}
}
return Intent(context, ReAuthActivity::class.java).apply {
- putExtra(MvRx.KEY_ARG, Args(authType, reasonTitle, fromError.session, lastErrorCode, resultKeyStoreAlias))
+ putExtra(Mavericks.KEY_ARG, Args(authType, reasonTitle, fromError.session, lastErrorCode, resultKeyStoreAlias))
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/auth/ReAuthState.kt b/vector/src/main/java/im/vector/app/features/auth/ReAuthState.kt
index 075ef758b8..733516c691 100644
--- a/vector/src/main/java/im/vector/app/features/auth/ReAuthState.kt
+++ b/vector/src/main/java/im/vector/app/features/auth/ReAuthState.kt
@@ -16,7 +16,7 @@
package im.vector.app.features.auth
-import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MavericksState
data class ReAuthState(
val title: String? = null,
@@ -25,7 +25,7 @@ data class ReAuthState(
val ssoFallbackPageWasShown: Boolean = false,
val lastErrorCode: String? = null,
val resultKeyStoreAlias: String = ""
-) : MvRxState {
+) : MavericksState {
constructor(args: ReAuthActivity.Args) : this(
args.title,
args.session,
diff --git a/vector/src/main/java/im/vector/app/features/auth/ReAuthViewModel.kt b/vector/src/main/java/im/vector/app/features/auth/ReAuthViewModel.kt
index edbceae20f..830fd4e79d 100644
--- a/vector/src/main/java/im/vector/app/features/auth/ReAuthViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/auth/ReAuthViewModel.kt
@@ -16,13 +16,12 @@
package im.vector.app.features.auth
-import com.airbnb.mvrx.ActivityViewModelContext
-import com.airbnb.mvrx.FragmentViewModelContext
-import com.airbnb.mvrx.MvRxViewModelFactory
-import com.airbnb.mvrx.ViewModelContext
+import com.airbnb.mvrx.MavericksViewModelFactory
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
import im.vector.app.core.platform.VectorViewModel
import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
import org.matrix.android.sdk.api.session.Session
@@ -35,20 +34,11 @@ class ReAuthViewModel @AssistedInject constructor(
) : VectorViewModel