diff --git a/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt index f2ae37031e..db62ddc2d8 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt +++ b/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt @@ -468,6 +468,4 @@ interface FragmentModule { @IntoMap @FragmentKey(SharedSecuredStorageKeyFragment::class) fun bindSharedSecuredStorageKeyFragment(fragment: SharedSecuredStorageKeyFragment): Fragment - - } diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt index a7cb193770..af8b03a713 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt @@ -122,7 +122,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor( } private fun handleBack() = withState { state -> - if (state.checkingSSSSAction is Loading) return@withState //ignore + if (state.checkingSSSSAction is Loading) return@withState // ignore if (state.hasPassphrase && state.useKey) { setState { copy( diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt index 3a45210465..db4c5230fd 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt @@ -21,7 +21,6 @@ import android.content.Intent import android.os.Bundle import android.view.View import android.view.inputmethod.EditorInfo -import androidx.core.text.toSpannable import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState import com.jakewharton.rxbinding3.view.clicks @@ -31,7 +30,6 @@ import im.vector.matrix.android.api.extensions.tryThis import im.vector.riotx.R import im.vector.riotx.core.platform.VectorBaseFragment import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.colorizeMatchingText import im.vector.riotx.core.utils.startImportTextFromFileIntent import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.synthetic.main.fragment_ssss_access_from_key.* @@ -119,7 +117,6 @@ class SharedSecuredStorageKeyFragment @Inject constructor( } override fun invalidate() = withState(sharedViewModel) { _ -> - } companion object { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt index acb102798a..355997bedc 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt @@ -58,7 +58,6 @@ class SharedSecuredStoragePassphraseFragment @Inject constructor( .colorizeMatchingText(pass, colorProvider.getColorFromAttribute(android.R.attr.textColorLink)) .colorizeMatchingText(key, colorProvider.getColorFromAttribute(android.R.attr.textColorLink)) - ssss_passphrase_enter_edittext.editorActionEvents() .debounce(300, TimeUnit.MILLISECONDS) .observeOn(AndroidSchedulers.mainThread())