() {
+
+ override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginWebBinding {
+ return FragmentLoginWebBinding.inflate(inflater, container, false)
+ }
+
+ private var isWebViewLoaded = false
+ private var isForSessionRecovery = false
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ setupToolbar(views.loginWebToolbar)
+ }
+
+ override fun updateWithState(state: LoginViewState2) {
+ setupTitle(state)
+
+ isForSessionRecovery = state.deviceId?.isNotBlank() == true
+
+ if (!isWebViewLoaded) {
+ setupWebView(state)
+ isWebViewLoaded = true
+ }
+ }
+
+ private fun setupTitle(state: LoginViewState2) {
+ views.loginWebToolbar.title = when (state.signMode) {
+ SignMode2.SignIn -> getString(R.string.login_signin)
+ else -> getString(R.string.login_signup)
+ }
+ }
+
+ @SuppressLint("SetJavaScriptEnabled")
+ private fun setupWebView(state: LoginViewState2) {
+ views.loginWebWebView.settings.javaScriptEnabled = true
+
+ // Enable local storage to support SSO with Firefox accounts
+ views.loginWebWebView.settings.domStorageEnabled = true
+ views.loginWebWebView.settings.databaseEnabled = true
+
+ // Due to https://developers.googleblog.com/2016/08/modernizing-oauth-interactions-in-native-apps.html, we hack
+ // the user agent to bypass the limitation of Google, as a quick fix (a proper solution will be to use the SSO SDK)
+ views.loginWebWebView.settings.userAgentString = "Mozilla/5.0 Google"
+
+ // AppRTC requires third party cookies to work
+ val cookieManager = android.webkit.CookieManager.getInstance()
+
+ // clear the cookies
+ if (cookieManager == null) {
+ launchWebView(state)
+ } else {
+ if (!cookieManager.hasCookies()) {
+ launchWebView(state)
+ } else {
+ try {
+ cookieManager.removeAllCookies { launchWebView(state) }
+ } catch (e: Exception) {
+ Timber.e(e, " cookieManager.removeAllCookie() fails")
+ launchWebView(state)
+ }
+ }
+ }
+ }
+
+ private fun launchWebView(state: LoginViewState2) {
+ val url = loginViewModel.getFallbackUrl(state.signMode == SignMode2.SignIn, state.deviceId) ?: return
+
+ views.loginWebWebView.loadUrl(url)
+
+ views.loginWebWebView.webViewClient = object : WebViewClient() {
+ override fun onReceivedSslError(view: WebView, handler: SslErrorHandler,
+ error: SslError) {
+ AlertDialog.Builder(requireActivity())
+ .setMessage(R.string.ssl_could_not_verify)
+ .setPositiveButton(R.string.ssl_trust) { _, _ -> handler.proceed() }
+ .setNegativeButton(R.string.ssl_do_not_trust) { _, _ -> handler.cancel() }
+ .setOnKeyListener(DialogInterface.OnKeyListener { dialog, keyCode, event ->
+ if (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
+ handler.cancel()
+ dialog.dismiss()
+ return@OnKeyListener true
+ }
+ false
+ })
+ .setCancelable(false)
+ .show()
+ }
+
+ override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
+ super.onReceivedError(view, errorCode, description, failingUrl)
+
+ loginViewModel.handle(LoginAction2.PostViewEvent(LoginViewEvents2.OnWebLoginError(errorCode, description, failingUrl)))
+ }
+
+ override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+ super.onPageStarted(view, url, favicon)
+
+ views.loginWebToolbar.subtitle = url
+ }
+
+ override fun onPageFinished(view: WebView, url: String) {
+ // avoid infinite onPageFinished call
+ if (url.startsWith("http")) {
+ // Generic method to make a bridge between JS and the UIWebView
+ assetReader.readAssetFile("sendObject.js")?.let { view.loadUrl(it) }
+
+ if (state.signMode == SignMode2.SignIn) {
+ // The function the fallback page calls when the login is complete
+ assetReader.readAssetFile("onLogin.js")?.let { view.loadUrl(it) }
+ } else {
+ // MODE_REGISTER
+ // The function the fallback page calls when the registration is complete
+ assetReader.readAssetFile("onRegistered.js")?.let { view.loadUrl(it) }
+ }
+ }
+ }
+
+ /**
+ * Example of (formatted) url for MODE_LOGIN:
+ *
+ *
+ * js:{
+ * "action":"onLogin",
+ * "credentials":{
+ * "user_id":"@user:matrix.org",
+ * "access_token":"[ACCESS_TOKEN]",
+ * "home_server":"matrix.org",
+ * "device_id":"[DEVICE_ID]",
+ * "well_known":{
+ * "m.homeserver":{
+ * "base_url":"https://matrix.org/"
+ * }
+ * }
+ * }
+ * }
+ *
+ * @param view
+ * @param url
+ * @return
+ */
+ override fun shouldOverrideUrlLoading(view: WebView, url: String?): Boolean {
+ if (url == null) return super.shouldOverrideUrlLoading(view, url as String?)
+
+ if (url.startsWith("js:")) {
+ var json = url.substring(3)
+ var javascriptResponse: JavascriptResponse? = null
+
+ try {
+ // URL decode
+ json = URLDecoder.decode(json, "UTF-8")
+ val adapter = MoshiProvider.providesMoshi().adapter(JavascriptResponse::class.java)
+ javascriptResponse = adapter.fromJson(json)
+ } catch (e: Exception) {
+ Timber.e(e, "## shouldOverrideUrlLoading() : fromJson failed")
+ }
+
+ // succeeds to parse parameters
+ if (javascriptResponse != null) {
+ val action = javascriptResponse.action
+
+ if (state.signMode == SignMode2.SignIn) {
+ if (action == "onLogin") {
+ javascriptResponse.credentials?.let { notifyViewModel(it) }
+ }
+ } else {
+ // MODE_REGISTER
+ // check the required parameters
+ if (action == "onRegistered") {
+ javascriptResponse.credentials?.let { notifyViewModel(it) }
+ }
+ }
+ }
+ return true
+ }
+
+ return super.shouldOverrideUrlLoading(view, url)
+ }
+ }
+ }
+
+ private fun notifyViewModel(credentials: Credentials) {
+ if (isForSessionRecovery) {
+ val softLogoutViewModel: SoftLogoutViewModel by activityViewModel()
+ softLogoutViewModel.handle(SoftLogoutAction.WebLoginSuccess(credentials))
+ } else {
+ loginViewModel.handle(LoginAction2.WebLoginSuccess(credentials))
+ }
+ }
+
+ override fun resetViewModel() {
+ loginViewModel.handle(LoginAction2.ResetSignin)
+ }
+
+ override fun onBackPressed(toolbarButton: Boolean): Boolean {
+ return when {
+ toolbarButton -> super.onBackPressed(toolbarButton)
+ views.loginWebWebView.canGoBack() -> views.loginWebWebView.goBack().run { true }
+ else -> super.onBackPressed(toolbarButton)
+ }
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login2/SignMode2.kt b/vector/src/main/java/im/vector/app/features/login2/SignMode2.kt
new file mode 100644
index 0000000000..f3d59837e7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login2/SignMode2.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.features.login2
+
+enum class SignMode2 {
+ Unknown,
+
+ // Account creation
+ SignUp,
+
+ // Login
+ SignIn
+}
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedAction.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedAction.kt
new file mode 100644
index 0000000000..f108bfa886
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedAction.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.features.login2.created
+
+import android.net.Uri
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class AccountCreatedAction : VectorViewModelAction {
+ data class SetDisplayName(val displayName: String) : AccountCreatedAction()
+ data class SetAvatar(val avatarUri: Uri, val filename: String) : AccountCreatedAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
new file mode 100644
index 0000000000..861e3f9e98
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.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.features.login2.created
+
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.date.DateFormatKind
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
+import im.vector.app.core.intent.getFilenameFromUri
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.databinding.DialogBaseEditTextBinding
+import im.vector.app.databinding.FragmentLoginAccountCreatedBinding
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
+import im.vector.app.features.login2.AbstractLoginFragment2
+import im.vector.app.features.login2.LoginAction2
+import im.vector.app.features.login2.LoginActivity2
+import im.vector.app.features.login2.LoginViewState2
+import org.matrix.android.sdk.api.util.MatrixItem
+import java.util.UUID
+import javax.inject.Inject
+
+/**
+ * In this screen:
+ * - the account has been created and we propose the user to set an avatar and a display name
+ */
+class AccountCreatedFragment @Inject constructor(
+ val accountCreatedViewModelFactory: AccountCreatedViewModel.Factory,
+ private val avatarRenderer: AvatarRenderer,
+ private val dateFormatter: VectorDateFormatter,
+ private val matrixItemColorProvider: MatrixItemColorProvider,
+ colorProvider: ColorProvider
+) : AbstractLoginFragment2(),
+ GalleryOrCameraDialogHelper.Listener {
+
+ private val viewModel: AccountCreatedViewModel by fragmentViewModel()
+
+ private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+
+ override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginAccountCreatedBinding {
+ return FragmentLoginAccountCreatedBinding.inflate(inflater, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ setupClickListener()
+ setupSubmitButton()
+ observeViewEvents()
+
+ viewModel.subscribe { invalidateState(it) }
+
+ views.loginAccountCreatedTime.text = dateFormatter.format(System.currentTimeMillis(), DateFormatKind.MESSAGE_SIMPLE)
+ }
+
+ private fun observeViewEvents() {
+ viewModel.observeViewEvents {
+ when (it) {
+ is AccountCreatedViewEvents.Failure -> displayErrorDialog(it.throwable)
+ }
+ }
+ }
+
+ private fun setupClickListener() {
+ views.loginAccountCreatedMessage.setOnClickListener {
+ // Update display name
+ displayDialog()
+ }
+ views.loginAccountCreatedAvatar.setOnClickListener {
+ galleryOrCameraDialogHelper.show()
+ }
+ }
+
+ private fun displayDialog() = withState(viewModel) { state ->
+ val inflater = requireActivity().layoutInflater
+ val layout = inflater.inflate(R.layout.dialog_base_edit_text, null)
+ val views = DialogBaseEditTextBinding.bind(layout)
+ views.editText.setText(state.currentUser()?.getBestName().orEmpty())
+
+ AlertDialog.Builder(requireActivity())
+ .setTitle(R.string.settings_display_name)
+ .setView(layout)
+ .setPositiveButton(R.string.ok) { _, _ ->
+ val newName = views.editText.text.toString()
+ viewModel.handle(AccountCreatedAction.SetDisplayName(newName))
+ }
+ .setNegativeButton(R.string.cancel, null)
+ .show()
+ }
+
+ override fun onImageReady(uri: Uri?) {
+ uri ?: return
+ viewModel.handle(AccountCreatedAction.SetAvatar(
+ avatarUri = uri,
+ filename = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString())
+ )
+ }
+
+ private fun setupSubmitButton() {
+ views.loginAccountCreatedLater.setOnClickListener { terminate() }
+ views.loginAccountCreatedDone.setOnClickListener { terminate() }
+ }
+
+ private fun terminate() {
+ loginViewModel.handle(LoginAction2.Finish)
+ }
+
+ private fun invalidateState(state: AccountCreatedViewState) {
+ // Ugly hack...
+ (activity as? LoginActivity2)?.setIsLoading(state.isLoading)
+
+ views.loginAccountCreatedSubtitle.text = getString(R.string.login_account_created_subtitle, state.userId)
+
+ val user = state.currentUser()
+ if (user != null) {
+ avatarRenderer.render(user, views.loginAccountCreatedAvatar)
+ views.loginAccountCreatedMemberName.text = user.getBestName()
+ } else {
+ // Should not happen
+ views.loginAccountCreatedMemberName.text = state.userId
+ }
+
+ // User color
+ views.loginAccountCreatedMemberName
+ .setTextColor(matrixItemColorProvider.getColor(MatrixItem.UserItem(state.userId)))
+
+ views.loginAccountCreatedLater.isVisible = state.hasBeenModified.not()
+ views.loginAccountCreatedDone.isVisible = state.hasBeenModified
+ }
+
+ override fun updateWithState(state: LoginViewState2) {
+ // No op
+ }
+
+ override fun resetViewModel() {
+ // No op
+ }
+
+ override fun onBackPressed(toolbarButton: Boolean): Boolean {
+ // Just start the next Activity
+ terminate()
+ return false
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewEvents.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewEvents.kt
new file mode 100644
index 0000000000..4677e1abd5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewEvents.kt
@@ -0,0 +1,27 @@
+/*
+ * 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.features.login2.created
+
+import im.vector.app.core.platform.VectorViewEvents
+
+/**
+ * Transient events for Account Created
+ */
+sealed class AccountCreatedViewEvents : VectorViewEvents {
+ data class Failure(val throwable: Throwable) : AccountCreatedViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt
new file mode 100644
index 0000000000..1acec968b6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt
@@ -0,0 +1,115 @@
+/*
+ * 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.features.login2.created
+
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
+import timber.log.Timber
+
+class AccountCreatedViewModel @AssistedInject constructor(
+ @Assisted initialState: AccountCreatedViewState,
+ private val session: Session
+) : VectorViewModel(initialState) {
+
+ @AssistedFactory
+ interface Factory {
+ fun create(initialState: AccountCreatedViewState): AccountCreatedViewModel
+ }
+
+ companion object : MvRxViewModelFactory {
+
+ @JvmStatic
+ override fun create(viewModelContext: ViewModelContext, state: AccountCreatedViewState): AccountCreatedViewModel? {
+ val fragment: AccountCreatedFragment = (viewModelContext as FragmentViewModelContext).fragment()
+ return fragment.accountCreatedViewModelFactory.create(state)
+ }
+ }
+
+ init {
+ setState {
+ copy(
+ userId = session.myUserId
+ )
+ }
+ observeUser()
+ }
+
+ private fun observeUser() {
+ session.rx()
+ .liveUser(session.myUserId)
+ .unwrap()
+ .map {
+ if (MatrixPatterns.isUserId(it.userId)) {
+ it.toMatrixItem()
+ } else {
+ Timber.w("liveUser() has returned an invalid user: $it")
+ MatrixItem.UserItem(session.myUserId, null, null)
+ }
+ }
+ .execute {
+ copy(currentUser = it)
+ }
+ }
+
+ override fun handle(action: AccountCreatedAction) {
+ when (action) {
+ is AccountCreatedAction.SetAvatar -> handleSetAvatar(action)
+ is AccountCreatedAction.SetDisplayName -> handleSetDisplayName(action)
+ }
+ }
+
+ private fun handleSetAvatar(action: AccountCreatedAction.SetAvatar) {
+ setState { copy(isLoading = true) }
+ viewModelScope.launch {
+ val result = runCatching { session.updateAvatar(session.myUserId, action.avatarUri, action.filename) }
+ .onFailure { _viewEvents.post(AccountCreatedViewEvents.Failure(it)) }
+ setState {
+ copy(
+ isLoading = false,
+ hasBeenModified = hasBeenModified || result.isSuccess
+ )
+ }
+ }
+ }
+
+ private fun handleSetDisplayName(action: AccountCreatedAction.SetDisplayName) {
+ setState { copy(isLoading = true) }
+ viewModelScope.launch {
+ val result = runCatching { session.setDisplayName(session.myUserId, action.displayName) }
+ .onFailure { _viewEvents.post(AccountCreatedViewEvents.Failure(it)) }
+ setState {
+ copy(
+ isLoading = false,
+ hasBeenModified = hasBeenModified || result.isSuccess
+ )
+ }
+ }
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewState.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewState.kt
new file mode 100644
index 0000000000..80211b3da2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewState.kt
@@ -0,0 +1,29 @@
+/*
+ * 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.features.login2.created
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.util.MatrixItem
+
+data class AccountCreatedViewState(
+ val userId: String = "",
+ val isLoading: Boolean = false,
+ val currentUser: Async = Uninitialized,
+ val hasBeenModified: Boolean = false
+) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/login2/terms/LoginTermsFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/terms/LoginTermsFragment2.kt
new file mode 100755
index 0000000000..0be696e1c8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/login2/terms/LoginTermsFragment2.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2018 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.features.login2.terms
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.args
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.toReducedUrl
+import im.vector.app.core.utils.openUrlInChromeCustomTab
+import im.vector.app.databinding.FragmentLoginTerms2Binding
+import im.vector.app.features.login.terms.LocalizedFlowDataLoginTermsChecked
+import im.vector.app.features.login.terms.LoginTermsFragmentArgument
+import im.vector.app.features.login.terms.LoginTermsViewState
+import im.vector.app.features.login.terms.PolicyController
+import im.vector.app.features.login2.AbstractLoginFragment2
+import im.vector.app.features.login2.LoginAction2
+import im.vector.app.features.login2.LoginViewState2
+import org.matrix.android.sdk.internal.auth.registration.LocalizedFlowDataLoginTerms
+import javax.inject.Inject
+
+/**
+ * LoginTermsFragment displays the list of policies the user has to accept
+ */
+class LoginTermsFragment2 @Inject constructor(
+ private val policyController: PolicyController
+) : AbstractLoginFragment2(),
+ PolicyController.PolicyControllerListener {
+
+ private val params: LoginTermsFragmentArgument by args()
+
+ override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginTerms2Binding {
+ return FragmentLoginTerms2Binding.inflate(inflater, container, false)
+ }
+
+ private var loginTermsViewState: LoginTermsViewState = LoginTermsViewState(emptyList())
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ setupViews()
+ views.loginTermsPolicyList.configureWith(policyController)
+ policyController.listener = this
+
+ val list = ArrayList()
+
+ params.localizedFlowDataLoginTerms
+ .forEach {
+ list.add(LocalizedFlowDataLoginTermsChecked(it))
+ }
+
+ loginTermsViewState = LoginTermsViewState(list)
+ }
+
+ private fun setupViews() {
+ views.loginTermsSubmit.setOnClickListener { submit() }
+ }
+
+ override fun onDestroyView() {
+ views.loginTermsPolicyList.cleanup()
+ policyController.listener = null
+ super.onDestroyView()
+ }
+
+ private fun renderState() {
+ policyController.setData(loginTermsViewState.localizedFlowDataLoginTermsChecked)
+
+ // Button is enabled only if all checkboxes are checked
+ views.loginTermsSubmit.isEnabled = loginTermsViewState.allChecked()
+ }
+
+ override fun setChecked(localizedFlowDataLoginTerms: LocalizedFlowDataLoginTerms, isChecked: Boolean) {
+ if (isChecked) {
+ loginTermsViewState.check(localizedFlowDataLoginTerms)
+ } else {
+ loginTermsViewState.uncheck(localizedFlowDataLoginTerms)
+ }
+
+ renderState()
+ }
+
+ override fun openPolicy(localizedFlowDataLoginTerms: LocalizedFlowDataLoginTerms) {
+ localizedFlowDataLoginTerms.localizedUrl
+ ?.takeIf { it.isNotBlank() }
+ ?.let {
+ openUrlInChromeCustomTab(requireContext(), null, it)
+ }
+ }
+
+ private fun submit() {
+ loginViewModel.handle(LoginAction2.AcceptTerms)
+ }
+
+ override fun updateWithState(state: LoginViewState2) {
+ policyController.homeServer = state.homeServerUrlFromUser.toReducedUrl()
+ renderState()
+ }
+
+ override fun resetViewModel() {
+ loginViewModel.handle(LoginAction2.ResetSignup)
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt b/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt
index b549e01551..f067cd7599 100644
--- a/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/media/AttachmentProviderFactory.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.media
import im.vector.app.core.date.VectorDateFormatter
import im.vector.app.core.resources.StringProvider
+import kotlinx.coroutines.CoroutineScope
import org.matrix.android.sdk.api.session.Session
import org.matrix.android.sdk.api.session.room.Room
import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -30,24 +31,31 @@ class AttachmentProviderFactory @Inject constructor(
private val session: Session
) {
- fun createProvider(attachments: List): RoomEventsAttachmentProvider {
+ fun createProvider(attachments: List,
+ coroutineScope: CoroutineScope
+ ): RoomEventsAttachmentProvider {
return RoomEventsAttachmentProvider(
- attachments,
- imageContentRenderer,
- vectorDateFormatter,
- session.fileService(),
- stringProvider
+ attachments = attachments,
+ imageContentRenderer = imageContentRenderer,
+ dateFormatter = vectorDateFormatter,
+ fileService = session.fileService(),
+ coroutineScope = coroutineScope,
+ stringProvider = stringProvider
)
}
- fun createProvider(attachments: List, room: Room?): DataAttachmentRoomProvider {
+ fun createProvider(attachments: List,
+ room: Room?,
+ coroutineScope: CoroutineScope
+ ): DataAttachmentRoomProvider {
return DataAttachmentRoomProvider(
- attachments,
- room,
- imageContentRenderer,
- vectorDateFormatter,
- session.fileService(),
- stringProvider
+ attachments = attachments,
+ room = room,
+ imageContentRenderer = imageContentRenderer,
+ dateFormatter = vectorDateFormatter,
+ fileService = session.fileService(),
+ coroutineScope = coroutineScope,
+ stringProvider = stringProvider
)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
index 53996171a5..ca469bfbcb 100644
--- a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
@@ -31,8 +31,8 @@ import im.vector.lib.attachmentviewer.AttachmentInfo
import im.vector.lib.attachmentviewer.AttachmentSourceProvider
import im.vector.lib.attachmentviewer.ImageLoaderTarget
import im.vector.lib.attachmentviewer.VideoLoaderTarget
+import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.matrix.android.sdk.api.session.events.model.isVideoMessage
@@ -44,6 +44,7 @@ abstract class BaseAttachmentProvider(
private val attachments: List,
private val imageContentRenderer: ImageContentRenderer,
protected val fileService: FileService,
+ private val coroutineScope: CoroutineScope,
private val dateFormatter: VectorDateFormatter,
private val stringProvider: StringProvider
) : AttachmentSourceProvider {
@@ -155,7 +156,7 @@ abstract class BaseAttachmentProvider(
target.onVideoURLReady(info.uid, data.url)
} else {
target.onVideoFileLoading(info.uid)
- GlobalScope.launch(Dispatchers.Main) {
+ coroutineScope.launch(Dispatchers.IO) {
val result = runCatching {
fileService.downloadFile(
fileName = data.filename,
@@ -178,5 +179,5 @@ abstract class BaseAttachmentProvider(
// TODO("Not yet implemented")
}
- abstract fun getFileForSharing(position: Int, callback: ((File?) -> Unit))
+ abstract suspend fun getFileForSharing(position: Int): File?
}
diff --git a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
index 630433506f..31162f309f 100644
--- a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
@@ -19,10 +19,8 @@ package im.vector.app.features.media
import im.vector.app.core.date.VectorDateFormatter
import im.vector.app.core.resources.StringProvider
import im.vector.lib.attachmentviewer.AttachmentInfo
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.CoroutineScope
+import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.session.file.FileService
import org.matrix.android.sdk.api.session.room.Room
import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -35,8 +33,16 @@ class DataAttachmentRoomProvider(
imageContentRenderer: ImageContentRenderer,
dateFormatter: VectorDateFormatter,
fileService: FileService,
+ coroutineScope: CoroutineScope,
stringProvider: StringProvider
-) : BaseAttachmentProvider(attachments, imageContentRenderer, fileService, dateFormatter, stringProvider) {
+) : BaseAttachmentProvider(
+ attachments = attachments,
+ imageContentRenderer = imageContentRenderer,
+ fileService = fileService,
+ coroutineScope = coroutineScope,
+ dateFormatter = dateFormatter,
+ stringProvider = stringProvider
+) {
override fun getAttachmentInfoAt(position: Int): AttachmentInfo {
return getItem(position).let {
@@ -78,20 +84,17 @@ class DataAttachmentRoomProvider(
return room?.getTimeLineEvent(item.eventId)
}
- override fun getFileForSharing(position: Int, callback: (File?) -> Unit) {
- val item = getItem(position)
- GlobalScope.launch {
- val result = runCatching {
- fileService.downloadFile(
- fileName = item.filename,
- mimeType = item.mimeType,
- url = item.url,
- elementToDecrypt = item.elementToDecrypt
- )
- }
- withContext(Dispatchers.Main) {
- callback(result.getOrNull())
- }
- }
+ override suspend fun getFileForSharing(position: Int): File? {
+ return getItem(position)
+ .let { item ->
+ tryOrNull {
+ fileService.downloadFile(
+ fileName = item.filename,
+ mimeType = item.mimeType,
+ url = item.url,
+ elementToDecrypt = item.elementToDecrypt
+ )
+ }
+ }
}
}
diff --git a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
index fc6d5a1f22..1e0a3a2ad9 100644
--- a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
@@ -19,10 +19,8 @@ package im.vector.app.features.media
import im.vector.app.core.date.VectorDateFormatter
import im.vector.app.core.resources.StringProvider
import im.vector.lib.attachmentviewer.AttachmentInfo
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.CoroutineScope
+import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.session.events.model.toModel
import org.matrix.android.sdk.api.session.file.FileService
import org.matrix.android.sdk.api.session.room.model.message.MessageContent
@@ -41,8 +39,16 @@ class RoomEventsAttachmentProvider(
imageContentRenderer: ImageContentRenderer,
dateFormatter: VectorDateFormatter,
fileService: FileService,
+ coroutineScope: CoroutineScope,
stringProvider: StringProvider
-) : BaseAttachmentProvider(attachments, imageContentRenderer, fileService, dateFormatter, stringProvider) {
+) : BaseAttachmentProvider(
+ attachments = attachments,
+ imageContentRenderer = imageContentRenderer,
+ fileService = fileService,
+ coroutineScope = coroutineScope,
+ dateFormatter = dateFormatter,
+ stringProvider = stringProvider
+) {
override fun getAttachmentInfoAt(position: Int): AttachmentInfo {
return getItem(position).let {
@@ -121,24 +127,19 @@ class RoomEventsAttachmentProvider(
return getItem(position)
}
- override fun getFileForSharing(position: Int, callback: (File?) -> Unit) {
- getItem(position).let { timelineEvent ->
-
- val messageContent = timelineEvent.root.getClearContent().toModel()
- as? MessageWithAttachmentContent
- ?: return@let
- GlobalScope.launch {
- val result = runCatching {
- fileService.downloadFile(
- fileName = messageContent.body,
- mimeType = messageContent.mimeType,
- url = messageContent.getFileUrl(),
- elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt())
+ override suspend fun getFileForSharing(position: Int): File? {
+ return getItem(position)
+ .let { timelineEvent ->
+ timelineEvent.root.getClearContent().toModel() as? MessageWithAttachmentContent
}
- withContext(Dispatchers.Main) {
- callback(result.getOrNull())
+ ?.let { messageContent ->
+ tryOrNull {
+ fileService.downloadFile(
+ fileName = messageContent.body,
+ mimeType = messageContent.mimeType,
+ url = messageContent.getFileUrl(),
+ elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt())
+ }
}
- }
- }
}
}
diff --git a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
index c632a008ce..bc3acf3eec 100644
--- a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
@@ -28,7 +28,7 @@ import androidx.core.transition.addListener
import androidx.core.view.ViewCompat
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
-import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
import androidx.transition.Transition
import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
@@ -42,6 +42,9 @@ import im.vector.app.features.themes.ActivityOtherThemes
import im.vector.app.features.themes.ThemeUtils
import im.vector.lib.attachmentviewer.AttachmentCommands
import im.vector.lib.attachmentviewer.AttachmentViewerActivity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
import kotlinx.parcelize.Parcelize
import timber.log.Timber
import javax.inject.Inject
@@ -119,11 +122,11 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
val inMemoryData = intent.getParcelableArrayListExtra(EXTRA_IN_MEMORY_DATA)
val sourceProvider = if (inMemoryData != null) {
initialIndex = inMemoryData.indexOfFirst { it.eventId == args.eventId }.coerceAtLeast(0)
- dataSourceFactory.createProvider(inMemoryData, room)
+ dataSourceFactory.createProvider(inMemoryData, room, lifecycleScope)
} else {
val events = room?.getAttachmentMessages().orEmpty()
initialIndex = events.indexOfFirst { it.eventId == args.eventId }.coerceAtLeast(0)
- dataSourceFactory.createProvider(events)
+ dataSourceFactory.createProvider(events, lifecycleScope)
}
sourceProvider.interactionListener = this
setSourceProvider(sourceProvider)
@@ -264,9 +267,15 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
}
override fun onShareTapped() {
- currentSourceProvider?.getFileForSharing(currentPosition) { data ->
- if (data != null && lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
- shareMedia(this@VectorAttachmentViewerActivity, data, getMimeTypeFromUri(this@VectorAttachmentViewerActivity, data.toUri()))
+ lifecycleScope.launch(Dispatchers.IO) {
+ val file = currentSourceProvider?.getFileForSharing(currentPosition) ?: return@launch
+
+ withContext(Dispatchers.Main) {
+ shareMedia(
+ this@VectorAttachmentViewerActivity,
+ file,
+ getMimeTypeFromUri(this@VectorAttachmentViewerActivity, file.toUri())
+ )
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
index 80d2d8ba45..635de2ba16 100644
--- a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
@@ -25,8 +25,9 @@ import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.error.ErrorFormatter
import im.vector.app.core.files.LocalFilesHelper
+import im.vector.app.features.session.coroutineScope
+import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlinx.parcelize.Parcelize
@@ -39,6 +40,9 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
private val activeSessionHolder: ActiveSessionHolder,
private val errorFormatter: ErrorFormatter) {
+ private val sessionScope: CoroutineScope
+ get() = activeSessionHolder.getActiveSession().coroutineScope
+
@Parcelize
data class Data(
override val eventId: String,
@@ -76,7 +80,7 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
thumbnailView.isVisible = true
loadingView.isVisible = true
- GlobalScope.launch {
+ sessionScope.launch {
val result = runCatching {
activeSessionHolder.getActiveSession().fileService()
.downloadFile(
@@ -119,7 +123,7 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
thumbnailView.isVisible = true
loadingView.isVisible = true
- GlobalScope.launch {
+ sessionScope.launch {
val result = runCatching {
activeSessionHolder.getActiveSession().fileService()
.downloadFile(
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index bf8fa497ff..3abf01583c 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -54,6 +54,9 @@ import im.vector.app.features.home.room.detail.search.SearchActivity
import im.vector.app.features.home.room.detail.search.SearchArgs
import im.vector.app.features.home.room.filtered.FilteredRoomsActivity
import im.vector.app.features.invite.InviteUsersToRoomActivity
+import im.vector.app.features.login.LoginActivity
+import im.vector.app.features.login.LoginConfig
+import im.vector.app.features.login2.LoginActivity2
import im.vector.app.features.matrixto.MatrixToBottomSheet
import im.vector.app.features.media.AttachmentData
import im.vector.app.features.media.BigImageViewerActivity
@@ -99,6 +102,16 @@ class DefaultNavigator @Inject constructor(
private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider
) : Navigator {
+ override fun openLogin(context: Context, loginConfig: LoginConfig?, flags: Int) {
+ val intent = if (context.resources.getBoolean(R.bool.useLoginV2)) {
+ LoginActivity2.newIntent(context, loginConfig)
+ } else {
+ LoginActivity.newIntent(context, loginConfig)
+ }
+ intent.addFlags(flags)
+ context.startActivity(intent)
+ }
+
override fun openRoom(context: Context, roomId: String, eventId: String?, buildTask: Boolean) {
if (sessionHolder.getSafeActiveSession()?.getRoom(roomId) == null) {
fatalError("Trying to open an unknown room $roomId", vectorPreferences.failFast())
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 2302a749e7..444c48bddb 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -23,6 +23,7 @@ import android.view.View
import androidx.activity.result.ActivityResultLauncher
import androidx.core.util.Pair
import im.vector.app.features.crypto.recover.SetupMode
+import im.vector.app.features.login.LoginConfig
import im.vector.app.features.media.AttachmentData
import im.vector.app.features.pin.PinMode
import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
@@ -36,6 +37,8 @@ import org.matrix.android.sdk.api.util.MatrixItem
interface Navigator {
+ fun openLogin(context: Context, loginConfig: LoginConfig? = null, flags: Int = 0)
+
fun openRoom(context: Context, roomId: String, eventId: String? = null, buildTask: Boolean = false)
sealed class PostSwitchSpaceAction {
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index 5cdc915c81..1b72793f89 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -562,9 +562,8 @@ class NotificationUtils @Inject constructor(private val context: Context,
NotificationCompat.Action.Builder(R.drawable.vector_notification_quick_reply,
stringProvider.getString(R.string.action_quick_reply), replyPendingIntent)
.addRemoteInput(remoteInput)
- .build()?.let {
- addAction(it)
- }
+ .build()
+ .let { addAction(it) }
}
}
diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt
index 02c9c7f717..ee4e0e05b5 100644
--- a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt
@@ -26,7 +26,6 @@ import im.vector.app.core.platform.VectorBaseActivity
import im.vector.app.databinding.FragmentProgressBinding
import im.vector.app.features.home.HomeActivity
import im.vector.app.features.home.LoadingFragment
-import im.vector.app.features.login.LoginActivity
import javax.inject.Inject
class PermalinkHandlerActivity : VectorBaseActivity() {
@@ -71,9 +70,10 @@ class PermalinkHandlerActivity : VectorBaseActivity() {
}
private fun startLoginActivity() {
- val intent = LoginActivity.newIntent(this, null)
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
- startActivity(intent)
+ navigator.openLogin(
+ context = this,
+ flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+ )
finish()
}
}
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
index adc618d82e..9c55b88805 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
@@ -60,6 +60,7 @@ class PinLocker @Inject constructor(
return liveState
}
+ @Suppress("EXPERIMENTAL_API_USAGE")
private fun computeState() {
GlobalScope.launch {
val state = if (shouldBeLocked && pinCodeStore.hasEncodedPin()) {
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
index 304720dfb0..2f8e013f46 100644
--- a/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
@@ -88,6 +88,7 @@ class VectorFileLogger @Inject constructor(
}
}
+ @Suppress("EXPERIMENTAL_API_USAGE")
override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
fileHandler ?: return
GlobalScope.launch(Dispatchers.IO) {
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
index 095e250602..51dc62af8b 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
@@ -19,6 +19,7 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
import im.vector.app.core.extensions.cleanup
import im.vector.app.core.platform.VectorBaseFragment
import im.vector.app.databinding.EmojiChooserFragmentBinding
@@ -51,6 +52,8 @@ class EmojiChooserFragment @Inject constructor(
}
}
+ override fun getCoroutineScope() = lifecycleScope
+
override fun firstVisibleSectionChange(section: Int) {
viewModel.setCurrentSection(section)
}
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt
index 92bc21be25..45d26e81eb 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt
@@ -31,8 +31,8 @@ import androidx.transition.AutoTransition
import androidx.transition.TransitionManager
import im.vector.app.R
import im.vector.app.features.reactions.data.EmojiDataSource
+import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import javax.inject.Inject
import kotlin.math.abs
@@ -221,7 +221,7 @@ class EmojiRecyclerAdapter @Inject constructor(
}
override fun getItemCount() = dataSource.rawData.categories
- .sumBy { emojiCategory -> 1 /* Section */ + emojiCategory.emojis.size }
+ .sumOf { emojiCategory -> 1 /* Section */ + emojiCategory.emojis.size }
abstract class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
abstract fun bind(s: String?)
@@ -278,6 +278,7 @@ class EmojiRecyclerAdapter @Inject constructor(
}
interface InteractionListener {
+ fun getCoroutineScope(): CoroutineScope
fun firstVisibleSectionChange(section: Int)
}
@@ -323,11 +324,11 @@ class EmojiRecyclerAdapter @Inject constructor(
// Log.i("SCROLL SPEED","scroll speed $dy")
isFastScroll = abs(dy) > 50
val visible = (recyclerView.layoutManager as GridLayoutManager).findFirstCompletelyVisibleItemPosition()
- GlobalScope.launch {
+ interactionListener?.getCoroutineScope()?.launch {
val section = getSectionForAbsoluteIndex(visible)
if (section != currentFirstVisibleSection) {
currentFirstVisibleSection = section
- GlobalScope.launch(Dispatchers.Main) {
+ interactionListener?.getCoroutineScope()?.launch(Dispatchers.Main) {
interactionListener?.firstVisibleSectionChange(currentFirstVisibleSection)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt
index 8c510f568a..ac015ad1f0 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt
@@ -45,19 +45,20 @@ class EmojiSearchResultController @Inject constructor(
override fun buildModels(data: EmojiSearchResultViewState?) {
val results = data?.results ?: return
+ val host = this
if (results.isEmpty()) {
if (data.query.isEmpty()) {
// display 'Type something to find'
genericFooterItem {
id("type.query.item")
- text(stringProvider.getString(R.string.reaction_search_type_hint))
+ text(host.stringProvider.getString(R.string.reaction_search_type_hint))
}
} else {
// Display no search Results
genericFooterItem {
id("no.results.item")
- text(stringProvider.getString(R.string.no_result_placeholder))
+ text(host.stringProvider.getString(R.string.no_result_placeholder))
}
}
} else {
@@ -66,9 +67,9 @@ class EmojiSearchResultController @Inject constructor(
emojiSearchResultItem {
id(it.name)
emojiItem(it)
- emojiTypeFace(emojiTypeface)
+ emojiTypeFace(host.emojiTypeface)
currentQuery(data.query)
- onClickListener(listener)
+ onClickListener(host.listener)
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
index b71b494948..32c87bffd4 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt
@@ -42,6 +42,7 @@ class PublicRoomsController @Inject constructor(private val stringProvider: Stri
var callback: Callback? = null
override fun buildModels(viewState: PublicRoomsViewState) {
+ val host = this
val publicRooms = viewState.publicRooms
val unknownRoomItem = viewState.buildUnknownRoomIfNeeded()
@@ -51,7 +52,7 @@ class PublicRoomsController @Inject constructor(private val stringProvider: Stri
// No result
noResultItem {
id("noResult")
- text(stringProvider.getString(R.string.no_result_placeholder))
+ text(host.stringProvider.getString(R.string.no_result_placeholder))
}
} else {
publicRooms.forEach {
@@ -71,7 +72,7 @@ class PublicRoomsController @Inject constructor(private val stringProvider: Stri
}
onVisibilityStateChanged { _, _, visibilityState ->
if (visibilityState == VisibilityState.VISIBLE) {
- callback?.loadMore()
+ host.callback?.loadMore()
}
}
}
@@ -81,15 +82,16 @@ class PublicRoomsController @Inject constructor(private val stringProvider: Stri
if (viewState.asyncPublicRoomsRequest is Fail) {
errorWithRetryItem {
id("error")
- text(errorFormatter.toHumanReadable(viewState.asyncPublicRoomsRequest.error))
- listener { callback?.loadMore() }
+ text(host.errorFormatter.toHumanReadable(viewState.asyncPublicRoomsRequest.error))
+ listener { host.callback?.loadMore() }
}
}
}
private fun buildPublicRoom(publicRoom: PublicRoom, viewState: PublicRoomsViewState) {
+ val host = this
publicRoomItem {
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
id(publicRoom.roomId)
matrixItem(publicRoom.toMatrixItem())
roomAlias(publicRoom.getPrimaryAlias())
@@ -107,10 +109,10 @@ class PublicRoomsController @Inject constructor(private val stringProvider: Stri
joinState(joinState)
joinListener {
- callback?.onPublicRoomJoin(publicRoom)
+ host.callback?.onPublicRoomJoin(publicRoom)
}
globalListener {
- callback?.onPublicRoomClicked(publicRoom, joinState)
+ host.callback?.onPublicRoomClicked(publicRoom, joinState)
}
}
}
@@ -124,13 +126,14 @@ class PublicRoomsController @Inject constructor(private val stringProvider: Stri
isRoomId -> MatrixItem.RoomItem(roomIdOrAlias)
else -> null
}
+ val host = this@PublicRoomsController
return roomItem?.let {
UnknownRoomItem_().apply {
id(roomIdOrAlias)
matrixItem(it)
- avatarRenderer(this@PublicRoomsController.avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
globalListener {
- callback?.onUnknownRoomClicked(roomIdOrAlias)
+ host.callback?.onUnknownRoomClicked(roomIdOrAlias)
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
index fba3d4514c..03c98d249c 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
@@ -49,12 +49,13 @@ class CreateRoomController @Inject constructor(
private fun buildForm(viewState: CreateRoomViewState, enableFormElement: Boolean) {
val enableNonSimplifiedMode = !vectorPreferences.simplifiedMode()
+ val host = this
formEditableAvatarItem {
id("avatar")
enabled(enableFormElement)
imageUri(viewState.avatarUri)
- clickListener { listener?.onAvatarChange() }
- deleteListener { listener?.onAvatarDelete() }
+ clickListener { host.listener?.onAvatarChange() }
+ deleteListener { host.listener?.onAvatarDelete() }
}
settingsSectionTitleItem {
id("nameSection")
@@ -64,10 +65,10 @@ class CreateRoomController @Inject constructor(
id("name")
enabled(enableFormElement)
value(viewState.roomName)
- hint(stringProvider.getString(R.string.create_room_name_hint))
+ hint(host.stringProvider.getString(R.string.create_room_name_hint))
onTextChange { text ->
- listener?.onNameChange(text)
+ host.listener?.onNameChange(text)
}
}
settingsSectionTitleItem {
@@ -78,10 +79,10 @@ class CreateRoomController @Inject constructor(
id("topic")
enabled(enableFormElement)
value(viewState.roomTopic)
- hint(stringProvider.getString(R.string.create_room_topic_hint))
+ hint(host.stringProvider.getString(R.string.create_room_topic_hint))
onTextChange { text ->
- listener?.onTopicChange(text)
+ host.listener?.onTopicChange(text)
}
}
// Following settings are for advanced users only
@@ -93,13 +94,13 @@ class CreateRoomController @Inject constructor(
formSwitchItem {
id("public")
enabled(enableFormElement)
- title(stringProvider.getString(R.string.create_room_public_title))
- summary(stringProvider.getString(R.string.create_room_public_description))
+ title(host.stringProvider.getString(R.string.create_room_public_title))
+ summary(host.stringProvider.getString(R.string.create_room_public_description))
switchChecked(viewState.roomVisibilityType is CreateRoomViewState.RoomVisibilityType.Public)
showDivider(viewState.roomVisibilityType !is CreateRoomViewState.RoomVisibilityType.Public)
listener { value ->
- listener?.setIsPublic(value)
+ host.listener?.setIsPublic(value)
}
}
if (viewState.roomVisibilityType is CreateRoomViewState.RoomVisibilityType.Public) {
@@ -110,11 +111,11 @@ class CreateRoomController @Inject constructor(
value(viewState.roomVisibilityType.aliasLocalPart)
homeServer(":" + viewState.homeServerName)
errorMessage(
- roomAliasErrorFormatter.format(
+ host.roomAliasErrorFormatter.format(
(((viewState.asyncCreateRoomRequest as? Fail)?.error) as? CreateRoomFailure.AliasError)?.aliasError)
)
onTextChange { value ->
- listener?.setAliasLocalPart(value)
+ host.listener?.setAliasLocalPart(value)
}
}
} else {
@@ -122,36 +123,36 @@ class CreateRoomController @Inject constructor(
formSwitchItem {
id("encryption")
enabled(enableFormElement)
- title(stringProvider.getString(R.string.create_room_encryption_title))
+ title(host.stringProvider.getString(R.string.create_room_encryption_title))
summary(
if (viewState.hsAdminHasDisabledE2E) {
- stringProvider.getString(R.string.settings_hs_admin_e2e_disabled)
+ host.stringProvider.getString(R.string.settings_hs_admin_e2e_disabled)
} else {
- stringProvider.getString(R.string.create_room_encryption_description)
+ host.stringProvider.getString(R.string.create_room_encryption_description)
}
)
switchChecked(viewState.isEncrypted)
listener { value ->
- listener?.setIsEncrypted(value)
+ host.listener?.setIsEncrypted(value)
}
}
}
formAdvancedToggleItem {
id("showAdvanced")
- title(stringProvider.getString(if (viewState.showAdvanced) R.string.hide_advanced else R.string.show_advanced))
+ title(host.stringProvider.getString(if (viewState.showAdvanced) R.string.hide_advanced else R.string.show_advanced))
expanded(!viewState.showAdvanced)
- listener { listener?.toggleShowAdvanced() }
+ listener { host.listener?.toggleShowAdvanced() }
}
if (viewState.showAdvanced) {
formSwitchItem {
id("federation")
enabled(enableFormElement)
- title(stringProvider.getString(R.string.create_room_disable_federation_title, viewState.homeServerName))
- summary(stringProvider.getString(R.string.create_room_disable_federation_description))
+ title(host.stringProvider.getString(R.string.create_room_disable_federation_title, viewState.homeServerName))
+ summary(host.stringProvider.getString(R.string.create_room_disable_federation_description))
switchChecked(viewState.disableFederation)
showDivider(false)
- listener { value -> listener?.setDisableFederation(value) }
+ listener { value -> host.listener?.setDisableFederation(value) }
}
}
}
@@ -159,7 +160,7 @@ class CreateRoomController @Inject constructor(
id("submit")
enabled(enableFormElement)
buttonTitleId(R.string.create_room_action_create)
- buttonClickListener { listener?.submit() }
+ buttonClickListener { host.listener?.submit() }
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
index 2dd3b509a8..75e9807bd0 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
@@ -38,6 +38,7 @@ class RoomDirectoryPickerController @Inject constructor(private val stringProvid
var index = 0
override fun buildModels(viewState: RoomDirectoryPickerViewState) {
+ val host = this
val asyncThirdPartyProtocol = viewState.asyncThirdPartyRequest
when (asyncThirdPartyProtocol) {
@@ -56,24 +57,25 @@ class RoomDirectoryPickerController @Inject constructor(private val stringProvid
is Fail -> {
errorWithRetryItem {
id("error")
- text(errorFormatter.toHumanReadable(asyncThirdPartyProtocol.error))
- listener { callback?.retry() }
+ text(host.errorFormatter.toHumanReadable(asyncThirdPartyProtocol.error))
+ listener { host.callback?.retry() }
}
}
}
}
private fun buildDirectory(roomDirectoryData: RoomDirectoryData) {
+ val host = this
roomDirectoryItem {
- id(index++)
+ id(host.index++)
directoryName(roomDirectoryData.displayName)
val description = when {
roomDirectoryData.includeAllNetworks ->
- stringProvider.getString(R.string.directory_server_all_rooms_on_server, roomDirectoryData.displayName)
+ host.stringProvider.getString(R.string.directory_server_all_rooms_on_server, roomDirectoryData.displayName)
"Matrix" == roomDirectoryData.displayName ->
- stringProvider.getString(R.string.directory_server_native_rooms, roomDirectoryData.displayName)
+ host.stringProvider.getString(R.string.directory_server_native_rooms, roomDirectoryData.displayName)
else ->
null
}
@@ -83,7 +85,7 @@ class RoomDirectoryPickerController @Inject constructor(private val stringProvid
includeAllNetworks(roomDirectoryData.includeAllNetworks)
globalListener {
- callback?.onRoomDirectoryClicked(roomDirectoryData)
+ host.callback?.onRoomDirectoryClicked(roomDirectoryData)
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
index a692eebe40..88a0518cf9 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -99,6 +99,7 @@ class RoomMemberProfileController @Inject constructor(
private fun buildSecuritySection(state: RoomMemberProfileViewState) {
// Security
buildProfileSection(stringProvider.getString(R.string.room_profile_section_security))
+ val host = this
if (state.isRoomEncrypted) {
if (state.userMXCrossSigningInfo != null) {
@@ -152,7 +153,7 @@ class RoomMemberProfileController @Inject constructor(
genericFooterItem {
id("verify_footer")
- text(stringProvider.getString(R.string.room_profile_encrypted_subtitle))
+ text(host.stringProvider.getString(R.string.room_profile_encrypted_subtitle))
centered(false)
}
}
@@ -170,7 +171,7 @@ class RoomMemberProfileController @Inject constructor(
} else {
genericFooterItem {
id("verify_footer_not_encrypted")
- text(stringProvider.getString(R.string.room_profile_not_encrypted_subtitle))
+ text(host.stringProvider.getString(R.string.room_profile_not_encrypted_subtitle))
centered(false)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
index e0730d55f1..48eaa7ba6f 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
@@ -50,16 +50,15 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
var interactionListener: InteractionListener? = null
override fun buildModels(data: DeviceListViewState?) {
- if (data == null) {
- return
- }
+ data ?: return
+ val host = this
when (data.cryptoDevices) {
Uninitialized -> {
}
is Loading -> {
loadingItem {
id("loading")
- loadingText(stringProvider.getString(R.string.loading))
+ loadingText(host.stringProvider.getString(R.string.loading))
}
}
is Success -> {
@@ -77,11 +76,11 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
style(ItemStyle.BIG_TEXT)
titleIconResourceId(if (allGreen) R.drawable.ic_shield_trusted else R.drawable.ic_shield_warning)
title(
- stringProvider.getString(
+ host.stringProvider.getString(
if (allGreen) R.string.verification_profile_verified else R.string.verification_profile_warning
)
)
- description(stringProvider.getString(R.string.verification_conclusion_ok_notice))
+ description(host.stringProvider.getString(R.string.verification_conclusion_ok_notice))
}
if (vectorPreferences.developerMode()) {
@@ -92,13 +91,13 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
genericItem {
id("sessions")
style(ItemStyle.BIG_TEXT)
- title(stringProvider.getString(R.string.room_member_profile_sessions_section_title))
+ title(host.stringProvider.getString(R.string.room_member_profile_sessions_section_title))
}
if (deviceList.isEmpty()) {
// Can this really happen?
genericFooterItem {
id("empty")
- text(stringProvider.getString(R.string.search_no_results))
+ text(host.stringProvider.getString(R.string.search_no_results))
}
} else {
// Build list of device with status
@@ -107,14 +106,14 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
id(device.deviceId)
titleIconResourceId(if (device.isVerified) R.drawable.ic_shield_trusted else R.drawable.ic_shield_warning)
apply {
- if (vectorPreferences.developerMode()) {
+ if (host.vectorPreferences.developerMode()) {
val seq = span {
+(device.displayName() ?: device.deviceId)
+"\n"
span {
text = "(${device.deviceId})"
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
- textSize = dimensionConverter.spToPx(14)
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+ textSize = host.dimensionConverter.spToPx(14)
}
}
title(seq)
@@ -123,17 +122,17 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
}
}
value(
- stringProvider.getString(
+ host.stringProvider.getString(
if (device.isVerified) R.string.trusted else R.string.not_trusted
)
)
valueColorInt(
- colorProvider.getColor(
+ host.colorProvider.getColor(
if (device.isVerified) R.color.riotx_positive_accent else R.color.riotx_destructive_accent
)
)
itemClickAction(View.OnClickListener {
- interactionListener?.onDeviceSelected(device)
+ host.interactionListener?.onDeviceSelected(device)
})
}
}
@@ -142,7 +141,7 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
is Fail -> {
errorWithRetryItem {
id("error")
- text(stringProvider.getString(R.string.room_member_profile_failed_to_get_devices))
+ text(host.stringProvider.getString(R.string.room_member_profile_failed_to_get_devices))
listener {
// TODO
}
@@ -152,6 +151,7 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
}
private fun addDebugInfo(data: DeviceListViewState) {
+ val host = this
data.memberCrossSigningKey?.masterKey()?.let {
genericItemWithValue {
id("msk")
@@ -161,8 +161,8 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
+"Master Key:\n"
span {
text = it.unpaddedBase64PublicKey ?: ""
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
- textSize = dimensionConverter.spToPx(12)
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+ textSize = host.dimensionConverter.spToPx(12)
}
}
)
@@ -177,8 +177,8 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
+"User Key:\n"
span {
text = it.unpaddedBase64PublicKey ?: ""
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
- textSize = dimensionConverter.spToPx(12)
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+ textSize = host.dimensionConverter.spToPx(12)
}
}
)
@@ -193,8 +193,8 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
+"Self Signed Key:\n"
span {
text = it.unpaddedBase64PublicKey ?: ""
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
- textSize = dimensionConverter.spToPx(12)
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+ textSize = host.dimensionConverter.spToPx(12)
}
}
)
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
index 4c28acd904..f12f17ae14 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
@@ -44,6 +44,7 @@ class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvi
var interactionListener: InteractionListener? = null
override fun buildModels(data: DeviceListViewState?) {
+ val host = this
data?.selectedDevice?.let {
val isVerified = it.trustLevel?.isVerified() == true
genericItem {
@@ -51,7 +52,7 @@ class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvi
style(ItemStyle.BIG_TEXT)
titleIconResourceId(if (isVerified) R.drawable.ic_shield_trusted else R.drawable.ic_shield_warning)
title(
- stringProvider.getString(
+ host.stringProvider.getString(
if (isVerified) R.string.verification_profile_verified else R.string.verification_profile_warning
)
)
@@ -59,16 +60,16 @@ class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvi
genericFooterItem {
id("desc")
centered(false)
- textColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
+ textColor(host.colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
apply {
if (isVerified) {
// TODO FORMAT
- text(stringProvider.getString(R.string.verification_profile_device_verified_because,
+ text(host.stringProvider.getString(R.string.verification_profile_device_verified_because,
data.userItem?.displayName ?: "",
data.userItem?.id ?: ""))
} else {
// TODO what if mine
- text(stringProvider.getString(R.string.verification_profile_device_new_signing,
+ text(host.stringProvider.getString(R.string.verification_profile_device_new_signing,
data.userItem?.displayName ?: "",
data.userItem?.id ?: ""))
}
@@ -84,8 +85,8 @@ class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvi
+(it.displayName() ?: "")
span {
text = " (${it.deviceId})"
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
- textSize = dimensionConverter.spToPx(14)
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+ textSize = host.dimensionConverter.spToPx(14)
}
}
)
@@ -95,18 +96,18 @@ class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvi
genericFooterItem {
id("warn")
centered(false)
- textColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
- text(stringProvider.getString(R.string.verification_profile_device_untrust_info))
+ textColor(host.colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
+ text(host.stringProvider.getString(R.string.verification_profile_device_untrust_info))
}
bottomSheetVerificationActionItem {
id("verify")
- title(stringProvider.getString(R.string.cross_signing_verify_by_emoji))
- titleColor(colorProvider.getColor(R.color.riotx_accent))
+ title(host.stringProvider.getString(R.string.cross_signing_verify_by_emoji))
+ titleColor(host.colorProvider.getColor(R.color.riotx_accent))
iconRes(R.drawable.ic_arrow_right)
- iconColor(colorProvider.getColor(R.color.riotx_accent))
+ iconColor(host.colorProvider.getColor(R.color.riotx_accent))
listener {
- interactionListener?.onVerifyManually(it)
+ host.interactionListener?.onVerifyManually(it)
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 084d4ea297..2cfb9fb9d1 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -62,9 +62,8 @@ class RoomProfileController @Inject constructor(
}
override fun buildModels(data: RoomProfileViewState?) {
- if (data == null) {
- return
- }
+ data ?: return
+ val host = this
val roomSummary = data.roomSummary() ?: return
val enableNonSimplifiedMode = !vectorPreferences.simplifiedMode()
@@ -85,7 +84,7 @@ class RoomProfileController @Inject constructor(
}
override fun onUrlLongClicked(url: String): Boolean {
- callback?.onUrlInTopicLongClicked(url)
+ host.callback?.onUrlInTopicLongClicked(url)
return true
}
}))
@@ -102,7 +101,7 @@ class RoomProfileController @Inject constructor(
genericFooterItem {
id("e2e info")
centered(false)
- text(stringProvider.getString(learnMoreSubtitle))
+ text(host.stringProvider.getString(learnMoreSubtitle))
}
// SC: Move down in the list, this one-time action is not important to enough to show this prevalent at the top
//buildEncryptionAction(data.actionPermissions, roomSummary)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
index 0b695031c5..6edeeedca3 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
@@ -77,34 +77,36 @@ class RoomAliasController @Inject constructor(
}
private fun buildRoomDirectoryVisibility(data: RoomAliasViewState) {
+ val host = this
when (data.roomDirectoryVisibility) {
Uninitialized -> Unit
is Loading -> Unit
is Success -> {
formSwitchItem {
id("roomVisibility")
- title(stringProvider.getString(R.string.room_alias_publish_to_directory, data.homeServerName))
+ title(host.stringProvider.getString(R.string.room_alias_publish_to_directory, data.homeServerName))
showDivider(false)
switchChecked(data.roomDirectoryVisibility() == RoomDirectoryVisibility.PUBLIC)
listener {
if (it) {
- callback?.setRoomDirectoryVisibility(RoomDirectoryVisibility.PUBLIC)
+ host.callback?.setRoomDirectoryVisibility(RoomDirectoryVisibility.PUBLIC)
} else {
- callback?.setRoomDirectoryVisibility(RoomDirectoryVisibility.PRIVATE)
+ host.callback?.setRoomDirectoryVisibility(RoomDirectoryVisibility.PRIVATE)
}
}
}
}
is Fail -> {
errorWithRetryItem {
- text(stringProvider.getString(R.string.room_alias_publish_to_directory_error,
- errorFormatter.toHumanReadable(data.roomDirectoryVisibility.error)))
+ text(host.stringProvider.getString(R.string.room_alias_publish_to_directory_error,
+ host.errorFormatter.toHumanReadable(data.roomDirectoryVisibility.error)))
}
}
}
}
private fun buildPublishInfo(data: RoomAliasViewState) {
+ val host = this
buildProfileSection(
stringProvider.getString(R.string.room_alias_published_alias_title)
)
@@ -120,8 +122,8 @@ class RoomAliasController @Inject constructor(
profileActionItem {
id("canonical")
title(data.canonicalAlias)
- subtitle(stringProvider.getString(R.string.room_alias_published_alias_main))
- listener { callback?.openAliasDetail(canonicalAlias) }
+ subtitle(host.stringProvider.getString(R.string.room_alias_published_alias_main))
+ listener { host.callback?.openAliasDetail(canonicalAlias) }
}
}
@@ -143,7 +145,7 @@ class RoomAliasController @Inject constructor(
profileActionItem {
id("alt_$idx")
title(altAlias)
- listener { callback?.openAliasDetail(altAlias) }
+ listener { host.callback?.openAliasDetail(altAlias) }
}
}
}
@@ -154,14 +156,15 @@ class RoomAliasController @Inject constructor(
}
private fun buildPublishManuallyForm(data: RoomAliasViewState) {
+ val host = this
when (data.publishManuallyState) {
RoomAliasViewState.AddAliasState.Hidden -> Unit
RoomAliasViewState.AddAliasState.Closed -> {
settingsButtonItem {
id("publishManually")
- colorProvider(colorProvider)
+ colorProvider(host.colorProvider)
buttonTitleId(R.string.room_alias_published_alias_add_manually)
- buttonClickListener { callback?.toggleManualPublishForm() }
+ buttonClickListener { host.callback?.toggleManualPublishForm() }
}
}
is RoomAliasViewState.AddAliasState.Editing -> {
@@ -169,29 +172,30 @@ class RoomAliasController @Inject constructor(
id("publishManuallyEdit")
value(data.publishManuallyState.value)
showBottomSeparator(false)
- hint(stringProvider.getString(R.string.room_alias_address_hint))
+ hint(host.stringProvider.getString(R.string.room_alias_address_hint))
inputType(InputType.TYPE_CLASS_TEXT)
onTextChange { text ->
- callback?.setNewAlias(text)
+ host.callback?.setNewAlias(text)
}
}
settingsContinueCancelItem {
id("publishManuallySubmit")
- continueText(stringProvider.getString(R.string.room_alias_published_alias_add_manually_submit))
- continueOnClick { callback?.addAlias() }
- cancelOnClick { callback?.toggleManualPublishForm() }
+ continueText(host.stringProvider.getString(R.string.room_alias_published_alias_add_manually_submit))
+ continueOnClick { host.callback?.addAlias() }
+ cancelOnClick { host.callback?.toggleManualPublishForm() }
}
}
}
}
private fun buildLocalInfo(data: RoomAliasViewState) {
+ val host = this
buildProfileSection(
stringProvider.getString(R.string.room_alias_local_address_title)
)
settingsInfoItem {
id("localInfo")
- helperText(stringProvider.getString(R.string.room_alias_local_address_subtitle, data.homeServerName))
+ helperText(host.stringProvider.getString(R.string.room_alias_local_address_subtitle, data.homeServerName))
}
when (val localAliases = data.localAliases) {
@@ -211,7 +215,7 @@ class RoomAliasController @Inject constructor(
profileActionItem {
id("loc_$idx")
title(localAlias)
- listener { callback?.openAliasDetail(localAlias) }
+ listener { host.callback?.openAliasDetail(localAlias) }
}
}
}
@@ -219,7 +223,7 @@ class RoomAliasController @Inject constructor(
is Fail -> {
errorWithRetryItem {
id("alt_error")
- text(errorFormatter.toHumanReadable(localAliases.error))
+ text(host.errorFormatter.toHumanReadable(localAliases.error))
}
}
}
@@ -229,14 +233,15 @@ class RoomAliasController @Inject constructor(
}
private fun buildAddLocalAlias(data: RoomAliasViewState) {
+ val host = this
when (data.newLocalAliasState) {
RoomAliasViewState.AddAliasState.Hidden -> Unit
RoomAliasViewState.AddAliasState.Closed -> {
settingsButtonItem {
id("newLocalAliasButton")
- colorProvider(colorProvider)
+ colorProvider(host.colorProvider)
buttonTitleId(R.string.room_alias_local_address_add)
- buttonClickListener { callback?.toggleLocalAliasForm() }
+ buttonClickListener { host.callback?.toggleLocalAliasForm() }
}
}
is RoomAliasViewState.AddAliasState.Editing -> {
@@ -245,16 +250,16 @@ class RoomAliasController @Inject constructor(
value(data.newLocalAliasState.value)
homeServer(":" + data.homeServerName)
showBottomSeparator(false)
- errorMessage(roomAliasErrorFormatter.format((data.newLocalAliasState.asyncRequest as? Fail)?.error as? RoomAliasError))
+ errorMessage(host.roomAliasErrorFormatter.format((data.newLocalAliasState.asyncRequest as? Fail)?.error as? RoomAliasError))
onTextChange { value ->
- callback?.setNewLocalAliasLocalPart(value)
+ host.callback?.setNewLocalAliasLocalPart(value)
}
}
settingsContinueCancelItem {
id("newLocalAliasSubmit")
- continueText(stringProvider.getString(R.string.action_add))
- continueOnClick { callback?.addLocalAlias() }
- cancelOnClick { callback?.toggleLocalAliasForm() }
+ continueText(host.stringProvider.getString(R.string.action_add))
+ continueOnClick { host.callback?.addLocalAlias() }
+ cancelOnClick { host.callback?.toggleLocalAliasForm() }
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetController.kt
index 157037c13d..b030afd503 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetController.kt
@@ -73,12 +73,13 @@ class RoomAliasBottomSheetController @Inject constructor() : TypedEpoxyControlle
}
private fun RoomAliasBottomSheetSharedAction.toBottomSheetItem(index: Int) {
+ val host = this@RoomAliasBottomSheetController
return bottomSheetActionItem {
id("action_$index")
iconRes(iconResId)
textRes(titleRes)
destructive(this@toBottomSheetItem.destructive)
- listener(View.OnClickListener { listener?.didSelectMenuAction(this@toBottomSheetItem) })
+ listener(View.OnClickListener { host.listener?.didSelectMenuAction(this@toBottomSheetItem) })
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt
index 2a0c787a7a..6c2fac98d8 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt
@@ -52,6 +52,7 @@ class RoomBannedMemberListController @Inject constructor(
override fun buildModels(data: RoomBannedMemberListViewState?) {
val bannedList = data?.bannedMemberSummaries?.invoke() ?: return
+ val host = this
val quantityString = stringProvider.getQuantityString(R.plurals.room_settings_banned_users_count, bannedList.size, bannedList.size)
@@ -74,7 +75,7 @@ class RoomBannedMemberListController @Inject constructor(
profileMatrixItemWithProgress {
id(roomMember.userId)
matrixItem(roomMember.toMatrixItem())
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
apply {
if (actionInProgress) {
inProgress(true)
@@ -83,7 +84,7 @@ class RoomBannedMemberListController @Inject constructor(
inProgress(false)
editable(true)
clickListener { _ ->
- callback?.onUnbanClicked(roomMember)
+ host.callback?.onUnbanClicked(roomMember)
}
}
}
@@ -92,7 +93,7 @@ class RoomBannedMemberListController @Inject constructor(
between = { _, roomMemberBefore ->
dividerItem {
id("divider_${roomMemberBefore.userId}")
- color(dividerColor)
+ color(host.dividerColor)
}
}
)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
index eda461de14..5f070818a0 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
@@ -55,6 +55,7 @@ class RoomMemberListController @Inject constructor(
override fun buildModels(data: RoomMemberListViewState?) {
data ?: return
+ val host = this
roomMemberSummaryFilter.filter = data.filter
@@ -93,17 +94,17 @@ class RoomMemberListController @Inject constructor(
profileMatrixItem {
id(roomMember.userId)
matrixItem(roomMember.toMatrixItem())
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
userEncryptionTrustLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
clickListener { _ ->
- callback?.onRoomMemberClicked(roomMember)
+ host.callback?.onRoomMemberClicked(roomMember)
}
}
},
between = { _, roomMemberBefore ->
dividerItem {
id("divider_${roomMemberBefore.userId}")
- color(dividerColor)
+ color(host.dividerColor)
}
}
)
@@ -111,7 +112,7 @@ class RoomMemberListController @Inject constructor(
// Display the threepid invite after the regular invite
dividerItem {
id("divider_threepidinvites")
- color(dividerColor)
+ color(host.dividerColor)
}
buildThreePidInvites(data)
@@ -130,6 +131,7 @@ class RoomMemberListController @Inject constructor(
}
private fun buildThreePidInvites(data: RoomMemberListViewState) {
+ val host = this
data.threePidInvites()
?.filter { it.content.toModel() != null }
?.join(
@@ -138,11 +140,11 @@ class RoomMemberListController @Inject constructor(
?.let { content ->
profileMatrixItem {
id("3pid_$idx")
- matrixItem(content.toMatrixItem())
- avatarRenderer(avatarRenderer)
+ matrixItem(MatrixItem.UserItem("@", displayName = content.displayName))
+ avatarRenderer(host.avatarRenderer)
editable(data.actionsPermissions.canRevokeThreePidInvite)
clickListener { _ ->
- callback?.onThreePidInviteClicked(event)
+ host.callback?.onThreePidInviteClicked(event)
}
}
}
@@ -150,13 +152,9 @@ class RoomMemberListController @Inject constructor(
between = { idx, _ ->
dividerItem {
id("divider3_$idx")
- color(dividerColor)
+ color(host.dividerColor)
}
}
)
}
-
- private fun RoomThirdPartyInviteContent.toMatrixItem(): MatrixItem {
- return MatrixItem.UserItem("@", displayName = displayName)
- }
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
index fcc1354542..c510e0501b 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
@@ -88,6 +88,7 @@ class RoomPermissionsController @Inject constructor(
}
override fun buildModels(data: RoomPermissionsViewState?) {
+ val host = this
buildProfileSection(
stringProvider.getString(R.string.room_permissions_title)
)
@@ -97,17 +98,18 @@ class RoomPermissionsController @Inject constructor(
else -> {
loadingItem {
id("loading")
- loadingText(stringProvider.getString(R.string.loading))
+ loadingText(host.stringProvider.getString(R.string.loading))
}
}
}
}
private fun buildPermissions(data: RoomPermissionsViewState, content: PowerLevelsContent) {
+ val host = this
val editable = data.actionPermissions.canChangePowerLevels
settingsInfoItem {
id("notice")
- helperText(stringProvider.getString(if (editable) R.string.room_permissions_notice else R.string.room_permissions_notice_read_only))
+ helperText(host.stringProvider.getString(if (editable) R.string.room_permissions_notice else R.string.room_permissions_notice_read_only))
}
// Useful permissions
@@ -116,9 +118,9 @@ class RoomPermissionsController @Inject constructor(
// Toggle
formAdvancedToggleItem {
id("showAdvanced")
- title(stringProvider.getString(if (data.showAdvancedPermissions) R.string.hide_advanced else R.string.show_advanced))
+ title(host.stringProvider.getString(if (data.showAdvancedPermissions) R.string.hide_advanced else R.string.show_advanced))
expanded(!data.showAdvancedPermissions)
- listener { callback?.toggleShowAllPermissions() }
+ listener { host.callback?.toggleShowAllPermissions() }
}
// Advanced permissions
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index b12a6d52eb..24836bc504 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -62,6 +62,7 @@ class RoomSettingsController @Inject constructor(
override fun buildModels(data: RoomSettingsViewState?) {
val roomSummary = data?.roomSummary?.invoke() ?: return
+ val host = this
formEditableAvatarItem {
id("avatar")
@@ -69,7 +70,7 @@ class RoomSettingsController @Inject constructor(
when (val avatarAction = data.avatarAction) {
RoomSettingsViewState.AvatarAction.None -> {
// Use the current value
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
// We do not want to use the fallback avatar url, which can be the other user avatar, or the current user avatar.
matrixItem(roomSummary.toMatrixItem().copy(avatarUrl = data.currentRoomAvatarUrl))
}
@@ -78,8 +79,8 @@ class RoomSettingsController @Inject constructor(
is RoomSettingsViewState.AvatarAction.UpdateAvatar ->
imageUri(avatarAction.newAvatarUri)
}
- clickListener { callback?.onAvatarChange() }
- deleteListener { callback?.onAvatarDelete() }
+ clickListener { host.callback?.onAvatarChange() }
+ deleteListener { host.callback?.onAvatarDelete() }
}
buildProfileSection(
@@ -90,10 +91,10 @@ class RoomSettingsController @Inject constructor(
id("name")
enabled(data.actionPermissions.canChangeName)
value(data.newName ?: roomSummary.displayName)
- hint(stringProvider.getString(R.string.room_settings_name_hint))
+ hint(host.stringProvider.getString(R.string.room_settings_name_hint))
onTextChange { text ->
- callback?.onNameChanged(text)
+ host.callback?.onNameChanged(text)
}
}
@@ -101,10 +102,10 @@ class RoomSettingsController @Inject constructor(
id("topic")
enabled(data.actionPermissions.canChangeTopic)
value(data.newTopic ?: roomSummary.topic)
- hint(stringProvider.getString(R.string.room_settings_topic_hint))
+ hint(host.stringProvider.getString(R.string.room_settings_topic_hint))
onTextChange { text ->
- callback?.onTopicChanged(text)
+ host.callback?.onTopicChanged(text)
}
}
@@ -134,10 +135,10 @@ class RoomSettingsController @Inject constructor(
// add guest access option?
formSwitchItem {
id("guest_access")
- title(stringProvider.getString(R.string.room_settings_guest_access_title))
+ title(host.stringProvider.getString(R.string.room_settings_guest_access_title))
switchChecked(guestAccess == GuestAccess.CanJoin)
listener {
- callback?.onToggleGuestAccess()
+ host.callback?.onToggleGuestAccess()
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
index 3867485e6f..2141b6bf27 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
@@ -21,6 +21,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.net.toUri
+import androidx.lifecycle.lifecycleScope
import com.airbnb.mvrx.args
import com.airbnb.mvrx.fragmentViewModel
import com.airbnb.mvrx.withState
@@ -36,6 +37,7 @@ import im.vector.app.databinding.FragmentRoomUploadsBinding
import im.vector.app.features.home.AvatarRenderer
import im.vector.app.features.notifications.NotificationUtils
import im.vector.app.features.roomprofile.RoomProfileArgs
+import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.util.toMatrixItem
import javax.inject.Inject
@@ -76,13 +78,21 @@ class RoomUploadsFragment @Inject constructor(
shareMedia(requireContext(), it.file, getMimeTypeFromUri(requireContext(), it.file.toUri()))
}
is RoomUploadsViewEvents.FileReadyForSaving -> {
- saveMedia(
- context = requireContext(),
- file = it.file,
- title = it.title,
- mediaMimeType = getMimeTypeFromUri(requireContext(), it.file.toUri()),
- notificationUtils = notificationUtils
- )
+ lifecycleScope.launch {
+ runCatching {
+ saveMedia(
+ context = requireContext(),
+ file = it.file,
+ title = it.title,
+ mediaMimeType = getMimeTypeFromUri(requireContext(), it.file.toUri()),
+ notificationUtils = notificationUtils
+ )
+ }.onFailure { failure ->
+ if (!isAdded) return@onFailure
+ showErrorInSnackbar(failure)
+ }
+ }
+ Unit
}
is RoomUploadsViewEvents.Failure -> showFailure(it.throwable)
}.exhaustive
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
index f2c0ad2a9d..70240752e2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
@@ -49,16 +49,17 @@ class UploadsFileController @Inject constructor(
override fun buildModels(data: RoomUploadsViewState?) {
data ?: return
+ val host = this
buildFileItems(data.fileEvents)
if (data.hasMore) {
loadingItem {
// Always use a different id, because we can be notified several times of visibility state changed
- id("loadMore${idx++}")
+ id("loadMore${host.idx++}")
onVisibilityStateChanged { _, _, visibilityState ->
if (visibilityState == VisibilityState.VISIBLE) {
- listener?.loadMore()
+ host.listener?.loadMore()
}
}
}
@@ -66,24 +67,25 @@ class UploadsFileController @Inject constructor(
}
private fun buildFileItems(fileEvents: List) {
+ val host = this
fileEvents.forEach { uploadEvent ->
uploadsFileItem {
id(uploadEvent.eventId)
title(uploadEvent.contentWithAttachmentContent.body)
- subtitle(stringProvider.getString(R.string.uploads_files_subtitle,
+ subtitle(host.stringProvider.getString(R.string.uploads_files_subtitle,
uploadEvent.senderInfo.disambiguatedDisplayName,
- dateFormatter.format(uploadEvent.root.originServerTs, DateFormatKind.DEFAULT_DATE_AND_TIME)))
+ host.dateFormatter.format(uploadEvent.root.originServerTs, DateFormatKind.DEFAULT_DATE_AND_TIME)))
listener(object : UploadsFileItem.Listener {
override fun onItemClicked() {
- listener?.onOpenClicked(uploadEvent)
+ host.listener?.onOpenClicked(uploadEvent)
}
override fun onDownloadClicked() {
- listener?.onDownloadClicked(uploadEvent)
+ host.listener?.onDownloadClicked(uploadEvent)
}
override fun onShareClicked() {
- listener?.onShareClicked(uploadEvent)
+ host.listener?.onShareClicked(uploadEvent)
}
})
}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
index f8dff345bb..a57d3c45fc 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
@@ -60,16 +60,17 @@ class UploadsMediaController @Inject constructor(
override fun buildModels(data: RoomUploadsViewState?) {
data ?: return
+ val host = this
buildMediaItems(data.mediaEvents)
if (data.hasMore) {
squareLoadingItem {
// Always use a different id, because we can be notified several times of visibility state changed
- id("loadMore${idx++}")
+ id("loadMore${host.idx++}")
onVisibilityStateChanged { _, _, visibilityState ->
if (visibilityState == VisibilityState.VISIBLE) {
- listener?.loadMore()
+ host.listener?.loadMore()
}
}
}
@@ -77,17 +78,18 @@ class UploadsMediaController @Inject constructor(
}
private fun buildMediaItems(mediaEvents: List) {
+ val host = this
mediaEvents.forEach { uploadEvent ->
when (uploadEvent.contentWithAttachmentContent.msgType) {
MessageType.MSGTYPE_IMAGE -> {
val data = uploadEvent.toImageContentRendererData() ?: return@forEach
uploadsImageItem {
id(uploadEvent.eventId)
- imageContentRenderer(imageContentRenderer)
+ imageContentRenderer(host.imageContentRenderer)
data(data)
listener(object : UploadsImageItem.Listener {
override fun onItemClicked(view: View, data: ImageContentRenderer.Data) {
- listener?.onOpenImageClicked(view, data)
+ host.listener?.onOpenImageClicked(view, data)
}
})
}
@@ -96,11 +98,11 @@ class UploadsMediaController @Inject constructor(
val data = uploadEvent.toVideoContentRendererData() ?: return@forEach
uploadsVideoItem {
id(uploadEvent.eventId)
- imageContentRenderer(imageContentRenderer)
+ imageContentRenderer(host.imageContentRenderer)
data(data)
listener(object : UploadsVideoItem.Listener {
override fun onItemClicked(view: View, data: VideoContentRenderer.Data) {
- listener?.onOpenVideoClicked(view, data)
+ host.listener?.onOpenVideoClicked(view, data)
}
})
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
index 7d67946385..81d8be502c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
@@ -182,7 +182,7 @@ object VectorLocale {
}
}
// sort by human display names
- .sortedBy { localeToLocalisedString(it).toLowerCase(it) }
+ .sortedBy { localeToLocalisedString(it).lowercase(it) }
supportedLocales.clear()
supportedLocales.addAll(list)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index 334464e304..adab8f8630 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -52,7 +52,6 @@ import im.vector.app.features.MainActivityArgs
import im.vector.app.features.workers.signout.SignOutUiWorker
import io.reactivex.android.schedulers.AndroidSchedulers
import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.matrix.android.sdk.api.failure.isInvalidPassword
@@ -224,7 +223,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
it.summary = TextUtils.formatFileSize(requireContext(), size.toLong())
it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
- GlobalScope.launch(Dispatchers.Main) {
+ lifecycleScope.launch(Dispatchers.Main) {
// On UI Thread
displayLoadingView()
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt
index 6425256929..a98cc35ac2 100644
--- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt
@@ -42,18 +42,19 @@ class CrossSigningSettingsController @Inject constructor(
override fun buildModels(data: CrossSigningSettingsViewState?) {
if (data == null) return
+ val host = this
when {
data.xSigningKeyCanSign -> {
genericItem {
id("can")
titleIconResourceId(R.drawable.ic_shield_trusted)
- title(stringProvider.getString(R.string.encryption_information_dg_xsigning_complete))
+ title(host.stringProvider.getString(R.string.encryption_information_dg_xsigning_complete))
}
genericButtonItem {
id("Reset")
- text(stringProvider.getString(R.string.reset_cross_signing))
+ text(host.stringProvider.getString(R.string.reset_cross_signing))
buttonClickAction(DebouncedClickListener({
- interactionListener?.didTapInitializeCrossSigning()
+ host.interactionListener?.didTapInitializeCrossSigning()
}))
}
}
@@ -61,13 +62,13 @@ class CrossSigningSettingsController @Inject constructor(
genericItem {
id("trusted")
titleIconResourceId(R.drawable.ic_shield_custom)
- title(stringProvider.getString(R.string.encryption_information_dg_xsigning_trusted))
+ title(host.stringProvider.getString(R.string.encryption_information_dg_xsigning_trusted))
}
genericButtonItem {
id("Reset")
- text(stringProvider.getString(R.string.reset_cross_signing))
+ text(host.stringProvider.getString(R.string.reset_cross_signing))
buttonClickAction(DebouncedClickListener({
- interactionListener?.didTapInitializeCrossSigning()
+ host.interactionListener?.didTapInitializeCrossSigning()
}))
}
}
@@ -75,27 +76,27 @@ class CrossSigningSettingsController @Inject constructor(
genericItem {
id("enable")
titleIconResourceId(R.drawable.ic_shield_black)
- title(stringProvider.getString(R.string.encryption_information_dg_xsigning_not_trusted))
+ title(host.stringProvider.getString(R.string.encryption_information_dg_xsigning_not_trusted))
}
genericButtonItem {
id("Reset")
- text(stringProvider.getString(R.string.reset_cross_signing))
+ text(host.stringProvider.getString(R.string.reset_cross_signing))
buttonClickAction(DebouncedClickListener({
- interactionListener?.didTapInitializeCrossSigning()
+ host.interactionListener?.didTapInitializeCrossSigning()
}))
}
}
else -> {
genericItem {
id("not")
- title(stringProvider.getString(R.string.encryption_information_dg_xsigning_disabled))
+ title(host.stringProvider.getString(R.string.encryption_information_dg_xsigning_disabled))
}
genericPositiveButtonItem {
id("Initialize")
- text(stringProvider.getString(R.string.initialize_cross_signing))
+ text(host.stringProvider.getString(R.string.initialize_cross_signing))
buttonClickAction(DebouncedClickListener({
- interactionListener?.didTapInitializeCrossSigning()
+ host.interactionListener?.didTapInitializeCrossSigning()
}))
}
}
@@ -112,8 +113,8 @@ class CrossSigningSettingsController @Inject constructor(
+"Master Key:\n"
span {
text = it.unpaddedBase64PublicKey ?: ""
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
- textSize = dimensionConverter.spToPx(12)
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+ textSize = host.dimensionConverter.spToPx(12)
}
}
)
@@ -128,8 +129,8 @@ class CrossSigningSettingsController @Inject constructor(
+"User Key:\n"
span {
text = it.unpaddedBase64PublicKey ?: ""
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
- textSize = dimensionConverter.spToPx(12)
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+ textSize = host.dimensionConverter.spToPx(12)
}
}
)
@@ -144,8 +145,8 @@ class CrossSigningSettingsController @Inject constructor(
+"Self Signed Key:\n"
span {
text = it.unpaddedBase64PublicKey ?: ""
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
- textSize = dimensionConverter.spToPx(12)
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+ textSize = host.dimensionConverter.spToPx(12)
}
}
)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index b66204a9a4..930ad54b7e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -80,6 +80,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
val isMine = data.isMine
val currentSessionIsTrusted = data.accountCrossSigningIsTrusted
Timber.v("handleE2EWithCrossSigning $isMine, $cryptoDeviceInfo, $shield")
+ val host = this
if (isMine) {
if (currentSessionIsTrusted) {
@@ -87,8 +88,8 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
id("trust${cryptoDeviceInfo.deviceId}")
style(ItemStyle.BIG_TEXT)
titleIconResourceId(shield)
- title(stringProvider.getString(R.string.encryption_information_verified))
- description(stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
+ title(host.stringProvider.getString(R.string.encryption_information_verified))
+ description(host.stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
}
} else if (data.canVerifySession) {
// You need to complete security, only if there are other session(s) available, or if 4S contains secrets
@@ -96,11 +97,11 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
id("trust${cryptoDeviceInfo.deviceId}")
style(ItemStyle.BIG_TEXT)
titleIconResourceId(shield)
- title(stringProvider.getString(R.string.crosssigning_verify_this_session))
+ title(host.stringProvider.getString(R.string.crosssigning_verify_this_session))
if (data.hasOtherSessions) {
- description(stringProvider.getString(R.string.confirm_your_identity))
+ description(host.stringProvider.getString(R.string.confirm_your_identity))
} else {
- description(stringProvider.getString(R.string.confirm_your_identity_quad_s))
+ description(host.stringProvider.getString(R.string.confirm_your_identity_quad_s))
}
}
}
@@ -116,16 +117,16 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
id("trust${cryptoDeviceInfo.deviceId}")
style(ItemStyle.BIG_TEXT)
titleIconResourceId(shield)
- title(stringProvider.getString(R.string.encryption_information_verified))
- description(stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
+ title(host.stringProvider.getString(R.string.encryption_information_verified))
+ description(host.stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
}
} else {
genericItem {
id("trust${cryptoDeviceInfo.deviceId}")
titleIconResourceId(shield)
style(ItemStyle.BIG_TEXT)
- title(stringProvider.getString(R.string.encryption_information_not_verified))
- description(stringProvider.getString(R.string.settings_active_sessions_unverified_device_desc))
+ title(host.stringProvider.getString(R.string.encryption_information_not_verified))
+ description(host.stringProvider.getString(R.string.settings_active_sessions_unverified_device_desc))
}
}
}
@@ -145,12 +146,12 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
}
bottomSheetVerificationActionItem {
id("completeSecurity")
- title(stringProvider.getString(R.string.crosssigning_verify_this_session))
- titleColor(colorProvider.getColor(R.color.riotx_accent))
+ title(host.stringProvider.getString(R.string.crosssigning_verify_this_session))
+ titleColor(host.colorProvider.getColor(R.color.riotx_accent))
iconRes(R.drawable.ic_arrow_right)
- iconColor(colorProvider.getColor(R.color.riotx_accent))
+ iconColor(host.colorProvider.getColor(R.color.riotx_accent))
listener {
- callback?.onAction(DevicesAction.CompleteSecurity)
+ host.callback?.onAction(DevicesAction.CompleteSecurity)
}
}
} else if (!isMine) {
@@ -165,6 +166,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
}
private fun handleE2EInLegacy(data: DeviceVerificationInfoBottomSheetViewState, cryptoDeviceInfo: CryptoDeviceInfo, shield: Int) {
+ val host = this
// ==== Legacy
val isMine = data.isMine
@@ -174,16 +176,16 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
id("trust${cryptoDeviceInfo.deviceId}")
style(ItemStyle.BIG_TEXT)
titleIconResourceId(shield)
- title(stringProvider.getString(R.string.encryption_information_verified))
- description(stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
+ title(host.stringProvider.getString(R.string.encryption_information_verified))
+ description(host.stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
}
} else {
genericItem {
id("trust${cryptoDeviceInfo.deviceId}")
titleIconResourceId(shield)
style(ItemStyle.BIG_TEXT)
- title(stringProvider.getString(R.string.encryption_information_not_verified))
- description(stringProvider.getString(R.string.settings_active_sessions_unverified_device_desc))
+ title(host.stringProvider.getString(R.string.encryption_information_not_verified))
+ description(host.stringProvider.getString(R.string.settings_active_sessions_unverified_device_desc))
}
}
@@ -203,29 +205,30 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
}
bottomSheetVerificationActionItem {
id("verify${cryptoDeviceInfo.deviceId}")
- title(stringProvider.getString(R.string.verification_verify_device))
- titleColor(colorProvider.getColor(R.color.riotx_accent))
+ title(host.stringProvider.getString(R.string.verification_verify_device))
+ titleColor(host.colorProvider.getColor(R.color.riotx_accent))
iconRes(R.drawable.ic_arrow_right)
- iconColor(colorProvider.getColor(R.color.riotx_accent))
+ iconColor(host.colorProvider.getColor(R.color.riotx_accent))
listener {
- callback?.onAction(DevicesAction.VerifyMyDevice(cryptoDeviceInfo.deviceId))
+ host.callback?.onAction(DevicesAction.VerifyMyDevice(cryptoDeviceInfo.deviceId))
}
}
}
}
private fun addVerifyActions(cryptoDeviceInfo: CryptoDeviceInfo) {
+ val host = this
dividerItem {
id("verifyDiv")
}
bottomSheetVerificationActionItem {
id("verify_text")
- title(stringProvider.getString(R.string.cross_signing_verify_by_text))
- titleColor(colorProvider.getColor(R.color.riotx_accent))
+ title(host.stringProvider.getString(R.string.cross_signing_verify_by_text))
+ titleColor(host.colorProvider.getColor(R.color.riotx_accent))
iconRes(R.drawable.ic_arrow_right)
- iconColor(colorProvider.getColor(R.color.riotx_accent))
+ iconColor(host.colorProvider.getColor(R.color.riotx_accent))
listener {
- callback?.onAction(DevicesAction.VerifyMyDeviceManually(cryptoDeviceInfo.deviceId))
+ host.callback?.onAction(DevicesAction.VerifyMyDeviceManually(cryptoDeviceInfo.deviceId))
}
}
dividerItem {
@@ -233,17 +236,18 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
}
bottomSheetVerificationActionItem {
id("verify_emoji")
- title(stringProvider.getString(R.string.cross_signing_verify_by_emoji))
- titleColor(colorProvider.getColor(R.color.riotx_accent))
+ title(host.stringProvider.getString(R.string.cross_signing_verify_by_emoji))
+ titleColor(host.colorProvider.getColor(R.color.riotx_accent))
iconRes(R.drawable.ic_arrow_right)
- iconColor(colorProvider.getColor(R.color.riotx_accent))
+ iconColor(host.colorProvider.getColor(R.color.riotx_accent))
listener {
- callback?.onAction(DevicesAction.VerifyMyDevice(cryptoDeviceInfo.deviceId))
+ host.callback?.onAction(DevicesAction.VerifyMyDevice(cryptoDeviceInfo.deviceId))
}
}
}
private fun addGenericDeviceManageActions(data: DeviceVerificationInfoBottomSheetViewState, deviceId: String) {
+ val host = this
// Offer delete session if not me
if (!data.isMine) {
// Add the delete option
@@ -252,12 +256,12 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
}
bottomSheetVerificationActionItem {
id("delete")
- title(stringProvider.getString(R.string.settings_active_sessions_signout_device))
- titleColor(colorProvider.getColor(R.color.riotx_destructive_accent))
+ title(host.stringProvider.getString(R.string.settings_active_sessions_signout_device))
+ titleColor(host.colorProvider.getColor(R.color.riotx_destructive_accent))
iconRes(R.drawable.ic_arrow_right)
- iconColor(colorProvider.getColor(R.color.riotx_destructive_accent))
+ iconColor(host.colorProvider.getColor(R.color.riotx_destructive_accent))
listener {
- callback?.onAction(DevicesAction.Delete(deviceId))
+ host.callback?.onAction(DevicesAction.Delete(deviceId))
}
}
}
@@ -268,17 +272,18 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
}
bottomSheetVerificationActionItem {
id("rename")
- title(stringProvider.getString(R.string.rename))
- titleColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
+ title(host.stringProvider.getString(R.string.rename))
+ titleColor(host.colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
iconRes(R.drawable.ic_arrow_right)
- iconColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
+ iconColor(host.colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
listener {
- callback?.onAction(DevicesAction.PromptRename(deviceId))
+ host.callback?.onAction(DevicesAction.PromptRename(deviceId))
}
}
}
private fun handleNonE2EDevice(data: DeviceVerificationInfoBottomSheetViewState) {
+ val host = this
val info = data.deviceInfo.invoke() ?: return
genericItem {
id("info${info.deviceId}")
@@ -288,7 +293,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
genericFooterItem {
id("infoCrypto${info.deviceId}")
- text(stringProvider.getString(R.string.settings_failed_to_get_crypto_device_info))
+ text(host.stringProvider.getString(R.string.settings_failed_to_get_crypto_device_info))
}
info.deviceId?.let { addGenericDeviceManageActions(data, it) }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt
index ca2fea89d3..a3c7ffaa8f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt
@@ -61,6 +61,7 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
}
private fun buildDevicesModels(state: DevicesViewState) {
+ val host = this
when (val devices = state.devices) {
is Loading,
is Uninitialized ->
@@ -70,8 +71,8 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
is Fail ->
errorWithRetryItem {
id("error")
- text(errorFormatter.toHumanReadable(devices.error))
- listener { callback?.retry() }
+ text(host.errorFormatter.toHumanReadable(devices.error))
+ listener { host.callback?.retry() }
}
is Success ->
buildDevicesList(devices(), state.myDeviceId, !state.hasAccountCrossSigning, state.accountCrossSigningIsTrusted)
@@ -82,6 +83,7 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
myDeviceId: String,
legacyMode: Boolean,
currentSessionCrossTrusted: Boolean) {
+ val host = this
devices
.firstOrNull {
it.deviceInfo.deviceId == myDeviceId
@@ -90,21 +92,21 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
// Current device
genericItemHeader {
id("current")
- text(stringProvider.getString(R.string.devices_current_device))
+ text(host.stringProvider.getString(R.string.devices_current_device))
}
deviceItem {
id("myDevice${deviceInfo.deviceId}")
legacyMode(legacyMode)
trustedSession(currentSessionCrossTrusted)
- dimensionConverter(dimensionConverter)
- colorProvider(colorProvider)
- detailedMode(vectorPreferences.developerMode())
+ dimensionConverter(host.dimensionConverter)
+ colorProvider(host.colorProvider)
+ detailedMode(host.vectorPreferences.developerMode())
deviceInfo(deviceInfo)
currentDevice(true)
e2eCapable(true)
- lastSeenFormatted(dateFormatter.format(deviceInfo.lastSeenTs, DateFormatKind.DEFAULT_DATE_AND_TIME))
- itemClickAction { callback?.onDeviceClicked(deviceInfo) }
+ lastSeenFormatted(host.dateFormatter.format(deviceInfo.lastSeenTs, DateFormatKind.DEFAULT_DATE_AND_TIME))
+ itemClickAction { host.callback?.onDeviceClicked(deviceInfo) }
trusted(DeviceTrustLevel(currentSessionCrossTrusted, true))
}
@@ -126,7 +128,7 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
if (devices.size > 1) {
genericItemHeader {
id("others")
- text(stringProvider.getString(R.string.devices_other_devices))
+ text(host.stringProvider.getString(R.string.devices_other_devices))
}
devices
@@ -140,12 +142,12 @@ class DevicesController @Inject constructor(private val errorFormatter: ErrorFor
id("device$idx")
legacyMode(legacyMode)
trustedSession(currentSessionCrossTrusted)
- dimensionConverter(dimensionConverter)
- colorProvider(colorProvider)
- detailedMode(vectorPreferences.developerMode())
+ dimensionConverter(host.dimensionConverter)
+ colorProvider(host.colorProvider)
+ detailedMode(host.vectorPreferences.developerMode())
deviceInfo(deviceInfo)
currentDevice(false)
- itemClickAction { callback?.onDeviceClicked(deviceInfo) }
+ itemClickAction { host.callback?.onDeviceClicked(deviceInfo) }
e2eCapable(cryptoInfo != null)
trusted(cryptoInfo?.trustLevel)
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt
index 13d7e0f396..8f4e36b9a1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt
@@ -43,11 +43,12 @@ class AccountDataEpoxyController @Inject constructor(
override fun buildModels(data: AccountDataViewState?) {
if (data == null) return
+ val host = this
when (data.accountData) {
is Loading -> {
loadingItem {
id("loading")
- loadingText(stringProvider.getString(R.string.loading))
+ loadingText(host.stringProvider.getString(R.string.loading))
}
}
is Fail -> {
@@ -61,7 +62,7 @@ class AccountDataEpoxyController @Inject constructor(
if (dataList.isEmpty()) {
genericFooterItem {
id("noResults")
- text(stringProvider.getString(R.string.no_result_placeholder))
+ text(host.stringProvider.getString(R.string.no_result_placeholder))
}
} else {
dataList.forEach { accountData ->
@@ -69,10 +70,10 @@ class AccountDataEpoxyController @Inject constructor(
id(accountData.type)
title(accountData.type)
itemClickAction(DebouncedClickListener({
- interactionListener?.didTap(accountData)
+ host.interactionListener?.didTap(accountData)
}))
itemLongClickAction(View.OnLongClickListener {
- interactionListener?.didLongTap(accountData)
+ host.interactionListener?.didLongTap(accountData)
true
})
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingTrailPagedEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingTrailPagedEpoxyController.kt
index 603c67d074..666b0c3712 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingTrailPagedEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingTrailPagedEpoxyController.kt
@@ -54,10 +54,11 @@ class GossipingTrailPagedEpoxyController @Inject constructor(
var interactionListener: InteractionListener? = null
override fun buildItemModel(currentPosition: Int, item: Event?): EpoxyModel<*> {
+ val host = this
val event = item ?: return GenericItem_().apply { id(currentPosition) }
return GenericItem_().apply {
id(event.hashCode())
- itemClickAction(GenericItem.Action("view").apply { perform = Runnable { interactionListener?.didTap(event) } })
+ itemClickAction(GenericItem.Action("view").apply { perform = Runnable { host.interactionListener?.didTap(event) } })
title(
if (event.isEncrypted()) {
"${event.getClearType()} [encrypted]"
@@ -67,7 +68,7 @@ class GossipingTrailPagedEpoxyController @Inject constructor(
)
description(
span {
- +vectorDateFormatter.format(event.ageLocalTs, DateFormatKind.DEFAULT_DATE_AND_TIME)
+ +host.vectorDateFormatter.format(event.ageLocalTs, DateFormatKind.DEFAULT_DATE_AND_TIME)
span("\nfrom: ") {
textStyle = "bold"
}
@@ -98,7 +99,7 @@ class GossipingTrailPagedEpoxyController @Inject constructor(
val content = event.getClearContent().toModel()
if (event.mxDecryptionResult == null) {
span("**Failed to Decrypt** ${event.mCryptoError}") {
- textColor = colorProvider.getColor(R.color.vector_error_color)
+ textColor = host.colorProvider.getColor(R.color.vector_error_color)
}
}
span("\nsessionId:") {
@@ -157,7 +158,7 @@ class GossipingTrailPagedEpoxyController @Inject constructor(
+"${content?.requestingDeviceId}"
} else if (event.getClearType() == EventType.ENCRYPTED) {
span("**Failed to Decrypt** ${event.mCryptoError}") {
- textColor = colorProvider.getColor(R.color.vector_error_color)
+ textColor = host.colorProvider.getColor(R.color.vector_error_color)
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt
index c2bdcfbd04..3c90a45237 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt
@@ -40,6 +40,7 @@ class IncomingKeyRequestPagedController @Inject constructor(
var interactionListener: InteractionListener? = null
override fun buildItemModel(currentPosition: Int, item: IncomingRoomKeyRequest?): EpoxyModel<*> {
+ val host = this
val roomKeyRequest = item ?: return GenericItem_().apply { id(currentPosition) }
return GenericItem_().apply {
@@ -51,7 +52,7 @@ class IncomingKeyRequestPagedController @Inject constructor(
textStyle = "bold"
}
span("${roomKeyRequest.userId}")
- +vectorDateFormatter.format(roomKeyRequest.localCreationTimestamp, DateFormatKind.DEFAULT_DATE_AND_TIME)
+ +host.vectorDateFormatter.format(roomKeyRequest.localCreationTimestamp, DateFormatKind.DEFAULT_DATE_AND_TIME)
span("\nsessionId:") {
textStyle = "bold"
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
index 514311315d..3217756a82 100644
--- a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
@@ -46,6 +46,7 @@ class HomeserverSettingsController @Inject constructor(
override fun buildModels(data: HomeServerSettingsViewState?) {
data ?: return
+ val host = this
buildHeader(data)
buildCapabilities(data)
@@ -58,8 +59,8 @@ class HomeserverSettingsController @Inject constructor(
is Fail ->
errorWithRetryItem {
id("error")
- text(errorFormatter.toHumanReadable(federationVersion.error))
- listener { callback?.retry() }
+ text(host.errorFormatter.toHumanReadable(federationVersion.error))
+ listener { host.callback?.retry() }
}
is Success ->
buildFederationVersion(federationVersion())
@@ -101,6 +102,7 @@ class HomeserverSettingsController @Inject constructor(
}
private fun buildCapabilities(data: HomeServerSettingsViewState) {
+ val host = this
settingsSectionTitleItem {
id("uploadTitle")
titleResId(R.string.settings_server_upload_size_title)
@@ -113,7 +115,7 @@ class HomeserverSettingsController @Inject constructor(
if (limit == HomeServerCapabilities.MAX_UPLOAD_FILE_SIZE_UNKNOWN) {
helperTextResId(R.string.settings_server_upload_size_unknown)
} else {
- helperText(stringProvider.getString(R.string.settings_server_upload_size_content, "${limit / 1048576L} MB"))
+ helperText(host.stringProvider.getString(R.string.settings_server_upload_size_content, "${limit / 1048576L} MB"))
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
index 8080f2e032..ce84366ef3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
@@ -46,18 +46,19 @@ class IgnoredUsersController @Inject constructor(private val stringProvider: Str
}
private fun buildIgnoredUserModels(users: List) {
+ val host = this
if (users.isEmpty()) {
noResultItem {
id("empty")
- text(stringProvider.getString(R.string.no_ignored_users))
+ text(host.stringProvider.getString(R.string.no_ignored_users))
}
} else {
users.forEach { user ->
userItem {
id(user.userId)
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
matrixItem(user.toMatrixItem())
- itemClickAction { callback?.onUserIdClicked(user.userId) }
+ itemClickAction { host.callback?.onUserIdClicked(user.userId) }
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
index 9654eb2190..55d0ed7c3f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt
@@ -24,6 +24,7 @@ import im.vector.app.core.epoxy.loadingItem
import im.vector.app.core.epoxy.noResultItem
import im.vector.app.core.epoxy.profiles.profileSectionItem
import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.safeCapitalize
import im.vector.app.features.settings.VectorLocale
import im.vector.app.features.settings.VectorPreferences
import java.util.Locale
@@ -39,35 +40,36 @@ class LocalePickerController @Inject constructor(
@ExperimentalStdlibApi
override fun buildModels(data: LocalePickerViewState?) {
val list = data?.locales ?: return
+ val host = this
profileSectionItem {
id("currentTitle")
- title(stringProvider.getString(R.string.choose_locale_current_locale_title))
+ title(host.stringProvider.getString(R.string.choose_locale_current_locale_title))
}
localeItem {
id(data.currentLocale.toString())
- title(VectorLocale.localeToLocalisedString(data.currentLocale).capitalize(data.currentLocale))
- if (vectorPreferences.developerMode()) {
+ title(VectorLocale.localeToLocalisedString(data.currentLocale).safeCapitalize(data.currentLocale))
+ if (host.vectorPreferences.developerMode()) {
subtitle(VectorLocale.localeToLocalisedStringInfo(data.currentLocale))
}
- clickListener { listener?.onUseCurrentClicked() }
+ clickListener { host.listener?.onUseCurrentClicked() }
}
profileSectionItem {
id("otherTitle")
- title(stringProvider.getString(R.string.choose_locale_other_locales_title))
+ title(host.stringProvider.getString(R.string.choose_locale_other_locales_title))
}
when (list) {
is Incomplete -> {
loadingItem {
id("loading")
- loadingText(stringProvider.getString(R.string.choose_locale_loading_locales))
+ loadingText(host.stringProvider.getString(R.string.choose_locale_loading_locales))
}
}
is Success ->
if (list().isEmpty()) {
noResultItem {
id("noResult")
- text(stringProvider.getString(R.string.no_result_placeholder))
+ text(host.stringProvider.getString(R.string.no_result_placeholder))
}
} else {
list()
@@ -75,11 +77,11 @@ class LocalePickerController @Inject constructor(
.forEach {
localeItem {
id(it.toString())
- title(VectorLocale.localeToLocalisedString(it).capitalize(it))
- if (vectorPreferences.developerMode()) {
+ title(VectorLocale.localeToLocalisedString(it).safeCapitalize(it))
+ if (host.vectorPreferences.developerMode()) {
subtitle(VectorLocale.localeToLocalisedStringInfo(it))
}
- clickListener { listener?.onLocaleClicked(it) }
+ clickListener { host.listener?.onLocaleClicked(it) }
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt
index 2d111e4424..679f406832 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt
@@ -27,11 +27,12 @@ class PushGateWayController @Inject constructor(
) : TypedEpoxyController() {
override fun buildModels(data: PushGatewayViewState?) {
+ val host = this
data?.pushGateways?.invoke()?.let { pushers ->
if (pushers.isEmpty()) {
genericFooterItem {
id("footer")
- text(stringProvider.getString(R.string.settings_push_gateway_no_pushers))
+ text(host.stringProvider.getString(R.string.settings_push_gateway_no_pushers))
}
} else {
pushers.forEach {
@@ -44,7 +45,7 @@ class PushGateWayController @Inject constructor(
} ?: run {
genericFooterItem {
id("loading")
- text(stringProvider.getString(R.string.loading))
+ text(host.stringProvider.getString(R.string.loading))
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt
index a8a1ab2e17..c0119ed3be 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesController.kt
@@ -27,6 +27,7 @@ class PushRulesController @Inject constructor(
) : TypedEpoxyController() {
override fun buildModels(data: PushRulesViewState?) {
+ val host = this
data?.let {
it.rules.forEach {
pushRuleItem {
@@ -37,7 +38,7 @@ class PushRulesController @Inject constructor(
} ?: run {
genericFooterItem {
id("footer")
- text(stringProvider.getString(R.string.settings_push_rules_no_rules))
+ text(host.stringProvider.getString(R.string.settings_push_rules_no_rules))
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index cf811f1611..cb2cb3382f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -71,6 +71,7 @@ class ThreePidsSettingsController @Inject constructor(
override fun buildModels(data: ThreePidsSettingsViewState?) {
if (data == null) return
+ val host = this
if (data.uiState is ThreePidsSettingsUiState.Idle) {
currentInputValue = ""
@@ -80,7 +81,7 @@ class ThreePidsSettingsController @Inject constructor(
is Loading -> {
loadingItem {
id("loading")
- loadingText(stringProvider.getString(R.string.loading))
+ loadingText(host.stringProvider.getString(R.string.loading))
}
}
is Fail -> {
@@ -97,13 +98,14 @@ class ThreePidsSettingsController @Inject constructor(
}
private fun buildThreePids(list: List, data: ThreePidsSettingsViewState) {
+ val host = this
val splited = list.groupBy { it is ThreePid.Email }
val emails = splited[true].orEmpty()
val msisdn = splited[false].orEmpty()
settingsSectionTitleItem {
id("email")
- title(stringProvider.getString(R.string.settings_emails))
+ title(host.stringProvider.getString(R.string.settings_emails))
}
emails.forEach { buildThreePid("email ", it) }
@@ -116,7 +118,7 @@ class ThreePidsSettingsController @Inject constructor(
if (pendingList.isEmpty() && emails.isEmpty()) {
noResultItem {
id("noEmail")
- text(stringProvider.getString(R.string.settings_emails_empty))
+ text(host.stringProvider.getString(R.string.settings_emails_empty))
}
}
@@ -127,15 +129,15 @@ class ThreePidsSettingsController @Inject constructor(
ThreePidsSettingsUiState.Idle ->
genericButtonItem {
id("addEmail")
- text(stringProvider.getString(R.string.settings_add_email_address))
- textColor(colorProvider.getColor(R.color.riotx_accent))
- buttonClickAction(View.OnClickListener { interactionListener?.addEmail() })
+ text(host.stringProvider.getString(R.string.settings_add_email_address))
+ textColor(host.colorProvider.getColor(R.color.riotx_accent))
+ buttonClickAction(View.OnClickListener { host.interactionListener?.addEmail() })
}
is ThreePidsSettingsUiState.AddingEmail -> {
settingsEditTextItem {
id("addingEmail")
inputType(InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS)
- hint(stringProvider.getString(R.string.medium_email))
+ hint(host.stringProvider.getString(R.string.medium_email))
if (data.editTextReinitiator.isTrue()) {
value("")
requestFocus(true)
@@ -143,18 +145,18 @@ class ThreePidsSettingsController @Inject constructor(
errorText(data.uiState.error)
interactionListener(object : SettingsEditTextItem.Listener {
override fun onValidate() {
- interactionListener?.doAddEmail(currentInputValue)
+ host.interactionListener?.doAddEmail(host.currentInputValue)
}
override fun onTextChange(text: String) {
- currentInputValue = text
+ host.currentInputValue = text
}
})
}
settingsContinueCancelItem {
id("contAddingEmail")
- continueOnClick { interactionListener?.doAddEmail(currentInputValue) }
- cancelOnClick { interactionListener?.cancelAdding() }
+ continueOnClick { host.interactionListener?.doAddEmail(host.currentInputValue) }
+ cancelOnClick { host.interactionListener?.cancelAdding() }
}
}
is ThreePidsSettingsUiState.AddingPhoneNumber -> Unit
@@ -162,7 +164,7 @@ class ThreePidsSettingsController @Inject constructor(
settingsSectionTitleItem {
id("msisdn")
- title(stringProvider.getString(R.string.settings_phone_numbers))
+ title(host.stringProvider.getString(R.string.settings_phone_numbers))
}
msisdn.forEach { buildThreePid("msisdn ", it) }
@@ -175,7 +177,7 @@ class ThreePidsSettingsController @Inject constructor(
if (pendingList.isEmpty() && msisdn.isEmpty()) {
noResultItem {
id("noMsisdn")
- text(stringProvider.getString(R.string.settings_phone_number_empty))
+ text(host.stringProvider.getString(R.string.settings_phone_number_empty))
}
}
@@ -186,20 +188,20 @@ class ThreePidsSettingsController @Inject constructor(
ThreePidsSettingsUiState.Idle ->
genericButtonItem {
id("addMsisdn")
- text(stringProvider.getString(R.string.settings_add_phone_number))
- textColor(colorProvider.getColor(R.color.riotx_accent))
- buttonClickAction(View.OnClickListener { interactionListener?.addMsisdn() })
+ text(host.stringProvider.getString(R.string.settings_add_phone_number))
+ textColor(host.colorProvider.getColor(R.color.riotx_accent))
+ buttonClickAction(View.OnClickListener { host.interactionListener?.addMsisdn() })
}
is ThreePidsSettingsUiState.AddingEmail -> Unit
is ThreePidsSettingsUiState.AddingPhoneNumber -> {
settingsInfoItem {
id("addingMsisdnInfo")
- helperText(stringProvider.getString(R.string.login_msisdn_notice))
+ helperText(host.stringProvider.getString(R.string.login_msisdn_notice))
}
settingsEditTextItem {
id("addingMsisdn")
inputType(InputType.TYPE_CLASS_PHONE)
- hint(stringProvider.getString(R.string.medium_phone_number))
+ hint(host.stringProvider.getString(R.string.medium_phone_number))
if (data.editTextReinitiator.isTrue()) {
value("")
requestFocus(true)
@@ -207,34 +209,36 @@ class ThreePidsSettingsController @Inject constructor(
errorText(data.uiState.error)
interactionListener(object : SettingsEditTextItem.Listener {
override fun onValidate() {
- interactionListener?.doAddMsisdn(currentInputValue)
+ host.interactionListener?.doAddMsisdn(host.currentInputValue)
}
override fun onTextChange(text: String) {
- currentInputValue = text
+ host.currentInputValue = text
}
})
}
settingsContinueCancelItem {
id("contAddingMsisdn")
- continueOnClick { interactionListener?.doAddMsisdn(currentInputValue) }
- cancelOnClick { interactionListener?.cancelAdding() }
+ continueOnClick { host.interactionListener?.doAddMsisdn(host.currentInputValue) }
+ cancelOnClick { host.interactionListener?.cancelAdding() }
}
}
}.exhaustive
}
private fun buildThreePid(idPrefix: String, threePid: ThreePid) {
+ val host = this
threePidItem {
id(idPrefix + threePid.value)
// TODO Add an icon for emails
// iconResId(if (threePid is ThreePid.Msisdn) R.drawable.ic_phone else null)
title(threePid.getFormattedValue())
- deleteClickListener { interactionListener?.deleteThreePid(threePid) }
+ deleteClickListener { host.interactionListener?.deleteThreePid(threePid) }
}
}
private fun buildPendingThreePid(data: ThreePidsSettingsViewState, idPrefix: String, threePid: ThreePid) {
+ val host = this
threePidItem {
id(idPrefix + threePid.value)
// TODO Add an icon for emails
@@ -246,43 +250,43 @@ class ThreePidsSettingsController @Inject constructor(
is ThreePid.Email -> {
settingsInformationItem {
id("info" + idPrefix + threePid.value)
- message(stringProvider.getString(R.string.account_email_validation_message))
- colorProvider(colorProvider)
+ message(host.stringProvider.getString(R.string.account_email_validation_message))
+ colorProvider(host.colorProvider)
}
settingsContinueCancelItem {
id("cont" + idPrefix + threePid.value)
- continueOnClick { interactionListener?.continueThreePid(threePid) }
- cancelOnClick { interactionListener?.cancelThreePid(threePid) }
+ continueOnClick { host.interactionListener?.continueThreePid(threePid) }
+ cancelOnClick { host.interactionListener?.cancelThreePid(threePid) }
}
}
is ThreePid.Msisdn -> {
settingsInformationItem {
id("info" + idPrefix + threePid.value)
- message(stringProvider.getString(R.string.settings_text_message_sent, threePid.getFormattedValue()))
- colorProvider(colorProvider)
+ message(host.stringProvider.getString(R.string.settings_text_message_sent, threePid.getFormattedValue()))
+ colorProvider(host.colorProvider)
}
settingsEditTextItem {
id("msisdnVerification${threePid.value}")
inputType(InputType.TYPE_CLASS_NUMBER)
- hint(stringProvider.getString(R.string.settings_text_message_sent_hint))
+ hint(host.stringProvider.getString(R.string.settings_text_message_sent_hint))
if (data.msisdnValidationReinitiator[threePid]?.isTrue() == true) {
value("")
}
- errorText(getCodeError(data, threePid))
+ errorText(host.getCodeError(data, threePid))
interactionListener(object : SettingsEditTextItem.Listener {
override fun onValidate() {
- interactionListener?.submitCode(threePid, currentCodes[threePid] ?: "")
+ host.interactionListener?.submitCode(threePid, host.currentCodes[threePid] ?: "")
}
override fun onTextChange(text: String) {
- currentCodes[threePid] = text
+ host.currentCodes[threePid] = text
}
})
}
settingsContinueCancelItem {
id("cont" + idPrefix + threePid.value)
- continueOnClick { interactionListener?.submitCode(threePid, currentCodes[threePid] ?: "") }
- cancelOnClick { interactionListener?.cancelThreePid(threePid) }
+ continueOnClick { host.interactionListener?.submitCode(threePid, host.currentCodes[threePid] ?: "") }
+ cancelOnClick { host.interactionListener?.cancelThreePid(threePid) }
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
index 35c6de24c7..fd35bf11a4 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
@@ -37,6 +37,7 @@ class IncomingShareController @Inject constructor(private val roomSummaryItemFac
var callback: Callback? = null
override fun buildModels(data: IncomingShareViewState) {
+ val host = this
if (data.sharedData == null || data.filteredRoomSummaries is Incomplete) {
loadingItem {
id("loading")
@@ -47,7 +48,7 @@ class IncomingShareController @Inject constructor(private val roomSummaryItemFac
if (roomSummaries.isNullOrEmpty()) {
noResultItem {
id("no_result")
- text(stringProvider.getString(R.string.no_result_placeholder))
+ text(host.stringProvider.getString(R.string.no_result_placeholder))
}
} else {
roomSummaries.forEach { roomSummary ->
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
index f89480046f..7b5d8a9ebd 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
@@ -41,7 +41,6 @@ import im.vector.app.databinding.FragmentIncomingShareBinding
import im.vector.app.features.attachments.AttachmentsHelper
import im.vector.app.features.attachments.preview.AttachmentsPreviewActivity
import im.vector.app.features.attachments.preview.AttachmentsPreviewArgs
-import im.vector.app.features.login.LoginActivity
import org.matrix.android.sdk.api.session.content.ContentAttachmentData
import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -211,9 +210,10 @@ class IncomingShareFragment @Inject constructor(
}
private fun startLoginActivity() {
- val intent = LoginActivity.newIntent(requireActivity(), null)
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
- startActivity(intent)
+ navigator.openLogin(
+ context = requireActivity(),
+ flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+ )
requireActivity().finish()
}
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity2.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity2.kt
new file mode 100644
index 0000000000..cfccc6f699
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity2.kt
@@ -0,0 +1,119 @@
+/*
+ * 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.features.signout.soft
+
+import android.content.Context
+import android.content.Intent
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentManager
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.viewModel
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.replaceFragment
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
+import im.vector.app.features.login2.LoginActivity2
+
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.session.Session
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * In this screen, the user is viewing a message informing that he has been logged out
+ * Extends LoginActivity to get the login with SSO and forget password functionality for (nearly) free
+ *
+ * This is just a copy of SoftLogoutActivity2, which extends LoginActivity2
+ */
+class SoftLogoutActivity2 : LoginActivity2() {
+
+ private val softLogoutViewModel: SoftLogoutViewModel by viewModel()
+
+ @Inject lateinit var softLogoutViewModelFactory: SoftLogoutViewModel.Factory
+ @Inject lateinit var session: Session
+ @Inject lateinit var errorFormatter: ErrorFormatter
+
+ override fun injectWith(injector: ScreenComponent) {
+ super.injectWith(injector)
+ injector.inject(this)
+ }
+
+ override fun initUiAndData() {
+ super.initUiAndData()
+
+ softLogoutViewModel.subscribe(this) {
+ updateWithState(it)
+ }
+
+ softLogoutViewModel.observeViewEvents { handleSoftLogoutViewEvents(it) }
+ }
+
+ private fun handleSoftLogoutViewEvents(softLogoutViewEvents: SoftLogoutViewEvents) {
+ when (softLogoutViewEvents) {
+ is SoftLogoutViewEvents.Failure ->
+ showError(errorFormatter.toHumanReadable(softLogoutViewEvents.throwable))
+ is SoftLogoutViewEvents.ErrorNotSameUser -> {
+ // Pop the backstack
+ supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+
+ // And inform the user
+ showError(getString(
+ R.string.soft_logout_sso_not_same_user_error,
+ softLogoutViewEvents.currentUserId,
+ softLogoutViewEvents.newUserId)
+ )
+ }
+ is SoftLogoutViewEvents.ClearData -> {
+ MainActivity.restartApp(this, MainActivityArgs(clearCredentials = true))
+ }
+ }
+ }
+
+ private fun showError(message: String) {
+ AlertDialog.Builder(this)
+ .setTitle(R.string.dialog_title_error)
+ .setMessage(message)
+ .setPositiveButton(R.string.ok, null)
+ .show()
+ }
+
+ override fun addFirstFragment() {
+ replaceFragment(R.id.loginFragmentContainer, SoftLogoutFragment::class.java)
+ }
+
+ private fun updateWithState(softLogoutViewState: SoftLogoutViewState) {
+ if (softLogoutViewState.asyncLoginAction is Success) {
+ MainActivity.restartApp(this, MainActivityArgs())
+ }
+
+ views.loginLoading.isVisible = softLogoutViewState.isLoading()
+ }
+
+ companion object {
+ fun newIntent(context: Context): Intent {
+ return Intent(context, SoftLogoutActivity2::class.java)
+ }
+ }
+
+ override fun handleInvalidToken(globalError: GlobalError.InvalidToken) {
+ // No op here
+ Timber.w("Ignoring invalid token global error")
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
index 89fa4a982a..76f0fd7fd2 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
@@ -65,20 +65,21 @@ class SoftLogoutController @Inject constructor(
}
private fun buildHeader(state: SoftLogoutViewState) {
+ val host = this
loginHeaderItem {
id("header")
}
loginTitleItem {
id("title")
- text(stringProvider.getString(R.string.soft_logout_title))
+ text(host.stringProvider.getString(R.string.soft_logout_title))
}
loginTitleSmallItem {
id("signTitle")
- text(stringProvider.getString(R.string.soft_logout_signin_title))
+ text(host.stringProvider.getString(R.string.soft_logout_signin_title))
}
loginTextItem {
id("signText1")
- text(stringProvider.getString(R.string.soft_logout_signin_notice,
+ text(host.stringProvider.getString(R.string.soft_logout_signin_notice,
state.homeServerUrl.toReducedUrl(),
state.userDisplayName,
state.userId))
@@ -86,12 +87,13 @@ class SoftLogoutController @Inject constructor(
if (state.hasUnsavedKeys) {
loginTextItem {
id("signText2")
- text(stringProvider.getString(R.string.soft_logout_signin_e2e_warning_notice))
+ text(host.stringProvider.getString(R.string.soft_logout_signin_e2e_warning_notice))
}
}
}
private fun buildForm(state: SoftLogoutViewState) {
+ val host = this
when (state.asyncHomeServerLoginFlowRequest) {
is Incomplete -> {
loadingItem {
@@ -101,8 +103,8 @@ class SoftLogoutController @Inject constructor(
is Fail -> {
loginErrorWithRetryItem {
id("errorRetry")
- text(errorFormatter.toHumanReadable(state.asyncHomeServerLoginFlowRequest.error))
- listener { listener?.retry() }
+ text(host.errorFormatter.toHumanReadable(state.asyncHomeServerLoginFlowRequest.error))
+ listener { host.listener?.retry() }
}
}
is Success -> {
@@ -110,21 +112,21 @@ class SoftLogoutController @Inject constructor(
LoginMode.Password -> {
loginPasswordFormItem {
id("passwordForm")
- stringProvider(stringProvider)
+ stringProvider(host.stringProvider)
passwordShown(state.passwordShown)
submitEnabled(state.submitEnabled)
- onPasswordEdited { listener?.passwordEdited(it) }
- errorText((state.asyncLoginAction as? Fail)?.error?.let { errorFormatter.toHumanReadable(it) })
- passwordRevealClickListener { listener?.revealPasswordClicked() }
- forgetPasswordClickListener { listener?.forgetPasswordClicked() }
- submitClickListener { password -> listener?.signinSubmit(password) }
+ onPasswordEdited { host.listener?.passwordEdited(it) }
+ errorText((state.asyncLoginAction as? Fail)?.error?.let { host.errorFormatter.toHumanReadable(it) })
+ passwordRevealClickListener { host.listener?.revealPasswordClicked() }
+ forgetPasswordClickListener { host.listener?.forgetPasswordClicked() }
+ submitClickListener { password -> host.listener?.signinSubmit(password) }
}
}
is LoginMode.Sso -> {
loginCenterButtonItem {
id("sso")
- text(stringProvider.getString(R.string.login_signin_sso))
- listener { listener?.signinFallbackSubmit() }
+ text(host.stringProvider.getString(R.string.login_signin_sso))
+ listener { host.listener?.signinFallbackSubmit() }
}
}
is LoginMode.SsoAndPassword -> {
@@ -132,8 +134,8 @@ class SoftLogoutController @Inject constructor(
LoginMode.Unsupported -> {
loginCenterButtonItem {
id("fallback")
- text(stringProvider.getString(R.string.login_signin))
- listener { listener?.signinFallbackSubmit() }
+ text(host.stringProvider.getString(R.string.login_signin))
+ listener { host.listener?.signinFallbackSubmit() }
}
}
LoginMode.Unknown -> Unit // Should not happen
@@ -143,18 +145,19 @@ class SoftLogoutController @Inject constructor(
}
private fun buildClearDataSection() {
+ val host = this
loginTitleSmallItem {
id("clearDataTitle")
- text(stringProvider.getString(R.string.soft_logout_clear_data_title))
+ text(host.stringProvider.getString(R.string.soft_logout_clear_data_title))
}
loginTextItem {
id("clearDataText")
- text(stringProvider.getString(R.string.soft_logout_clear_data_notice))
+ text(host.stringProvider.getString(R.string.soft_logout_clear_data_notice))
}
loginRedButtonItem {
id("clearDataSubmit")
- text(stringProvider.getString(R.string.soft_logout_clear_data_submit))
- listener { listener?.clearData() }
+ text(host.stringProvider.getString(R.string.soft_logout_clear_data_submit))
+ listener { host.listener?.clearData() }
}
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
deleted file mode 100644
index 2f69ba89b9..0000000000
--- a/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * 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.features.spaces
-
-import android.os.Bundle
-import android.os.Parcelable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentManager
-import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.di.ScreenComponent
-import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
-import im.vector.app.core.utils.startSharePlainTextIntent
-import im.vector.app.databinding.BottomSheetSpaceInviteBinding
-import im.vector.app.features.invite.InviteUsersToRoomActivity
-import kotlinx.parcelize.Parcelize
-import javax.inject.Inject
-
-class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment() {
-
- @Parcelize
- data class Args(
- val spaceId: String
- ) : Parcelable
-
- override val showExpanded = true
-
- @Inject
- lateinit var activeSessionHolder: ActiveSessionHolder
-
- override fun injectWith(injector: ScreenComponent) {
- injector.inject(this)
- }
-
- override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetSpaceInviteBinding {
- return BottomSheetSpaceInviteBinding.inflate(inflater, container, false)
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
-
- // Not going for full view model for now, as it may change
-
- val args: Args = arguments?.getParcelable(EXTRA_ARGS)
- ?: return Unit.also { dismiss() }
- val summary = activeSessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(args.spaceId)?.spaceSummary()
-
- val spaceName = summary?.name
- views.descriptionText.text = getString(R.string.invite_people_to_your_space_desc, spaceName)
-
- // XXX enable back when supported
- views.inviteByMailButton.isVisible = false
- views.inviteByMailButton.debouncedClicks {
- }
-
- views.inviteByMxidButton.debouncedClicks {
- val intent = InviteUsersToRoomActivity.getIntent(requireContext(), args.spaceId)
- startActivity(intent)
- }
-
- views.inviteByLinkButton.debouncedClicks {
- activeSessionHolder.getSafeActiveSession()?.permalinkService()?.createRoomPermalink(args.spaceId)?.let { permalink ->
- startSharePlainTextIntent(
- fragment = this,
- activityResultLauncher = null,
- chooserTitle = getString(R.string.share_by_text),
- text = getString(R.string.share_space_link_message, spaceName, permalink),
- extraTitle = getString(R.string.share_space_link_message, spaceName, permalink)
- )
- }
- }
-
-// views.skipButton.debouncedClicks {
-// dismiss()
-// }
- }
-
- companion object {
-
- const val EXTRA_ARGS = "EXTRA_ARGS"
-
- fun show(fragmentManager: FragmentManager, spaceId: String): ShareSpaceBottomSheet {
- return ShareSpaceBottomSheet().apply {
- isCancelable = true
- arguments = Bundle().apply {
- this.putParcelable(EXTRA_ARGS, ShareSpaceBottomSheet.Args(spaceId = spaceId))
- }
- }.also {
- it.show(fragmentManager, ShareSpaceBottomSheet::class.java.name)
- }
- }
- }
-}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index 8271595d9d..2526b62f39 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -16,6 +16,7 @@
package im.vector.app.features.spaces
+import android.content.DialogInterface
import android.os.Bundle
import android.os.Parcelable
import android.view.LayoutInflater
@@ -27,8 +28,10 @@ import com.airbnb.mvrx.args
import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.dialogs.withColoredButton
import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.core.resources.ColorProvider
import im.vector.app.databinding.BottomSheetSpaceSettingsBinding
import im.vector.app.features.home.AvatarRenderer
import im.vector.app.features.navigation.Navigator
@@ -36,15 +39,18 @@ import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
import im.vector.app.features.rageshake.BugReporter
import im.vector.app.features.rageshake.ReportType
import im.vector.app.features.roomprofile.RoomProfileActivity
+import im.vector.app.features.session.coroutineScope
import im.vector.app.features.settings.VectorPreferences
import im.vector.app.features.spaces.manage.ManageType
import im.vector.app.features.spaces.manage.SpaceManageActivity
import io.reactivex.android.schedulers.AndroidSchedulers
-import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.parcelize.Parcelize
+import me.gujun.android.span.span
+import org.matrix.android.sdk.api.extensions.orFalse
import org.matrix.android.sdk.api.session.events.model.EventType
import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
import org.matrix.android.sdk.api.util.toMatrixItem
import timber.log.Timber
import javax.inject.Inject
@@ -54,6 +60,7 @@ data class SpaceBottomSheetSettingsArgs(
val spaceId: String
) : Parcelable
+// XXX make proper view model before leaving beta
class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment() {
@Inject lateinit var navigator: Navigator
@@ -61,6 +68,7 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment
- GlobalScope.launch {
+ session.coroutineScope.launch {
try {
session.getRoom(spaceArgs.spaceId)?.leave(null)
} catch (failure: Throwable) {
@@ -153,6 +191,7 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment
groupSummaryItem {
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
id("all_communities")
- matrixItem(mxItem.copy(displayName = stringProvider.getString(R.string.group_all_communities)))
+ matrixItem(mxItem.copy(displayName = host.stringProvider.getString(R.string.group_all_communities)))
selected(nonNullViewState.selectedGroupingMethod is RoomGroupingMethod.ByLegacyGroup
&& nonNullViewState.selectedGroupingMethod.group() == null)
- listener { callback?.onGroupSelected(null) }
+ listener { host.callback?.onGroupSelected(null) }
}
}
nonNullViewState.legacyGroups.forEach { groupSummary ->
groupSummaryItem {
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
id(groupSummary.groupId)
matrixItem(groupSummary.toMatrixItem())
selected(nonNullViewState.selectedGroupingMethod is RoomGroupingMethod.ByLegacyGroup
&& nonNullViewState.selectedGroupingMethod.group()?.groupId == groupSummary.groupId)
- listener { callback?.onGroupSelected(groupSummary) }
+ listener { host.callback?.onGroupSelected(groupSummary) }
}
}
}
@@ -111,10 +112,11 @@ class SpaceSummaryController @Inject constructor(
rootSpaces: List?,
expandedStates: Map,
homeCount: RoomAggregateNotificationCount) {
+ val host = this
spaceBetaHeaderItem {
id("beta_header")
clickAction(View.OnClickListener {
- callback?.sendFeedBack()
+ host.callback?.sendFeedBack()
})
}
@@ -123,13 +125,13 @@ class SpaceSummaryController @Inject constructor(
summaries?.filter { it.membership == Membership.INVITE }
?.forEach {
spaceSummaryItem {
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
id(it.roomId)
matrixItem(it.toMatrixItem())
countState(UnreadCounterBadgeView.State(1, true, 0, false))
selected(false)
- description(stringProvider.getString(R.string.you_are_invited))
- listener { callback?.onSpaceInviteSelected(it) }
+ description(host.stringProvider.getString(R.string.you_are_invited))
+ listener { host.callback?.onSpaceInviteSelected(it) }
}
}
@@ -137,11 +139,11 @@ class SpaceSummaryController @Inject constructor(
id("space_home")
selected(selected is RoomGroupingMethod.BySpace && selected.space() == null)
countState(UnreadCounterBadgeView.State(homeCount.totalCount, homeCount.isHighlight, homeCount.unreadCount, homeCount.markedUnread))
- listener { callback?.onSpaceSelected(null) }
+ listener { host.callback?.onSpaceSelected(null) }
}
rootSpaces
- ?.sortedBy { it.displayName.toLowerCase(Locale.getDefault()) }
+ ?.sortedBy { it.displayName.lowercase(Locale.getDefault()) }
?.forEach { groupSummary ->
val isSelected = selected is RoomGroupingMethod.BySpace && groupSummary.roomId == selected.space()?.roomId
// does it have children?
@@ -152,20 +154,20 @@ class SpaceSummaryController @Inject constructor(
val expanded = expandedStates[groupSummary.roomId] == true
spaceSummaryItem {
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
id(groupSummary.roomId)
hasChildren(hasChildren)
expanded(expanded)
matrixItem(groupSummary.toMatrixItem())
selected(isSelected)
- onMore { callback?.onSpaceSettings(groupSummary) }
- listener { callback?.onSpaceSelected(groupSummary) }
- toggleExpand { callback?.onToggleExpand(groupSummary) }
+ onMore { host.callback?.onSpaceSettings(groupSummary) }
+ listener { host.callback?.onSpaceSelected(groupSummary) }
+ toggleExpand { host.callback?.onToggleExpand(groupSummary) }
countState(
UnreadCounterBadgeView.State(
groupSummary.notificationCount,
groupSummary.highlightCount > 0,
- groupSummary.scUnreadCount(scSdkPreferences),
+ groupSummary.scUnreadCount(host.scSdkPreferences),
groupSummary.markedUnread
)
)
@@ -181,7 +183,7 @@ class SpaceSummaryController @Inject constructor(
spaceAddItem {
id("create")
- listener { callback?.onAddSpaceSelected() }
+ listener { host.callback?.onAddSpaceSelected() }
}
}
@@ -189,6 +191,7 @@ class SpaceSummaryController @Inject constructor(
expandedStates: Map,
selected: RoomGroupingMethod,
info: SpaceChildInfo, currentDepth: Int, maxDepth: Int) {
+ val host = this
if (currentDepth >= maxDepth) return
val childSummary = summaries?.firstOrNull { it.roomId == info.childRoomId } ?: return
// does it have children?
@@ -199,21 +202,21 @@ class SpaceSummaryController @Inject constructor(
val isSelected = selected is RoomGroupingMethod.BySpace && childSummary.roomId == selected.space()?.roomId
subSpaceSummaryItem {
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
id(childSummary.roomId)
hasChildren(!subSpaces.isNullOrEmpty())
selected(isSelected)
expanded(expanded)
- onMore { callback?.onSpaceSettings(childSummary) }
+ onMore { host.callback?.onSpaceSettings(childSummary) }
matrixItem(childSummary.toMatrixItem())
- listener { callback?.onSpaceSelected(childSummary) }
- toggleExpand { callback?.onToggleExpand(childSummary) }
+ listener { host.callback?.onSpaceSelected(childSummary) }
+ toggleExpand { host.callback?.onToggleExpand(childSummary) }
indent(currentDepth)
countState(
UnreadCounterBadgeView.State(
childSummary.notificationCount,
childSummary.highlightCount > 0,
- childSummary.scUnreadCount(scSdkPreferences),
+ childSummary.scUnreadCount(host.scSdkPreferences),
childSummary.markedUnread
)
)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
index 8a87ff3473..a8b85c9887 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
@@ -36,23 +36,24 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
// var shouldForceFocusOnce = true
override fun buildModels(data: CreateSpaceState?) {
+ val host = this
genericFooterItem {
id("info_help_header")
style(ItemStyle.TITLE)
text(
if (data?.spaceType == SpaceType.Public) {
- stringProvider.getString(R.string.create_spaces_room_public_header, data.name)
+ host.stringProvider.getString(R.string.create_spaces_room_public_header, data.name)
} else {
- stringProvider.getString(R.string.create_spaces_room_private_header)
+ host.stringProvider.getString(R.string.create_spaces_room_private_header)
}
)
- textColor(colorProvider.getColorFromAttribute(R.attr.riot_primary_text_color))
+ textColor(host.colorProvider.getColorFromAttribute(R.attr.riot_primary_text_color))
}
genericFooterItem {
id("info_help")
text(
- stringProvider.getString(
+ host.stringProvider.getString(
if (data?.spaceType == SpaceType.Public) {
R.string.create_spaces_room_public_header_desc
} else {
@@ -60,7 +61,7 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
}
)
)
- textColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary))
+ textColor(host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary))
}
val firstRoomName = data?.defaultRooms?.get(0)
@@ -69,11 +70,11 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
enabled(true)
value(firstRoomName)
singleLine(true)
- hint(stringProvider.getString(R.string.create_room_name_section))
+ hint(host.stringProvider.getString(R.string.create_room_name_section))
endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
showBottomSeparator(false)
onTextChange { text ->
- listener?.onNameChange(0, text)
+ host.listener?.onNameChange(0, text)
}
}
@@ -83,11 +84,11 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
enabled(true)
value(secondRoomName)
singleLine(true)
- hint(stringProvider.getString(R.string.create_room_name_section))
+ hint(host.stringProvider.getString(R.string.create_room_name_section))
endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
showBottomSeparator(false)
onTextChange { text ->
- listener?.onNameChange(1, text)
+ host.listener?.onNameChange(1, text)
}
}
@@ -97,11 +98,11 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
enabled(true)
value(thirdRoomName)
singleLine(true)
- hint(stringProvider.getString(R.string.create_room_name_section))
+ hint(host.stringProvider.getString(R.string.create_room_name_section))
endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
showBottomSeparator(false)
onTextChange { text ->
- listener?.onNameChange(2, text)
+ host.listener?.onNameChange(2, text)
}
// onBind { _, view, _ ->
// if (shouldForceFocusOnce
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
index d46ae36275..6ab35d3bf6 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
@@ -37,13 +37,14 @@ class SpaceDetailEpoxyController @Inject constructor(
// var shouldForceFocusOnce = true
override fun buildModels(data: CreateSpaceState?) {
+ val host = this
genericFooterItem {
id("info_help")
text(
if (data?.spaceType == SpaceType.Public) {
- stringProvider.getString(R.string.create_spaces_details_public_header)
+ host.stringProvider.getString(R.string.create_spaces_details_public_header)
} else {
- stringProvider.getString(R.string.create_spaces_details_private_header)
+ host.stringProvider.getString(R.string.create_spaces_details_private_header)
}
)
}
@@ -52,17 +53,17 @@ class SpaceDetailEpoxyController @Inject constructor(
id("avatar")
enabled(true)
imageUri(data?.avatarUri)
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
matrixItem(data?.name?.let { MatrixItem.RoomItem("!", it, null).takeIf { !it.displayName.isNullOrBlank() } })
- clickListener { listener?.onAvatarChange() }
- deleteListener { listener?.onAvatarDelete() }
+ clickListener { host.listener?.onAvatarChange() }
+ deleteListener { host.listener?.onAvatarDelete() }
}
formEditTextItem {
id("name")
enabled(true)
value(data?.name)
- hint(stringProvider.getString(R.string.create_room_name_hint))
+ hint(host.stringProvider.getString(R.string.create_room_name_hint))
singleLine(true)
showBottomSeparator(false)
errorMessage(data?.nameInlineError)
@@ -76,7 +77,7 @@ class SpaceDetailEpoxyController @Inject constructor(
// }
// }
onTextChange { text ->
- listener?.onNameChange(text)
+ host.listener?.onNameChange(text)
}
}
@@ -84,11 +85,11 @@ class SpaceDetailEpoxyController @Inject constructor(
id("topic")
enabled(true)
value(data?.topic)
- hint(stringProvider.getString(R.string.create_space_topic_hint))
+ hint(host.stringProvider.getString(R.string.create_space_topic_hint))
showBottomSeparator(false)
textSizeSp(16)
onTextChange { text ->
- listener?.onTopicChange(text)
+ host.listener?.onTopicChange(text)
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 28d410529e..e334868d7c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -26,7 +26,8 @@ import im.vector.app.core.epoxy.loadingItem
import im.vector.app.core.error.ErrorFormatter
import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.GenericEmptyWithActionItem
+import im.vector.app.core.ui.list.genericEmptyWithActionItem
import im.vector.app.core.ui.list.genericPillItem
import im.vector.app.features.home.AvatarRenderer
import im.vector.app.features.home.room.list.spaceChildInfoItem
@@ -35,7 +36,7 @@ import org.matrix.android.sdk.api.failure.Failure
import org.matrix.android.sdk.api.failure.MatrixError.Companion.M_UNRECOGNIZED
import org.matrix.android.sdk.api.session.room.model.RoomType
import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
-import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
import javax.inject.Inject
class SpaceDirectoryController @Inject constructor(
@@ -50,11 +51,13 @@ class SpaceDirectoryController @Inject constructor(
fun onSpaceChildClick(spaceChildInfo: SpaceChildInfo)
fun onRoomClick(spaceChildInfo: SpaceChildInfo)
fun retry()
+ fun addExistingRooms(spaceId: String)
}
var listener: InteractionListener? = null
override fun buildModels(data: SpaceDirectoryState?) {
+ val host = this
val results = data?.spaceSummaryApiResult
if (results is Incomplete) {
@@ -70,13 +73,13 @@ class SpaceDirectoryController @Inject constructor(
tintIcon(false)
text(
span {
- span(stringProvider.getString(R.string.spaces_no_server_support_title)) {
+ span(host.stringProvider.getString(R.string.spaces_no_server_support_title)) {
textStyle = "bold"
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_primary)
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_primary)
}
+"\n\n"
- span(stringProvider.getString(R.string.spaces_no_server_support_description)) {
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+ span(host.stringProvider.getString(R.string.spaces_no_server_support_description)) {
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
}
}
)
@@ -84,8 +87,8 @@ class SpaceDirectoryController @Inject constructor(
} else {
errorWithRetryItem {
id("api_err")
- text(errorFormatter.toHumanReadable(failure))
- listener { listener?.retry() }
+ text(host.errorFormatter.toHumanReadable(failure))
+ listener { host.listener?.retry() }
}
}
} else {
@@ -96,9 +99,23 @@ class SpaceDirectoryController @Inject constructor(
?: emptyList()
if (flattenChildInfo.isEmpty()) {
- genericFooterItem {
- id("empty_footer")
- stringProvider.getString(R.string.no_result_placeholder)
+ genericEmptyWithActionItem {
+ id("empty_res")
+ title(host.stringProvider.getString(R.string.this_space_has_no_rooms))
+ iconRes(R.drawable.ic_empty_icon_room)
+ iconTint(host.colorProvider.getColorFromAttribute(R.attr.riotx_reaction_background_on))
+ apply {
+ if (data?.canAddRooms == true) {
+ description(host.stringProvider.getString(R.string.this_space_has_no_rooms_admin))
+ val action = GenericEmptyWithActionItem.Action(host.stringProvider.getString(R.string.space_add_existing_rooms))
+ action.perform = Runnable {
+ host.listener?.addExistingRooms(data.spaceId)
+ }
+ buttonAction(action)
+ } else {
+ description(host.stringProvider.getString(R.string.this_space_has_no_rooms_not_admin))
+ }
+ }
}
} else {
flattenChildInfo.forEach { info ->
@@ -107,24 +124,24 @@ class SpaceDirectoryController @Inject constructor(
val isLoading = data?.changeMembershipStates?.get(info.childRoomId)?.isInProgress() ?: false
spaceChildInfoItem {
id(info.childRoomId)
- matrixItem(MatrixItem.RoomItem(info.childRoomId, info.name, info.avatarUrl))
- avatarRenderer(avatarRenderer)
+ matrixItem(info.toMatrixItem())
+ avatarRenderer(host.avatarRenderer)
topic(info.topic)
memberCount(info.activeMemberCount ?: 0)
space(isSpace)
loading(isLoading)
buttonLabel(
- if (isJoined) stringProvider.getString(R.string.action_open)
- else stringProvider.getString(R.string.join)
+ if (isJoined) host.stringProvider.getString(R.string.action_open)
+ else host.stringProvider.getString(R.string.join)
)
apply {
if (isSpace) {
- itemClickListener(View.OnClickListener { listener?.onSpaceChildClick(info) })
+ itemClickListener(View.OnClickListener { host.listener?.onSpaceChildClick(info) })
} else {
- itemClickListener(View.OnClickListener { listener?.onRoomClick(info) })
+ itemClickListener(View.OnClickListener { host.listener?.onRoomClick(info) })
}
}
- buttonClickListener(View.OnClickListener { listener?.onButtonClick(info) })
+ buttonClickListener(View.OnClickListener { host.listener?.onButtonClick(info) })
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index fa44f4595e..a866ea9b89 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -19,6 +19,8 @@ package im.vector.app.features.spaces.explore
import android.os.Bundle
import android.os.Parcelable
import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import com.airbnb.mvrx.activityViewModel
@@ -26,9 +28,12 @@ import com.airbnb.mvrx.withState
import im.vector.app.R
import im.vector.app.core.extensions.cleanup
import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.registerStartForActivityResult
import im.vector.app.core.platform.OnBackPressed
import im.vector.app.core.platform.VectorBaseFragment
import im.vector.app.databinding.FragmentRoomDirectoryPickerBinding
+import im.vector.app.features.spaces.manage.ManageType
+import im.vector.app.features.spaces.manage.SpaceManageActivity
import kotlinx.parcelize.Parcelize
import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
import javax.inject.Inject
@@ -44,6 +49,8 @@ class SpaceDirectoryFragment @Inject constructor(
SpaceDirectoryController.InteractionListener,
OnBackPressed {
+ override fun getMenuRes() = R.menu.menu_space_directory
+
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
FragmentRoomDirectoryPickerBinding.inflate(layoutInflater, container, false)
@@ -60,6 +67,10 @@ class SpaceDirectoryFragment @Inject constructor(
}
epoxyController.listener = this
views.roomDirectoryPickerList.configureWith(epoxyController)
+
+ viewModel.selectSubscribe(this, SpaceDirectoryState::canAddRooms) {
+ invalidateOptionsMenu()
+ }
}
override fun onDestroyView() {
@@ -77,6 +88,28 @@ class SpaceDirectoryFragment @Inject constructor(
views.toolbar.title = title
}
+ override fun onPrepareOptionsMenu(menu: Menu) = withState(viewModel) { state ->
+ menu.findItem(R.id.spaceAddRoom)?.isVisible = state.canAddRooms
+ menu.findItem(R.id.spaceCreateRoom)?.isVisible = false // Not yet implemented
+ super.onPrepareOptionsMenu(menu)
+ }
+
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ when (item.itemId) {
+ R.id.spaceAddRoom -> {
+ withState(viewModel) { state ->
+ addExistingRooms(state.spaceId)
+ }
+ return true
+ }
+ R.id.spaceCreateRoom -> {
+ // not implemented yet
+ return true
+ }
+ }
+ return super.onOptionsItemSelected(item)
+ }
+
override fun onButtonClick(spaceChildInfo: SpaceChildInfo) {
viewModel.handle(SpaceDirectoryViewAction.JoinOrOpen(spaceChildInfo))
}
@@ -97,6 +130,14 @@ class SpaceDirectoryFragment @Inject constructor(
override fun retry() {
viewModel.handle(SpaceDirectoryViewAction.Retry)
}
+
+ private val addExistingRoomActivityResult = registerStartForActivityResult { _ ->
+ viewModel.handle(SpaceDirectoryViewAction.Retry)
+ }
+
+ override fun addExistingRooms(spaceId: String) {
+ addExistingRoomActivityResult.launch(SpaceManageActivity.newIntent(requireContext(), spaceId, ManageType.AddRooms))
+ }
// override fun navigateToRoom(roomId: String) {
// viewModel.handle(SpaceDirectoryViewAction.NavigateToRoom(roomId))
// }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt
index 75adc659d5..220c3e3492 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt
@@ -36,7 +36,8 @@ data class SpaceDirectoryState(
// Set of joined roomId / spaces,
val joinedRoomsIds: Set = emptySet(),
// keys are room alias or roomId
- val changeMembershipStates: Map = emptyMap()
+ val changeMembershipStates: Map = emptyMap(),
+ val canAddRooms: Boolean = false
) : MvRxState {
constructor(args: SpaceDirectoryArgs) : this(
spaceId = args.spaceId
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index 0c23752936..313ddfe1dc 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -28,12 +28,15 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
import org.matrix.android.sdk.api.session.room.model.Membership
import org.matrix.android.sdk.api.session.room.model.RoomType
import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
import org.matrix.android.sdk.rx.rx
import timber.log.Timber
@@ -70,6 +73,23 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
refreshFromApi()
observeJoinedRooms()
observeMembershipChanges()
+ observePermissions()
+ }
+
+ private fun observePermissions() {
+ val room = session.getRoom(initialState.spaceId) ?: return
+
+ val powerLevelsContentLive = PowerLevelsObservableFactory(room).createObservable()
+
+ powerLevelsContentLive
+ .subscribe {
+ val powerLevelsHelper = PowerLevelsHelper(it)
+ setState {
+ copy(canAddRooms = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
+ EventType.STATE_SPACE_CHILD))
+ }
+ }
+ .disposeOnClear()
}
private fun refreshFromApi() {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
index dffb09529b..69be246506 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
@@ -62,6 +62,22 @@ class AddRoomListController @Inject constructor(
var initialLoadOccurred = false
+ var expanded: Boolean = true
+ set(value) {
+ if (value != field) {
+ field = value
+ requestForcedModelBuild()
+ }
+ }
+
+ var disabled: Boolean = false
+ set(value) {
+ if (value != field) {
+ field = value
+ requestForcedModelBuild()
+ }
+ }
+
fun boundaryChange(boundary: ResultBoundaries) {
val boundaryHasLoadedSomething = boundary.frontLoaded || boundary.zeroItemLoaded
if (initialLoadOccurred != boundaryHasLoadedSomething) {
@@ -88,6 +104,11 @@ class AddRoomListController @Inject constructor(
}
override fun addModels(models: List>) {
+ if (disabled) {
+ super.addModels(emptyList())
+ return
+ }
+ val host = this
val filteredModel = if (ignoreRooms == null) {
models
} else {
@@ -100,38 +121,44 @@ class AddRoomListController @Inject constructor(
add(
RoomCategoryItem_().apply {
id("header")
- title(sectionName ?: "")
- expanded(true)
+ title(host.sectionName ?: "")
+ expanded(host.expanded)
+ listener {
+ host.expanded = !host.expanded
+ }
}
)
- if (subHeaderText != null) {
+ if (expanded && subHeaderText != null) {
add(
GenericPillItem_().apply {
id("sub_header")
- text(subHeaderText)
+ text(host.subHeaderText)
imageRes(R.drawable.ic_info)
}
)
}
}
- super.addModels(filteredModel)
- if (!initialLoadOccurred) {
- add(
- RoomSelectionPlaceHolderItem_().apply { id("loading") }
- )
+ if (expanded) {
+ super.addModels(filteredModel)
+ if (!initialLoadOccurred) {
+ add(
+ RoomSelectionPlaceHolderItem_().apply { id("loading") }
+ )
+ }
}
}
override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
+ val host = this
if (item == null) return RoomSelectionPlaceHolderItem_().apply { id(currentPosition) }
return RoomSelectionItem_().apply {
id(item.roomId)
matrixItem(item.toMatrixItem())
- avatarRenderer(this@AddRoomListController.avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
space(item.roomType == RoomType.SPACE)
- selected(selectedItems[item.roomId] ?: false)
+ selected(host.selectedItems[item.roomId] ?: false)
itemClickListener(DebouncedClickListener({
- listener?.onItemSelected(item)
+ host.listener?.onItemSelected(item)
}))
}
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
index 203098d32b..05a2f19941 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
@@ -42,6 +42,7 @@ import javax.inject.Inject
class SpaceAddRoomFragment @Inject constructor(
private val spaceEpoxyController: AddRoomListController,
private val roomEpoxyController: AddRoomListController,
+ private val dmEpoxyController: AddRoomListController,
private val viewModelFactory: SpaceAddRoomsViewModel.Factory
) : VectorBaseFragment(),
OnBackPressed, AddRoomListController.Listener, SpaceAddRoomsViewModel.Factory {
@@ -84,6 +85,7 @@ class SpaceAddRoomFragment @Inject constructor(
viewModel.selectionListLiveData.observe(viewLifecycleOwner) {
spaceEpoxyController.selectedItems = it
roomEpoxyController.selectedItems = it
+ dmEpoxyController.selectedItems = it
saveNeeded = it.values.any { it }
invalidateOptionsMenu()
}
@@ -95,6 +97,7 @@ class SpaceAddRoomFragment @Inject constructor(
viewModel.selectSubscribe(this, SpaceAddRoomsState::ignoreRooms) {
spaceEpoxyController.ignoreRooms = it
roomEpoxyController.ignoreRooms = it
+ dmEpoxyController.ignoreRooms = it
}.disposeOnDestroyView()
viewModel.selectSubscribe(this, SpaceAddRoomsState::isSaving) {
@@ -105,6 +108,10 @@ class SpaceAddRoomFragment @Inject constructor(
}
}.disposeOnDestroyView()
+ viewModel.selectSubscribe(this, SpaceAddRoomsState::shouldShowDMs) {
+ dmEpoxyController.disabled = !it
+ }.disposeOnDestroyView()
+
views.createNewRoom.debouncedClicks {
sharedViewModel.handle(SpaceManagedSharedAction.CreateRoom)
}
@@ -121,11 +128,11 @@ class SpaceAddRoomFragment @Inject constructor(
.setNegativeButton(R.string.cancel, null)
.show()
}
- is SpaceAddRoomsViewEvents.SaveFailed -> {
+ is SpaceAddRoomsViewEvents.SaveFailed -> {
showErrorInSnackbar(it.reason)
invalidateOptionsMenu()
}
- SpaceAddRoomsViewEvents.SavedDone -> {
+ SpaceAddRoomsViewEvents.SavedDone -> {
sharedViewModel.handle(SpaceManagedSharedAction.HandleBack)
}
}
@@ -149,6 +156,7 @@ class SpaceAddRoomFragment @Inject constructor(
views.roomList.cleanup()
spaceEpoxyController.listener = null
roomEpoxyController.listener = null
+ dmEpoxyController.listener = null
super.onDestroyView()
}
@@ -181,6 +189,19 @@ class SpaceAddRoomFragment @Inject constructor(
concatAdapter.addAdapter(roomEpoxyController.adapter)
concatAdapter.addAdapter(spaceEpoxyController.adapter)
+ // This controller can be disabled depending on the space type (public or not)
+ viewModel.updatableDMLivePageResult.liveBoundaries.observe(viewLifecycleOwner) {
+ dmEpoxyController.boundaryChange(it)
+ }
+ viewModel.updatableDMLivePageResult.livePagedList.observe(viewLifecycleOwner) {
+ dmEpoxyController.totalSize = it.size
+ dmEpoxyController.submitList(it)
+ }
+ dmEpoxyController.sectionName = getString(R.string.direct_chats_header)
+ dmEpoxyController.listener = this
+
+ concatAdapter.addAdapter(dmEpoxyController.adapter)
+
views.roomList.adapter = concatAdapter
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsState.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsState.kt
index 6ce3468fe1..2d9113ae68 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsState.kt
@@ -26,7 +26,8 @@ data class SpaceAddRoomsState(
val currentFilter: String = "",
val spaceName: String = "",
val ignoreRooms: List = emptyList(),
- val isSaving: Async> = Uninitialized
+ val isSaving: Async> = Uninitialized,
+ val shouldShowDMs : Boolean = false
// val selectionList: Map = emptyMap()
) : MvRxState {
constructor(args: SpaceManageArgs) : this(
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
index 55e65eb171..35c415b087 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -98,6 +98,26 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
)
}
+ val updatableDMLivePageResult: UpdatableLivePageResult by lazy {
+ session.getFilteredPagedRoomSummariesLive(
+ roomSummaryQueryParams {
+ this.memberships = listOf(Membership.JOIN)
+ this.excludeType = listOf(RoomType.SPACE)
+ this.includeType = null
+ this.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+ this.activeSpaceFilter = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
+ this.displayName = QueryStringValue.Contains(initialState.currentFilter, QueryStringValue.Case.INSENSITIVE)
+ },
+ pagedListConfig = PagedList.Config.Builder()
+ .setPageSize(10)
+ .setInitialLoadSizeHint(20)
+ .setEnablePlaceholders(true)
+ .setPrefetchDistance(10)
+ .build(),
+ sortOrder = RoomSortOrder.NAME
+ )
+ }
+
private val selectionList = mutableMapOf()
val selectionListLiveData = MutableLiveData>()
@@ -106,7 +126,8 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
setState {
copy(
spaceName = spaceSummary?.displayName ?: "",
- ignoreRooms = (spaceSummary?.flattenParentIds ?: emptyList()) + listOf(initialState.spaceId)
+ ignoreRooms = (spaceSummary?.flattenParentIds ?: emptyList()) + listOf(initialState.spaceId),
+ shouldShowDMs = spaceSummary?.isPublic == false
)
}
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
index a94a2d9242..b16c6de921 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
@@ -19,9 +19,12 @@ package im.vector.app.features.spaces.manage
import com.airbnb.epoxy.TypedEpoxyController
import com.airbnb.mvrx.Fail
import com.airbnb.mvrx.Incomplete
+import im.vector.app.R
import im.vector.app.core.epoxy.errorWithRetryItem
import im.vector.app.core.epoxy.loadingItem
import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
import im.vector.app.core.utils.DebouncedClickListener
import im.vector.app.features.home.AvatarRenderer
import org.matrix.android.sdk.api.session.room.model.RoomType
@@ -31,7 +34,8 @@ import javax.inject.Inject
class SpaceManageRoomsController @Inject constructor(
private val avatarRenderer: AvatarRenderer,
- private val errorFormatter: ErrorFormatter
+ private val errorFormatter: ErrorFormatter,
+ private val stringProvider: StringProvider
) : TypedEpoxyController() {
interface Listener {
@@ -43,6 +47,7 @@ class SpaceManageRoomsController @Inject constructor(
private val matchFilter = SpaceChildInfoMatchFilter()
override fun buildModels(data: SpaceManageRoomViewState?) {
+ val host = this
val roomListAsync = data?.childrenInfo
if (roomListAsync is Incomplete) {
loadingItem { id("loading") }
@@ -51,8 +56,8 @@ class SpaceManageRoomsController @Inject constructor(
if (roomListAsync is Fail) {
errorWithRetryItem {
id("Api Error")
- text(errorFormatter.toHumanReadable(roomListAsync.error))
- listener { listener?.retry() }
+ text(host.errorFormatter.toHumanReadable(roomListAsync.error))
+ listener { host.listener?.retry() }
}
return
}
@@ -66,17 +71,24 @@ class SpaceManageRoomsController @Inject constructor(
matchFilter.filter = data.currentFilter
val filteredResult = directChildren.filter { matchFilter.test(it) }
- filteredResult.forEach { childInfo ->
- roomManageSelectionItem {
- id(childInfo.childRoomId)
- matrixItem(childInfo.toMatrixItem())
- avatarRenderer(avatarRenderer)
- suggested(childInfo.suggested ?: false)
- space(childInfo.roomType == RoomType.SPACE)
- selected(data.selectedRooms.contains(childInfo.childRoomId))
- itemClickListener(DebouncedClickListener({
- listener?.toggleSelection(childInfo)
- }))
+ if (filteredResult.isEmpty()) {
+ genericFooterItem {
+ id("empty_result")
+ text(host.stringProvider.getString(R.string.no_result_placeholder))
+ }
+ } else {
+ filteredResult.forEach { childInfo ->
+ roomManageSelectionItem {
+ id(childInfo.childRoomId)
+ matrixItem(childInfo.toMatrixItem())
+ avatarRenderer(host.avatarRenderer)
+ suggested(childInfo.suggested ?: false)
+ space(childInfo.roomType == RoomType.SPACE)
+ selected(data.selectedRooms.contains(childInfo.childRoomId))
+ itemClickListener(DebouncedClickListener({
+ host.listener?.toggleSelection(childInfo)
+ }))
+ }
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
index de51805472..614f6f92c8 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
@@ -61,6 +61,7 @@ class SpaceSettingsController @Inject constructor(
override fun buildModels(data: RoomSettingsViewState?) {
val roomSummary = data?.roomSummary?.invoke() ?: return
+ val host = this
formEditableSquareAvatarItem {
id("avatar")
@@ -68,7 +69,7 @@ class SpaceSettingsController @Inject constructor(
when (val avatarAction = data.avatarAction) {
RoomSettingsViewState.AvatarAction.None -> {
// Use the current value
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
// We do not want to use the fallback avatar url, which can be the other user avatar, or the current user avatar.
matrixItem(roomSummary.toMatrixItem().copy(avatarUrl = data.currentRoomAvatarUrl))
}
@@ -77,8 +78,8 @@ class SpaceSettingsController @Inject constructor(
is RoomSettingsViewState.AvatarAction.UpdateAvatar ->
imageUri(avatarAction.newAvatarUri)
}
- clickListener { callback?.onAvatarChange() }
- deleteListener { callback?.onAvatarDelete() }
+ clickListener { host.callback?.onAvatarChange() }
+ deleteListener { host.callback?.onAvatarDelete() }
}
buildProfileSection(
@@ -89,10 +90,10 @@ class SpaceSettingsController @Inject constructor(
id("name")
enabled(data.actionPermissions.canChangeName)
value(data.newName ?: roomSummary.displayName)
- hint(stringProvider.getString(R.string.create_room_name_hint))
+ hint(host.stringProvider.getString(R.string.create_room_name_hint))
showBottomSeparator(false)
onTextChange { text ->
- callback?.onNameChanged(text)
+ host.callback?.onNameChanged(text)
}
}
@@ -100,10 +101,10 @@ class SpaceSettingsController @Inject constructor(
id("topic")
enabled(data.actionPermissions.canChangeTopic)
value(data.newTopic ?: roomSummary.topic)
- hint(stringProvider.getString(R.string.create_space_topic_hint))
+ hint(host.stringProvider.getString(R.string.create_space_topic_hint))
showBottomSeparator(false)
onTextChange { text ->
- callback?.onTopicChanged(text)
+ host.callback?.onTopicChanged(text)
}
}
@@ -122,11 +123,11 @@ class SpaceSettingsController @Inject constructor(
formSwitchItem {
id("isPublic")
enabled(data.actionPermissions.canChangeJoinRule)
- title(stringProvider.getString(R.string.make_this_space_public))
+ title(host.stringProvider.getString(R.string.make_this_space_public))
switchChecked(isPublic)
listener { value ->
- callback?.setIsPublic(value)
+ host.callback?.setIsPublic(value)
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
index 87f5356f6d..b4b48d7710 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
@@ -28,7 +28,7 @@ import im.vector.app.core.extensions.hideKeyboard
import im.vector.app.core.platform.GenericIdArgs
import im.vector.app.core.platform.VectorBaseActivity
import im.vector.app.databinding.ActivitySimpleLoadingBinding
-import im.vector.app.features.spaces.ShareSpaceBottomSheet
+import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
class SpacePeopleActivity : VectorBaseActivity() {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
index 71be3690a1..eb237510f1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
@@ -58,6 +58,7 @@ class SpacePeopleListController @Inject constructor(
}
override fun buildModels(data: RoomMemberListViewState?) {
+ val host = this
val memberSummaries = data?.roomMemberSummaries?.invoke()
if (memberSummaries == null) {
loadingItem { id("loading") }
@@ -72,7 +73,7 @@ class SpacePeopleListController @Inject constructor(
if (filtered.isNotEmpty()) {
dividerItem {
id("divider_type_${memberEntry.first.titleRes}")
- color(dividerColor)
+ color(host.dividerColor)
}
}
foundCount += filtered.size
@@ -82,15 +83,15 @@ class SpacePeopleListController @Inject constructor(
profileMatrixItemWithPowerLevel {
id(roomMember.userId)
matrixItem(roomMember.toMatrixItem())
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
userEncryptionTrustLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
.apply {
- val pl = memberEntry.first.toPowerLevelLabel()
+ val pl = host.toPowerLevelLabel(memberEntry.first)
if (memberEntry.first == RoomMemberListCategories.INVITE) {
powerLevelLabel(
span {
- span(stringProvider.getString(R.string.invited)) {
- textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+ span(host.stringProvider.getString(R.string.invited)) {
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
textStyle = "bold"
// fontFamily = "monospace"
}
@@ -100,10 +101,10 @@ class SpacePeopleListController @Inject constructor(
powerLevelLabel(
span {
span(" $pl ") {
- backgroundColor = colorProvider.getColor(R.color.notification_accent_color)
- paddingTop = dimensionConverter.dpToPx(2)
- paddingBottom = dimensionConverter.dpToPx(2)
- textColor = colorProvider.getColor(R.color.white)
+ backgroundColor = host.colorProvider.getColor(R.color.notification_accent_color)
+ paddingTop = host.dimensionConverter.dpToPx(2)
+ paddingBottom = host.dimensionConverter.dpToPx(2)
+ textColor = host.colorProvider.getColor(R.color.white)
textStyle = "bold"
// fontFamily = "monospace"
}
@@ -115,14 +116,14 @@ class SpacePeopleListController @Inject constructor(
}
clickListener { _ ->
- listener?.onSpaceMemberClicked(roomMember)
+ host.listener?.onSpaceMemberClicked(roomMember)
}
}
},
between = { _, roomMemberBefore ->
dividerItem {
id("divider_${roomMemberBefore.userId}")
- color(dividerColor)
+ color(host.dividerColor)
}
}
)
@@ -135,30 +136,30 @@ class SpacePeopleListController @Inject constructor(
title(
span {
+"\n"
- +stringProvider.getString(R.string.no_result_placeholder)
+ +host.stringProvider.getString(R.string.no_result_placeholder)
}
)
description(
span {
- +stringProvider.getString(R.string.looking_for_someone_not_in_space, data.roomSummary.invoke()?.displayName ?: "")
+ +host.stringProvider.getString(R.string.looking_for_someone_not_in_space, data.roomSummary.invoke()?.displayName ?: "")
+"\n"
span("Invite them") {
- textColor = colorProvider.getColorFromAttribute(R.attr.colorAccent)
+ textColor = host.colorProvider.getColorFromAttribute(R.attr.colorAccent)
textStyle = "bold"
}
}
)
itemClickAction(GenericItem.Action("invite").apply {
perform = Runnable {
- listener?.onInviteToSpaceSelected()
+ host.listener?.onInviteToSpaceSelected()
}
})
}
}
}
- private fun RoomMemberListCategories.toPowerLevelLabel(): String? {
- return when (this) {
+ private fun toPowerLevelLabel(categories: RoomMemberListCategories): String? {
+ return when (categories) {
RoomMemberListCategories.ADMIN -> stringProvider.getString(R.string.power_level_admin)
RoomMemberListCategories.MODERATOR -> stringProvider.getString(R.string.power_level_moderator)
else -> null
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
index 8f2e7379c4..e15f404cbf 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
@@ -37,11 +37,12 @@ class SpacePreviewController @Inject constructor(
var interactionListener: InteractionListener? = null
override fun buildModels(data: SpacePreviewState?) {
+ val host = this
val memberCount = data?.spaceInfo?.invoke()?.memberCount ?: 0
spaceTopSummaryItem {
id("info")
- formattedMemberCount(stringProvider.getQuantityString(R.plurals.room_title_members, memberCount, memberCount))
+ formattedMemberCount(host.stringProvider.getQuantityString(R.plurals.room_title_members, memberCount, memberCount))
topic(data?.spaceInfo?.invoke()?.topic ?: data?.topic ?: "")
}
@@ -49,7 +50,7 @@ class SpacePreviewController @Inject constructor(
if (result.isNotEmpty()) {
genericItemHeader {
id("header_rooms")
- text(stringProvider.getString(R.string.rooms))
+ text(host.stringProvider.getString(R.string.rooms))
}
buildChildren(result, 0)
@@ -57,6 +58,7 @@ class SpacePreviewController @Inject constructor(
}
private fun buildChildren(children: List, depth: Int) {
+ val host = this
children.forEach { child ->
if (child.isSubSpace == true) {
@@ -66,7 +68,7 @@ class SpacePreviewController @Inject constructor(
title(child.name)
depth(depth)
avatarUrl(child.avatarUrl)
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
}
when (child.children) {
is Loading -> {
@@ -87,7 +89,7 @@ class SpacePreviewController @Inject constructor(
topic(child.topic ?: "")
avatarUrl(child.avatarUrl)
memberCount(TextUtils.formatCountToShortDecimal(child.memberCount ?: 0))
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
}
}
// when (child) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceAction.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceAction.kt
new file mode 100644
index 0000000000..d97e17fabb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceAction.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.features.spaces.share
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class ShareSpaceAction : VectorViewModelAction {
+ object InviteByMxId : ShareSpaceAction()
+ object InviteByLink : ShareSpaceAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt
new file mode 100644
index 0000000000..4289af7b3b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt
@@ -0,0 +1,126 @@
+/*
+ * 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.features.spaces.share
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentManager
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.core.utils.startSharePlainTextIntent
+import im.vector.app.databinding.BottomSheetSpaceInviteBinding
+import im.vector.app.features.invite.InviteUsersToRoomActivity
+import kotlinx.parcelize.Parcelize
+import javax.inject.Inject
+
+class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment(), ShareSpaceViewModel.Factory {
+
+ @Parcelize
+ data class Args(
+ val spaceId: String,
+ val postCreation: Boolean = false
+ ) : Parcelable
+
+ override val showExpanded = true
+
+ private val viewModel: ShareSpaceViewModel by fragmentViewModel(ShareSpaceViewModel::class)
+
+ @Inject lateinit var viewModelFactory: ShareSpaceViewModel.Factory
+
+ override fun create(initialState: ShareSpaceViewState): ShareSpaceViewModel = viewModelFactory.create(initialState)
+
+ override fun injectWith(injector: ScreenComponent) {
+ injector.inject(this)
+ }
+
+ override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetSpaceInviteBinding {
+ return BottomSheetSpaceInviteBinding.inflate(inflater, container, false)
+ }
+
+ override fun invalidate() = withState(viewModel) { state ->
+ super.invalidate()
+ val summary = state.spaceSummary.invoke()
+
+ val spaceName = summary?.name
+
+ if (state.postCreation) {
+ views.headerText.text = getString(R.string.invite_people_to_your_space)
+ views.descriptionText.setTextOrHide(getString(R.string.invite_people_to_your_space_desc, spaceName))
+ } else {
+ views.headerText.text = getString(R.string.invite_to_space, spaceName)
+ views.descriptionText.setTextOrHide(null)
+ }
+
+ views.inviteByMailButton.isVisible = false // not yet implemented
+ views.inviteByLinkButton.isVisible = state.canShareLink
+ views.inviteByMxidButton.isVisible = state.canInviteByMxId
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ // XXX enable back when supported
+ views.inviteByMailButton.isVisible = false
+ views.inviteByMailButton.debouncedClicks {
+ }
+
+ views.inviteByMxidButton.debouncedClicks {
+ viewModel.handle(ShareSpaceAction.InviteByMxId)
+ }
+
+ views.inviteByLinkButton.debouncedClicks {
+ viewModel.handle(ShareSpaceAction.InviteByLink)
+ }
+
+ viewModel.observeViewEvents { event ->
+ when (event) {
+ is ShareSpaceViewEvents.NavigateToInviteUser -> {
+ val intent = InviteUsersToRoomActivity.getIntent(requireContext(), event.spaceId)
+ startActivity(intent)
+ }
+ is ShareSpaceViewEvents.ShowInviteByLink -> {
+ startSharePlainTextIntent(
+ fragment = this,
+ activityResultLauncher = null,
+ chooserTitle = getString(R.string.share_by_text),
+ text = getString(R.string.share_space_link_message, event.spaceName, event.permalink),
+ extraTitle = getString(R.string.share_space_link_message, event.spaceName, event.permalink)
+ )
+ }
+ }
+ }
+ }
+
+ companion object {
+
+ fun show(fragmentManager: FragmentManager, spaceId: String, postCreation: Boolean = false): ShareSpaceBottomSheet {
+ return ShareSpaceBottomSheet().apply {
+ setArguments(Args(spaceId = spaceId, postCreation = postCreation))
+ }.also {
+ it.show(fragmentManager, ShareSpaceBottomSheet::class.java.name)
+ }
+ }
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewEvents.kt
new file mode 100644
index 0000000000..60c553b7b0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewEvents.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.features.spaces.share
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class ShareSpaceViewEvents : VectorViewEvents {
+ data class NavigateToInviteUser(val spaceId: String) : ShareSpaceViewEvents()
+ data class ShowInviteByLink(val permalink: String, val spaceName: String) : ShareSpaceViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt
new file mode 100644
index 0000000000..dfce534a7a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt
@@ -0,0 +1,98 @@
+/*
+ * 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.features.spaces.share
+
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+
+class ShareSpaceViewModel @AssistedInject constructor(
+ @Assisted private val initialState: ShareSpaceViewState,
+ private val session: Session) : VectorViewModel(initialState) {
+
+ @AssistedFactory
+ interface Factory {
+ fun create(initialState: ShareSpaceViewState): ShareSpaceViewModel
+ }
+
+ companion object : MvRxViewModelFactory {
+ override fun create(viewModelContext: ViewModelContext, state: ShareSpaceViewState): ShareSpaceViewModel? {
+ val factory = when (viewModelContext) {
+ is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+ is ActivityViewModelContext -> viewModelContext.activity as? Factory
+ }
+ return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+ }
+ }
+
+ init {
+ val roomSummary = session.getRoomSummary(initialState.spaceId)
+ setState {
+ copy(
+ spaceSummary = roomSummary?.let { Success(it) } ?: Uninitialized,
+ canShareLink = roomSummary?.isPublic.orFalse()
+ )
+ }
+ observePowerLevel()
+ }
+
+ private fun observePowerLevel() {
+ val room = session.getRoom(initialState.spaceId) ?: return
+ PowerLevelsObservableFactory(room)
+ .createObservable()
+ .subscribe { powerLevelContent ->
+ val powerLevelsHelper = PowerLevelsHelper(powerLevelContent)
+ setState {
+ copy(
+ canInviteByMxId = powerLevelsHelper.isUserAbleToInvite(session.myUserId)
+ )
+ }
+ }
+ .disposeOnClear()
+ }
+
+ override fun handle(action: ShareSpaceAction) {
+ when (action) {
+ ShareSpaceAction.InviteByLink -> {
+ val roomSummary = session.getRoomSummary(initialState.spaceId)
+ val alias = roomSummary?.canonicalAlias
+ val permalink = if (alias != null) {
+ session.permalinkService().createPermalink(alias)
+ } else {
+ session.permalinkService().createRoomPermalink(initialState.spaceId)
+ }
+ if (permalink != null) {
+ _viewEvents.post(ShareSpaceViewEvents.ShowInviteByLink(permalink, roomSummary?.name ?: ""))
+ }
+ }
+ ShareSpaceAction.InviteByMxId -> {
+ _viewEvents.post(ShareSpaceViewEvents.NavigateToInviteUser(initialState.spaceId))
+ }
+ }
+ }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewState.kt
new file mode 100644
index 0000000000..97606e9506
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewState.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.features.spaces.share
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+data class ShareSpaceViewState(
+ val spaceId: String,
+ val spaceSummary: Async = Uninitialized,
+ val canInviteByMxId: Boolean = false,
+ val canShareLink: Boolean = false,
+ val postCreation: Boolean = false
+) : MvRxState {
+ constructor(args: ShareSpaceBottomSheet.Args) : this(
+ spaceId = args.spaceId,
+ postCreation = args.postCreation
+ )
+}
diff --git a/vector/src/main/java/im/vector/app/features/terms/TermsController.kt b/vector/src/main/java/im/vector/app/features/terms/TermsController.kt
index 0b0088e05e..e80d28bf8e 100644
--- a/vector/src/main/java/im/vector/app/features/terms/TermsController.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/TermsController.kt
@@ -36,6 +36,7 @@ class TermsController @Inject constructor(
override fun buildModels(data: ReviewTermsViewState?) {
data ?: return
+ val host = this
when (data.termsList) {
is Incomplete -> {
@@ -46,8 +47,8 @@ class TermsController @Inject constructor(
is Fail -> {
errorWithRetryItem {
id("errorRetry")
- text(errorFormatter.toHumanReadable(data.termsList.error))
- listener { listener?.retry() }
+ text(host.errorFormatter.toHumanReadable(data.termsList.error))
+ listener { host.listener?.retry() }
}
}
is Success -> buildTerms(data.termsList.invoke())
@@ -55,6 +56,7 @@ class TermsController @Inject constructor(
}
private fun buildTerms(termsList: List) {
+ val host = this
settingsSectionTitleItem {
id("header")
titleResId(R.string.widget_integration_review_terms)
@@ -63,12 +65,12 @@ class TermsController @Inject constructor(
termItem {
id(term.url)
name(term.name)
- description(description)
+ description(host.description)
checked(term.accepted)
- clickListener(View.OnClickListener { listener?.review(term) })
+ clickListener(View.OnClickListener { host.listener?.review(term) })
checkChangeListener { _, isChecked ->
- listener?.setChecked(term, isChecked)
+ host.listener?.setChecked(term, isChecked)
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
index 90fb828663..5fe78cffdf 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
@@ -51,36 +51,37 @@ class UserListController @Inject constructor(private val session: Session,
override fun buildModels() {
val currentState = state ?: return
+ val host = this
// Build generic items
if (currentState.searchTerm.isBlank()) {
if (currentState.showInviteActions()) {
actionItem {
id(R.drawable.ic_share)
- title(stringProvider.getString(R.string.invite_friends))
+ title(host.stringProvider.getString(R.string.invite_friends))
actionIconRes(R.drawable.ic_share)
clickAction(View.OnClickListener {
- callback?.onInviteFriendClick()
+ host.callback?.onInviteFriendClick()
})
}
}
if (currentState.showContactBookAction) {
actionItem {
id(R.drawable.ic_baseline_perm_contact_calendar_24)
- title(stringProvider.getString(R.string.contacts_book_title))
+ title(host.stringProvider.getString(R.string.contacts_book_title))
actionIconRes(R.drawable.ic_baseline_perm_contact_calendar_24)
clickAction(View.OnClickListener {
- callback?.onContactBookClick()
+ host.callback?.onContactBookClick()
})
}
}
if (currentState.showInviteActions()) {
actionItem {
id(R.drawable.ic_qr_code_add)
- title(stringProvider.getString(R.string.qr_code))
+ title(host.stringProvider.getString(R.string.qr_code))
actionIconRes(R.drawable.ic_qr_code_add)
clickAction(View.OnClickListener {
- callback?.onUseQRCode()
+ host.callback?.onUseQRCode()
})
}
}
@@ -109,12 +110,13 @@ class UserListController @Inject constructor(private val session: Session,
}
private fun buildKnownUsers(currentState: UserListViewState, selectedUsers: List) {
+ val host = this
currentState.knownUsers()
?.filter { it.userId != session.myUserId }
?.let { userList ->
userListHeaderItem {
id("known_header")
- header(stringProvider.getString(R.string.direct_room_user_list_known_title))
+ header(host.stringProvider.getString(R.string.direct_room_user_list_known_title))
}
if (userList.isEmpty()) {
@@ -127,9 +129,9 @@ class UserListController @Inject constructor(private val session: Session,
id(item.userId)
selected(isSelected)
matrixItem(item.toMatrixItem())
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
clickListener { _ ->
- callback?.onItemClick(item)
+ host.callback?.onItemClick(item)
}
}
}
@@ -137,6 +139,7 @@ class UserListController @Inject constructor(private val session: Session,
}
private fun buildDirectoryUsers(directoryUsers: List, selectedUsers: List, searchTerms: String, ignoreIds: List) {
+ val host = this
val toDisplay = directoryUsers
.filter { !ignoreIds.contains(it.userId) && it.userId != session.myUserId }
@@ -145,7 +148,7 @@ class UserListController @Inject constructor(private val session: Session,
}
userListHeaderItem {
id("suggestions")
- header(stringProvider.getString(R.string.direct_room_user_list_suggestions_title))
+ header(host.stringProvider.getString(R.string.direct_room_user_list_suggestions_title))
}
if (toDisplay.isEmpty()) {
renderEmptyState()
@@ -156,9 +159,9 @@ class UserListController @Inject constructor(private val session: Session,
id(user.userId)
selected(isSelected)
matrixItem(user.toMatrixItem())
- avatarRenderer(avatarRenderer)
+ avatarRenderer(host.avatarRenderer)
clickListener { _ ->
- callback?.onItemClick(user)
+ host.callback?.onItemClick(user)
}
}
}
@@ -172,16 +175,18 @@ class UserListController @Inject constructor(private val session: Session,
}
private fun renderEmptyState() {
+ val host = this
noResultItem {
id("noResult")
- text(stringProvider.getString(R.string.no_result_placeholder))
+ text(host.stringProvider.getString(R.string.no_result_placeholder))
}
}
private fun renderFailure(failure: Throwable) {
+ val host = this
errorWithRetryItem {
id("error")
- text(errorFormatter.toHumanReadable(failure))
+ text(host.errorFormatter.toHumanReadable(failure))
}
}
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index 9fa04aabbb..f9acfb3ce6 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -22,7 +22,7 @@ import dagger.assisted.AssistedInject
import dagger.assisted.AssistedFactory
import im.vector.app.R
import im.vector.app.core.resources.StringProvider
-import kotlinx.coroutines.GlobalScope
+import im.vector.app.features.session.coroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.query.QueryStringValue
@@ -465,7 +465,8 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
}
private fun launchWidgetAPIAction(widgetPostAPIMediator: WidgetPostAPIMediator, eventData: JsonDict, block: suspend () -> Unit): Job {
- return GlobalScope.launch {
+ // We should probably use a scope tight to the lifecycle here...
+ return session.coroutineScope.launch {
kotlin.runCatching {
block()
}.fold(
diff --git a/vector/src/main/res/drawable/ic_empty_icon_room.xml b/vector/src/main/res/drawable/ic_empty_icon_room.xml
new file mode 100644
index 0000000000..07fbb64749
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_empty_icon_room.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index 7ea632eefb..c4bba45ebf 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -79,7 +79,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/id" />
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 2f8d890131..68fc8653cf 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -46,7 +46,7 @@
android:layout_height="40dp"
android:layout_gravity="center"
android:contentDescription="@string/avatar"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/space_avatars" />
+ tools:text="@sample/spaces.json/data/name" />
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index 9ed8f17069..e3c97d92dc 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -26,7 +26,7 @@
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:ignore="MissingConstraints" />
+ app:tint="@color/riotx_notice"
+ tools:ignore="MissingConstraints,MissingPrefix" />
+ app:layout_constraintEnd_toStartOf="parent" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/users.json/data/id" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
new file mode 100644
index 0000000000..1ae081fd88
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
new file mode 100644
index 0000000000..a103f9a5b7
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_reset_password_2.xml
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
new file mode 100644
index 0000000000..afb5d88a25
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
new file mode 100644
index 0000000000..626564325e
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_server_selection_2.xml b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
new file mode 100644
index 0000000000..9200a76f04
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_server_selection_2.xml
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form_2.xml b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
new file mode 100644
index 0000000000..75b587f0c1
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_server_url_form_2.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_signin_password_2.xml b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
new file mode 100644
index 0000000000..f75706799c
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_signin_password_2.xml
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
new file mode 100644
index 0000000000..3654c81f82
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_signin_username_2.xml b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
new file mode 100644
index 0000000000..5521b52aab
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_signin_username_2.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_signup_password_2.xml b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
new file mode 100644
index 0000000000..83935c339f
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_signup_password_2.xml
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_signup_username_2.xml b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
new file mode 100644
index 0000000000..8c9a7741d1
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_signup_username_2.xml
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_splash_2.xml b/vector/src/main/res/layout/fragment_login_splash_2.xml
new file mode 100644
index 0000000000..0b06d1cc65
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_splash_2.xml
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_sso_only_2.xml b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
new file mode 100644
index 0000000000..abcefbefce
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_sso_only_2.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_terms_2.xml b/vector/src/main/res/layout/fragment_login_terms_2.xml
new file mode 100644
index 0000000000..d6ccfbba87
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_terms_2.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
new file mode 100644
index 0000000000..8b7f36bb44
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index cf99fbd64b..398aaf2c4a 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -58,7 +58,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:alpha="1"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 3b12a05c92..b2d24f5218 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -26,7 +26,7 @@
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
+ tools:text="@sample/rooms.json/data/alias"
+ tools:visibility="visible" />
+ tools:text="@sample/rooms.json/data/topic" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/users.json/data/id" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
+ tools:text="@sample/rooms.json/data/topic" />
diff --git a/vector/src/main/res/layout/fragment_room_directory_picker.xml b/vector/src/main/res/layout/fragment_room_directory_picker.xml
index f0b7a22b8c..eb04084e9a 100644
--- a/vector/src/main/res/layout/fragment_room_directory_picker.xml
+++ b/vector/src/main/res/layout/fragment_room_directory_picker.xml
@@ -5,7 +5,7 @@
android:id="@+id/coordinatorLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?riotx_header_panel_background">
+ android:background="?riotx_background">
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
@@ -82,7 +82,7 @@
android:layout_height="128dp"
android:layout_marginTop="60dp"
android:importantForAccessibility="no"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
+ tools:text="@sample/rooms.json/data/topic" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml
index d6af178308..39ba60f1a7 100644
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@@ -37,7 +37,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 1b7601c967..c225766ae1 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -63,7 +63,7 @@
android:maxLines="1"
android:textColor="?riotx_text_secondary"
android:textSize="16sp"
- tools:text="@sample/matrix.json/data/spaceName" />
+ tools:text="@sample/spaces.json/data/name" />
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 7e89ab9070..765b5f607c 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -46,7 +46,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/space_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 6b92712d3a..e77b51591c 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -69,7 +69,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/showUserCodeCardTopBarrier"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/users.json/data/id" />
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 4fc7d45f07..e15db581fd 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -14,7 +14,7 @@
android:layout_height="28dp"
android:layout_gravity="center_vertical"
android:importantForAccessibility="no"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:fontFamily="sans-serif"
+ tools:text="@sample/users.json/data/displayName" />
+ tools:src="@sample/room_round_avatars" />
+ tools:fontFamily="sans-serif"
+ tools:text="@sample/rooms.json/data/name" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index 8db2080b47..812325d16a 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -18,7 +18,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/users.json/data/id" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_display_read_receipt.xml b/vector/src/main/res/layout/item_display_read_receipt.xml
index 7058b8b86f..58ddf8e5ad 100644
--- a/vector/src/main/res/layout/item_display_read_receipt.xml
+++ b/vector/src/main/res/layout/item_display_read_receipt.xml
@@ -17,12 +17,12 @@
android:layout_height="32dp"
android:layout_marginEnd="8dp"
android:contentDescription="@string/avatar"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:src="@sample/user_round_avatars" />
diff --git a/vector/src/main/res/layout/item_editable_square_avatar.xml b/vector/src/main/res/layout/item_editable_square_avatar.xml
index d931e807ea..bfd806c520 100644
--- a/vector/src/main/res/layout/item_editable_square_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -28,7 +28,7 @@
android:importantForAccessibility="no"
android:scaleType="fitCenter"
tools:alpha="0.3"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/space_avatars" />
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index d0520d2dba..5da2583fd3 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -20,7 +20,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:maxLines="2"
- tools:text="@sample/matrix.json/data/roomTopic" />
+ tools:text="@sample/rooms.json/data/topic" />
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index e13851db04..44c8740a9f 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -58,7 +58,8 @@
app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/item_generic_title_text"
- tools:text="At totam delectus et aliquid dolorem. Consectetur voluptas tempore et non blanditiis id optio. Dolorum impedit quidem minus nihil. "
+ tools:maxLines="3"
+ tools:text="@tools:sample/lorem/random"
tools:visibility="visible" />
+ tools:src="@sample/room_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/users.json/data/id" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml
index d6b5d6898e..d8a2d96809 100644
--- a/vector/src/main/res/layout/item_login_password_form.xml
+++ b/vector/src/main/res/layout/item_login_password_form.xml
@@ -58,6 +58,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
+ android:paddingStart="0dp"
+ android:paddingEnd="0dp"
android:text="@string/auth_forgot_password" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/users.json/data/id" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/users.json/data/id" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
+ tools:text="@sample/rooms.json/data/alias" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/messages.json/data/message" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
+ tools:text="@sample/rooms.json/data/topic" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+ app:layout_constraintVertical_chainStyle="packed" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
index d6b5eb2acd..8513649ad1 100644
--- a/vector/src/main/res/layout/item_room_to_manage_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -38,7 +38,7 @@
app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
- tools:text="@sample/matrix.json/data/roomName" />
+ tools:text="@sample/rooms.json/data/name" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/messages.json/data/message" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index 73b0750cbd..1fd9df247c 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -24,7 +24,7 @@
+ tools:text="@sample/users.json/data/displayName" />
+ tools:src="@sample/space_avatars" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
+ tools:text="@sample/rooms.json/data/topic" />
+ tools:src="@sample/space_avatars" />
+ tools:text="@sample/spaces.json/data/name" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index 27b21ece9b..fd451e7b93 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -44,6 +44,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spaceSummaryMemberCountIcon"
- tools:text="@sample/matrix.json/data/roomTopic" />
+ tools:text="@sample/spaces.json/data/topic" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index e01b9a4cc7..33f9e0c469 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -31,7 +31,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/indent"
app:layout_constraintTop_toTopOf="parent"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/space_avatars" />
+ tools:src="@sample/room_round_avatars" />
@@ -55,7 +55,7 @@
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
app:layout_constraintTop_toTopOf="parent"
- tools:text="@sample/matrix.json/data/displayName" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/rooms.json/data/topic" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:srcCompat="@sample/user_round_avatars" />
+ tools:srcCompat="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
+ tools:srcCompat="@sample/user_round_avatars" />
+ tools:srcCompat="@sample/user_round_avatars" />
+ tools:text="@sample/messages.json/data/message" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/id" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 3028fb7953..7af3262248 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -17,7 +17,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/users.json/data/id" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/vector_settings_round_avatar.xml b/vector/src/main/res/layout/vector_settings_round_avatar.xml
index 3349e092f9..596eef5d3c 100644
--- a/vector/src/main/res/layout/vector_settings_round_avatar.xml
+++ b/vector/src/main/res/layout/vector_settings_round_avatar.xml
@@ -11,7 +11,7 @@
android:adjustViewBounds="true"
android:contentDescription="@string/avatar"
android:scaleType="centerCrop"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index ac4351b379..6e674406fa 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -26,7 +26,7 @@
android:adjustViewBounds="true"
android:importantForAccessibility="no"
android:scaleType="centerCrop"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:src="@sample/user_round_avatars" />
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 7df09721be..c31f25d24b 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -28,7 +28,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="spread_inside"
- tools:src="@tools:sample/avatars" />
+ tools:src="@sample/user_round_avatars" />
+ tools:text="@sample/users.json/data/displayName" />
+ tools:text="@sample/users.json/data/id" />
+ tools:src="@sample/room_round_avatars" />
+ tools:text="@sample/rooms.json/data/name" />
+ tools:text="@sample/rooms.json/data/alias" />
diff --git a/vector/src/main/res/menu/menu_space_directory.xml b/vector/src/main/res/menu/menu_space_directory.xml
new file mode 100644
index 0000000000..23fe7991c7
--- /dev/null
+++ b/vector/src/main/res/menu/menu_space_directory.xml
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index ae136a0274..663ee6b641 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2211,7 +2211,7 @@
Odeslat
Přehrát
Pozastavit
- Zavrhnout
+ Odmítnout
Nemáte povolení zahájit konferenční hovor v této místnosti
Konference již probíhá!
Zahájit video schůzku
@@ -2424,8 +2424,8 @@
Smazat údaje účtu typu %1$s\?
\n
\nOpatrně, může vést k neočekávanému chování.
- Změny zavrhnout
- Zůstávají neuložené změny. Zavrhnout změny\?
+ Zahodit změny
+ Zahodit neuložené změny\?
Místnost nebyla ještě založena. Zrušit založení místnosti\?
Kód PIN se vyžaduje při každém otevření ${app_name}u.
Kód PIN se vyžaduje, pokud se ${app_name} nepoužil 2 minuty.
@@ -2804,4 +2804,24 @@
Dovolit hostům vstoupit
Pozvání
Doporučené místnosti
+ Správa místností a prostorů
+ Označit za nikoli doporučené
+ Označit za doporučené
+ Doporučeno
+ Učinit tento prostor veřejným
+ Správa místností
+ Hledáte někoho, kdo není v %s\?
+ %s Vás zve
+ Tato místnosti je veřejná
+ Poslat media v původní velikosti
+
+ - Poslat video v původní velikosti
+ - Poslat videa v původní velikosti
+ - Poslat videa v původní velikosti
+
+ Soubor je pro nahrání příliš velký.
+ Komprimuji video %d%%
+ Komprimuji obrázek…
+ Použít výchozí a dále se neptat
+ Vždy se dotázat
\ No newline at end of file
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 9eb7301176..03e03cb845 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -9,23 +9,23 @@
%1$s hat den Raum verlassen
%1$s hat die Einladung abgelehnt
%1$s hat %2$s gekickt
- %1$s hat die Sperre von %2$s aufgehoben
- %1$s hat %2$s verbannt
+ %1$s hat den Bann von %2$s aufgehoben
+ %1$s hat %2$s gebannt
%1$s hat die Einladung für %2$s zurückgezogen
%1$s hat das Profilbild geändert
%1$s hat den Anzeigenamen geändert in %2$s
%1$s hat den Anzeigenamen von %2$s auf %3$s geändert
- %1$s hat den Anzeigenamen gelöscht (%2$s)
+ %1$s hat den Anzeigenamen gelöscht (war %2$s)
%1$s hat das Raumthema geändert auf: %2$s
%1$s hat den Raumnamen geändert in: %2$s
- %s hat einen Videoanruf durchgeführt.
+ %s hat einen Videoanruf gestartet.
%s hat einen Sprachanruf getätigt.
%s hat den Anruf angenommen.
%s hat den Anruf beendet.
%1$s hat den zukünftigen Chatverlauf sichtbar gemacht für %2$s
- Alle Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden).
- Alle Mitglieder (ab dem Zeitpunkt, an dem sie den Raum betreten haben).
- alle Raum-Mitglieder.
+ alle Mitglieder, ab Einladung.
+ alle Mitglieder, ab Beitritt.
+ alle Mitglieder.
Jeder.
Unbekannt (%s).
%1$s hat die Ende-zu-Ende-Verschlüsselung aktiviert (%2$s)
@@ -75,7 +75,7 @@
Erste Synchronisation:
\nImportiere Benutzerkonto…
Erste Synchronisation:
-\nImportiere Cryptoschlüssel
+\nImportiere Kryptoschlüssel
Erste Synchronisation:
\nImportiere Räume
Erste Synchronisation:
@@ -133,7 +133,7 @@
Du hast dein Profilbild geändert
Du hast deinen Anzeigenamen zu %1$s geändert
Du hast deinen Anzeigenamen von %1$s zu %2$s geändert
- Du hast deinen Anzeigenamen entfernt (er war %1$s)
+ Du hast deinen Anzeigenamen gelöscht (war %1$s)
Du hast das Thema geändert auf: %1$s
%1$s hat das Bild des Raumes geändert
Du hast das Bild des Raumes geändert
@@ -144,7 +144,7 @@
Du hast den Anruf beendet.
Du hast den zukünftigen Nachrichtenverlauf für %1$s sichtbar gemacht
Du hast Ende-zu-Ende-Verschlüsselung aktiviert (%1$s)
- Du hast den Raum aufgwertet.
+ Du hast den Raum aufgewertet.
Du hast eine VoIP-Konferenz angefordert
Du hast den Raumnamen entfernt
Du hast das Raumthema entfernt
@@ -181,16 +181,16 @@
Du hast die Einladung von %1$s angenommen. Grund: %2$s
Du hast die Einladung von %1$s abgelehnt. Grund: %2$s
- - Du hast die Raumaddresse %1$s hinzugefügt.
- - Du hast die Raumaddressen %1$s hinzugefügt.
+ - Du hast die Raumadresse %1$s hinzugefügt.
+ - Du hast die Raumadressen %1$s hinzugefügt.
- Du hast die Raum-Adresse %1$s vom Raum entfernt.
- Du hast die Raum-Adressen %1$s vom Raum entfernt.
- Du hast den Raumaddressen %1$s hinzugefügt und %2$s entfernt.
- Du hast die Hauptaddresse für diesen Raum auf %1$s gesetzt.
- Du hast die Hauptaddresse des Raums entfernt.
+ Du hast die Raumadressen %1$s hinzugefügt und %2$s entfernt.
+ Du hast die Hauptadresse für diesen Raum auf %1$s gesetzt.
+ Du hast die Hauptadresse des Raums entfernt.
Du hast Gästen erlaubt dem Raum beizutreten.
Du hast Gästen untersagt dem Raum beizutreten.
Du hast Ende-zu-Ende-Verschlüsselung aktiviert.
@@ -252,7 +252,7 @@
Keine Änderung.
• Server, die mit IPs übereinstimmen, sind jetzt gesperrt.
• Server, die mit IPs übereinstimmen, sind nicht erlaubt.
- • Server, die mit %s übereinstimmen, wurden von der Elaubten-Liste entfernt.
+ • Server, die mit %s übereinstimmen, wurden von der Erlaubten-Liste entfernt.
• Server, die mit %s übereinstimmen, sind jetzt erlaubt.
• Server, die mit %s übereinstimmen, werden von der Sperrliste entfernt.
• Server, die mit %s übereinstimmen, sind jetzt gesperrt.
@@ -396,7 +396,7 @@
E-Mail-Adresse
E-Mail-Adresse (optional)
Telefonnummer
- Telefonummer (optional)
+ Telefonnummer (optional)
Passwort wiederholen
Neues Passwort bestätigen
Benutzername und/oder Passwort falsch
@@ -494,7 +494,7 @@
${app_name} benötigt die Berechtigung, auf Kamera und Mikrofon zu zugreifen, um Video-Anrufe durchzuführen.
\n
\nBitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen.
- ${app_name} kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer Email-Adresse und Telefonnummer zu finden. Wenn du der Nutzung deines Adressbuchs zu diesem Zweck zustimmst, erlaube den Zugriff im nächsten Popup-Fenster.
+ ${app_name} kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer E-Mail-Adresse und Telefonnummer zu finden. Wenn du der Nutzung deines Adressbuchs zu diesem Zweck zustimmst, erlaube den Zugriff im nächsten Pop-up-Fenster.
${app_name} kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer E-Mail-Adresse und Telefonnummer zu finden.
\n
\nStimmst du der Nutzung deines Adressbuchs zu diesem Zweck zu\?
@@ -557,7 +557,7 @@
Nur Matrix-Benutzer
Benutzer per ID einladen
Bitte gib eine oder mehrere E-Mail-Adressen oder eine Matrix-ID ein
- E-Mail or Matrix-ID
+ E-Mail oder Matrix-ID
Suchen
%s schreibt…
@@ -660,7 +660,7 @@
Timeout für Synchronisierungsanfragen
Verzögerung zwischen jeder Synchronisierung
Version
- OLM Version
+ OLM-Version
Nutzungsbedingungen
Nutzungshinweise von Drittanbietern
Urheberrechtserklärung
@@ -719,7 +719,7 @@
Ungültige Mobilfunknummer für das gewählte Land
Telefonische Verifizierung
Wir haben dir einen Aktivierungscode per SMS gesendet. Bitte trage diesen Code hier ein.
- Hier Aktivierungsccode eintragen
+ Hier Aktivierungscode eintragen
Fehler beim Verifizieren der Telefonnummer
Code
@@ -868,7 +868,7 @@
Zeige Zeitstempel im 12-Stunden-Format
Um Widgets in diesem Raum zu verwalten, ist eine Berechtigung erforderlich
Widget konnte nicht erstellt werden
- Konferenzgespräche mit jitsi durchführen
+ Konferenzgespräche mit Jitsi durchführen
Soll das Widget wirklich aus diesem Raum gelöscht werden?
Widget konnte nicht erstellt werden.
@@ -1013,7 +1013,7 @@
Normal
Verringerter Datenschutz
Dies App braucht die Berechtigung im Hintergrund zu laufen
- • Benachrichtigungen werden über Firebase Cloud Messaging versendet
+ • Benachrichtigungen werden über Firebase-Cloud-Messaging versendet
• Benachrichtigungen enthalten nur Metadaten
• Der Nachrichteninhalt der Benachrichtigung wird sicher vom Matrix-Home-Server abgerufen
• Benachrichtigungen enthalten Metadaten und Nachrichteninhalte
@@ -1037,8 +1037,8 @@
Ein Parameter ist nicht valide.
Um %1$s weiter zu verwenden, musst die Geschäftsbedingungen begutachten und ihnen zustimmen.
Jetzt prüfen
- Account deaktiveren
- Dies wir dein Konto permanent unbenutzbar machen. Du wirst dich nicht anmelden können und keiner wird denselben Nutzernamen erneut registrieren können. Du verlässt automatisch alle Räume, in denen du bist, und deine Kontoangaben werden vom Identitätsserver gelöscht. Diese Aktion ist unumkehrbar.
+ Account deaktivieren
+ Dies wird dein Konto permanent unbenutzbar machen. Du wirst dich nicht anmelden können und keiner wird denselben Nutzernamen erneut registrieren können. Du verlässt automatisch alle Räume, in denen du bist, und deine Kontoangaben werden vom Identitätsserver gelöscht. Diese Aktion ist unumkehrbar.
\n
\nDie Deaktivierung deines Konto wird standardmäßig keine deiner gesendeten Nachrichten löschen. Wenn du möchtest, dass auch deine Nachrichten gelöscht werden, wähle zusätzlich die Option unten.
\n
@@ -1156,7 +1156,7 @@
Formatiere Nachrichten mittels Markdown-Syntax, bevor sie gesendet werden. Dies erlaubt erweiterte Formatierungen, etwa Sternchen (*) um kursiven Text anzuzeigen.
Zeige Lesebestätigungen
Klicke auf die Lesebestätigungen für eine detailliertere Liste.
- Einladungen, Kicks und Bans bleiben unberührt.
+ Einladungen, Kicks und Banns bleiben unberührt.
Passwort
Starte die System-Kamera anstelle der angepassten Kamera.
Diese Option erfordert eine externe Anwendung um Sprachnachrichten aufzuzeichnen.
@@ -1191,7 +1191,7 @@
Benachrichtigungen sind für diese Sitzung nicht aktiviert.
\nBitte überprüfe die Einstellungen für ${app_name}.
Aktiviere
- ${app_name} benutzt Google Play Dienste um Push-Nachrichten zu übermitteln, doch scheinen sie nicht korrekt konfiguriert zu sein:
+ ${app_name} benutzt Google-Play-Dienste um Push-Nachrichten zu übermitteln, doch scheinen sie nicht korrekt konfiguriert zu sein:
\n%1$s
Repariere Play-Dienste
Firebase-Token
@@ -1199,7 +1199,7 @@
\n%1$s
Abfragen des FCM-Tokens fehlgeschlagen:
\n%1$s
- FCM-Token erfolgreich beim Home-Sserver registriert.
+ FCM-Token erfolgreich beim Home-Server registriert.
FCM-Token konnte nicht beim Home-Server registriert werden:
\n%1$s
Benachrichtigungsdienst
@@ -1209,7 +1209,7 @@
Starte Dienst
Automatischer Neustart des Benachrichtigungsdienstes
Dienst wurde automatisch gestoppt und erneut gestartet.
- Dienst konnte nicht neugestartet werden
+ Dienst konnte nicht neu gestartet werden
Starte beim Hochfahren
Dienst wird starten, wenn das Gerät neu gestartet wird.
Dieser Dienst wird nicht starten, wenn das Gerät neu gestartet wird. Du wirst keine Benachrichtigungen bekommen bis ${app_name} einmal geöffnet wurde.
@@ -1225,9 +1225,9 @@
${app_name} wird nicht von Batterieoptimierungen beeinflusst.
Fehler bei Benachrichtigungen finden
Diagnose von Fehlern
- Basisdiagnose ist OK. Wenn du immer noch keine Benachrichtigungen bekommst, sende bitte einen Fehlerbericht, um uns beim nachforschen zu helfen.
+ Basisdiagnose ist OK. Wenn du immer noch keine Benachrichtigungen bekommst, sende bitte einen Fehlerbericht, um uns beim Nachforschen zu helfen.
Prüfung der Play-Dienste
- Google Play-Dienste-APK ist verfügbar und aktuell.
+ Google-Play-Dienste-APK ist verfügbar und aktuell.
Token-Registrierung
Wenn ein Benutzer ein abgestecktes Gerät mit ausgeschaltetem Bildschirm eine Weile nicht bewegt, wechselt es in den Bereitschaftsmodus. Dies hindert Apps daran, auf das Netzwerk zuzugreifen und verzögert die Ausführung von Aufgaben, Synchronisierungen und Standard-Alarmen.
Ignoriere Optimierungen
@@ -1285,10 +1285,10 @@
[%1$s]
\nDieser Fehler ist außerhalb von ${app_name} passiert. Google sagt, dass dieses Gerät zu viele Apps registriert hat um FCM zu nutzen. Der Fehler taucht nur auf, wenn sehr viele Apps installiert sind. Er sollte also den Durchschnittsnutzer nicht betreffen.
[%1$s]
-\nDieser Fehler liegt nicht unter der Kontrolle von ${app_name}. Er kann aus verschiedenen Gründen auftreten. Vielleicht wird es funktionieren, wenn du es später noch einmal probierst. Außerdem kannst Du prüfen, ob die Datennutzung der Google Play-Dienste unbeschränkt ist und die Geräteuhr richtig eingestellt ist. Der Fehler kann aber auch unter Custom-ROMs auftreten.
+\nDieser Fehler liegt nicht unter der Kontrolle von ${app_name}. Er kann aus verschiedenen Gründen auftreten. Vielleicht wird es funktionieren, wenn du es später noch einmal probierst. Außerdem kannst Du prüfen, ob die Datennutzung der Google-Play-Dienste unbeschränkt ist und die Geräteuhr richtig eingestellt ist. Der Fehler kann aber auch unter Custom-ROMs auftreten.
[%1$s]
\nDieser Fehler ist außerhalb von ${app_name} passiert. Es gibt kein Google-Konto auf dem Gerät. Bitte füge ein Google-Konto hinzu.
- Verwaltung der Krypto-Schlüssel
+ Verwaltung der Kryptoschlüssel
Schlüssel-Sicherung verwalten
Nachrichten in verschlüsselten Räumen sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der Empfänger haben die Schlüssel um diese Nachrichten zu lesen.
\n
@@ -1451,7 +1451,7 @@
Warte auf Bestätigung des Partners…
Verifiziert!
Du hast diese Sitzung erfolgreich verifiziert.
- Sichere Nachrichten mit diesem Benutzer sind Ende-zu-Ende verschlüsselt und können nicht von Dritten mitgelesen werden.
+ Sichere Nachrichten mit diesem Benutzer sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten mitgelesen werden.
Verstanden
Schlüssel-Verifizierung
Anfrage abgebrochen
@@ -1508,7 +1508,7 @@
Schlüsselaustausch anfragen
Es sieht so aus, als hättest du bereits ein Setup-Schlüssel-Backup von einer anderen Sitzung. Möchtest du es durch das, was du gerade erstellt hast, ersetzen\?
Für maximale Sicherheit empfehlen wir, dies persönlich zu tun, oder ein anderes vertrautes Kommunikationsmedium zu nutzen.
- Überprüfe diese Sitzung, um sie als vertrauenswürdig zu markieren. Sitzungen von anderen Nutzern zu vertrauen gibt dir zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende verschlüsselten Nachrichten.
+ Überprüfe diese Sitzung, um sie als vertrauenswürdig zu markieren. Sitzungen von anderen Nutzern zu vertrauen gibt dir zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende-verschlüsselten Nachrichten.
Durch Verifizieren dieser Sitzung wird sie bei dir und deinem Gegenüber als vertrauenswürdig markiert.
Verifiziere diese Sitzung, indem du bestätigst, dass das folgende Emoji auf dem Bildschirm deines Gegenübers angezeigt wird
Verifiziere diese Sitzung, indem du bestätigst, dass die folgenden Zahlen auf dem Bildschirm deines Gegenübers angezeigt werden
@@ -1524,7 +1524,7 @@
Fehlerhaftes Ereignis, kann nicht angezeigt werden
Beim Abrufen der Vertrauensinformationen ist ein Fehler aufgetreten
Beim Abrufen der Schlüsselsicherungsdaten ist ein Fehler aufgetreten
- Matrix SDK Version
+ Matrix-SDK-Version
Sonstige Hinweise Dritter
Du siehst diesen Raum bereits!
Schnelle Reaktionen
@@ -1584,7 +1584,7 @@
Anruf aufgrund eines falsch konfigurierten Servers fehlgeschlagen
Versuche es mit %s
Nicht erneut fragen
- Richte eine E-Mail für die Kontowiederherstellung ein. Optional, kannst du später einrichten, dass Personen dich über diese Adresse finden.
+ Richte eine E-Mail für die Kontowiederherstellung ein. Optional kannst du später einrichten, dass Personen dich über diese Adresse finden.
Richte eine Telefonnummer ein. Später kannst du einrichten, dass Personen dich über diese finden.
Lege eine E-Mail-Adresse für die Kontowiederherstellung fest. Später kann optional eine E-Mail-Adresse oder eine Telefonnummer dazu verwendet werden, um von anderen Personen gefunden zu werden.
Lege eine E-Mail-Adresse für die Kontowiederherstellung fest. Später kann optional eine E-Mail-Adresse oder eine Telefonnummer dazu verwendet werden, um von anderen Personen gefunden zu werden.
@@ -1629,7 +1629,7 @@
Du kannst dies nicht auf einem mobilen ${app_name} tun
Authentifizierung benötigt
Hintergrund-Synchronisierungsmodus
- ${app_name} wird sich im Hintergrund auf eine Art synchronisieren die Ressourcen des Geräts (Akku) schont.
+ ${app_name} wird sich im Hintergrund auf eine Art synchronisieren, die Ressourcen des Geräts (Akku) schont.
\nAbhängig vom Ressourcen-Status deines Geräts kann dein System die Synchronisierung verschieben.
${app_name} wird sich im Hintergrund periodisch zu einem bestimmten Zeitpunkt synchronisieren (konfigurierbar).
\nDies wird Funk- und Akkunutzung beeinflussen. Es wird eine permanente Benachrichtigung geben, die sagt, dass ${app_name} auf Ereignisse lauscht.
@@ -1684,7 +1684,7 @@
Schließe das Raumerstellungsmenü…
Starte einen neuen Privatchat
Erstelle einen neuen Raum
- Schließe Key Backup Einblendung
+ Schließe Key-Backup-Einblendung
Passwort anzeigen
Passwort verstecken
Zum Ende springen
@@ -1724,7 +1724,7 @@
\nWenn du keine weiteren Inhalte dieses Nutzers sehen möchtest, kannst ihn ignorieren, um jene Nachrichten auszublenden.
${app_name} benötigt Berechtigungen, um deine E2E Schlüssel zu speichern.
\n
-\nBitte erlaube den Zugriff im nächsten Pop-Up sodass du deine Schlüssel manuell exportieren kannst.
+\nBitte erlaube den Zugriff im nächsten Pop-up sodass du deine Schlüssel manuell exportieren kannst.
Aktuell besteht keine Netzwerkverbindung
Nutzer ignorieren
Alle Nachrichten (laut)
@@ -1744,14 +1744,14 @@
Beginne
Wähle einen Server
Genau wie bei E-Mails haben Accounts ein Zuhause, auch wenn du mit jedem kommunizieren kannst
- Folge Millionen anderen kostenlos auf dem größten öffentlichen Server
- Premium Hosting für Organisationen
+ Folge Millionen Anderen kostenlos auf dem größten öffentlichen Server
+ Premium-Hosting für Organisationen
Mehr erfahren
Andere
Benutzerdefinierte & erweiterte Einstellungen
Fortfahren
Eine Trennung von deinem Identitätsserver würde bedeuten, dass du weder von anderen Nutzern gefunden werden, noch diese per E-Mail oder Telefonnummer einladen kannst.
- Du teilst deine Email Adressen oder Telefonnummern momentan auf dem Identitätsserver %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.
+ Du teilst deine E-Mail-Adressen oder Telefonnummern momentan auf dem Identitätsserver %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.
Stimme den Nutzungsbedingungen des Identitätsservers (%s) zu, um zu erlauben per E-Mail oder Telefonnummer gefunden zu werden.
Zu teilende Daten nicht verarbeitbar
Erweitere & individualisiere dein Benutzererlebnis
@@ -1762,7 +1762,7 @@
Registrieren
Anmelden
Mit einmaligem Anmelden fortfahren
- Element Matrix Services Adresse
+ Element Matrix Services-Adresse
Adresse
Ein Fehler beim Laden der Seite %1$s (%2$d) ist aufgetreten
Es tut uns leid. Dieser Server akzeptiert keine neuen Benutzerkonten.
@@ -1778,7 +1778,7 @@
Fortfahren
Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft
Prüfe deinen Posteingang
- Eine Bestätigungsemail wurde an %1$s versendet.
+ Eine Bestätigungsmail wurde an %1$s versendet.
Klicke auf den Link um dein neues Passwort zu bestätigen. Sobald du dem enthaltenen Link gefolgt bist, klicke unten.
Ich habe meine E-Mail-Adresse bestätigt
Erfolgreich!
@@ -1818,9 +1818,9 @@
Die Anwendung kann sich nicht bei diesem Home-Server anmelden. Der Home-Server unterstützt die folgenden Anmeldetypen: %1$s.
\n
\nMöchtest du dich mit einem Webclient anmelden\?
- Eine Bestätigungs-E-Mail wird an dich gesendet, um dein neues Passwort zu bestätigen.
+ Eine Bestätigungsmail wird an dich gesendet, um dein neues Passwort zu bestätigen.
Weiter
- Du wurdest von allen Sitzungen abgemeldet und erhälst keine Push-Benachrichtigungen mehr. Um Benachrichtigungen wieder zu aktivieren, melde dich auf jedem Gerät erneut an.
+ Du wurdest von allen Sitzungen abgemeldet und erhältst keine Push-Benachrichtigungen mehr. Um Benachrichtigungen wieder zu aktivieren, melde dich auf jedem Gerät erneut an.
Warnung
Lege eine E-Mail-Adresse fest, um dein Konto wiederherzustellen. Später kannst du optional zulassen, dass Personen dich anhand dieser E-Mail-Adresse entdecken.
Weiter
@@ -1855,7 +1855,7 @@
Du bist abgemeldet
Anmelden
Dein Home-Server-Administrator (%1$s) hat dich von deinem Konto %2$s (%3$s) abgemeldet.
- Melden dich an, um ausschließlich auf diesem Gerät gespeicherte Verschlüsselungsschlüssel wiederherzustellen. Du benötigst sie, um deine verschlüsselten Nachrichten auf jedem Gerät zu lesen.
+ Melde dich an, um ausschließlich auf diesem Gerät gespeicherte Verschlüsselungsschlüssel wiederherzustellen. Du benötigst sie, um deine verschlüsselten Nachrichten auf jedem Gerät zu lesen.
Anmelden
Passwort
Persönliche Daten löschen
@@ -1875,8 +1875,8 @@
Initiale Synchronisierung…
Alle meine Sitzungen anzeigen
Erweiterte Einstellungen
- Entwicklungsmodus
- Der Entwicklungsmodus aktiviert versteckte Funktionen und kann die Anwendung weniger stabil machen. Nur für Entwickler!
+ Entwicklermodus
+ Der Entwicklermodus aktiviert versteckte Funktionen und kann die Anwendung weniger stabil machen. Nur für Entwickler!
Wutschütteln
Erkennungsschwelle
Schüttel dein Telefon, um die Erkennungsschwelle zu testen
@@ -1932,8 +1932,8 @@
Für zusätzliche Sicherheit überprüfe %s, indem ihr auf beiden Geräten einen einzigartigen Code überprüft.
\n
\nFür maximale Sicherheit macht dies persönlich.
- Nachrichten in diesem Raum sind nicht Ende-zu-Ende verschlüsselt.
- Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt.
+ Nachrichten in diesem Raum sind nicht Ende-zu-Ende-verschlüsselt.
+ Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt.
\n
\nDeine Nachrichten sind gesichert und nur du und dein Gegenüber haben die eindeutigen Schlüssel, um sie zu entsperren.
Sicherheit
@@ -1958,7 +1958,7 @@
Springen & als gelesen markieren
${app_name} kann keine Ereignisse vom Typ \'%1$s\'
${app_name} beherrscht keine Nachrichten vom Typ \'%1$s\'
- ${app_name} ist beim verarbeiten des Ereignisinhalts mit der ID \'%1$s\' auf ein Problem gestoßen
+ ${app_name} ist beim Verarbeiten des Ereignisinhalts mit der ID \'%1$s\' auf ein Problem gestoßen
Nicht ignorieren
Diese Sitzung kann diese Verifizierung nicht mit deinen anderen Sitzungen teilen.
\nDie Überprüfung wird lokal gespeichert und in einer zukünftigen Version der App freigegeben.
@@ -1973,11 +1973,11 @@
Verschlüsselung aktivieren\?
Nach der Aktivierung kann die Verschlüsselung für einen Raum nicht deaktiviert werden. In einem verschlüsselten Raum gesendete Nachrichten können vom Server nicht gesehen werden, nur von den Teilnehmenden des Raums. Durch die Verschlüsselung funktionieren viele Bots und Bridges möglicherweise nicht ordnungsgemäß.
Verschlüsselung aktivieren
- Um sicher zu gehen, verifiziere %s, indem ein einmaligen Code überprüft wird.
+ Um sicher zu gehen, verifiziere %s, indem ein einmaliger Code überprüft wird.
Um sicher zu sein, tut dies persönlich oder verwendet einen anderen Kommunikationsweg.
Vergleiche die einzigartigen Emoji und stell sicher, dass sie in derselben Reihenfolge angezeigt werden.
Vergleiche den Code mit dem Code auf dem Bildschirm deines Gegenübers.
- Nachrichten mit diesem Gegenüber sind Ende-zu-Ende verschlüsselt und können nicht von Dritten gelesen werden.
+ Nachrichten mit diesem Gegenüber sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.
Deine neue Sitzung ist jetzt verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an.
Cross-Signing
Cross-Signing ist aktiviert
@@ -2016,11 +2016,11 @@
Initialisiere Cross-Signing
Schlüssel zurücksetzen
QR-Code
- Fast geschaft! Zeigt %s dasselbe Schild an\?
+ Fast geschafft! Zeigt %s dasselbe Schild an\?
Ja
Nein
Verbindung zum Server wurde unterbrochen
- Entwicklungswerkzeuge
+ Entwicklerwerkzeuge
Kontodaten
- %d Stimme
@@ -2060,9 +2060,9 @@
Neu laden
Neue Anmeldung. Warst du das\?
Tippe für eine Überprüfung & Verifikation
- Benutze diese Sitzung um deine neue zu verfizieren, damit sie auf verschlüsselte Nachrichten zugreifen kann.
+ Benutze diese Sitzung um deine neue zu verifizieren, damit sie auf verschlüsselte Nachrichten zugreifen kann.
Das war ich nicht
- Dein Account ist möglicherweise komprimittiert
+ Dein Account ist möglicherweise kompromittiert
Wenn du abbrichst, wirst du auf diesem Gerät keine verschlüsselten Nachrichten lesen können, und andere Benutzer werden ihm nicht vertrauen
Wenn du abbrichst, wirst du auf deinem neuen Gerät keine verschlüsselten Nachrichten lesen können, und andere Benutzer werden ihm nicht vertrauen
Du wirst %1$s (%2$s) nicht verifizieren, wenn du jetzt abbrichst. Beginne in deren Nutzerprofil erneut.
@@ -2078,7 +2078,7 @@
Verifizierung abgebrochen
Generiere einen Nachrichtenschlüssel
Bestätige %s
- Gibe dein %s ein um fortzufahren.
+ Gib dein %s ein um fortzufahren.
Gib deine %s für eine Bestätigung erneut ein.
Benutze dein Accountpasswort nicht mehrfach.
Dies könnte einige Sekunden dauern, gedulde dich bitte.
@@ -2090,7 +2090,7 @@
Benutze diesen %1$s als Sicherheit für den Fall, dass du deine %2$s vergisst.
Veröffentliche erstellte Identitätsschlüssel
Generiere sicheren Schlüssel von der Passphrase
- Definiere SSSS Standardschlüssel
+ Definiere SSSS-Standardschlüssel
Synchronisiere Hauptschlüssel
Synchronisiere Benutzerschlüssel
Synchronisiere selbstsignierenden Schlüssel
@@ -2115,7 +2115,7 @@
Dies kann nicht von einem mobilen Gerät erfolgen
Wenn Räume verbessert werden
Verschlüsselung aktiviert
- Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt. Erfahre mehr & verifiziere Benutzer in deren Profil.
+ Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Erfahre mehr & verifiziere Benutzer in deren Profil.
Die Verschlüsselung in diesem Raum wird nicht unterstützt
Warte auf %s…
%s setzen
@@ -2141,32 +2141,32 @@
Überprüfe Wiederherstellungsschlüssel
Überprüfe Sicherungsstatus (%s)
Erzeuge Kurvenschlüssel
- Generiere SSSS Schlüssel aus dem Passwort
- Generiere SSSS Schlüssel aus dem Passwort (%s)
- Generiere SSSS Schlüssel aus dem Wiederherstellungsschlüssel
- Speichere Schlüsselbackup Schlüssel in SSSS
+ Generiere SSSS-Schlüssel aus dem Passwort
+ Generiere SSSS-Schlüssel aus dem Passwort (%s)
+ Generiere SSSS-Schlüssel aus dem Wiederherstellungsschlüssel
+ Speichere Schlüsselbackup-Schlüssel in SSSS
%1$s (%2$s)
Gib dein Passwort für das Schlüsselbackup ein, um fortzufahren.
- nutze deinen Schlüsselbackup Wiederherstellungsschlüssel
- Wenn du dein Schlüsselbackup Passwort nicht weißt, kannst du %s.
- Schlüsselbackup Wiederherstellungsschlüssel
+ nutze deinen Schlüsselbackup-Wiederherstellungsschlüssel
+ Wenn du dein Schlüsselbackup-Passwort nicht weißt, kannst du %s.
+ Schlüsselbackup-Wiederherstellungsschlüssel
Verhindere Screenshots innerhalb der Anwendung
Das Aktivieren dieser Einstellung setzt das FLAG_SECURE in allen Aktivitäten. Starte die Anwendung neu, damit die Änderung wirksam wird.
Datei wurde der Galerie hinzugefügt
Datei konnte nicht zur Galerie hinzugefügt werden
Neues Benutzerpasswort festlegen…
- Nutze die neueste Version von ${app_name} auf deinen anderen Geräten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} für Android oder einen anderen cross-signing fähigen Matrix client
+ Nutze die neueste Version von ${app_name} auf deinen anderen Geräten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} für Android oder einen anderen cross-signing-fähigen Matrix-Client
${app_name} Web
\n${app_name} Desktop
${app_name} iOS
\n${app_name} Android
- oder einen anderen cross-signing fähigen Matrix Client
+ oder einen anderen cross-signing-fähigen Matrix Client
Nutze die neueste Version von ${app_name} auf deinen anderen Geräten:
Erzwingt das Verwerfen der aktuell ausgehende Gruppensitzung in einem verschlüsseltem Raum
Wird nur in verschlüsselten Räumen unterstützt
Benutze deine %1$s oder deinen %2$s um fortzufahren.
Wiederherstellungsschlüssel verwenden
- Wähle deinen Wiederherstellungsschüssel, gib ihn ein oder füge ihn aus der Zwischenablage ein
+ Wähle deinen Wiederherstellungsschlüssel, gib ihn ein oder füge ihn aus der Zwischenablage ein
Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden. Bitte stelle sicher, dass du den korrekten Wiederherstellungsschlüssel eingegeben hast.
Konnte nicht auf gesicherten Speicher zugreifen
Unverschlüsselt
@@ -2292,7 +2292,7 @@
Sticker
Administrative Aktionen
Standard in %1$s
- Dein Serveradministrator hat in privaten Räumen und Direktnachrichten Ende-zu-Ende Verschlüsselung standardmäßig deaktiviert.
+ Dein Serveradministrator hat in privaten Räumen und Direktnachrichten Ende-zu-Ende-Verschlüsselung standardmäßig deaktiviert.
Flugzeugmodus ist aktiv
Gib eine Sicherheitsphrase ein, die nur du kennst. Diese wird benutzt um deine Daten auf dem Server geheim zu halten.
Wenn du jetzt abbrichst und den Zugriff zu deinen Sitzungen verlierst, kannst du verschlüsselte Nachrichten & Daten verlieren.
@@ -2300,21 +2300,21 @@
\nDu kannst auch ein Backup einrichten & deine Schlüssel in den Einstellungen verwalten.
Du hast den Raum erstellt und konfiguriert.
Dieser Account ist deaktiviert worden.
- Aktiviere Cross Signing
+ Aktiviere Cross-Signing
Konnte Mediendatei nicht speichern
Aktuelle Sprache
Andere verfügbare Sprachen
Lade verfügbare Sprachen…
Öffne AGBs von %s
- Trenne Verbingung zu Identitätsserver %s\?
+ Trenne Verbindung zu Identitätsserver %s\?
Dieser Identitätsserver ist veraltet. ${app_name} unterstützt nur API V2.
- Diese Operation is nicht möglich. Der Homeserver ist veraltet.
+ Diese Operation ist nicht möglich. Der Home-Server ist veraltet.
Bitte konfiguriere zuerst einen Identitätsserver.
Bitte akzeptiere zuerst die AGB des Identitätsservers in den Einstellungen.
- Deiner Privatssphäre wegen unterstützt ${app_name} nur das Senden gehashter Emailaddressen und Telefonnummern.
+ Deiner Privatsphäre wegen unterstützt ${app_name} nur das Senden gehashter E-Mail-Adressen und Telefonnummern.
Die Assoziierung ist fehlgeschlagen.
Für diese Kennung gibt es aktuell keine Assoziierung.
- Dein Homeserver (%1$s) schlägt %2$s als Identitätsserver vor
+ Dein Home-Server (%1$s) schlägt %2$s als Identitätsserver vor
Benutze %1$s
Alternativ kannst du die URL eines beliebigen anderen Identitätsservers angeben
Gib die URL von einem Identitätsserver ein
@@ -2347,7 +2347,7 @@
Du kannst auf diese Nachricht nicht zugreifen
Warte auf diese Nachricht. Das könnte eine Weile dauern
Kann nicht entschlüsselt werden
- Wegen der Ende-zu-Ende Verschlüsselung könnte es sein, dass du auf jemandes Nachricht warten musst, weil die Verschlüsselungsschlüssel nicht ordnungsgemäß gesendet worden sind.
+ Wegen der Ende-zu-Ende-Verschlüsselung könnte es sein, dass du auf jemandes Nachricht warten musst, weil die Verschlüsselungsschlüssel nicht ordnungsgemäß gesendet worden sind.
Du kannst auf diese Nachricht nicht zugreifen, weil der Sender dich blockiert hat
Du kannst auf diese Nachricht nicht zugreifen, weil der Sender deiner Sitzung nicht vertraut
Du kannst auf diese Nachricht nicht zugreifen, weil der Sender absichtlich die Schlüssel nicht gesendet hat
@@ -2388,7 +2388,7 @@
Es ist bereits eine Konferenz aktiv!
Starte eine Videokonferenz
Starte eine Audiokonferenz
- Konferenzen nutzen die Jitsi Sicherheits- und Berechtigungsrichtlinien. Alle im Raum Anwessenden können während der Konferenz beitreten.
+ Konferenzen nutzen die Jitsi-Sicherheits- und Berechtigungsrichtlinien. Alle im Raum Anwesenden können während der Konferenz beitreten.
Du kannst dich nicht selbst anrufen
Du kannst dich nicht selbst anrufen, warte bis Teilnehmer die Einladung annehmen
Hinzufügen des Widgets fehlgeschlagen
@@ -2407,14 +2407,14 @@
- Von %1$s, %2$s und %3$d anderen gelesen
- - Falscher code, %d verbleibender Versuch
- - Falscher code, %d verbleibende Versuche
+ - Falscher Code, %d verbleibender Versuch
+ - Falscher Code, %d verbleibende Versuche
Warnung! Letzter Versuch bevor du ausgeloggt wirst!
Zu viele Fehler. Du wurdest ausgeloggt
Diese Telefonnummer ist bereits registriert.
Deinem Konto wurde keine Telefonnummer hinzugefügt
- E-mail-Adressen
+ E-Mail-Adressen
Deinem Konto wurde keine E-Mail hinzugefügt
Telefonnummern
%s entfernen\?
@@ -2469,14 +2469,14 @@
Alle Wiederherstellungsoptionen vergessen oder verloren\? Alles zurücksetzen
Du bist beigetreten.
%s ist beigetreten.
- Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt.
+ Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt.
Verlassen
Einstellungen
- Nachrichten hier sind Ende-zu-Ende verschlüsselt.
+ Nachrichten hier sind Ende-zu-Ende-verschlüsselt.
\n
\nDeine Nachrichten sind mit digitalen Schlüsseln gesichert. Nur du und der Empfänger haben die einzigen Schlüssel, um jene zu entsperren.
- Nachrichten hier sind nicht Ende-zu-Ende verschlüsselt.
- Dieser Homeserver läuft mit einer alten Version. Bitte deinen Homeserver-Administrator um eine Aktualisierung. Du kannst fortfahren, aber einige Funktionen funktionieren möglicherweise nicht richtig.
+ Nachrichten hier sind nicht Ende-zu-Ende-verschlüsselt.
+ Dieser Home-Server läuft mit einer alten Version. Bitte deinen Home-Server-Administrator um eine Aktualisierung. Du kannst fortfahren, aber einige Funktionen funktionieren möglicherweise nicht richtig.
Du hast dies auf Einladungen beschränkt.
%1$s hat dies auf Einladungen beschränkt.
Zeige vollständigen Verlauf in verschlüsselten Räumen an
@@ -2514,8 +2514,8 @@
E-Mails und Telefonnummern senden
Autorisieren
Meine Zustimmung widerrufen
- Du hast zugestimmt E-Mails und Telefonnummern an diesen Identitätsserver zu senden, um von anderen Nutzenden entdeckt zu werden.
- Du hast nicht zugestimmt E-Mails und Telefonnummern an diesen Identitätsserver zu senden, um von anderen Nutzenden entdeckt zu werden.
+ Du hast zugestimmt E-Mails und Telefonnummern an diesen Identitätsserver zu senden, um von anderen Nutzern entdeckt zu werden.
+ Du hast nicht zugestimmt E-Mails und Telefonnummern an diesen Identitätsserver zu senden, um von anderen Nutzern entdeckt zu werden.
E-Mails und Telefonnummern senden
Vorschläge
Kontakte
@@ -2531,7 +2531,7 @@
Raumadressen und Sichtbarkeit im Raumverzeichnis ansehen und bearbeiten.
Raumadresse
Raumzugang
- Änderungen daran, wer die Chronik lesen kann, gellten nur für kommende Nachrichten in diesem Raum. Die Sichtbarkeit der bestehenden Chronik bleibt unverändert.
+ Änderungen daran, wer die Chronik lesen kann, gelten nur für kommende Nachrichten in diesem Raum. Die Sichtbarkeit der bestehenden Chronik bleibt unverändert.
Zurückziehen
Hinzufügen
Mit Nachricht teilen
@@ -2540,7 +2540,7 @@
Die Sichtbarkeit des Raums konnte nicht abgerufen werden (%1$s).
Matrix-Link
QR-Code nicht gescannt!
- Inkorrekter QR code (invalide URL)!
+ Inkorrekter QR-Code (invalide URL)!
Du kannst dir selbst keine Direktnachricht schicken!
Ändere deine aktuelle PIN
PIN ändern
@@ -2550,7 +2550,7 @@
Teile diesen Code mit Leuten, damit sie ihn scannen und mit dir chatten können.
Meinen Code teilen
Mein Code
- Scanne einen QR code
+ Scanne einen QR-Code
Das ist kein korrekter QR-Code von Matrix
🔐️ Komm mit zu ${app_name}
Hey, schreibe mit mir auf ${app_name}: %s
@@ -2568,10 +2568,10 @@
Bitte gib eine Raumadresse an
Diese Adresse ist bereits vergeben
Raumadresse
- Aktivieren, wenn der Raum nur von Mitgliedern deines Homeservers zur internen Kommunikation verwendet wird. Das kann später nicht mehr geändert werden.
+ Aktivieren, wenn der Raum nur von Mitgliedern deines Home-Servers zur internen Kommunikation verwendet wird. Das kann später nicht mehr geändert werden.
Begrenze Zugang zu diesem Raum (für immer!) auf Mitglieder von %s
%1$d von %2$d
- QR-Code scannen, um eine neue Direktnachtricht schicken
+ QR-Code scannen, um eine neue Direktnachricht schicken
Um bestehende Kontakte zu finden, ist es notwendig, Ihre Kontaktdaten (Telefonnummern und/oder E-Mails) mit dem ausgewählten Identitätsserver (%1$s) zu teilen.
\n
\nFür mehr Datenschutz werden die gesendeten Daten vor dem Versenden gehasht.
@@ -2639,7 +2639,7 @@
Authentifizierung fehlgeschlagen
Deine Anmeldeinformationen müssen für ${app_name} eingegeben werden, um diese Aktion auszuführen.
Erneute Authentifizierung erforderlich
- Cross Signing konnte nicht eingerichtet werden
+ Cross-Signing konnte nicht eingerichtet werden
Nicht autorisierte, fehlende gültige Authentifizierungsdaten
Nutzer
Beim Übertragen des Anrufs ist ein Fehler aufgetreten
@@ -2677,23 +2677,23 @@
Ereignisinhalt
Statusschlüssel
Typ
- Benutzendendefiniertes Status-Event senden
+ Benutzerdefiniertes Status-Event senden
Inhalt bearbeiten
Status-Events
Status-Event senden
- Benutzendendefiniertes Ereignis senden
+ Benutzerdefiniertes Ereignis senden
Raum-Status erkunden
- Entwicklungswerkzeuge
+ Entwicklerwerkzeuge
Lesebestätigungen anzeigen
Nicht benachrichtigen
Mit Ton benachrichtigen
Ohne Ton benachrichtigen
- Nachricht wegen eines Errors nicht gesendet
+ Nachricht aufgrund eines Fehlers nicht gesendet
Geprüft
Emoji-Auswahl schließen
Emoji-Auswahl öffnen
Vertraute Vertrauensstufe
- Warnungsvertrauensstufe
+ Warnungs-Vertrauensstufe
Standard-Vertrauensstufe
Ausgewählt
Video
@@ -2710,10 +2710,10 @@
- %d Einträge
Die Obergrenze ist nicht bekannt.
- Dein Homeserver akzeptiert Anhänge (wie Dateien, Medien, etc.) mit einer Größe bis zu %s.
+ Dein Home-Server akzeptiert Anhänge (wie Dateien, Medien, etc.) mit einer Größe bis zu %s.
Datei-Upload-Obergrenze des Servers
- Server-Version
- Severname
+ Serverversion
+ Servername
Raum-Einstellungen
Derzeitige Konferenz verlassen und zu einer anderen wechseln\?
Raum-Version
@@ -2727,11 +2727,11 @@
Wechseln
Zeige alle Räume im Raumverzeichnis, inklusive der Räume mit anstößigen Inhalten.
Zeige Räume mit anstößigen Inhalten
- Bist du dir sicher, dass du alle nicht gesendete Nachrichten in diesem Raum löschen willst\?
+ Bist du dir sicher, dass du alle nicht gesendeten Nachrichten in diesem Raum löschen willst\?
Nicht gesendete Nachrichten löschen
Fehlgeschlagen
Willst du zu sendende Nachrichten zurückziehen\?
- Alle fehgeschlagene Nachrichten löschen
+ Alle fehlgeschlagene Nachrichten löschen
Senden der Nachricht gescheitert
Wird gesendet
Nachricht gesendet
@@ -2745,12 +2745,12 @@
Nur Eingeladene können es finden und beitreten
Privat
Unbekannte Zugriffseinstellung (%s)
- Gäste erlauben beizutreten
+ Gästen erlauben beizutreten
Einladungen
Vorgeschlagene Räume
Spaces
Jeder kann im Raum anklopfen, Mitglieder können dann zustimmen oder ablehnen
-
+ Momentan bist nur du hier. Mit anderen Leuten wird %s noch viel besser.
Diese werden in der Lage sein %s zu durchsuchen
Diese werden kein Teil von %s sein
Tritt meinem Space %1$s %2$s bei
@@ -2767,8 +2767,8 @@
Zugang nur mit Einladung. Am besten für Teams oder dich selbst
Stelle sicher, dass die richtigen Personen Zugang zu %s besitzen. Du kannst das später noch ändern.
Mit wem arbeitest du zusammen\?
- Verlasse den Raum mit der angegebenen ID (oder den aktuellen Raum, indem du keine ID angibst)
- Name des Spaces
+ Verlasse den Raum mit der angegebenen ID (oder den aktuellen Raum, wenn keine ID angegeben wird)
+ Name suchen
Du wurdest eingeladen
Bist du dir sicher, dass du den Space verlassen willst\?
Space verlassen
@@ -2791,9 +2791,9 @@
Meine Teamkameraden und ich
Ein privater Space um deine Räume zu organisieren
Um einem bereits existierenden Space beizutreten, benötigst du eine Einladung.
- Spaces sind eine neue Art Personen und Räume zu gruppieren
- Dein Privater space
- Dein Öffentliches Space
+ Wir haben Spaces entwickelt, damit ihr eure vielen Räume besser organisieren könnt.
+ Dein privater Space
+ Dein öffentlicher Space
Betrete einen Space mit der angegebenen ID
Beschreibung
Erzeuge Space…
@@ -2806,4 +2806,32 @@
Space erstellen
Jeder, der sich in einem Space mit diesem Raum befindet, kann diesen Raum finden und ihm beitreten. Nur die Administratoren des Raums können diesen zu einem Space hinzufügen.
Spaces
+
+ - %d Person, die du kennst, ist bereits beigetreten
+ - %d Personen, die du kennst, sind bereits beigetreten
+
+ Suchst du jemanden außerhalb %s\?
+ Wir erstellen dir für jedes einen Raum. Du kannst jederzeit weitere Räume hinzufügen.
+ Räume und Spaces verwalten
+ Als \"vorgeschlagen\" markieren
+ Als \"nicht vorgeschlagen\" markieren
+ Vorgeschlagen
+ Teile deinen öffentlichen Space mit der Welt
+ Räume verwalten
+ %s lädt dich ein
+ Dieser Alias ist gerade nicht verfügbar.
+\nVersuche es später noch einmal oder kontaktiere einen Admin.
+ Wir erstellen dir für jedes einen Raum. Du kannst jederzeit neue oder existierende Räume hinzufügen.
+ An welchen Projekten arbeitest du gerade\?
+ Dieser Raum ist öffentlich
+ Mediendatei in Originalgröße senden
+
+ - Video in Originalauflösung senden
+ - Videos in Originalauflösung senden
+
+ Die Datei ist zu groß.
+ Video wird komprimiert (%d%%)
+ Bild wird komprimiert…
+ Als Standard festsetzen und nicht mehr fragen
+ Jedes Mal fragen
\ No newline at end of file
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index b0357ab34c..076ca3ffed 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -28,7 +28,7 @@
todos los miembros de la sala.
todos.
desconocido (%s).
- %1$s ha activado la encriptación de Extremo-a-Extremo (%2$s)
+ %1$s ha activado el cifrado Extremo-a-Extremo (%2$s)
%1$s solicitó una conferencia de VozIP
Conferencia de VozIP iniciada
Conferencia de VozIP finalizada
@@ -105,17 +105,17 @@
%1$s ha retirado la invitación de %2$s. Razón: %3$s
- %1$s ha añadido %2$s como alias de esta sala.
- - %1$s ha añadido %2$s como alias de esta sala.
+ - %1$s han añadido %2$s como alias de esta sala.
- %1$s ha quitado %2$s como alias de esta sala.
- - %1$s ha quitado %2$s como alias de esta sala.
+ - %1$s han quitado %2$s como alias de esta sala.
%1$s ha establecido la dirección principal de esta sala a %2$s.
%1$s ha permitido que los invitados se unan a la sala.
%1$s ha impedido que los invitados se unan a la sala.
- %1$s ha activado la encriptación extremo a extremo.
- %1$s ha activado la encriptación de extremo a extremo (algoritmo no reconocido %2$s).
+ %1$s ha activado el cifrado Extremo-a-Extremo.
+ %1$s ha activado el cifrado Extremo-a-Extremo (algoritmo no reconocido %2$s).
Enviaste una imagen.
Enviaste un sticker.
Tu invitación
@@ -144,7 +144,7 @@
Respondiste la llamada.
Terminaste la llamada.
Hiciste visible el futuro historial de la %1$s
- Has activado la encriptación de Extremo-a-Extremo (%1$s)
+ Has activado la cifrado Extremo-a-Extremo (%1$s)
Has actualizado esta sala.
Solicitaste una conferencia de VozIP
Quitaste el nombre de la sala
@@ -195,8 +195,8 @@
Quitaste la dirección principal de esta sala.
Ha permitido que los invitados se unan a la sala.
Ha impedido que los invitados se unan a la sala.
- Tu has activado la encriptación de Extremo-a-Extremo.
- Has activado la encriptación de Extremo-a-Extremo (algoritmo %1$s no reconocido).
+ Has activado el cifrado Extremo-a-Extremo.
+ Has activado el cifrado Extremo-a-Extremo (algoritmo %1$s no reconocido).
Has impedido que invitados se unan a la sala.
Has permitido a invitados unirse aquí.
Te has ido. Razón: %1$s
@@ -290,7 +290,7 @@
Reenviar
Enlace Permanente
Ver Fuente
- Ver Fuente Desencriptada
+ Ver Fuente Descifrada
Eliminar
Renombrar
Reportar contenido
@@ -304,7 +304,7 @@
Necesitas permiso para invitar a iniciar una conferencia en esta sala
No se puede iniciar la llamada
Detalles de la sesión
- No se admiten llamadas de conferencia en salas encriptadas
+ No se admiten llamadas de conferencia en salas cifradas
Enviar de Todos Modos
o
Invitar
@@ -566,7 +566,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
%s está escribiendo…
%1$s y %2$s están escribiendo…
%1$s y %2$s y otros están escribiendo…
- Enviar un mensaje encriptado…
+ Enviar un mensaje cifrado…
Enviar un mensaje (sin cifrar)…
Se perdió la conexión con el servidor.
Los mensajes no se enviaron. ¿%1$s o %2$s ahora?
@@ -761,11 +761,11 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Direcciones
Laboratorios
Estas son funcionalidades experimentales que pueden romperse de maneras inesperadas. Utilizar con precaución.
- Encriptación de Extremo a Extremo
- La encriptación de Extremo a Extremo está activa
- Necesitas cerrar sesión para poder habilitar la encriptación.
+ Cifrado Extremo-a-Extremo
+ El cifrado Extremo-a-Extremo está activo
+ Necesitas cerrar sesión para poder habilitar el cifrado.
Cifrar solo a sesiones verificadas
- Nunca enviar mensajes encriptados a sesiones sin verificar en esta sala desde esta sesión.
+ Nunca enviar mensajes cifrados a sesiones sin verificar en esta sala desde esta sesión.
Esta sala no tiene direcciones locales
Dirección nueva (ej. #foo:matrix.org)
@@ -777,23 +777,23 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Dejar de Establecer como dirección principal
Copiar ID de Sala
Copiar Dirección de Sala
- La encriptación está habilitada en esta sala.
- La encriptación está deshabilitada en esta sala.
- Habilitar encriptado
+ El cifrado está habilitado en esta sala.
+ El cifrado está deshabilitado en esta sala.
+ Habilitar cifrado
\n(advertencia: ¡no se puede volver a deshabilitar!)
Directorio
%s estaba intentando cargar un momento específico en la línea de tiempo de esta sala pero no pudo encontrarlo.
- Información de encriptación Extremo-a-Extremo
+ Información de cifrado Extremo-a-Extremo
Información de eventos
ID de Usuario
Clave de identidad Curve25519
Clave de huella digital Ed25519 reclamada
Algoritmo
ID de Sesión
- Error de desencriptación
+ Error de descifrado
Información de la sesión emisora
Nombre público
Nombre público
@@ -801,21 +801,21 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Clave de sesión
Verificación
Huella digital Ed25519
- Exportar claves de salas con encriptación Extremo-a-Extremo
+ Exportar claves de salas con cifrado Extremo-a-Extremo
Exportar claves de sala
Exportar las claves a un archivo local
Exportar
Ingresar frase de contraseña
Confirmar frase de contraseña
- Las claves de salas con encriptado de Extremo-a-Extremo se guardaron en \'%s\'.
+ Las claves de salas con cifrado Extremo-a-Extremo se guardaron en \'%s\'.
\n
\nAdvertencia: este archivo puede ser eliminado si la aplicación se desinstala.
- Importar claves de salas con encriptación Extremo-a-Extremo
+ Importar claves de salas con cifrado Extremo-a-Extremo
Importar claves de sala
Importar las claves desde un archivo local
Importar
Cifrar solo a sesiones verificadas
- Nunca enviar mensajes encriptados a sesiones sin verificar desde esta sesión.
+ Nunca enviar mensajes cifrados a sesiones sin verificar desde esta sesión.
SIN Verificar
Verificado
Prohibido
@@ -901,8 +901,8 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Añadir aplicaciones de Matrix
Utilizar cámara nativa
- Has añadido una nueva sesión \'%s\', que está solicitando claves de encriptación.
- Tu sesión sin verificar \'%s\' está solicitando claves de encriptación.
+ Has añadido una nueva sesión \'%s\', que está solicitando claves de cifrado.
+ Tu sesión sin verificar \'%s\' está solicitando claves de cifrado.
Iniciar verificación
Compartir sin verificar
Ignorar solicitud
@@ -915,7 +915,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Desactivado
Ruidoso
- Mensaje encriptado
+ Mensaje cifrado
Detalles de comunidad
Cargando…
Salir
@@ -1057,7 +1057,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Borrar
continuar con…
Lo sentimos, no se encontró ninguna aplicación externa para completar esta acción.
- Volver a solicitar las claves de encriptado de tus otras sesiones.
+ Volver a solicitar las claves de cifrado de tus otras sesiones.
Solicitud de clave enviada.
Privacidad de Notificaciones
${app_name} puede ejecutarse en segundo plano para gestionar tus notificaciones de forma segura y privada. Esto podría afectar la duración de la batería.
@@ -1161,12 +1161,12 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Copia de seguridad de la clave
Usar copia de seguridad de la clave
La copia de seguridad de la clave no ha finalizado, por favor espere…
- No quiero mis mensajes encriptados
+ No quiero mis mensajes cifrados
Creando copia de seguridad de las claves…
Usar copia de seguridad de la clave
¿Estás seguro\?
Copia de seguridad
- Perderá el acceso a sus mensajes encriptados si cierra sesión sin hacer una copia de seguridad de sus claves.
+ Perderá el acceso a sus mensajes cifrados si cierra sesión sin hacer una copia de seguridad de sus claves.
Quedarse
Saltar
Hecho
@@ -1199,14 +1199,14 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Comprueba ajustes
Prueba de servicios Google Play
APK de servicios de Google Play esta disponible y actualizado.
- Al cerrar la sesión se perderán los mensajes encriptados
+ Al cerrar la sesión se perderán los mensajes cifrados
¿Estás seguro que quieres cerrar la sesión\?
Está URL no es válida, por favor compruébala
El diagnóstico base se ha completado con éxito. Si aun no recibes notificaciones, por favor mándanos un informe de error.
Una o más pruebas han fallado, por favor prueba las soluciones propuestas.
Una o más pruebas han fallado, por favor mándanos un informe de error para que podamos investigar.
- Copia de seguridad en progreso. Si cierras sesión ahora perderás el acceso a tus mensajes encriptados.
- La copia de seguridad debería estar activa ahora en todas tus sesiones para evitar la pérdida de acceso a tus mensajes encriptados.
+ Copia de seguridad en progreso. Si cierras sesión ahora perderás el acceso a tus mensajes cifrados.
+ La copia de seguridad debería estar activa ahora en todas tus sesiones para evitar la pérdida de acceso a tus mensajes cifrados.
${app_name} usa los servicios de Google Play para entregar mensajes Push pero no parece estar configurado correctamente:
\n%1$s
solucionar error con los Servicios de Google Play
@@ -1231,10 +1231,10 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Borrar copia de seguridad
nueva copia de seguridad
Ese era yo
- Nunca pierda mensajes encriptados
- Configurar copia de seguridad de las claves de encriptado
- Nunca pierdas mensajes encriptados
- Nuevas claves de encriptación de mensajes
+ Nunca pierda mensajes cifrados
+ Configurar copia de seguridad de las claves de cifrado
+ Nunca pierdas mensajes cifrados
+ Nuevas claves de cifrado de mensajes
Gestionar Copia de Seguridad
Guardando copia de seguridad…
Versión
@@ -1293,7 +1293,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Compresión predeterminada
Seleccionar
Seleccionar
- Recuperación de mensajes encriptados
+ Recuperación de mensajes cifrados
Gestionar copia de seguridad clave
- %1$s: %2$d mensaje
@@ -1330,8 +1330,8 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
La contraseña que has introducido es muy débil
Por favor borra la contraseña si quieres que ${app_name} genere una clave de recuperación.
No hay ninguna sesión de Matrix disponible
- Nunca perder los mensajes encriptados
- Los mensajes en salas encriptadas están asegurados con encriptación Extremo-a-Extremo. Solo los integrantes de la sala y tu podéis leer estos mensajes.
+ Nunca perder los mensajes cifrados
+ Los mensajes en salas cifradas están asegurados con cifrado Extremo-a-Extremo. Solo los integrantes de la sala y tu podéis leer estos mensajes.
\n
\nAsegúrate de guardar bien tus claves para evitar perderlas.
(Avanzado)
@@ -1346,7 +1346,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
(Avanzado) Establecer clave de recuperación
Completado!
Tus claves se están guardando.
- Tu clave de recuperación es una red de seguridad - puedes usarla para recuperar el acceso a tus mensajes encriptados si olvidas tu contraseña.
+ Tu clave de recuperación es una red de seguridad - puedes usarla para recuperar el acceso a tus mensajes cifrados si olvidas tu contraseña.
\nMantén tu clave de recuperación en algún lugar muy seguro como un administrador de contraseñas (o en una caja fuerte)
Mantén tu clave de recuperación en algún lugar muy seguro como un administrador de contraseñas (o en una caja fuerte)
Hecho
@@ -1366,10 +1366,10 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Tus claves cifradas están siendo guardadas en segundo plano en tu servidor. La copia de seguridad inicial podría tardar varios minutos.
Estás seguro\?
Podrías perder el acceso a tus mensajes si te desconectas o pierdes este dispositivo.
- Utiliza tu clave de recuperación para desbloquear tu historial de mensajes encriptados
+ Utiliza tu clave de recuperación para desbloquear tu historial de mensajes cifrados
Utiliza tu clave de recuperación
No sabes tu clave de recuperación\? puedes %s.
- Utiliza tu clave de recuperación para desbloquear tu historial de mensajes encriptados
+ Utiliza tu clave de recuperación para desbloquear tu historial de mensajes cifrados
Introduzca la clave de recuperación
Mensaje de recuperación
Has perdido tu clave de recuperación\? Puedes crear una nueva en ajustes.
@@ -1413,14 +1413,14 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
\n%2$s
Configuración de uso
Origen predeterminado de medios
- Configurar copia de seguridad de las claves de encriptación
+ Configurar copia de seguridad de las claves de cifrado
Obteniendo una versión de copia de seguridad…
La copia de seguridad tiene una firma valida de la sesión no verificada %s
La copia de seguridad tiene una firma inválida de la sesión verificada %s
La copia de seguridad tiene una firma inválida de la sesión no verificada %s
Error al conseguir información de confianza para la copia de seguridad (%s).
Para usar la copia de seguridad de la clave en esta sesión introduzca su contraseña o su clave de recuperación ahora.
- Deseas borrar tus claves de encriptación guardadas en el servidor\? No podrás usar tu clave de recuperación para leer el historial de mensajes encriptados.
+ ¿Deseas borrar tus claves de cifrado guardadas en el servidor\? No podrás usar tu clave de recuperación para leer el historial de mensajes cifrados.
Una nueva copia de seguridad de mensajes ha sido detectada.
\n
\nSi no ha establecido un nuevo método de recuperación, alguien podría estar intentando acceder a su cuenta. Cambie su contraseña y establezca un nuevo método de recuperación inmediatamente en ajustes.
@@ -1428,11 +1428,11 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Reproducir sonido de cámara
Verificar sesión
ip desconocida
- Una nueva sesión solicita claves de encriptación.
+ Una nueva sesión solicita claves de cifrado.
\nSesión: %1$s
\nVisto por última vez: %2$s
\nSi no has iniciado sesión en otro dispositivo ignora esta solicitud.
- Una sesión no verificada solicita claves de encriptación.
+ Una sesión no verificada solicita claves de cifrado.
\nSesión: %1$s
\nVisto por última vez: %2$s
\nSi no has iniciado sesión en otro dispositivo ignora esta solicitud.
@@ -1450,7 +1450,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Para más seguridad, te recomendamos que hagas esto en persona o por otros medios confiables.
Empezar verificación
Solicitud de verificación
- Verifica esta sesión para marcarla de confianza. Marcar sesiones de otros como de confianza te da aún más tranquilidad cuando usas cifrado de Extremo-a-Extremo.
+ Verifica esta sesión para marcarla de confianza. Marcar sesiones de otros como de confianza te da aún más tranquilidad cuando usas cifrado Extremo-a-Extremo.
Verificar esta sesión la marcará como confiable, y también marcará como confiable tu sesión para la contraparte.
Verifica esta sesión confirmando los emojis que aparecen en la pantalla de la contraparte
Verifica esta sesión confirmando que los siguietes números aparecen en la pantalla de la contraparte
@@ -1459,7 +1459,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Esperando confirmación de la contraparte…
¡Verificado!
Has verificado correctamente esta sesión.
- Los mensajes con este usuario están encriptados de Extremo-a-Extremo y no son legibles por terceros.
+ Los mensajes con este usuario están cifrados Extremo-a-Extremo y no son legibles por terceros.
Ok
¿No aparece nada\? No todas las aplicaciones cliente soportan verificación interactiva. Usa la verificación clásica.
Usar verificación clásica.
@@ -1747,7 +1747,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Mensajes no leídos
Es tu conversación. Sé su dueño.
Envía mensajes a personas o grupos
- Mantén las conversaciones privadas con encriptación
+ Mantén conversaciones privadas con cifrado
Extiende y personaliza tu experiencia
Empieza
Selecciona un servidor
@@ -1869,7 +1869,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
${app_name} puede fallar con más frecuencia cuando ocurre un error inesperado
Antepone ¯\\_(ツ)_/¯ a un mensaje de texto sin formato
Habilitar crifrado
- Una vez habilitada, la encriptación no se puede deshabilitar.
+ Una vez habilitado, el cifrado no se puede deshabilitar.
Su dominio de correo electrónico no está autorizado para registrarse en este servidor
Inicio de sesión no confiable
Coinciden
@@ -1904,7 +1904,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Verificar %s
Verificado %s
Esperando por %s…
- Los mensajes en esta sala no están encriptados de Extremo-a-Extremo.
+ Los mensajes en esta sala no están cifrados Extremo-a-Extremo.
Seguridad
Saber mas
Mas
@@ -1937,10 +1937,10 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Envía el mensaje dado en colores
Línea de tiempo
Editor de mensage
- Encriptacion habilitada (end-to-end) …
- Una vez habilitada, la encriptación no se puede deshabilitar.
- Encriptar \?
- Habilitar la encriptación
+ Habilitar cifrado Extremo-a-Extremo…
+ Una vez habilitado, el cifrado no se puede deshabilitar.
+ ¿Desea cifrar \?
+ Habilitar el cifrado
Firma cruzada
Firma cruzada no habilitada
Sesiones Activas
@@ -1959,7 +1959,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
No es confiable
Inicializar Firmas Cruzadas
Restablecer claves
- Codigo QR
+ Código QR
Correcto
No
Sin conexión
@@ -1983,7 +1983,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Clave de mensaje
Contraseña de la cuenta
¡Listo!
- Encriptación habilitada
+ Cifrado habilitado
Sala creada y configurada por usted.
Esperando por %s…
Ajuste de Notificaciones
@@ -2035,7 +2035,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Configurar copia de seguridad segura
Restablecer copia de seguridad segura
Configurar en este dispositivo
- Protéjase contra la pérdida de acceso a los mensajes y datos encriptados haciendo una copia de seguridad de las claves de encriptado en su servidor.
+ Protéjase contra la pérdida de acceso a los mensajes y datos cifrados haciendo una copia de seguridad de las claves de cifrado en su servidor.
Genere una nueva llave de seguridad o establezca una nueva frase de seguridad para su copia de seguridad existente.
Esto reemplazará su clave o frase actual.
Las integraciones están deshabilitadas
@@ -2057,7 +2057,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Sin widgets activos
La clave de recuperación se ha guardada.
Copia de seguridad segura
- Protéjase contra la pérdida de acceso a mensajes y datos encriptados
+ Protéjase contra la pérdida de acceso a mensajes y datos cifrados
Configurar copia de seguridad segura
Mensaje borrado
Se ha creado la sala, pero algunas invitaciones no se han enviado por el siguiente motivo:
@@ -2078,7 +2078,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
No hiciste cambios
Hiciste que la sala fuera pública para quien conozca el enlace.
Hiciste la sala solo por invitación.
- Únase gratis a millones en el servidor público más grande
+ Únase gratis a millones de personas en el mayor servidor público
Continuar con SSO
Dirección de servicios de Element Matrix
Ingrese la dirección del servidor que desea utilizar
@@ -2087,7 +2087,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Email
Nueva contraseña
¡Advertencia!
- Cambiar su contraseña restablecerá cualquier clave de encriptado de Extremo-a-Extremo en todas sus sesiones, haciendo ilegible el historial de chat encriptado. Configure la Copia de seguridad de claves o exporte las claves de su sala desde otra sesión antes de restablecer su contraseña.
+ Cambiar su contraseña restablecerá cualquier clave de cifrado Extremo-a-Extremo en todas sus sesiones, haciendo ilegible el historial de chat cifrado. Configure la Copia de seguridad de claves o exporte las claves de su sala desde otra sesión antes de restablecer su contraseña.
Seguir
Este correo electrónico no está vinculado a ninguna cuenta
Revisa tu correo
@@ -2114,7 +2114,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Numero de teléfono (opcional)
Siguiente
Confirmar número de teléfono
- Acabamos de mandar un codigo a %1$s. Ingréselo a continuación para verificar que es usted.
+ Acabamos de mandar un código a %1$s. Introdúzcalo a continuación para verificar su identidad.
Introduzca el código
Enviar de nuevo
Siguiente
@@ -2167,18 +2167,18 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Estás desconectado
Registrarse
El administrador de su servidor privado (%1$s) ha cerrado la sesión de su cuenta %2$s (%3$s).
- Inicie sesión para recuperar las claves de encriptación almacenadas exclusivamente en este dispositivo. Los necesita para leer todos sus mensajes seguros en cualquier dispositivo.
+ Inicie sesión para recuperar las claves de cifrado almacenadas exclusivamente en este dispositivo. Los necesita para leer todos sus mensajes seguros en cualquier dispositivo.
Registrarse
Contraseña
Borrar datos personales
- Advertencia: sus datos personales (incluidas las claves de encriptación) todavía están almacenadas en este dispositivo.
+ Advertencia: sus datos personales (incluidas las claves de cifrado) todavía están almacenadas en este dispositivo.
\n
\nBórrelo si terminó de usar este dispositivo o si desea iniciar sesión en otra cuenta.
Borrar todos los datos
Borrar datos
¿Borrar todos los datos almacenados actualmente en este dispositivo\?
\nVuelva a iniciar sesión para acceder a los datos y mensajes de su cuenta.
- Perderás el acceso a los mensajes seguros a menos que inicies sesión para recuperar tus claves de encriptación.
+ Perderás el acceso a los mensajes seguros a menos que inicies sesión para recuperar tus claves de cifrado.
Borrar datos
La sesión actual es para el usuario %1$s y usted proporciona las credenciales para el usuario %2$s. Esto no está suportado por ${app_name}.
\nPrimero borre los datos, luego inicie sesión nuevamente con otra cuenta.
@@ -2193,19 +2193,19 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Para mayor seguridad, verifique %s verificando un código único en ambos dispositivos.
\n
\nPara máxima seguridad, hágalo en persona.
- Los mensajes de esta sala están encriptados de Extremo-a-Extremo.
+ Los mensajes de esta sala están cifrados Extremo-a-Extremo.
\n
-\nSus mensajes están protegidos con candados y solo usted y el destinatario tienen las claves únicas para desbloquearlos.
+\nSus mensajes están protegidos y sólo usted y el destinatario tienen las claves únicas para descifrarlos.
Esta sesión no puede compartir esta verificación con sus otras sesiones.
\nLa verificación se guardará localmente y se compartirá en una versión futura de la aplicación.
Envía el emote dado coloreado como un arcoíris
- Una vez habilitado, la encriptación de una sala no se puede deshabilitar. Los mensajes enviados en una sala encriptada no pueden ser vistos por el servidor, solo por los participantes de la sala. Habilitar la encriptación puede impedir que muchos bots y puentes funcionen correctamente.
+ Una vez habilitado, el cifrado de una sala no se puede deshabilitar. Los mensajes enviados en una sala cifrada no pueden ser vistos por el servidor, solo por los participantes de la sala. Habilitar el cifrado puede impedir que muchos bots y puentes funcionen correctamente.
Para estar seguro, verifique %s comprobando un código de un solo uso.
Para estar seguro, hágalo en persona o use otra forma de comunicarse.
Compare los emoji únicos, asegurándose de que aparezcan en el mismo orden.
Compare el código con el que se muestra en la pantalla del otro usuario.
- Los mensajes con este usuario están encriptados de extremo a extremo y no pueden ser leídos por terceros.
- Su nueva sesión ahora está verificada. Tiene acceso a sus mensajes encriptados y otros usuarios lo verán como de confianza.
+ Los mensajes con este usuario están cifrados Extremo-a-Extremo y no pueden ser leídos por terceros.
+ Su nueva sesión ahora está verificada. Tiene acceso a sus mensajes cifrados y otros usuarios lo verán como de confianza.
La firma cruzada está habilitada
\n Claves privadas en el dispositivo.
La firma cruzada está habilitada
@@ -2213,15 +2213,15 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
\nNo se conocen las claves privadas
La firma cruzada está habilitada.
\nLas claves no son de confianza
- El administrador de su servidor ha desactivado la encriptación de Extremo-a-Extremo de forma predeterminada en salas privadas y mensajes directos.
+ El administrador de su servidor ha desactivado el cifrado Extremo-a-Extremo de forma predeterminada en salas privadas y mensajes directos.
No hay información criptográfica disponible
Esta sesión es confiable para mensajería segura porque usted la verificó:
- Verifique esta sesión para marcarla como confiable y otorgarle acceso a mensajes encriptados. Si no inició sesión en esta sesión, su cuenta puede verse comprometida:
+ Verifique esta sesión para marcarla como confiable y otorgarle acceso a mensajes cifrados. Si no inició sesión en esta sesión, su cuenta puede verse comprometida:
- %d sesión activa
- %d sesiones activas
- Utilice una sesión existente para verificar ésta, otorgándole acceso a los mensajes encriptados.
+ Utilice una sesión existente para verificar ésta, otorgándole acceso a los mensajes cifrados.
Esta sesión es de confianza para mensajería segura porque %1$s (%2$s) la ha verificado:
%1$s (%2$s) iniciado sesión con una nueva sesión:
Hasta que este usuario confíe en esta sesión, los mensajes enviados hacia y desde ella se etiquetan con advertencias. Alternativamente, puede verificarlo manualmente.
@@ -2250,10 +2250,10 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Evento eliminado por el usuario, motivo: %1$s
Evento moderado por el administrador de la sala, motivo: %1$s
Solicitudes clave
- Desbloquear el historial de mensajes encriptados
- Utilice esta sesión para verificar su nuevo, otorgándole acceso a mensajes encriptados.
- Si cancela, no podrá leer mensajes encriptados en este dispositivo y otros usuarios no confiarán en él
- Si cancela, no podrá leer mensajes encriptados en su nuevo dispositivo y otros usuarios no confiarán en él
+ Desbloquear el historial de mensajes cifrados
+ Utilice esta sesión para verificar su nuevo, otorgándole acceso a mensajes cifrados.
+ Si cancela, no podrá leer mensajes cifrados en este dispositivo y otros usuarios no confiarán en él
+ Si cancela, no podrá leer mensajes cifrados en su nuevo dispositivo y otros usuarios no confiarán en él
No verificarás %1$s (%2$s) si cancelas ahora. Comience de nuevo en su perfil de usuario.
Uno de los siguientes puede verse comprometido:
\n
@@ -2268,7 +2268,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Generar una clave de mensaje
Confirmar %s
Ingrese su %s para continuar.
- Proteja y desbloquee los mensajes encriptados y confíe en %s.
+ Proteja y desbloquee los mensajes cifrados y confíe en %s.
Ingrese su %s nuevamente para confirmarlo.
No use la contraseña de su cuenta.
Ingrese una frase de seguridad que solo usted conozca, que se usa para proteger secretos en su servidor.
@@ -2287,34 +2287,34 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Configuración de copia de seguridad de claves
Tus %2$s y %1$s ahora están configurados.
\n
-\n¡Mantenlos a salvo! Los necesitará para desbloquear mensajes encriptados y proteger la información si pierde todas sus sesiones activas.
+\n¡Mantenlos a salvo! Los necesitará para desbloquear mensajes cifrados y proteger la información si pierde todas sus sesiones activas.
Imprímelo y guárdalo en un lugar seguro
Guárdelo en una llave USB o unidad de respaldo
Cópielo en su almacenamiento personal en la nube
No puedes hacer eso desde el móvil
- Establecer una frase de contraseña de recuperación le permite proteger y desbloquear mensajes encriptados y de confianza.
+ Establecer una Frase de Recuperación le permite proteger y desbloquear mensajes cifrados y de confianza.
\n
-\nSi no desea establecer una contraseña de mensaje, genere una clave de mensaje.
- Establecer una frase de contraseña de recuperación le permite proteger y desbloquear mensajes encriptados y de confianza.
- Si cancela ahora, puede perder mensajes y datos encriptados si pierde el acceso a sus inicios de sesión.
+\nSi no desea establecer una Contraseña de Mensaje, genere una Clave de Mensaje en su lugar.
+ Establecer una Frase de Recuperación le permite proteger y desbloquear mensajes cifrados y de confianza.
+ Si cancela ahora, puede perder mensajes y datos cifrados si pierde el acceso a sus inicios de sesión.
\n
-\nTambién puede configurar la Copia de seguridad segura y administrar sus claves en Configuración.
- Los mensajes de esta sala están encriptados de Extremo-a-Extremo. Obtenga más información y verifique a los usuarios en su perfil.
- Encriptación no habilitada
- La encriptación usada por esta sala no es compatible
+\nTambién puede configurar la Copia de Seguridad Segura y administrar sus claves en Configuración.
+ Los mensajes de esta sala están cifrados Extremo-a-Extremo. Obtenga más información y verifique a los usuarios en su perfil.
+ Cifrado no habilitado
+ El cifrado usado por esta sala no es compatible
%s creado y configurado la sala.
¡Casi ahí! ¿El otro dispositivo muestra el mismo escudo\?
¡Casi ahí! Esperando confirmación…
No se pudieron importar las claves
Mensajes que contienen @room
- Mensajes encriptados en chats 1:1
- Mensajes encriptados en chats de grupo
+ Mensajes cifrados en conversaciones personales
+ Mensajes cifrados en chats de grupo
Cuando las salas son actualizadas
Solucionar problemas
Envía un mensaje como texto estándar, sin interpretarlo como Markdown
Nombre de usuario y / o contraseña incorrectos. La contraseña ingresada comienza o termina con espacios, verifíquela.
Esta cuenta ha sido desactivada.
- Mejora de encriptación disponible
+ Mejora de cifrado disponible
Habilitar la firma cruzada
Verifíquese a usted mismo y a los demás para mantener sus chats seguros
Entrar %s
@@ -2341,7 +2341,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
${app_name} Web
\n${app_name} de escritorio
${app_name} iOS
-\${app_name} Android
+\n${app_name} Android
u otro cliente Matrix con capacidad de firma cruzada
Utilice la última versión de ${app_name} en sus otros dispositivos:
Obliga a descartar la sesión de grupo saliente actual en una sala cifrada
@@ -2351,15 +2351,15 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Seleccione su clave de recuperación o introdúzcala manualmente escribiéndola o pegándola desde su portapapeles
La copia de seguridad no se pudo descifrar con esta clave de recuperación: verifique que ingresó la clave de recuperación correcta.
No se pudo acceder al almacenamiento seguro
- Sin encriptar
- Encriptado por un dispositivo no verificado
+ Sin cifrar
+ Cifrado por un dispositivo no verificado
Revise dónde inició sesión
Verifique todas sus sesiones para asegurarse de que su cuenta y sus mensajes estén seguros
Verifique el nuevo inicio de sesión accediendo a su cuenta: %1$s
Verificar manualmente por texto
Verificación interactiva por emoji
- Confirme su identidad verificando este inicio de sesión de una de sus otras sesiones, otorgándole acceso a los mensajes encriptados.
- Confirme su identidad verificando este inicio de sesión, otorgándole acceso a los mensajes encriptados.
+ Confirme su identidad verificando este inicio de sesión de una de sus otras sesiones, otorgándole acceso a los mensajes cifrados.
+ Confirme su identidad verificando este inicio de sesión, otorgándole acceso a los mensajes cifrados.
Marcar como de confianza
No pudimos crear tu DM. Marque los usuarios que desea invitar y vuelva a intentarlo.
Primero acepta los términos del servidor de identidad en la configuración.
@@ -2380,7 +2380,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Enciende la cámara
Configurar copia de seguridad segura
Respaldo seguro
- Protéjase contra la pérdida de acceso a los mensajes y datos encriptados haciendo una copia de seguridad de las claves de encriptación en su servidor.
+ Protéjase contra la pérdida de acceso a los mensajes y datos cifrados haciendo una copia de seguridad de las claves de cifrado en su servidor.
Preparar
Usa una llave de seguridad
Genere una clave de seguridad para almacenar en un lugar seguro, como un administrador de contraseñas o una caja fuerte.
@@ -2400,11 +2400,11 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
No puedes acceder a este mensaje
Esperando este mensaje, esto puede tardar un poco
No se puede descifrar
- Debido a la encriptación de Extremo-a-Extremo, es posible que deba esperar a que llegue el mensaje de alguien porque las claves de encriptación no se le enviaron correctamente.
+ Debido al cifrado Extremo-a-Extremo, es posible que deba esperar a que llegue el mensaje de alguien porque las claves de cifrado no se le enviaron correctamente.
No puede acceder a este mensaje porque ha sido bloqueado por el remitente
No puede acceder a este mensaje porque el remitente no confía en su sesión
No puede acceder a este mensaje porque el remitente no envió las claves a propósito
- Esperando al historial de encriptación
+ Esperando al historial de cifrado
¡Nos complace anunciar que hemos cambiado de nombre! Tu aplicación está actualizada y accediste a tu cuenta.
Guardar la clave de recuperación en
Agregar desde mi directorio telefónico
@@ -2430,14 +2430,14 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
¿Olvidó su PIN\?
No se puede abrir una sala en la que está prohibido.
No puedo encontrar esta sala. Asegúrate de que exista.
- Los mensajes en esta sala están encriptados punto-a-punto.
+ Los mensajes en esta sala están cifrados Extremo-a-Extremo.
Mensaje directo
Salir
Preferencias
- Los mensajes aquí están encriptados de Extremo-a-Extremo.
+ Los mensajes aquí están cifrados Extremo-a-Extremo.
\n
-\nTus mensajes están asegurados con un candado. Solo tú y tú destinatario tenéis las llaves especiales para desencriptarlos.
- Los mensajes aquí no están encriptados de Extremo-a-Extremo.
+\nTus mensajes están asegurados con un candado. Solo tú y tú destinatario tenéis las llaves especiales para descifrarlos.
+ Los mensajes aquí no están cifrados Extremo-a-Extremo.
Botones de Bot
Encuesta
Eliminar de baja prioridad
@@ -2454,7 +2454,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
La aplicación está recibiendo PUSH
La aplicación está esperando al PUSH
Probar Push
- Búsquedas en salas encriptadas todavía no están soportadas.
+ Todavía no se puede hacer búsquedas en salas cifradas.
Filtrar usuarios excluidos
Enviar la historia de peticiones de claves compartidas
No hay más resultados
@@ -2499,7 +2499,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Tú has configurado como sólo con invitación.
%1$s ha configurado como sólo con invitación.
Añadir imagen de
- Mostrar la historia completa en salas encriptadas
+ Mostrar la historia completa en salas cifradas
Ajustes de la sala
Tema
Tema de la sala (opcional)
@@ -2538,27 +2538,27 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Añadir
No tiene permisos para encryptar esta sala.
No es un ID matrix valido
- Mi codigo
- Compartir mi codigo
+ Mi código
+ Compartir mi código
Escanear QR
🔐️ Unirme a ${app_name}
Hey, contactame por ${app_name}:%s
Adicionar persona
- Compartir ese codigo para que puedan contactarloa usted.
+ Comparte este código para que puedan contactar contigo.
Crear una converzacion por ID Matrix
Crear una converzacion escanenado QR
Adicionar botón en el redactor de mensajes para abrir el teclado emoji
Mostrar teclado emoji
Reciente
- Adicionar por codigo QR
+ Añadir mediante código QR
Buscar por nick o ID
- Codigo QR
+ Código QR
Sugerencias
Contactos
Usuarios conocidos
Mostrar efectos de chat
Para leer el código QR , necesita dar permisos de acceso a su cámara.
- Invitar contactos
+ Invitar amigos
Modifique los roles y privilegios de la sala.
Sala no pública. No puede acceder sin una invitacion.
Actualizar sala
@@ -2589,4 +2589,14 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
Esperar
Continuar
Volver
+ Los espacios son una manera de agrupar salas y personas por trabajo, diversión o lo que quieras.
+ ¡Bienvenido a los Espacios!
+ Únete a un Espacio
+ Crea un Espacio
+ Añade un Espacio
+ Crea un Espacio
+ Crear un espacio
+ Los Espacios son una nueva forma de agrupar salas y personas
+ Sincronización inicial:
+\nEsperando respuesta del servidor…
\ No newline at end of file
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 8047422a1f..cd58abcbf7 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2752,4 +2752,23 @@
Kogukonnakeskused
Kutsed
Soovitatud jututoad
+ Halda jututubasid ja kogukonnakeskuseid
+ Eemalda soovitus
+ Märgi soovituseks
+ Soovitatud
+ Tee see jututuba avalikuks
+ Halda jututubasid
+ Kas sa otsid kedagi, kes ei leidu %s kogukonnas\?
+ %s kutsus sind
+ See jututuba on avalik
+ Saada meedia algses suuruses
+
+ - Saada videofail algses suuruses
+ - Saada videofailid algses suuruses
+
+ See fail on üleslaadimiseks liiga suur.
+ Teen video väiksemaks %d%%
+ Teen pildi väiksemaks…
+ Kasuta vaikeseadistusena ja ära küsi uuesti
+ Alati küsi
\ No newline at end of file
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 4d1ff806e5..0681fed0df 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -2752,4 +2752,23 @@
مجوز پیوستن مهمان به اتاق
دعوتها
اتاقهای پیشنهادی
+ مدیریت اتاقها و فضاهای کاری
+ نشانهگذاری به عنوان غیر پیشنهادی
+ نشانهگذاری به عنوان پیشنهادی
+ پیشنهادی
+ عمومی کردن این فضای کاری
+ مدیریت اتاقها
+ به دنبال کسی هستید که در %s نباشد؟
+ %s شما را دعوت کرده است
+ این اتاق عمومی است
+ رسانه را با اندازه اصلی ارسال کن
+
+ - ارسال فیلم با اندازه اصلی
+ - ارسال فیلمها با اندازه اصلی
+
+ پرونده برای بارگذاری بسیار بزرگ است.
+ فشردهسازی فیلم %d%%
+ فشردهسازی تصویر…
+ به عنوان پیش فرض استفاده کن و دیگر سوال نپرس
+ همواره بپرس
\ No newline at end of file
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 36d87488da..28a576613e 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -2230,4 +2230,35 @@
MEDIA
Asetit palvelimen käyttäjäoikeuslistan tähän huoneeseen.
%s asetti palvelimen käyttäjäoikeuslistan tähän huoneeseen.
+ Asetit huoneen pääosoitteeksi %1$s.
+ Lisäsit %1$s ja poistit %2$s huoneen osoitteista.
+
+ - Poistit %1$s huoneen osoitteista.
+ - Poistitt %1$s huoneen osoitteista.
+
+
+ - Lisäsit %1$s osoitteeksi tähän huoneeseen.
+ - Lisäsit %1$s osoitteiksi tähän huoneeseen.
+
+ Peruit %1$s:n kutsun. Syynä: %2$s
+ Viesti lähetetty
+ Ensimmäinen synkronointi:
+\nLadataan tietoja…
+ Ensimmäinen synkronointi:
+\nOdotetaan palvelimen vastausta. . .
+
+ - %1$s, %2$s, %3$s ja %4$d muu
+ - %1$s, %2$s, %3$s ja %4$d muuta
+
+ %1$s %2$s:sta %3$s:n
+ %1$s muutti käyttäjän %2$s oikeustasoa.
+ Muutit käyttäjän %1$s oikeustasoa.
+ Muokkasit videopuhelua
+ %1$s muokkasi videopuhelua
+ Lopetit videopuhelun
+ %1$s lopetti videopuhelun
+ Aloitit videopuhelun
+ %1$s aloitti videopuhelun
+ Muutit huoneen palvelimien käyttäjäoikeuslistaa.
+ %s muutti huoneen palvelimien käyttäjäoikeuslistaa.
\ No newline at end of file
diff --git a/vector/src/main/res/values-fr-rCA/strings.xml b/vector/src/main/res/values-fr-rCA/strings.xml
index cf3e08d791..e9e6e66d7c 100644
--- a/vector/src/main/res/values-fr-rCA/strings.xml
+++ b/vector/src/main/res/values-fr-rCA/strings.xml
@@ -2673,4 +2673,53 @@
Vous avez envoyé une image.
%1$s a envoyé une image.
%1$s : %2$s
+ Donnez-lui un nom pour poursuivre.
+ Ajoutez quelques informations pour renforcer son identité. Vous pourrez changer ceci plus tard.
+ Ajoutez quelques informations pour l’aider à se démarquer. Vous pourrez changer ceci plus tard.
+ Créer un espace
+ Sur invitation, idéal pour vous-même ou les équipes
+ Privé
+ Ouvert à tous, idéal pour les communautés
+ Public
+ Un espace privé pour vous et votre équipe
+ Moi et mon équipe
+ Un espace privé pour organiser vos salons
+ Seulement moi
+ Assurez-vous que les accès à %s sont accordés aux bonnes personnes. Vous pourrez changer ceci plus tard.
+ Avec qui travaillez-vous\?
+ Pour rejoindre un espace existant, il vous faut une invitation.
+ Vous pouvez changer ceci plus tard
+ Quel type d’espace voulez-vous créer\?
+ Les espaces sont un nouveau moyen de regrouper les salons et les personnes
+ Votre espace privé
+ Votre espace public
+ Ajouter un espace
+ Partir du salon correspondant à l’identifiant donné (ou le salon actuel si aucun n’est fourni)
+ Rejoindre l’espace avec l’identifiant donné
+ Créer un espace
+ Ce salon est public
+ Décoché
+ Envoyer le média avec la taille originale
+
+ - Envoyer la vidéo avec sa taille originale
+ - Envoyer les vidéos avec leur taille originale
+
+ Le fichier est trop volumineux pour être téléversé.
+ Rechercher par nom
+ Compression de la vidéo %d %%
+ Compression de l’image…
+ Tout membre d’un espace contenant ce salon peut le trouver et le rejoindre. Seuls les administrateurs de ce salon peuvent l’ajouter à un espace.
+ Espaces
+ Tout le monde peut trouver ce salon et le rejoindre
+ Public
+ Seules les personnes invitées peuvent le trouver et le rejoindre
+ Privé
+ Paramètre d’accès inconnu (%s)
+ Tout le monde peut frapper à la porte du salon, les membres peuvent accepter ou rejeter la demande
+ Permettre l’accès aux visiteurs
+ Utiliser par défaut et ne plus demander
+ Toujours demander
+ Espaces
+ Invitations
+ Salons recommandés
\ No newline at end of file
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index acd069818d..9fb56dd860 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1956,8 +1956,8 @@
Supprimer…
Voulez-vous envoyer cette pièce jointe à %1$s \?
- - Envoyer l’image en taille originale
- - Envoyer les images en taille originale
+ - Envoyer l’image en taille d’origine
+ - Envoyer les images en taille d’origine
Confirmer la suppression
Voulez-vous vraiment supprimer cet évènement \? Notez que si vous supprimez un changement de nom ou de sujet du salon, cela pourrait annuler le changement.
@@ -2742,8 +2742,8 @@
Créons un salon pour chacun d’entre eux. Vous pourrez en ajouter plus tard, y compris certains déjà existant.
Sur quels projets travaillez-vous \?
Nous allons créer les salons pour ces sujets. Vous pourrez en ajouter d’autres plus tard.
- De quoi allez vous parler dans %s \?
- Donnez lui un nom pour poursuivre.
+ De quoi allez-vous parler dans %s \?
+ Donnez-lui un nom pour poursuivre.
Ajoutez quelques informations pour renforcer son identité. Vous pourrez changer ceci plus tard.
Ajoutez quelques informations pour l’aider à se démarquer. Vous pourrez changer ceci plus tard.
Créer un espace
@@ -2758,4 +2758,24 @@
Assurez-vous que les accès à %s sont accordés aux bonnes personnes. Vous pourrez changer ceci plus tard.
Avec qui travaillez-vous \?
Pour rejoindre un espace existant, il vous faut une invitation.
+ Le fichier est trop volumineux pour être envoyé.
+ Compression de la vidéo %d %%
+ Compression de l’image…
+ Utiliser par défaut et ne plus demander
+ Toujours demander
+ Attention, nécessite la prise en charge par le serveur ainsi qu’une version de salon expérimentale
+ Gérer les salons et les espaces
+ Marquer comme non recommandé
+ Marquer comme recommandé
+ Recommandé
+ Rendre cet espace public
+ Gérer les salons
+ Vous cherchez quelqu’un qui n’est pas dans %s \?
+ %s vous invite
+ Ce salon est public
+ Envoyer le média en taille d’origine
+
+ - Envoyer la vidéo en taille originale
+ - Envoyer les vidéos en taille originale
+
\ No newline at end of file
diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index 582f678e81..12a1df9012 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -594,4 +594,40 @@
Wachtwurdssin ynfiere
Wachtwurdssin befestigje
Wachtwurdssin oanmeitsje
+ Ferstjoerd
+ Mislearre
+ %s fuortsmite\?
+ PIN feroarje
+ Avanseare
+ Avanseare Ynstellings Foar Notifikaasjes
+ Ferjitte
+ Favorite
+ Útsykje
+ Koade
+ Graach in lân útsykje
+ Lân útsykje
+ Wachtwurden komme net oerien
+ Dit emailadres koe net fûn wurde.
+ Dit emailadres wurd ol brûkt.
+ Dit telefoannûmer wurd ol brûkt.
+ Emails en telefoannûmers
+ Dyn wachtwurd is fernijd
+ It wachtwurd is net jildich
+ Fernijen fan it wachtwurd is mislearre
+ Wachtwurd Fernije
+ Nij wachtwurd befêstigje
+ Wachtwurd feroarje
+ Wachtwurd
+ Ferifikaasje Ôfwachtsje
+ Nij wachtwurd
+ Lân
+ Útsykje
+ Ûnderwerp
+ Wa kin de skiednis lêze\?
+ Lokaal Adres
+ Eltsenien dyt in link nei disse keamer hat, mar gjin gasten
+ Privee
+ Iepenbier
+ Eltsenien kin by disse keamer oankopje, leden kinne don akseptearje as ôfslaan
+ Eltsenien dyt in link nei disse keamer hat, sels gasten
\ No newline at end of file
diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index 99c024c320..6512cc3b7d 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -1,9 +1,8 @@
-
+
%1$s: %2$s
%1$s sendi mynd.
%1$s sendi límmerki.
-
%s sendi boð um þátttöku
%1$s bauð %2$s
%1$s bauð þér
@@ -21,20 +20,14 @@
óþekktur (%s).
VoIP-símafundur hafinn
VoIP-símafundi lokið
-
(einnig var skipt um auðkennismynd)
** Mistókst að afkóða: %s **
-
Gat ekki sent skilaboð
-
Gat ekki sent inn mynd
-
Villa í netkerfi
Villa í Matrix
-
Tölvupóstfang
Símanúmer
-
%1$s tók til baka boð frá %2$s
%1$s setti birtingarnafn sitt sem %2$s
%1$s breytti birtingarnafni sínu úr %2$s í %3$s
@@ -46,7 +39,6 @@
%s svaraði símtalinu.
%s lauk símtalinu.
%1$s kveikti á enda-í-enda dulritun (%2$s)
-
%1$s bað um VoIP-símafund
%1$s fjarlægði heiti spjallrásar
%1$s fjarlægði umfjöllunarefni spjallrásar
@@ -54,31 +46,24 @@
%1$s uppfærði notandasniðið sitt %2$s
%1$s sendi boð til %2$s um þátttöku í spjallrásinni
%1$s samþykkti boð um að taka þátt í %2$s
-
Tæki sendandans hefur ekki sent okkur dulritunarlyklana fyrir þessi skilaboð.
-
Gat ekki ritstýrt
Ekki er í augnablikinu hægt að taka aftur þátt í spjallrás sem er tóm.
-
Boð á spjallrás
%1$s og %2$s
-
- %1$s og 1 annar
- %1$s og %2$d aðrir
-
Tóm spjallrás
Boð frá %s
Ljóst þema
Dökkt þema
Svart þema
-
- Samstilli
+ Samstilli…
Hlusta eftir atburðum
Háværar tilkynningar
Hljóðlegar tilkynningar
-
Skilaboð
Spjallrás
Stillingar
@@ -86,9 +71,7 @@
Ferilskráning
Villuskýrsla
Nánar um samfélag
-
Hleð inn…
-
Í lagi
Hætta við
Vista
@@ -109,7 +92,6 @@
eða
Bjóða
Ónettengt
-
Fara út
Aðgerðir
Skrá út
@@ -122,32 +104,26 @@
Loka
Afritað á klippispjald
Gera óvirkt
-
Staðfesting
Aðvörun
-
Heim
Eftirlæti
Fólk
Spjallrásir
Boðsgestir
Lítill forgangur
-
Samtöl
Nafnaskrá á þessari tölvu
Engin samtöl
Engar niðurstöður
-
Spjallrásir
Engar spjallrásir
- %d notandi
- %d notendur
-
Bjóða
Engir hópar
-
Senda atvikaskrá
Senda hrunskrár
Senda skjámynd
@@ -155,23 +131,19 @@
Lýstu vandamálinu þínu hér
Senda inn í
Lesið
-
Taka þátt í spjallrás
Notandanafn
Skrá þig
Innskráning
Útskráning
Leita
-
Hefja nýtt spjall
Hefja raddsamtal
Hefja myndsamtal
-
Senda skrár
Taka ljósmynd eða myndskeið
Taka ljósmynd
Taka myndskeið
-
Innskráning
Nýskrá
Senda inn
@@ -197,49 +169,40 @@
Lykilorðin stemma ekki
Gleymt lykilorð?
Notandanafn er í notkun
-
Gallað JSON
- %d breyting á aðild
- %d breytingar á aðild
-
- "Senda sem "
+ Senda sem
Upprunalegt
Stórt
Miðlungs
Lítið
-
Hætta við niðurhalið?
Hætta við innsendinguna?
%d sek
%1$dm %2$ds
-
Í gær
Í dag
-
Nafn spjallrásar
Umfjöllunarefni spjallrásar
-
Samtal
Hringi…
Innhringing
Innhringing myndsamtals
Innhringing raddsamtals
- Samtal í gangi
-
+ Samtal í gangi…
Upplýsingar
Vistað
- Vista í niðurhalsmöppu
+ Vista í niðurhalsmöppu\?
JÁ
NEI
Halda áfram
-
Fjarlægja
Taka þátt
Forskoðun
Hafna
-
Listi yfir meðlimi
Opna haus
Samstilli…
@@ -254,20 +217,16 @@
- %d meðlimir
1 meðlimur
-
Fara af spjallrás
Ertu viss um að þú viljir fara út spjallrásinni?
Búa til
-
Nettengt
Ónettengt
Iðjulaust
-
KERFISSTJÓRNUNARTÓL
SAMTAL
BEINT SPJALL
TÆKI
-
Bjóða
Fara af spjallrás
Fjarlægja úr þessari spjallrás
@@ -283,7 +242,6 @@
- %d ný skilaboð
- %d ný skilaboð
-
Treysta
Ekki treysta
Útskráning
@@ -294,8 +252,6 @@
Skrár
Stillingar
Hætta við niðurhal
-
-
Leita
Sía meðlimi spjallrásar
Engar niðurstöður
@@ -303,7 +259,6 @@
SKILABOÐ
FÓLK
SKRÁR
-
TAKA ÞÁTT
MAPPA
EFTIRLÆTI
@@ -331,16 +286,14 @@
Athugasemdir frá þriðja aðila
Höfundarréttur
Meðferð persónuupplýsinga
-
Notandamynd
Birtingarnafn
Tölvupóstfang
Bæta við tölvupóstfangi
Símanúmer
Bæta við símanúmeri
- Kerfisupplýsingar forrits
+ Kerfisupplýsingar forrits.
Upplýsingar um forrit
-
Útgáfa
Útgáfa olm
Skilmálar og kvaðir
@@ -365,12 +318,10 @@
Auðkenning
Lykilorð:
Senda inn
-
Skráð inn sem
Notandaviðmót
Tungumál notandaviðmóts
Veldu tungumál
-
Sannvottun í bið
Breyta lykilorði
eldra lykilorð
@@ -378,50 +329,42 @@
staðfestu lykilorð
Mistókst að uppfæra lykilorð
Lykilorðið þitt hefur verið uppfært
- Sýna öll skilaboð frá %s?
-
+ Sýna öll skilaboð frá %s\?
+\n
+\nAthugaðu að þessi aðgerð mun endurræsa forritið og það getur tekið nokkurn tíma.
Veldu land
-
Land
Veldu land
Símanúmer
Sannprófun símanúmers
Kóði
-
-
3 dagar
1 vika
1 mánuður
Að eilífu
-
Mynd spjallrásar
Nafn spjallrásar
Umfjöllunarefni
Merki spjallrásar
Merkt sem:
-
Eftirlæti
Lítill forgangur
Ekkert
-
Aðgengi og sýnileiki
Tilkynningar
Hver getur lesið ferilskráningu?
Hver sem er
Bannaðir notendur
-
Ítarlegt
Vistföng
Enda-í-enda dulritun
Mappa
Þema
-
Upplýsingar um atburð
Notandaauðkenni
Reiknirit
Auðkenni setu
Afkóðunarvilla
-
Upplýsingar um tæki sendanda
Heiti tækis
Heiti
@@ -429,30 +372,24 @@
Dulritunarlykill tækis
Sannvottun
Ed25519 fingrafar
-
Flytja út
Settu inn lykilsetningu (passphrase)
Staðfestu lykilsetningu
Flytja inn
óþekkt tæki
ekkert
-
Sannreyna
Afturkalla sannvottun
Bannlisti
Taka af bannlista
-
Allar spjallrásir á %s vefþjóninum
Allar innbyggðar %s-spjallrásir
-
- %d spjallrás
- %d spjallrásir
%1$s í %2$s
-
Leita í ferilskráningu
-
Stærð leturs
Örsmátt
Lítið
@@ -461,12 +398,10 @@
Stærra
Stærst
Flennistórt
-
- %d virkur viðmótshluti
- %d virkir viðmótshlutar
-
Þú ert ekki á þessari spjallrás.
Þú hefur ekki réttindi til þess að gera þetta á þessari spjallrás.
@@ -474,53 +409,42 @@
Aðvörun!
Skipanavilla
Óþekkt skipun: %s
-
Slökkt
Hávært
-
Dulrituð skilaboð
-
Búa til
Dæmi
dæmi
-
Heim
Fólk
Spjallrásir
Engir notendur
-
Spjallrásir
Sía meðlimi hóps
Sía spjallrásahópa
-
Ástæða: %1$s
Gleyma spjallrás
-
Auðkennismynd kvittunar
Auðkennismynd tilkynningar
Auðkennismynd
-
Skoða afkóðaða upprunaskrá
Virkt samtal
Mistókst að hefja samtal, reyndu aftur síðar
Mistókst að hefja samtal
Snöggt svar
Samfélög
-
Leita að spjallrásum
Leita að eftirlætum
Leita að fólki
Leita að spjallrásum
Leita að samfélagi
-
Einungis tengiliðir í Matrix
Engar opinberar spjallrásir tiltækar
Samfélög
Framvinda (%s%%)
-
Senda endurstillingarpóst
Fara aftur í innskráningargluggann
Þetta lítur ekki út eins og gilt tölvupóstfang
@@ -535,15 +459,12 @@
Of margar beiðnir hafa verið sendar
Þetta notandanafn er þegar í notkun
Listi yfir hópa
-
Samtal tengt
Samtal tengist…
Samtali lokið
samtali svarað annars staðar
-
Boð um samtal
Nota innbyggða myndavél
-
Búa til samfélag
Heiti samfélags
@@ -551,25 +472,20 @@
Minnst á
Aðeins minnst á
Titra þegar minnst er á
-
Ertu viss um að þú viljir fjarlægja %1$s %2$s?
-
Ógilt símanúmer fyrir valið land
Við höfum sent SMS-skilaboð með virkjunarkóða. Settu þennan kóða inn hér fyrir neðan.
Settu inn virkjunarkóða
Villa við að sannreyna símanúmerið þitt
Hlutverksmerki
-
Aðgangur að spjallrás
Lesanleiki ferilskrár spjallrásar
Hver hefur aðgang að þessari spjallrás?
-
Enda-í-enda dulritun er virk
- " Þessi spjallrás sýnir ekki hlutverksmerki fyrir nein samfélög"
+ Þessi spjallrás sýnir ekki hlutverksmerki fyrir nein samfélög
Dulritun er virk í þessari spjallrás.
Dulritun er óvirk í þessari spjallrás.
Enda-í-enda dulritunarupplýsingar
-
Curve25519 auðkennislykill
Tilkynnti Ed25519 fingrafarslykil
Flytja út E2E dulritunarlykla spjallrásar
@@ -581,13 +497,11 @@
Ekki sannreynt
Sannreynt
Á bannlista
-
Sannreyna tæki
Bæta við Matrix-forritum
Hefja sannvottun
Deila án sannvottunar
Hunsa beiðni
-
Þér hefur verið sparkað úr %1$s af %2$s
Þú hefur verið settur í bann á %1$s af %2$s
@@ -600,7 +514,6 @@
Ertu viss að þú viljir byrja nýtt spjall við %s?
Ertu viss að þú viljir byrja raddsamtal?
Ertu viss að þú viljir byrja myndsamtal?
-
Nota sérsniðna valkosti vefþjóns (ítarlegt)
Heimaþjónn:
Auðkennisþjónn:
@@ -613,9 +526,7 @@
Gat ekki frumstillt myndavélina
Taktu mynd eða myndskeið
Get ekki tekið upp myndskeið
-
Fara í fyrstu ólesin skilaboð.
-
Nýtt spjall
Banna
Afbanna
@@ -627,9 +538,7 @@
Birta lista yfir tæki
SKRÁ YFIR NOTENDUR (%s)
Einungis notendur Matrix
-
Tölvupóstfang eða Matrix-auðkenni
-
Senda skilaboð (ódulrituð)…
Tenging við vefþjón hefur rofnað.
Endursenda allt
@@ -637,20 +546,18 @@
Eyða ósendum skilaboðum
Þú hefur ekki heimild til að senda skilaboð á þessa spjallrás
Gat ekki sannreynt auðkenni fjartengds þjóns.
-
BOÐIÐ
SKRÁÐUR
-
Ástæður fyrir tilkynningu um vankanta á þessu efni
- Viltu fela öll skilaboð frá þessum notanda?
+ Viltu fela öll skilaboð frá þessum notanda\?
+\n
+\nAthugaðu að þessi aðgerð mun endurræsa forritið og það getur tekið nokkurn tíma.
Hætta við innsendingu
Leita í yfirlitsskrá…
-
Öll skilaboð (hávært)
Minnka forgang
Hætta í samtali
Bæta við flýtileið á aðalskjá
-
Friðhelgi tilkynninga
Venjulegt
Minnkuð friðhelgi
@@ -658,10 +565,8 @@
Virkja tilkynningar fyrir þennan notandaaðgang
Virkja tilkynningar á þessu tæki
Kveikja á skjá í 3 sekúndur
-
Þegar mér er boðið á spjallrás
Skilaboð send af vélmennum
-
Virkja í ræsingu
Samstilling í bakgrunni
Virkja samstillingu í bakgrunnsvinnslu
@@ -672,46 +577,36 @@
Friðhelgi tilkynninga
Gefa heimild
Veldu annan valkost
-
Gagnavistunarhamur
-
Nánar um tæki
Þessi aðgerð krefst viðbótar-auðkenningar.
-Til að halda áfram skaltu setja inn lykilorðið þitt.
+\nTil að halda áfram skaltu setja inn lykilorðið þitt.
Heimaþjónn
Auðkennisþjónn
-
- Þetta tölvupóstfang er nú þegar í notkun
- Gat ekki sent tölvupóst: Þetta tölvupóstfang fannst ekki
- Þetta símanúmer er nú þegar í notkun
-
+ Þetta tölvupóstfang er nú þegar í notkun.
+ Gat ekki sent tölvupóst: Þetta tölvupóstfang fannst ekki.
+ Þetta símanúmer er nú þegar í notkun.
Setja þessa spjallrás á skrá yfir spjallrásir
Einungis meðlimir (síðan þessi kostur var valinn)
Einungis meðlimir (síðan þeim var boðið)
Einungis meðlimir (síðan þeir skráðu sig)
-
Innra auðkenni þessarar spjallrásar
Nýtt vistfang (t.d. #foo:matrix.org)
-
Nýtt samfélag (t.d. #foo:matrix.org)
Ógilt auðkenni samfélags
\'%s\' er ekki gilt auðkenni samfélags
-
-
Afrita auðkenni spjallrásar
Afrita vistfang spjallrásar
-
Ég staðfesti hvort dulritunarlyklarnir samsvari
-
Spjallrás inniheldur óþekkt tæki
Veldu skrá yfir spjallrásir
URL-slóð heimaþjóns
- - %d ólesin tilkynnt skilaboð
+ - %d ólesið tilkynnt skilaboð
- %d ólesin tilkynnt skilaboð
- - %d ólesin tilkynnt skilaboð
+ - %d ólesið tilkynnt skilaboð
- %d ólesin tilkynnt skilaboð
Þú þarft aðgangsheimildir til að sýsla með viðmótshluta á þessari spjallrás
@@ -724,17 +619,14 @@ Til að halda áfram skaltu setja inn lykilorðið þitt.
Boðið
Taka þátt aftur
Listi yfir leskvittanir
-
Þér hefur verið boðið af %s að taka þátt í þessari spjallrás
Ertu viss um að þú viljir fjarlægja %s úr þessu spjalli?
Ertu viss um að þú viljir bjóða %s á þetta spjall?
- Ertu viss um að þú viljir banna þennan notanda á þessu spjalli?
-
+ Bönun notanda mun henda þeim út úr þessu herbergi og halda þeim frá því að koma aftur.
Bjóða miðað við auðkenni
TENGILIÐIR Á TÆKI (%d)
Bjóða notendum miðað við auðkenni
Settu inn auðkenni eða samheiti spjallrásar
-
- %1$s spjallrás fannst fyrir %2$s
- %1$s spjallrásir fundust fyrir %2$s
@@ -745,7 +637,6 @@ Til að halda áfram skaltu setja inn lykilorðið þitt.
• Efni skilaboða í tilkynningum er staðsett beint og öruggt á Matrix heimavefþjóninum
• Tilkynningar innihalda efni skilaboða og lýsigögn
• Tilkynningar munu ekki birta efni skilaboða
-
Skilaboð innihalda birtingarnafn mitt
Skilaboð innihalda notandanafn mitt
Skilaboð í maður-á-mann spjalli
@@ -758,7 +649,6 @@ Til að halda áfram skaltu setja inn lykilorðið þitt.
Þar sem ýmsar heimildir vantar, eru sumir eiginleikar ekki tiltækir…
Þú heimilaðir ${app_name} ekki aðgang að tengiliðum á tækinu
Hristu ákveðið til að senda villutilkynningu
-
Það tókst að senda villuskýrsluna
Mistókst að senda villuskýrsluna (%s)
Þessi heimavefþjónn vill ganga úr skugga um að þú sért ekki vélmenni
@@ -768,82 +658,70 @@ Til að halda áfram skaltu setja inn lykilorðið þitt.
Gat ekki sannprófað tölvupóstfang: gakktu úr skugga um að þú hafir smellt á tengilinn í tölvupóstinum
Tenging gagnamiðils mistókst
Því miður, aðgerðin var ekki framkvæmd þar sem nauðsynlegar heimildir vantaði
-
Þú getur ekki afturkallað þessa aðgerð, þar sem þú ert að gefa notandanum jafn mikil völd og þú hefur sjálf/ur.
-Ertu alveg viss?
-
+\nErtu alveg viss\?
Settu inn eitt eða fleir tölvupóstföng eða Matrix auðkenni
Skilaboð ekki send. %1$s eða %2$s núna?
Skilaboð ekki send vegna þess að vart var við óþekkt tæki. %1$s eða %2$s núna?
Hlé milli tveggja samstillingarbeiðna
Halda gögnum
-
${app_name} getur keyrt í bakgrunni og stýrt tilkynningum á öruggan hátt (getur haft áhrif á rafhlöðunotkun).
-
Skoðaðu tölvupóstinn þinn og smelltu á tengilinn sem hann inniheldur. Þegar því er lokið skaltu smella á að halda áfram.
- Tókst ekki að sannreyna tölvupóstfang. Skoðaðu tölvupóstinn þinn og smelltu á tengilinn sem hann inniheldur. Þegar því er lokið skaltu smella á að halda áfram
+ Tókst ekki að sannreyna tölvupóstfang. Skoðaðu tölvupóstinn þinn og smelltu á tengilinn sem hann inniheldur. Þegar því er lokið skaltu smella á að halda áfram.
Aðeins fólk sem hefur verið boðið
\'%s\' er ekki gilt snið fyrir samnefni
- Virkja dulritun
-(aðvörun: er ekki hægt að gera aftur óvirkt!)
- E2E-dulritunarlyklar spjallrásar hafa verið vistaðir í \'%s\'
-
+ Virkja dulritun
+\n(aðvörun: er ekki hægt að gera aftur óvirkt!)
+ E2E-dulritunarlyklar spjallrásar hafa verið vistaðir í \'%s\'
+\n
+\nViðvörun: Þessi skrá gæti verið eytt ef forritið er fjarlægt.
Aðeins dulrita til sannvottaðra tækja
- Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja
-
+ Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja.
Völd verða að vera jákvæð heiltala.
Þú bættir við nýju tæki \'%s\', sem er að krefjast dulritunarlykla.
ósannvottaða tækið þitt \'%s\' er að krefjast dulritunarlykla.
Símafundir eru í þróun og gætu verið óáreiðanlegir.
-
Kerfisstjóri samfélagsins hefur ekki gefið upp ítarlega lýsingu fyrir þetta samfélag.
-
Skrifaðu heimanetþjón til að telja upp opinberar spjallrásir á
Vantar spjallrásarauðkenni í beiðni.
Vantar notandaauðkenni í beiðni.
Senda límmerki
-
Lykilorðið þitt hefur verið endurstillt.
-
-Þú hefur verið skráður út af öllum tækjum og munt ekki lengur fá ýti-tilkynningar. Til að endurvirkja tilkynningar, þarf að skrá sig aftur inn á hverju tæki fyrir sig.
-
+\n
+\nÞú hefur verið skráður út af öllum tækjum og munt ekki lengur fá ýti-tilkynningar. Til að endurvirkja tilkynningar, þarf að skrá sig aftur inn á hverju tæki fyrir sig.
Tiltekið aðgangsteikn þekktist ekki
Ekki var svarað á fjartengda endanum.
${app_name} þarf heimild til að nota mynda- og myndskeiðasafn svo hægt sé að senda og vista viðhengi.
-
-Leyfðu aðgang í næsta sprettglugga til þess að geta sent skrár úr símanum.
+\n
+\nLeyfðu aðgang í næsta sprettglugga til þess að geta sent skrár úr símanum.
${app_name} þarf heimild til að nota myndavélina svo hægt sé að taka myndir og hringja myndsímtöl.
-
-
-Leyfðu aðgang í næsta sprettglugga til þess að geta hringt.
+ "
+\n
+\nLeyfðu aðgang í næsta sprettglugga til þess að geta hringt."
${app_name} þarf heimild til að nota hljóðnemann svo hægt sé að hringja hljóðsímtöl.
-
-
-Leyfðu aðgang í næsta sprettglugga til þess að geta hringt.
+ "
+\n
+\nLeyfðu aðgang í næsta sprettglugga til þess að geta hringt."
${app_name} þarf heimild til að nota myndavélina og hljóðnemann svo hægt sé að hringja myndsímtöl.
-
-Leyfðu aðgang í næstu sprettgluggum til þess að geta hringt.
+\n
+\nLeyfðu aðgang í næstu sprettgluggum til þess að geta hringt.
${app_name} þarf heimild til að nota tengiliði í nafnaskránni svo hægt sé að finna aðra Matrix-notendur eftir tölvupóstföngum og símanúmerum þeirra.
Leyfðu aðgang í næsta sprettglugga til þess að finna þá notendur í nafnaskránni sem hægt er að hafa samband við úr ${app_name}.
${app_name} þarf heimild til að nota tengiliði í nafnaskránni svo hægt sé að finna aðra Matrix-notendur eftir tölvupóstföngum og símanúmerum þeirra.
-
-Leyfa ${app_name} nota tengiliðina ?
-
+\n
+\nLeyfa ${app_name} að nota tengiliðina\?
Gera notandaaðgang óvirkann
Gera notandaaðganginn minn óvirkann
-
Senda greiningargögn
- Já, ég vil hjálpa til
-
+ Já, ég vil hjálpa til!
Yfirfara núna
-
Gera notandaaðgang óvirkann
Til að halda áfram, settu inn lykilorðið þitt:
Gera notandaaðgang óvirkann
-
- "Símafundur í gangi.\nTaka þátt með %1$s eða %2$s."
+ Símafundur í gangi.
+\nTaka þátt með %1$s eða %2$s
hljóð-
myndsímtali
Þú þarft aðgangsheimildir til að bjóða til símafundar á þessari spjallrás
@@ -854,31 +732,25 @@ Leyfa ${app_name} nota tengiliðina ?
Forritið hrundi síðast. Myndirðu vilja senda inn villuskýrslu?
Senda límmerki
Tölvupósttengill sem ekki er enn búið að smella á
-
Rangt formað auðkenni. Ætti að vera tölvupóstfang eða Matrix-auðkenni á borð við\'@sérheiti:lén\'
${app_name} safnar nafnlausum greiningargögnum til að gera okkur kleift að bæta forritið.
Endilega virkjaðu greiningargögn til að hjálpa okkur að bæta ${app_name}.
Til að tengja við spjallrás verður hún að vera með vistfang.
Þú ert að reyna að tengjast %s. Myndirðu vilja gerast meðlimur til að geta tekið þátt í samræðunni?
Þetta er forskoðun á spjallrásinni. Samskipti spjallrásarinnar hafa verið gerð óvirk.
-
Heimaskjár
Festa spjallrásir með óskoðuðum tilkynningum
Festa spjallrásir með ólesnum skilaboðum
Sjálfgefið virkja forskoðun innfelldra vefslóða
Hver sá sem þekkir slóðina á spjallrásina, fyrir utan gesti
Hver sá sem þekkir slóðina á spjallrásina, að gestum meðtöldum
-
Þetta eru eiginleikar á tilraunastigi sem gætu bilað á óvæntan hátt. Notist með varúð.
Þú þarft að skrá þig út til að geta virkjað dulritunina.
Aðeins dulrita til sannvottaðra tækja
Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja.
-
Aðvaranir vegna aðalvistfangs
-
Setja sem aðalvistfang
Ekki setja sem aðalvistfang
Nauðsynlegt gildi vantar.
Gildið er ekki gilt.
-
-
+
\ No newline at end of file
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 542ab5783b..520fac1900 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2814,4 +2814,23 @@
Spazi
Inviti
Stanze suggerite
+ Gestisci stanze e spazi
+ Segna come non consigliato
+ Segna come consigliato
+ Consigliato
+ Rendi questo spazio pubblico
+ Gestisci stanze
+ Cerchi qualcuno non in %s\?
+ %s ti ha invitato
+ Questa stanza è pubblica
+ Invia i file multimediali nella dimensione originale
+
+ - Invia il video nella dimensione originale
+ - Invia i video nella dimensione originale
+
+ Il file è troppo grande per essere inviato.
+ Compressione video %d%%
+ Compressione immagine…
+ Usa come predefinito e non chiedere più
+ Chiedi sempre
\ No newline at end of file
diff --git a/vector/src/main/res/values-lt/strings.xml b/vector/src/main/res/values-lt/strings.xml
index 6eb730da63..b18595388c 100644
--- a/vector/src/main/res/values-lt/strings.xml
+++ b/vector/src/main/res/values-lt/strings.xml
@@ -32,4 +32,80 @@
%1$s išėjo iš kambario
Jūs prisijungėte
%1$s prisijungė
+ Pranešimai
+ Versija
+ Normalūs
+ Įjungti
+ Įjungti
+ Tel. numeris
+ E. paštas
+ Versija
+ Nustatymai
+ Nustatymai
+ Atsijungti
+ Ieškoti
+ Priežastis
+ Ignoruoti
+ Atblokuoti
+ Užblokuoti
+ Pakviesti
+ Prisijungę
+ Atsijungę
+ Sukurti
+ Sinchronizuojama…
+ Atmesti
+ Peržiūra
+ Prisijungti
+ Pašalinti
+ Tęsti
+ NE
+ TAIP
+ Informacija
+ Skambinama…
+ Skambutis
+ Skambučiai
+ Šiandien
+ Jūs pakvietėte %1$s
+ %1$s pakvietė %2$s
+ Jūs išsiuntėte pakvietimą %1$s prisijungti prie kambario
+ Jūs atnaujinote savo profilį %1$s
+ %1$s atnaujino savo profilį %2$s
+ Žinutę pašalino %1$s [Priežastis: %2$s]
+ Žinutė pašalinta [Priežastis: %1$s]
+ Žinutę pašalino %1$s
+ Žinutė pašalinta
+ Jūs pašalinote kambario nuotrauką
+ %1$s pašalino kambario nuotrauka
+ Jūs pašalinote kambario tema
+ %1$s pašalino kambario temą
+ Jūs pašalinote kambario pavadinimą
+ %1$s pašalino kambario pavadinimą
+ VoIP konferencija baigta
+ VoIP konferencija pradėta
+ Jūs paprašėte VoIP konferencijos
+ 🎉 Visiem serveriam yra uždrausta dalyvauti! Šiuo kambariu nebegalima naudotis.
+ Jūs atnaujinote šį kambarį.
+ %s atnaujino šį kambarį.
+ Jūs įjungėte ištisinį šifravimą (%1$s)
+ %1$s įjungė ištisinį šifravimą (%2$s)
+ nežinomas (%s).
+ bet kas.
+ Visi kambario dalyviai.
+ Visi kambario dalyviai, nuo tada, kai jie yra pakviesti.
+ %s baigė skambutį.
+ Jūs atsiliepėte į skambutį.
+ %s atsiliepė į skambutį.
+ %s pradėjo balso skambutį.
+ Jūs pradėjote vaizdo skambutį.
+ %s pradėjo vaizdo skambutį.
+ %1$s pakeitė kambario pavadinimą į %2$s
+ Jūs pakeitėte kambario nuotrauka
+ Jūs pakeitėte temą į %1$s
+ %1$s pakeitė temą į: %2$s
+ Jūs pakeitėte savo vardą iš %1$s į %2$s
+ %1$s pakeitė savo vardą iš %2$s į %3$s
+ Jūs pakeitėte savo vardą į %1$s
+ %1$s pakeitė savo vardą į %2$s
+ Jūs pakeitėte savo profilio nuotrauką
+ %1$s pakeitė savo profilio nuotrauką
\ No newline at end of file
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 72c7faa1ca..902c0df49e 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -2,7 +2,6 @@
%1$s: %2$s
%1$s wysłał(a) zdjęcie.
-
Zaproszenie od %s
%1$s zaprosił(a) %2$s
%1$s zaprosił(a) Cię
@@ -18,15 +17,11 @@
%1$s usunął(-ęła) swoją wyświetlaną nazwę (%2$s)
%1$s zmienił(a) temat na: %2$s
Nie można wysłać wiadomości
-
Przesyłanie zdjęcia nie powiodło się
-
Błąd sieci
Błąd Matrixa
-
Adres e-mail
Numer telefonu
-
wszyscy członkowie pokoju.
wszyscy.
%1$s zmienił(a) nazwę pokoju na: %2$s
@@ -34,25 +29,20 @@
%1$s usunął(-ęła) nazwę pokoju
%1$s usunął(-ęła) temat pokoju
%1$s wysłał(a) naklejkę.
-
%1$s włączył(a) szyfrowanie end-to-end (%2$s)
-
%1$s wycofał(a) zaproszenie %2$s
%s odebrał(a) połączenie.
(awatar też został zmieniony)
-
Zaproszenie od %s
Zaproszenie do pokoju
%1$s i %2$s
Pusty pokój
-
- %1$s i jeden inny
- %1$s i kilku innych
- %1$s i %2$d innych
- - %d godzina
- %d godz.
- - %d dzień
@@ -2403,4 +2387,48 @@ Spróbuj uruchomić ponownie aplikację.