6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Do not display the banner when keys backup is sending keys

This commit is contained in:
Benoit Marty 2019-07-10 17:57:30 +02:00 committed by Benoit Marty
parent c8ab53e39c
commit ddf4a81905
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt
View File

@ -93,12 +93,12 @@ class KeysBackupBanner @JvmOverloads constructor(
hideAll()

when (newState) {
State.Initial -> renderInitial()
State.Hidden -> renderHidden()
is State.Setup -> renderSetup(newState.numberOfKeys)
State.Initial -> renderInitial()
State.Hidden -> renderHidden()
is State.Setup -> renderSetup(newState.numberOfKeys)
is State.Recover -> renderRecover(newState.version)
is State.Update -> renderUpdate(newState.version)
State.BackingUp -> renderBackingUp()
is State.Update -> renderUpdate(newState.version)
State.BackingUp -> renderBackingUp()
}
}

@ -120,7 +120,7 @@ class KeysBackupBanner @JvmOverloads constructor(

override fun onClick(v: View?) {
when (state) {
is State.Setup -> {
is State.Setup -> {
delegate?.setupKeysBackup()
}
is State.Recover -> {
@ -133,7 +133,7 @@ class KeysBackupBanner @JvmOverloads constructor(
internal fun onCloseClicked() {
state.let {
when (it) {
is State.Setup -> {
is State.Setup -> {
PreferenceManager.getDefaultSharedPreferences(context).edit {
putBoolean(BANNER_SETUP_DO_NOT_SHOW_AGAIN, true)
}
@ -143,12 +143,12 @@ class KeysBackupBanner @JvmOverloads constructor(
putString(BANNER_RECOVER_DO_NOT_SHOW_FOR_VERSION, it.version)
}
}
is State.Update -> {
is State.Update -> {
PreferenceManager.getDefaultSharedPreferences(context).edit {
putString(BANNER_UPDATE_DO_NOT_SHOW_FOR_VERSION, it.version)
}
}
else -> {
else -> {
// Should not happen, close button is not displayed in other cases
}
}
@ -217,7 +217,8 @@ class KeysBackupBanner @JvmOverloads constructor(
}

private fun renderBackingUp() {
isVisible = true
// Do not render when backing up anymore
isVisible = false

textView1.setText(R.string.keys_backup_banner_in_progress)
loading.isVisible = true