Added logic to re-decrypt a message automatically when a user added a…

… missed passphrase.| #1251
FlowCrypt · Jun 2, 2021 · f8e1d43 · f8e1d43
1 parent 666f487
commit f8e1d43
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 11 deletions.
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MsgDetailsViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MsgDetailsViewModel.kt
@@ -113,6 +113,9 @@ class MsgDetailsViewModel(
     )
   }
 
+  private val afterKeysStorageUpdatedMsgLiveData: MediatorLiveData<MessageEntity?> =
+    MediatorLiveData()
+
   private val afterKeysUpdatedMsgLiveData: LiveData<MessageEntity?> =
     keysStorage.secretKeyRingsLiveData.switchMap {
       liveData {
@@ -128,6 +131,19 @@ class MsgDetailsViewModel(
       }
     }
 
+  private val afterPassphrasesUpdatedMsgLiveData: LiveData<MessageEntity?> =
+    keysStorage.passphrasesUpdatesLiveData.switchMap {
+      liveData {
+        emit(
+          roomDatabase.msgDao().getMsgSuspend(
+            account = messageEntity.email,
+            folder = messageEntity.folder,
+            uid = messageEntity.uid
+          )
+        )
+      }
+    }
+
   private val mediatorMsgLiveData: MediatorLiveData<MessageEntity?> = MediatorLiveData()
 
   private val processingMsgLiveData: MediatorLiveData<Result<ParseDecryptedMsgResult?>> =
@@ -248,19 +264,28 @@ class MsgDetailsViewModel(
   )
 
   init {
+    afterKeysStorageUpdatedMsgLiveData.addSource(afterKeysUpdatedMsgLiveData) {
+      afterKeysStorageUpdatedMsgLiveData.value = it
+    }
+    afterKeysStorageUpdatedMsgLiveData.addSource(afterPassphrasesUpdatedMsgLiveData) {
+      afterKeysStorageUpdatedMsgLiveData.value = it
+    }
+
     mediatorMsgLiveData.addSource(initMsgLiveData) { mediatorMsgLiveData.value = it }
     //here we resolve a situation when a user updates private keys.
     // To prevent errors we skip the first call
-    mediatorMsgLiveData.addSource(afterKeysUpdatedMsgLiveData, object : Observer<MessageEntity?> {
-      var isFirstCall = true
-      override fun onChanged(messageEntity: MessageEntity?) {
-        if (isFirstCall) {
-          isFirstCall = false
-        } else {
-          mediatorMsgLiveData.value = messageEntity
+    mediatorMsgLiveData.addSource(
+      afterKeysStorageUpdatedMsgLiveData,
+      object : Observer<MessageEntity?> {
+        var isFirstCall = true
+        override fun onChanged(messageEntity: MessageEntity?) {
+          if (isFirstCall) {
+            isFirstCall = false
+          } else {
+            mediatorMsgLiveData.value = messageEntity
+          }
         }
-      }
-    })
+      })
 
     processingMsgLiveData.addSource(processingProgressLiveData) { processingMsgLiveData.value = it }
     processingMsgLiveData.addSource(processingOutgoingMsgLiveData) {

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt
@@ -482,7 +482,10 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi
       this@MessageDetailsFragment,
       REQUEST_CODE_SHOW_FIX_EMPTY_PASSPHRASE_DIALOG
     )
-    fragment.show(parentFragmentManager, FixEmptyPassphraseDialogFragment::class.java.simpleName)
+    val tag = FixEmptyPassphraseDialogFragment::class.java.simpleName
+    if (parentFragmentManager.findFragmentByTag(tag) == null) {
+      fragment.show(parentFragmentManager, tag)
+    }
   }
 
   /**

diff --git a/.../java/com/flowcrypt/email/ui/activity/fragment/dialog/FixEmptyPassphraseDialogFragment.kt b/.../java/com/flowcrypt/email/ui/activity/fragment/dialog/FixEmptyPassphraseDialogFragment.kt
@@ -167,7 +167,7 @@ class FixEmptyPassphraseDialogFragment : BaseDialogFragment() {
 
   @SuppressLint("FragmentLiveDataObserve")
   private fun setupCheckPrivateKeysViewModel() {
-    checkPrivateKeysViewModel.checkPrvKeysLiveData.observe(this, { it ->
+    checkPrivateKeysViewModel.checkPrvKeysLiveData.observe(this, {
       when (it.status) {
         Result.Status.LOADING -> {
           baseActivity?.countingIdlingResource?.incrementSafely()