filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

klint

This commit is contained in:
Valere 2020-04-22 18:33:34 +02:00
parent e719541b5e
commit f7e7659750
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt
View File

@ -468,6 +468,4 @@ interface FragmentModule {
@IntoMap @IntoMap
@FragmentKey(SharedSecuredStorageKeyFragment::class) @FragmentKey(SharedSecuredStorageKeyFragment::class)
fun bindSharedSecuredStorageKeyFragment(fragment: SharedSecuredStorageKeyFragment): Fragment fun bindSharedSecuredStorageKeyFragment(fragment: SharedSecuredStorageKeyFragment): Fragment
} }

2
vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt
View File

@ -122,7 +122,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
} }
private fun handleBack() = withState { state -> 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) { if (state.hasPassphrase && state.useKey) {
setState { setState {
copy( copy(

3
vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
View File

@ -21,7 +21,6 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import androidx.core.text.toSpannable
import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.activityViewModel
import com.airbnb.mvrx.withState import com.airbnb.mvrx.withState
import com.jakewharton.rxbinding3.view.clicks 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.R
import im.vector.riotx.core.platform.VectorBaseFragment import im.vector.riotx.core.platform.VectorBaseFragment
import im.vector.riotx.core.resources.ColorProvider import im.vector.riotx.core.resources.ColorProvider
import im.vector.riotx.core.utils.colorizeMatchingText
import im.vector.riotx.core.utils.startImportTextFromFileIntent import im.vector.riotx.core.utils.startImportTextFromFileIntent
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import kotlinx.android.synthetic.main.fragment_ssss_access_from_key.* import kotlinx.android.synthetic.main.fragment_ssss_access_from_key.*
@ -119,7 +117,6 @@ class SharedSecuredStorageKeyFragment @Inject constructor(
} }
override fun invalidate() = withState(sharedViewModel) { _ -> override fun invalidate() = withState(sharedViewModel) { _ ->
} }
companion object { companion object {

1
vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
View File

@ -58,7 +58,6 @@ class SharedSecuredStoragePassphraseFragment @Inject constructor(
.colorizeMatchingText(pass, colorProvider.getColorFromAttribute(android.R.attr.textColorLink)) .colorizeMatchingText(pass, colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
.colorizeMatchingText(key, colorProvider.getColorFromAttribute(android.R.attr.textColorLink)) .colorizeMatchingText(key, colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
ssss_passphrase_enter_edittext.editorActionEvents() ssss_passphrase_enter_edittext.editorActionEvents()
.debounce(300, TimeUnit.MILLISECONDS) .debounce(300, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())