filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First test if resultCode == Activity.RESULT_OK

Browse Source
This commit is contained in:
Benoit Marty 2020-09-23 12:56:54 +02:00 committed by Benoit Marty
parent b8c350488b
commit a6cf2b0685
1 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
View File

@ -322,9 +322,11 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == REQUEST_CODE_SAVE_MEGOLM_EXPORT) {
if (resultCode == Activity.RESULT_OK) {
when (requestCode) {
REQUEST_CODE_SAVE_MEGOLM_EXPORT -> {
val uri = data?.data
if (resultCode == Activity.RESULT_OK && uri != null) {
if (uri != null) {
activity?.let { activity ->
ExportKeysDialog().show(activity, object : ExportKeysDialog.ExportKeyDialogListener {
override fun onPassphrase(passphrase: String) {
@ -352,14 +354,16 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
})
}
}
} else if (requestCode == PinActivity.PIN_REQUEST_CODE) {
}
PinActivity.PIN_REQUEST_CODE -> {
doOpenPinCodePreferenceScreen()
} else if (requestCode == REQUEST_E2E_FILE_REQUEST_CODE) {
if (resultCode == Activity.RESULT_OK) {
}
REQUEST_E2E_FILE_REQUEST_CODE -> {
importKeys(data)
}
}
}
}
private fun openPinCodePreferenceScreen() {
lifecycleScope.launchWhenResumed {