From 13af189bdb6ff94801bf07dfe8efc57a2c0d2147 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Tue, 21 Dec 2021 11:23:57 +0200
Subject: [PATCH 01/24] Moved CreateMessageFragment to fragment package.| #1620

---
 .../com/flowcrypt/email/ui/activity/CreateMessageActivity.kt   | 2 +-
 .../ui/activity/fragment/{base => }/CreateMessageFragment.kt   | 3 ++-
 FlowCrypt/src/main/res/layout/activity_create_message.xml      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/{base => }/CreateMessageFragment.kt (99%)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt
index b90b79eba9..12ad3e163e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt
@@ -26,7 +26,7 @@ import com.flowcrypt.email.model.MessageEncryptionType
 import com.flowcrypt.email.model.MessageType
 import com.flowcrypt.email.service.PrepareOutgoingMessagesJobIntentService
 import com.flowcrypt.email.ui.activity.base.BaseBackStackSyncActivity
-import com.flowcrypt.email.ui.activity.fragment.base.CreateMessageFragment
+import com.flowcrypt.email.ui.activity.fragment.CreateMessageFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.ChoosePublicKeyDialogFragment
 import com.flowcrypt.email.ui.activity.listeners.OnChangeMessageEncryptionTypeListener
 import com.flowcrypt.email.ui.activity.settings.FeedbackActivity
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
similarity index 99%
rename from FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CreateMessageFragment.kt
rename to FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index 6185751a4d..d565da2d0e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -3,7 +3,7 @@
  * Contributors: DenBond7
  */
 
-package com.flowcrypt.email.ui.activity.fragment.base
+package com.flowcrypt.email.ui.activity.fragment
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -68,6 +68,7 @@ import com.flowcrypt.email.security.KeysStorageImpl
 import com.flowcrypt.email.ui.activity.CreateMessageActivity
 import com.flowcrypt.email.ui.activity.ImportPublicKeyActivity
 import com.flowcrypt.email.ui.activity.SelectRecipientsActivity
+import com.flowcrypt.email.ui.activity.fragment.base.BaseSyncFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.ChoosePublicKeyDialogFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.FixNeedPassphraseIssueDialogFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.NoPgpFoundDialogFragment
diff --git a/FlowCrypt/src/main/res/layout/activity_create_message.xml b/FlowCrypt/src/main/res/layout/activity_create_message.xml
index 1732b0b99c..152e112ecf 100644
--- a/FlowCrypt/src/main/res/layout/activity_create_message.xml
+++ b/FlowCrypt/src/main/res/layout/activity_create_message.xml
@@ -14,7 +14,7 @@
 
     <androidx.fragment.app.FragmentContainerView xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/createMessageFragment"
-        android:name="com.flowcrypt.email.ui.activity.fragment.base.CreateMessageFragment"
+        android:name="com.flowcrypt.email.ui.activity.fragment.CreateMessageFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"

From 9ecb411f74364b8c014f28e95a391619f253d705 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Wed, 22 Dec 2021 13:01:34 +0200
Subject: [PATCH 02/24] Added a template of
 ProvidePasswordToProtectMsgDialogFragment.| #1620

---
 .../fragment/CreateMessageFragment.kt         |   1 -
 .../dialog/NoPgpFoundDialogFragment.kt        |  28 ++++-
 ...ovidePasswordToProtectMsgDialogFragment.kt |  45 +++++++
 .../ic_password_not_protected_white_24.xml    |  17 +++
 .../ic_password_protected_gray_48.xml         |  17 +++
 .../ic_password_protected_white_24.xml        |  17 +++
 .../res/layout/fragment_create_message.xml    |  45 +++++--
 ...agment_provide_password_to_protect_msg.xml | 117 ++++++++++++++++++
 FlowCrypt/src/main/res/values/strings.xml     |   1 +
 9 files changed, 277 insertions(+), 11 deletions(-)
 create mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
 create mode 100644 FlowCrypt/src/main/res/drawable/ic_password_not_protected_white_24.xml
 create mode 100644 FlowCrypt/src/main/res/drawable/ic_password_protected_gray_48.xml
 create mode 100644 FlowCrypt/src/main/res/drawable/ic_password_protected_white_24.xml
 create mode 100644 FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index d565da2d0e..e5aeb50c41 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -106,7 +106,6 @@ import javax.mail.internet.InternetAddress
  * Time: 11:27
  * E-mail: DenBond7@gmail.com
  */
-//todo-denbond7 exlude from the base package
 class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   AdapterView.OnItemSelectedListener,
   View.OnClickListener, PgpContactsNachoTextView.OnChipLongClickListener {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/NoPgpFoundDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/NoPgpFoundDialogFragment.kt
index fcecf1f313..75f96b0243 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/NoPgpFoundDialogFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/NoPgpFoundDialogFragment.kt
@@ -30,15 +30,29 @@ class NoPgpFoundDialogFragment : BaseDialogFragment(), DialogInterface.OnClickLi
   private var recipientWithPubKeys: RecipientWithPubKeys? = null
   private var dialogItems: MutableList<DialogItem> = mutableListOf()
   private var isRemoveActionEnabled: Boolean = false
+  private var isProtectingWithPasswordEnabled: Boolean = false
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 
     this.recipientWithPubKeys = arguments?.getParcelable(EXTRA_KEY_PGP_CONTACT)
     this.isRemoveActionEnabled = arguments?.getBoolean(EXTRA_KEY_IS_REMOVE_ACTION_ENABLED) ?: false
+    this.isProtectingWithPasswordEnabled = arguments?.getBoolean(
+      EXTRA_KEY_IS_PROTECTING_WITH_PASSWORD_ENABLED
+    ) ?: false
 
     dialogItems = ArrayList()
 
+    if (isProtectingWithPasswordEnabled) {
+      dialogItems.add(
+        DialogItem(
+          iconResourceId = R.drawable.ic_password_protected_gray_48,
+          title = getString(R.string.protect_with_password),
+          id = RESULT_CODE_PROTECT_WITH_PASSWORD
+        )
+      )
+    }
+
     dialogItems.add(
       DialogItem(
         iconResourceId = R.mipmap.ic_switch,
@@ -103,6 +117,7 @@ class NoPgpFoundDialogFragment : BaseDialogFragment(), DialogInterface.OnClickLi
     const val RESULT_CODE_IMPORT_THEIR_PUBLIC_KEY = 11
     const val RESULT_CODE_COPY_FROM_OTHER_CONTACT = 12
     const val RESULT_CODE_REMOVE_CONTACT = 13
+    const val RESULT_CODE_PROTECT_WITH_PASSWORD = 14
 
     val EXTRA_KEY_PGP_CONTACT =
       GeneralUtil.generateUniqueExtraKey(
@@ -116,13 +131,24 @@ class NoPgpFoundDialogFragment : BaseDialogFragment(), DialogInterface.OnClickLi
         NoPgpFoundDialogFragment::class.java
       )
 
+    private val EXTRA_KEY_IS_PROTECTING_WITH_PASSWORD_ENABLED =
+      GeneralUtil.generateUniqueExtraKey(
+        "EXTRA_KEY_IS_PROTECTING_WITH_PASSWORD_ENABLED",
+        NoPgpFoundDialogFragment::class.java
+      )
+
     fun newInstance(
       RecipientWithPubKeys: RecipientWithPubKeys,
-      isRemoveActionEnabled: Boolean
+      isRemoveActionEnabled: Boolean,
+      isProtectingWithPasswordEnabled: Boolean = false
     ): NoPgpFoundDialogFragment {
       val args = Bundle()
       args.putParcelable(EXTRA_KEY_PGP_CONTACT, RecipientWithPubKeys)
       args.putBoolean(EXTRA_KEY_IS_REMOVE_ACTION_ENABLED, isRemoveActionEnabled)
+      args.putBoolean(
+        EXTRA_KEY_IS_PROTECTING_WITH_PASSWORD_ENABLED,
+        isProtectingWithPasswordEnabled
+      )
       val noPgpFoundDialogFragment = NoPgpFoundDialogFragment()
       noPgpFoundDialogFragment.arguments = args
       return noPgpFoundDialogFragment
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
new file mode 100644
index 0000000000..834694cee2
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
@@ -0,0 +1,45 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.ui.activity.fragment.dialog
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.flowcrypt.email.databinding.FragmentProvidePasswordToProtectMsgBinding
+
+/**
+ * @author Denis Bondarenko
+ * Date: 01.08.2017
+ * Time: 10:04
+ * E-mail: DenBond7@gmail.com
+ */
+class ProvidePasswordToProtectMsgDialogFragment : BaseDialogFragment() {
+  private var binding: FragmentProvidePasswordToProtectMsgBinding? = null
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    val builder = AlertDialog.Builder(activity)
+    binding = FragmentProvidePasswordToProtectMsgBinding.inflate(
+      LayoutInflater.from(requireContext()),
+      if ((view != null) and (view is ViewGroup)) view as ViewGroup? else null,
+      false
+    )
+
+    builder.setView(binding!!.root)
+    builder.setTitle(null)
+    return builder.create()
+  }
+
+  companion object {
+    fun newInstance(): ProvidePasswordToProtectMsgDialogFragment {
+      val args = Bundle()
+      val noPgpFoundDialogFragment = ProvidePasswordToProtectMsgDialogFragment()
+      noPgpFoundDialogFragment.arguments = args
+      return noPgpFoundDialogFragment
+    }
+  }
+}
diff --git a/FlowCrypt/src/main/res/drawable/ic_password_not_protected_white_24.xml b/FlowCrypt/src/main/res/drawable/ic_password_not_protected_white_24.xml
new file mode 100644
index 0000000000..cc125c9a6e
--- /dev/null
+++ b/FlowCrypt/src/main/res/drawable/ic_password_not_protected_white_24.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: DenBond7
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.6,17.7h9.2v0.9H7.6V17.7zM8.1,15.9l0.4,-0.7l0.4,0.7l0.6,-0.3l-0.4,-0.7h0.8v-0.7H9.1l0.4,-0.7l-0.6,-0.3l-0.4,0.7l-0.4,-0.7l-0.6,0.3l0.4,0.7H7.2v0.7h0.8l-0.4,0.7L8.1,15.9zM11.2,15.5l0.6,0.3l0.4,-0.7l0.4,0.7l0.6,-0.3l-0.4,-0.7h0.8v-0.7h-0.8l0.4,-0.7l-0.6,-0.3l-0.4,0.7l-0.4,-0.7l-0.6,0.3l0.4,0.7h-0.8v0.7h0.8L11.2,15.5zM17.2,14.1h-0.8l0.4,-0.7l-0.6,-0.3l-0.4,0.7l-0.4,-0.7l-0.6,0.3l0.4,0.7h-0.8v0.7h0.8l-0.4,0.7l0.6,0.3l0.4,-0.7l0.4,0.7l0.6,-0.3l-0.4,-0.7h0.8V14.1z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18,8.5h-1v-2c0,-2.8 -2.2,-5 -5,-5c-2.5,0 -4.6,1.9 -4.9,4.4h2c0.3,-1.4 1.5,-2.4 2.9,-2.4c1.7,0 3,1.3 3,3v2h-4.3H9H7H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-10C20,9.4 19.1,8.5 18,8.5zM18,20.5H6v-10h12V20.5z" />
+</vector>
diff --git a/FlowCrypt/src/main/res/drawable/ic_password_protected_gray_48.xml b/FlowCrypt/src/main/res/drawable/ic_password_protected_gray_48.xml
new file mode 100644
index 0000000000..44e3c58c65
--- /dev/null
+++ b/FlowCrypt/src/main/res/drawable/ic_password_protected_gray_48.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: DenBond7
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#888888"
+        android:pathData="M18,8.5h-1v-2c0,-2.8 -2.2,-5 -5,-5s-5,2.2 -5,5v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-10C20,9.4 19.1,8.5 18,8.5zM9,6.5c0,-1.7 1.3,-3 3,-3s3,1.3 3,3v2H9V6.5zM18,20.5H6v-10h12V20.5z" />
+    <path
+        android:fillColor="#888888"
+        android:pathData="M7.4,17.3h9.2v0.9H7.4V17.3zM7.9,15.5l0.4,-0.7l0.4,0.7l0.6,-0.3l-0.4,-0.7h0.8v-0.7H8.9l0.4,-0.7l-0.6,-0.3l-0.4,0.7l-0.4,-0.7l-0.6,0.3l0.4,0.7H7v0.7h0.8l-0.4,0.7L7.9,15.5zM11,15.1l0.6,0.3l0.4,-0.7l0.4,0.7l0.6,-0.3l-0.4,-0.7h0.8v-0.7h-0.8l0.4,-0.7l-0.6,-0.3L12,13.4l-0.4,-0.7L11,13.1l0.4,0.7h-0.8v0.7h0.8L11,15.1zM17,13.8h-0.8l0.4,-0.7l-0.6,-0.3l-0.4,0.7l-0.4,-0.7l-0.6,0.3l0.4,0.7h-0.8v0.7h0.8l-0.4,0.7l0.6,0.3l0.4,-0.7l0.4,0.7l0.6,-0.3l-0.4,-0.7H17V13.8z" />
+</vector>
diff --git a/FlowCrypt/src/main/res/drawable/ic_password_protected_white_24.xml b/FlowCrypt/src/main/res/drawable/ic_password_protected_white_24.xml
new file mode 100644
index 0000000000..6eb3f3a844
--- /dev/null
+++ b/FlowCrypt/src/main/res/drawable/ic_password_protected_white_24.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: DenBond7
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18,8.5h-1v-2c0,-2.8 -2.2,-5 -5,-5s-5,2.2 -5,5v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-10C20,9.4 19.1,8.5 18,8.5zM9,6.5c0,-1.7 1.3,-3 3,-3s3,1.3 3,3v2H9V6.5zM18,20.5H6v-10h12V20.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.4,17.3h9.2v0.9H7.4V17.3zM7.9,15.5l0.4,-0.7l0.4,0.7l0.6,-0.3l-0.4,-0.7h0.8v-0.7H8.9l0.4,-0.7l-0.6,-0.3l-0.4,0.7l-0.4,-0.7l-0.6,0.3l0.4,0.7H7v0.7h0.8l-0.4,0.7L7.9,15.5zM11,15.1l0.6,0.3l0.4,-0.7l0.4,0.7l0.6,-0.3l-0.4,-0.7h0.8v-0.7h-0.8l0.4,-0.7l-0.6,-0.3L12,13.4l-0.4,-0.7L11,13.1l0.4,0.7h-0.8v0.7h0.8L11,15.1zM17,13.8h-0.8l0.4,-0.7l-0.6,-0.3l-0.4,0.7l-0.4,-0.7l-0.6,0.3l0.4,0.7h-0.8v0.7h0.8l-0.4,0.7l0.6,0.3l0.4,-0.7l0.4,0.7l0.6,-0.3l-0.4,-0.7H17V13.8z" />
+</vector>
diff --git a/FlowCrypt/src/main/res/layout/fragment_create_message.xml b/FlowCrypt/src/main/res/layout/fragment_create_message.xml
index 3c1d1e04dc..ae84451791 100644
--- a/FlowCrypt/src/main/res/layout/fragment_create_message.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_create_message.xml
@@ -3,7 +3,7 @@
   ~ Contributors: DenBond7
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -21,14 +21,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:visibility="visible" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ScrollView
         android:id="@+id/scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        tools:visibility="visible">
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:id="@+id/layoutForm"
@@ -267,11 +272,33 @@
         </LinearLayout>
     </ScrollView>
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fAButtonPasswordProtected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/create_new_message"
+        android:visibility="gone"
+        app:backgroundTint="@color/colorPrimary"
+        app:layout_constraintBottom_toBottomOf="@+id/scrollView"
+        app:layout_constraintEnd_toEndOf="@+id/scrollView"
+        app:srcCompat="@drawable/ic_password_protected_white_24" />
+
     <include
         android:id="@+id/viewIdStatusView"
         layout="@layout/sync_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone" />
-</FrameLayout>
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/groupContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="scrollView,fAButtonPasswordProtected"
+        tools:visibility="visible" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml b/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml
new file mode 100644
index 0000000000..4905bb33fc
--- /dev/null
+++ b/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: DenBond7
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/tVTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="The recipients will receive a link to read your message on a web portal, where they will need to enter this password.\n\nThey will have access to this message for 3 days."
+        android:textAlignment="viewStart"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintTop_toTopOf="@+id/guidelineTop" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tILPassphrase"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="Enter web portal password"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintTop_toBottomOf="@+id/tVTitle"
+        app:passwordToggleContentDescription="description"
+        app:passwordToggleEnabled="true">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/eTPassphrase"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:ems="10"
+            android:imeOptions="actionDone"
+            android:inputType="textPassword" />
+
+        <ProgressBar
+            android:id="@+id/pBarPassphraseQuality"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/default_margin_content_small"
+            android:progress="0" />
+
+        <TextView
+            android:id="@+id/tVPassphraseQuality"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_margin_small"
+            android:gravity="center"
+            tools:text="WEAK (average time to crack: 13 seconds)" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Button
+        android:id="@+id/btSetPassphrase"
+        style="@style/AppWidget.Button"
+        android:layout_width="0dp"
+        android:layout_marginTop="@dimen/default_margin_content_big"
+        android:text="SET PASSWORD"
+        android:theme="@style/AppWidget.Button.SilverWithWhiteText"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintTop_toBottomOf="@+id/tILPassphrase" />
+
+    <TextView
+        android:id="@+id/tVLostPassphraseWarning"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_margin_content_big"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:text="Do not use your Pass Phrase (that you chose during FlowCrypt Setup). Use some other password that you can share with others.\n\nYou are responsible for sharing this password with recipients (use other medium to share the password - not email)."
+        android:textAlignment="viewStart"
+        android:textColor="@color/red"
+        android:textSize="@dimen/default_text_size_medium"
+        app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintTop_toBottomOf="@+id/btSetPassphrase"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineLeft"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="@dimen/default_margin_content_big" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="@dimen/default_margin_content" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineRight"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_end="@dimen/default_margin_content_big" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineBottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_end="@dimen/default_margin_content" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
index e3199a6c1e..9f8a40e82c 100644
--- a/FlowCrypt/src/main/res/values/strings.xml
+++ b/FlowCrypt/src/main/res/values/strings.xml
@@ -122,6 +122,7 @@
     <string name="import_their_public_key">Import their Public Key</string>
     <string name="copy_from_other_contact">Copy from other contact</string>
     <string name="template_remove_recipient">Remove %1$s</string>
+    <string name="protect_with_password">Protect with password</string>
     <string name="recipient_does_not_use_pgp">Recipient doesn\'t use PGP</string>
     <string name="reply">Reply</string>
     <string name="import_public_key">Import Public Key</string>

From 5f2a8bbef895ceeb1c3526c670cc2138c88dc92b Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Wed, 22 Dec 2021 14:47:00 +0200
Subject: [PATCH 03/24] CreateMessageFragment. Migrated to use binding.| #1620

---
 .../fragment/CreateMessageFragment.kt         | 419 +++++++++---------
 1 file changed, 216 insertions(+), 203 deletions(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index e5aeb50c41..2aaba9cea4 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -27,18 +27,15 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import android.widget.EditText
 import android.widget.FilterQueryProvider
 import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.LinearLayout
 import android.widget.ListView
 import android.widget.ProgressBar
-import android.widget.ScrollView
 import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.FileProvider
+import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.R
@@ -54,12 +51,16 @@ import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.database.entity.RecipientEntity
 import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
+import com.flowcrypt.email.databinding.FragmentCreateMessageBinding
 import com.flowcrypt.email.extensions.decrementSafely
+import com.flowcrypt.email.extensions.gone
 import com.flowcrypt.email.extensions.incrementSafely
+import com.flowcrypt.email.extensions.invisible
 import com.flowcrypt.email.extensions.org.bouncycastle.openpgp.toPgpKeyDetails
 import com.flowcrypt.email.extensions.showInfoDialog
 import com.flowcrypt.email.extensions.showKeyboard
 import com.flowcrypt.email.extensions.showNeedPassphraseDialog
+import com.flowcrypt.email.extensions.visible
 import com.flowcrypt.email.jetpack.viewmodel.AccountAliasesViewModel
 import com.flowcrypt.email.jetpack.viewmodel.RecipientsViewModel
 import com.flowcrypt.email.model.MessageEncryptionType
@@ -85,7 +86,6 @@ import com.flowcrypt.email.util.UIUtil
 import com.flowcrypt.email.util.exception.ExceptionUtil
 import com.google.android.gms.common.util.CollectionUtils
 import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.textfield.TextInputLayout
 import com.hootsuite.nachos.NachoTextView
 import com.hootsuite.nachos.chip.Chip
 import com.hootsuite.nachos.terminator.ChipTerminatorHandler
@@ -117,6 +117,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private val accountAliasesViewModel: AccountAliasesViewModel by viewModels()
   private val recipientsViewModel: RecipientsViewModel by viewModels()
 
+  private var binding: FragmentCreateMessageBinding? = null
   private var recipientWithPubKeysTo: MutableList<RecipientWithPubKeys>? = null
   private var recipientWithPubKeysCc: MutableList<RecipientWithPubKeys>? = null
   private var recipientWithPubKeysBcc: MutableList<RecipientWithPubKeys>? = null
@@ -129,26 +130,6 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private var extraActionInfo: ExtraActionInfo? = null
   private var messageType = MessageType.NEW
 
-  private var layoutAtts: ViewGroup? = null
-  private var editTextFrom: EditText? = null
-  private var spinnerFrom: Spinner? = null
-  private var recipientsTo: PgpContactsNachoTextView? = null
-  private var recipientsCc: PgpContactsNachoTextView? = null
-  private var recipientsBcc: PgpContactsNachoTextView? = null
-  private var editTextEmailSubject: EditText? = null
-  private var editTextEmailMsg: EditText? = null
-  private var textInputLayoutMsg: TextInputLayout? = null
-  private var layoutContent: ScrollView? = null
-  private var progressBarTo: View? = null
-  private var progressBarCc: View? = null
-  private var progressBarBcc: View? = null
-  private var layoutCc: View? = null
-  private var layoutBcc: View? = null
-  private var progressBarAndButtonLayout: LinearLayout? = null
-  private var imageButtonAliases: ImageButton? = null
-  private var imageButtonAdditionalRecipientsVisibility: View? = null
-  private var iBShowQuotedText: View? = null
-
   private var isUpdateToCompleted = true
   private var isUpdateCcCompleted = true
   private var isUpdateBccCompleted = true
@@ -164,7 +145,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override val contentResourceId: Int = R.layout.fragment_create_message
 
   override val contentView: View?
-    get() = layoutContent
+    get() = binding?.scrollView
 
   /**
    * Generate an outgoing message info from entered information by user.
@@ -173,9 +154,9 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    * contains information about an outgoing message.
    */
   private fun getOutgoingMsgInfo(): OutgoingMessageInfo {
-    var msg = editTextEmailMsg?.text.toString()
+    var msg = binding?.editTextEmailMessage?.text.toString()
     if (messageType == MessageType.REPLY || messageType == MessageType.REPLY_ALL) {
-      if (iBShowQuotedText?.visibility == View.VISIBLE) {
+      if (binding?.iBShowQuotedText?.visibility == View.VISIBLE) {
         msg += EmailUtil.genReplyContent(msgInfo)
       }
     }
@@ -185,12 +166,13 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
     return OutgoingMessageInfo(
       account = accountViewModel.activeAccountLiveData.value?.email ?: "",
-      subject = editTextEmailSubject?.text.toString(),
+      subject = binding?.editTextEmailSubject?.text.toString(),
       msg = msg,
-      toRecipients = recipientsTo?.chipValues?.map { InternetAddress(it) } ?: emptyList(),
-      ccRecipients = recipientsCc?.chipValues?.map { InternetAddress(it) },
-      bccRecipients = recipientsBcc?.chipValues?.map { InternetAddress(it) },
-      from = editTextFrom?.text.toString(),
+      toRecipients = binding?.editTextRecipientTo?.chipValues?.map { InternetAddress(it) }
+        ?: emptyList(),
+      ccRecipients = binding?.editTextRecipientCc?.chipValues?.map { InternetAddress(it) },
+      bccRecipients = binding?.editTextRecipientBcc?.chipValues?.map { InternetAddress(it) },
+      from = binding?.editTextFrom?.text.toString(),
       atts = attachments,
       forwardedAtts = forwardedAtts,
       encryptionType = listener.msgEncryptionType,
@@ -207,40 +189,50 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    */
   private val isDataCorrect: Boolean
     get() {
-      recipientsTo?.chipifyAllUnterminatedTokens()
-      recipientsCc?.chipifyAllUnterminatedTokens()
-      recipientsBcc?.chipifyAllUnterminatedTokens()
+      binding?.editTextRecipientTo?.chipifyAllUnterminatedTokens()
+      binding?.editTextRecipientCc?.chipifyAllUnterminatedTokens()
+      binding?.editTextRecipientBcc?.chipifyAllUnterminatedTokens()
       if (fromAddrs?.isEnabled(
-          spinnerFrom?.selectedItemPosition
-            ?: Spinner.INVALID_POSITION
+          binding?.spinnerFrom?.selectedItemPosition ?: Spinner.INVALID_POSITION
         ) == false
       ) {
-        showInfoSnackbar(recipientsTo!!, getString(R.string.no_key_available))
+        showInfoSnackbar(binding?.editTextRecipientTo, getString(R.string.no_key_available))
         return false
       }
-      if (recipientsTo?.text?.isEmpty() == true) {
+      if (binding?.editTextRecipientTo?.text?.isEmpty() == true) {
         showInfoSnackbar(
-          recipientsTo!!, getString(
+          binding?.editTextRecipientTo, getString(
             R.string.text_must_not_be_empty,
             getString(R.string.prompt_recipients_to)
           )
         )
-        recipientsTo?.requestFocus()
+        binding?.editTextRecipientTo?.requestFocus()
         return false
       }
-      if (hasInvalidEmail(recipientsTo, recipientsCc, recipientsBcc)) {
+      if (hasInvalidEmail(
+          binding?.editTextRecipientTo,
+          binding?.editTextRecipientCc,
+          binding?.editTextRecipientBcc
+        )
+      ) {
         return false
       }
       if (listener.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
-        if (recipientsTo?.text?.isNotEmpty() == true && recipientWithPubKeysTo?.isEmpty() == true) {
+        if (binding?.editTextRecipientTo?.text?.isNotEmpty() == true
+          && recipientWithPubKeysTo?.isEmpty() == true
+        ) {
           fetchDetailsAboutRecipients(RecipientEntity.Type.TO)
           return false
         }
-        if (recipientsCc?.text?.isNotEmpty() == true && recipientWithPubKeysCc?.isEmpty() == true) {
+        if (binding?.editTextRecipientCc?.text?.isNotEmpty() == true
+          && recipientWithPubKeysCc?.isEmpty() == true
+        ) {
           fetchDetailsAboutRecipients(RecipientEntity.Type.CC)
           return false
         }
-        if (recipientsBcc?.text?.isNotEmpty() == true && recipientWithPubKeysBcc?.isEmpty() == true) {
+        if (binding?.editTextRecipientBcc?.text?.isNotEmpty() == true
+          && recipientWithPubKeysBcc?.isEmpty() == true
+        ) {
           fetchDetailsAboutRecipients(RecipientEntity.Type.BCC)
           return false
         }
@@ -253,19 +245,22 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           return false
         }
       }
-      if (editTextEmailSubject?.text?.isEmpty() == true) {
+      if (binding?.editTextEmailSubject?.text?.isEmpty() == true) {
         showInfoSnackbar(
-          editTextEmailSubject, getString(
+          binding?.editTextEmailSubject, getString(
             R.string.text_must_not_be_empty,
             getString(R.string.prompt_subject)
           )
         )
-        editTextEmailSubject?.requestFocus()
+        binding?.editTextEmailSubject?.requestFocus()
         return false
       }
-      if (atts?.isEmpty() == true && editTextEmailMsg?.text?.isEmpty() == true) {
-        showInfoSnackbar(editTextEmailMsg, getString(R.string.sending_message_must_not_be_empty))
-        editTextEmailMsg?.requestFocus()
+      if (atts?.isEmpty() == true && binding?.editTextEmailMessage?.text?.isEmpty() == true) {
+        showInfoSnackbar(
+          binding?.editTextEmailMessage,
+          getString(R.string.sending_message_must_not_be_empty)
+        )
+        binding?.editTextEmailMessage?.requestFocus()
         return false
       }
       if (atts?.isEmpty() == true || !hasExternalStorageUris(this.atts)) {
@@ -339,9 +334,16 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     initExtras(activity?.intent)
   }
 
+  override fun onCreateView(
+    inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+  ): View? {
+    binding = FragmentCreateMessageBinding.inflate(inflater, container, false)
+    return binding?.root
+  }
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
-    initViews(view)
+    initViews()
     setupAccountAliasesViewModel()
     setupPrivateKeysViewModel()
     setupRecipientsViewModel()
@@ -411,9 +413,21 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           )
 
           if (recipientWithPubKeys != null) {
-            removeRecipientWithPubKey(recipientWithPubKeys, recipientsTo, recipientWithPubKeysTo)
-            removeRecipientWithPubKey(recipientWithPubKeys, recipientsCc, recipientWithPubKeysCc)
-            removeRecipientWithPubKey(recipientWithPubKeys, recipientsBcc, recipientWithPubKeysBcc)
+            removeRecipientWithPubKey(
+              recipientWithPubKeys,
+              binding?.editTextRecipientTo,
+              recipientWithPubKeysTo
+            )
+            removeRecipientWithPubKey(
+              recipientWithPubKeys,
+              binding?.editTextRecipientCc,
+              recipientWithPubKeysCc
+            )
+            removeRecipientWithPubKey(
+              recipientWithPubKeys,
+              binding?.editTextRecipientBcc,
+              recipientWithPubKeysBcc
+            )
           }
         }
       }
@@ -437,9 +451,9 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
               )
 
               updateRecipients()
-              updateChips(recipientsTo, recipientWithPubKeysTo)
-              updateChips(recipientsCc, recipientWithPubKeysCc)
-              updateChips(recipientsBcc, recipientWithPubKeysBcc)
+              updateChips(binding?.editTextRecipientTo, recipientWithPubKeysTo)
+              updateChips(binding?.editTextRecipientCc, recipientWithPubKeysCc)
+              updateChips(binding?.editTextRecipientBcc, recipientWithPubKeysBcc)
 
               Toast.makeText(context, R.string.key_successfully_copied, Toast.LENGTH_LONG).show()
             }
@@ -495,7 +509,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           if (isDataCorrect) {
             if (listener.msgEncryptionType == MessageEncryptionType.ENCRYPTED) {
               val keysStorage = KeysStorageImpl.getInstance(requireContext())
-              val senderEmail = editTextFrom?.text.toString()
+              val senderEmail = binding?.editTextFrom?.text.toString()
               val keyRings = keysStorage.getPGPSecretKeyRingsByUserId(senderEmail)
               if (keyRings.isNotEmpty()) {
                 val firstMatchedSecretKey = keyRings.first()
@@ -555,7 +569,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override fun onContextItemSelected(item: MenuItem): Boolean {
     return when (item.itemId) {
       R.id.menuDeleteQuotedText -> {
-        iBShowQuotedText?.visibility = View.GONE
+        binding?.iBShowQuotedText?.gone()
         msgInfo?.text = ""
         true
       }
@@ -567,39 +581,39 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override fun onFocusChange(v: View, hasFocus: Boolean) {
     when (v.id) {
       R.id.editTextRecipientTo -> runUpdateActionForRecipients(
-        recipientWithPubKeysTo, progressBarTo,
+        recipientWithPubKeysTo, binding?.progressBarTo,
         RecipientEntity.Type.TO, hasFocus
       )
 
       R.id.editTextRecipientCc -> runUpdateActionForRecipients(
-        recipientWithPubKeysCc, progressBarCc,
+        recipientWithPubKeysCc, binding?.progressBarCc,
         RecipientEntity.Type.CC, hasFocus
       )
 
       R.id.editTextRecipientBcc -> runUpdateActionForRecipients(
-        recipientWithPubKeysBcc, progressBarBcc,
+        recipientWithPubKeysBcc, binding?.progressBarBcc,
         RecipientEntity.Type.BCC, hasFocus
       )
 
       R.id.editTextEmailSubject, R.id.editTextEmailMessage -> if (hasFocus) {
         var isExpandButtonNeeded = false
-        if (TextUtils.isEmpty(recipientsCc!!.text)) {
-          layoutCc?.visibility = View.GONE
+        if (TextUtils.isEmpty(binding?.editTextRecipientCc!!.text)) {
+          binding?.layoutCc?.gone()
           isExpandButtonNeeded = true
         }
 
-        if (TextUtils.isEmpty(recipientsBcc!!.text)) {
-          layoutBcc?.visibility = View.GONE
+        if (binding?.editTextRecipientBcc?.text?.isEmpty() == true) {
+          binding?.layoutBcc?.gone()
           isExpandButtonNeeded = true
         }
 
         if (isExpandButtonNeeded) {
-          imageButtonAdditionalRecipientsVisibility?.visibility = View.VISIBLE
+          binding?.imageButtonAdditionalRecipientsVisibility?.gone()
           val layoutParams = FrameLayout.LayoutParams(
             FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT
           )
           layoutParams.gravity = Gravity.TOP or Gravity.END
-          progressBarAndButtonLayout?.layoutParams = layoutParams
+          binding?.progressBarAndButtonLayout?.layoutParams = layoutParams
         }
       }
     }
@@ -608,13 +622,13 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
     when (parent?.id) {
       R.id.spinnerFrom -> {
-        editTextFrom?.setText(parent.adapter.getItem(position) as CharSequence)
+        binding?.editTextFrom?.setText(parent.adapter.getItem(position) as CharSequence)
         if (listener.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
           val adapter = parent.adapter as ArrayAdapter<*>
           val colorGray = UIUtil.getColor(requireContext(), R.color.gray)
-          editTextFrom?.setTextColor(if (adapter.isEnabled(position)) originalColor else colorGray)
+          binding?.editTextFrom?.setTextColor(if (adapter.isEnabled(position)) originalColor else colorGray)
         } else {
-          editTextFrom?.setTextColor(originalColor)
+          binding?.editTextFrom?.setTextColor(originalColor)
         }
       }
     }
@@ -627,30 +641,30 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override fun onClick(v: View) {
     when (v.id) {
       R.id.imageButtonAliases -> if (fromAddrs?.count != 1 && fromAddrs?.count != 0) {
-        spinnerFrom?.performClick()
+        binding?.spinnerFrom?.performClick()
       }
 
       R.id.imageButtonAdditionalRecipientsVisibility -> {
-        layoutCc?.visibility = View.VISIBLE
-        layoutBcc?.visibility = View.VISIBLE
+        binding?.layoutCc?.visible()
+        binding?.layoutBcc?.visible()
         val layoutParams = FrameLayout.LayoutParams(
           FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.MATCH_PARENT
         )
         layoutParams.gravity = Gravity.TOP or Gravity.END
 
-        progressBarAndButtonLayout?.layoutParams = layoutParams
+        binding?.progressBarAndButtonLayout?.layoutParams = layoutParams
         v.visibility = View.GONE
-        recipientsCc?.requestFocus()
+        binding?.editTextRecipientCc?.requestFocus()
       }
 
       R.id.iBShowQuotedText -> {
-        val currentCursorPosition = editTextEmailMsg?.selectionStart ?: 0
-        if (editTextEmailMsg?.text?.isNotEmpty() == true) {
-          editTextEmailMsg?.append("\n" + EmailUtil.genReplyContent(msgInfo))
+        val currentCursorPosition = binding?.editTextEmailMessage?.selectionStart ?: 0
+        if (binding?.editTextEmailMessage?.text?.isNotEmpty() == true) {
+          binding?.editTextEmailMessage?.append("\n" + EmailUtil.genReplyContent(msgInfo))
         } else {
-          editTextEmailMsg?.append(EmailUtil.genReplyContent(msgInfo))
+          binding?.editTextEmailMessage?.append(EmailUtil.genReplyContent(msgInfo))
         }
-        editTextEmailMsg?.setSelection(currentCursorPosition)
+        binding?.editTextEmailMessage?.setSelection(currentCursorPosition)
         v.visibility = View.GONE
       }
     }
@@ -673,18 +687,27 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       when (messageEncryptionType) {
         MessageEncryptionType.ENCRYPTED -> {
           emailMassageHint = getString(R.string.prompt_compose_security_email)
-          recipientsTo?.onFocusChangeListener?.onFocusChange(recipientsTo, false)
-          recipientsCc?.onFocusChangeListener?.onFocusChange(recipientsCc, false)
-          recipientsBcc?.onFocusChangeListener?.onFocusChange(recipientsBcc, false)
+          binding?.editTextRecipientTo?.onFocusChangeListener?.onFocusChange(
+            binding?.editTextRecipientTo,
+            false
+          )
+          binding?.editTextRecipientCc?.onFocusChangeListener?.onFocusChange(
+            binding?.editTextRecipientCc,
+            false
+          )
+          binding?.editTextRecipientBcc?.onFocusChangeListener?.onFocusChange(
+            binding?.editTextRecipientBcc,
+            false
+          )
           fromAddrs?.setUseKeysInfo(true)
 
           val colorGray = UIUtil.getColor(requireContext(), R.color.gray)
-          val selectedItemPosition = spinnerFrom?.selectedItemPosition
+          val selectedItemPosition = binding?.spinnerFrom?.selectedItemPosition
           if (selectedItemPosition != null && selectedItemPosition != AdapterView.INVALID_POSITION
-            && spinnerFrom?.adapter?.count ?: 0 > selectedItemPosition
+            && binding?.spinnerFrom?.adapter?.count ?: 0 > selectedItemPosition
           ) {
             val isItemEnabled = fromAddrs?.isEnabled(selectedItemPosition) ?: true
-            editTextFrom?.setTextColor(if (isItemEnabled) originalColor else colorGray)
+            binding?.editTextFrom?.setTextColor(if (isItemEnabled) originalColor else colorGray)
           }
         }
 
@@ -697,11 +720,11 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           isUpdateCcCompleted = true
           isUpdateBccCompleted = true
           fromAddrs?.setUseKeysInfo(false)
-          editTextFrom?.setTextColor(originalColor)
+          binding?.editTextFrom?.setTextColor(originalColor)
         }
       }
     }
-    textInputLayoutMsg?.hint = emailMassageHint
+    binding?.textInputLayoutEmailMessage?.hint = emailMassageHint
   }
 
   private fun attachFile() {
@@ -810,34 +833,34 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   }
 
   private fun updateRecipients() {
-    recipientsTo?.chipAndTokenValues?.let {
+    binding?.editTextRecipientTo?.chipAndTokenValues?.let {
       recipientsViewModel.fetchAndUpdateInfoAboutRecipients(
         RecipientEntity.Type.TO,
         it
       )
     }
 
-    if (layoutCc?.visibility == View.VISIBLE) {
-      recipientsCc?.chipAndTokenValues?.let {
+    if (binding?.layoutCc?.isVisible == true) {
+      binding?.editTextRecipientCc?.chipAndTokenValues?.let {
         recipientsViewModel.fetchAndUpdateInfoAboutRecipients(
           RecipientEntity.Type.CC,
           it
         )
       }
     } else {
-      recipientsCc?.setText(null as CharSequence?)
+      binding?.editTextRecipientCc?.setText(null as CharSequence?)
       recipientWithPubKeysCc?.clear()
     }
 
-    if (layoutBcc?.visibility == View.VISIBLE) {
-      recipientsBcc?.chipAndTokenValues?.let {
+    if (binding?.layoutBcc?.isVisible == true) {
+      binding?.editTextRecipientBcc?.chipAndTokenValues?.let {
         recipientsViewModel.fetchAndUpdateInfoAboutRecipients(
           RecipientEntity.Type.BCC,
           it
         )
       }
     } else {
-      recipientsBcc?.setText(null as CharSequence?)
+      binding?.editTextRecipientBcc?.setText(null as CharSequence?)
       recipientWithPubKeysBcc?.clear()
     }
   }
@@ -873,19 +896,19 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private fun fetchDetailsAboutRecipients(type: RecipientEntity.Type) {
     when (type) {
       RecipientEntity.Type.TO -> {
-        recipientsTo?.chipAndTokenValues?.let {
+        binding?.editTextRecipientTo?.chipAndTokenValues?.let {
           recipientsViewModel.fetchAndUpdateInfoAboutRecipients(RecipientEntity.Type.TO, it)
         }
       }
 
       RecipientEntity.Type.CC -> {
-        recipientsCc?.chipAndTokenValues?.let {
+        binding?.editTextRecipientCc?.chipAndTokenValues?.let {
           recipientsViewModel.fetchAndUpdateInfoAboutRecipients(RecipientEntity.Type.CC, it)
         }
       }
 
       RecipientEntity.Type.BCC -> {
-        recipientsBcc?.chipAndTokenValues?.let {
+        binding?.editTextRecipientBcc?.chipAndTokenValues?.let {
           recipientsViewModel.fetchAndUpdateInfoAboutRecipients(RecipientEntity.Type.BCC, it)
         }
       }
@@ -931,7 +954,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       if (firstFoundedAlias != null) {
         val position = fromAddrs?.getPosition(firstFoundedAlias) ?: Spinner.INVALID_POSITION
         if (position != Spinner.INVALID_POSITION) {
-          spinnerFrom?.setSelection(position)
+          binding?.spinnerFrom?.setSelection(position)
         }
       }
     }
@@ -949,7 +972,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     if (firstFoundedAliasWithPrvKey != null) {
       val position = fromAddrs?.getPosition(firstFoundedAliasWithPrvKey) ?: Spinner.INVALID_POSITION
       if (position != Spinner.INVALID_POSITION) {
-        spinnerFrom?.setSelection(position)
+        binding?.spinnerFrom?.setSelection(position)
       }
     }
   }
@@ -1091,46 +1114,23 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    *
    * @param view The root fragment view.
    */
-  private fun initViews(view: View) {
-    layoutContent = view.findViewById(R.id.scrollView)
-    layoutAtts = view.findViewById(R.id.layoutAtts)
-    layoutCc = view.findViewById(R.id.layoutCc)
-    layoutBcc = view.findViewById(R.id.layoutBcc)
-    progressBarAndButtonLayout = view.findViewById(R.id.progressBarAndButtonLayout)
-
-    recipientsTo = view.findViewById(R.id.editTextRecipientTo)
-    recipientsCc = view.findViewById(R.id.editTextRecipientCc)
-    recipientsBcc = view.findViewById(R.id.editTextRecipientBcc)
-
-    initChipsView(recipientsTo)
-    initChipsView(recipientsCc)
-    initChipsView(recipientsBcc)
+  private fun initViews() {
+    initChipsView(binding?.editTextRecipientTo)
+    initChipsView(binding?.editTextRecipientCc)
+    initChipsView(binding?.editTextRecipientBcc)
 
-    spinnerFrom = view.findViewById(R.id.spinnerFrom)
-    spinnerFrom?.onItemSelectedListener = this
-    spinnerFrom?.adapter = fromAddrs
+    binding?.spinnerFrom?.onItemSelectedListener = this
+    binding?.spinnerFrom?.adapter = fromAddrs
 
-    editTextFrom = view.findViewById(R.id.editTextFrom)
-    originalColor = editTextFrom!!.currentTextColor
+    originalColor = requireNotNull(binding?.editTextFrom?.currentTextColor)
 
-    imageButtonAliases = view.findViewById(R.id.imageButtonAliases)
-    imageButtonAliases?.setOnClickListener(this)
+    binding?.imageButtonAliases?.setOnClickListener(this)
 
-    imageButtonAdditionalRecipientsVisibility =
-      view.findViewById(R.id.imageButtonAdditionalRecipientsVisibility)
-    imageButtonAdditionalRecipientsVisibility?.setOnClickListener(this)
+    binding?.imageButtonAdditionalRecipientsVisibility?.setOnClickListener(this)
 
-    editTextEmailSubject = view.findViewById(R.id.editTextEmailSubject)
-    editTextEmailSubject?.onFocusChangeListener = this
-    editTextEmailMsg = view.findViewById(R.id.editTextEmailMessage)
-    editTextEmailMsg?.onFocusChangeListener = this
-    textInputLayoutMsg = view.findViewById(R.id.textInputLayoutEmailMessage)
-    iBShowQuotedText = view.findViewById(R.id.iBShowQuotedText)
-    iBShowQuotedText?.setOnClickListener(this)
-
-    progressBarTo = view.findViewById(R.id.progressBarTo)
-    progressBarCc = view.findViewById(R.id.progressBarCc)
-    progressBarBcc = view.findViewById(R.id.progressBarBcc)
+    binding?.editTextEmailSubject?.onFocusChangeListener = this
+    binding?.editTextEmailMessage?.onFocusChangeListener = this
+    binding?.iBShowQuotedText?.setOnClickListener(this)
   }
 
   private fun showContent() {
@@ -1157,9 +1157,9 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     } else {
       if (msgInfo != null) {
         updateViewsFromIncomingMsgInfo()
-        recipientsTo?.chipifyAllUnterminatedTokens()
-        recipientsCc?.chipifyAllUnterminatedTokens()
-        editTextEmailSubject?.setText(prepareReplySubject(msgInfo?.getSubject() ?: ""))
+        binding?.editTextRecipientTo?.chipifyAllUnterminatedTokens()
+        binding?.editTextRecipientCc?.chipifyAllUnterminatedTokens()
+        binding?.editTextEmailSubject?.setText(prepareReplySubject(msgInfo?.getSubject() ?: ""))
       }
 
       if (serviceInfo != null) {
@@ -1169,46 +1169,55 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   }
 
   private fun updateViewsFromExtraActionInfo() {
-    setupPgpFromExtraActionInfo(recipientsTo, extraActionInfo!!.toAddresses.toTypedArray())
-    setupPgpFromExtraActionInfo(recipientsCc, extraActionInfo!!.ccAddresses.toTypedArray())
-    setupPgpFromExtraActionInfo(recipientsBcc, extraActionInfo!!.bccAddresses.toTypedArray())
+    setupPgpFromExtraActionInfo(
+      binding?.editTextRecipientTo,
+      extraActionInfo?.toAddresses?.toTypedArray()
+    )
+    setupPgpFromExtraActionInfo(
+      binding?.editTextRecipientCc,
+      extraActionInfo?.ccAddresses?.toTypedArray()
+    )
+    setupPgpFromExtraActionInfo(
+      binding?.editTextRecipientBcc,
+      extraActionInfo?.bccAddresses?.toTypedArray()
+    )
 
-    editTextEmailSubject?.setText(extraActionInfo!!.subject)
-    editTextEmailMsg?.setText(extraActionInfo!!.body)
+    binding?.editTextEmailSubject?.setText(extraActionInfo?.subject)
+    binding?.editTextEmailMessage?.setText(extraActionInfo?.body)
 
-    if (recipientsTo?.text?.isEmpty() == true) {
-      recipientsTo?.requestFocus()
+    if (binding?.editTextRecipientTo?.text?.isEmpty() == true) {
+      binding?.editTextRecipientTo?.requestFocus()
       return
     }
 
-    if (editTextEmailSubject?.text?.isEmpty() == true) {
-      editTextEmailSubject?.requestFocus()
+    if (binding?.editTextEmailSubject?.text?.isEmpty() == true) {
+      binding?.editTextEmailSubject?.requestFocus()
       return
     }
 
-    editTextEmailMsg?.requestFocus()
-    editTextEmailMsg?.showKeyboard()
+    binding?.editTextEmailMessage?.requestFocus()
+    binding?.editTextEmailMessage?.showKeyboard()
   }
 
   private fun updateViewsFromServiceInfo() {
-    recipientsTo?.isFocusable = serviceInfo!!.isToFieldEditable
-    recipientsTo?.isFocusableInTouchMode = serviceInfo!!.isToFieldEditable
-    //todo-denbond7 Need to add a similar option for recipientsCc and recipientsBcc
+    binding?.editTextRecipientTo?.isFocusable = serviceInfo?.isToFieldEditable ?: false
+    binding?.editTextRecipientTo?.isFocusableInTouchMode = serviceInfo?.isToFieldEditable ?: false
+    //todo-denbond7 Need to add a similar option for editTextRecipientCc and editTextRecipientBcc
 
-    editTextEmailSubject?.isFocusable = serviceInfo?.isSubjectEditable ?: false
-    editTextEmailSubject?.isFocusableInTouchMode = serviceInfo?.isSubjectEditable ?: false
+    binding?.editTextEmailSubject?.isFocusable = serviceInfo?.isSubjectEditable ?: false
+    binding?.editTextEmailSubject?.isFocusableInTouchMode = serviceInfo?.isSubjectEditable ?: false
 
-    editTextEmailMsg?.isFocusable = serviceInfo?.isMsgEditable ?: false
-    editTextEmailMsg?.isFocusableInTouchMode = serviceInfo?.isMsgEditable ?: false
+    binding?.editTextEmailMessage?.isFocusable = serviceInfo?.isMsgEditable ?: false
+    binding?.editTextEmailMessage?.isFocusableInTouchMode = serviceInfo?.isMsgEditable ?: false
 
     if (serviceInfo?.systemMsg?.isNotEmpty() == true) {
-      editTextEmailMsg?.setText(serviceInfo?.systemMsg)
+      binding?.editTextEmailMessage?.setText(serviceInfo?.systemMsg)
     }
   }
 
   private fun updateViewsFromIncomingMsgInfo() {
-    iBShowQuotedText?.visibility = View.VISIBLE
-    iBShowQuotedText?.let { registerForContextMenu(it) }
+    binding?.iBShowQuotedText?.visible()
+    binding?.iBShowQuotedText?.let { registerForContextMenu(it) }
 
     when (messageType) {
       MessageType.REPLY -> updateViewsIfReplyMode()
@@ -1243,7 +1252,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       }
     }
 
-    editTextEmailMsg?.setText(
+    binding?.editTextEmailMessage?.setText(
       getString(
         R.string.forward_template,
         originalMsgInfo.getFrom().first().address ?: "",
@@ -1254,22 +1263,22 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     )
 
     if (!CollectionUtils.isEmpty(originalMsgInfo.getCc())) {
-      editTextEmailMsg?.append("Cc: ")
-      editTextEmailMsg?.append(prepareRecipientsLineForForwarding(originalMsgInfo.getCc()))
-      editTextEmailMsg?.append("\n\n")
+      binding?.editTextEmailMessage?.append("Cc: ")
+      binding?.editTextEmailMessage?.append(prepareRecipientsLineForForwarding(originalMsgInfo.getCc()))
+      binding?.editTextEmailMessage?.append("\n\n")
     }
 
-    editTextEmailMsg?.append("\n\n" + originalMsgInfo.text)
+    binding?.editTextEmailMessage?.append("\n\n" + originalMsgInfo.text)
   }
 
   private fun updateViewsIfReplyAllMode() {
     when (folderType) {
       FoldersManager.FolderType.SENT, FoldersManager.FolderType.OUTBOX -> {
-        recipientsTo?.setText(prepareRecipients(msgInfo?.getTo()))
+        binding?.editTextRecipientTo?.setText(prepareRecipients(msgInfo?.getTo()))
 
         if (msgInfo?.getCc()?.isNotEmpty() == true) {
-          layoutCc?.visibility = View.VISIBLE
-          recipientsCc?.append(prepareRecipients(msgInfo?.getCc()))
+          binding?.layoutCc?.visibility = View.VISIBLE
+          binding?.editTextRecipientCc?.append(prepareRecipients(msgInfo?.getCc()))
         }
       }
 
@@ -1280,7 +1289,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           msgInfo?.getReplyToWithoutOwnerAddress() ?: emptyList()
         }
 
-        recipientsTo?.setText(prepareRecipients(toRecipients))
+        binding?.editTextRecipientTo?.setText(prepareRecipients(toRecipients))
 
         val ccSet = HashSet<InternetAddress>()
 
@@ -1319,25 +1328,29 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         val finalCcSet = ccSet.filter { fromAddress?.equals(it.address, true) != true }
 
         if (finalCcSet.isNotEmpty()) {
-          layoutCc?.visibility = View.VISIBLE
+          binding?.layoutCc?.visible()
           val ccRecipients = prepareRecipients(finalCcSet)
-          recipientsCc?.append(ccRecipients)
+          binding?.editTextRecipientCc?.append(ccRecipients)
         }
       }
     }
 
-    if (recipientsTo?.text?.isNotEmpty() == true || recipientsCc?.text?.isNotEmpty() == true) {
-      editTextEmailMsg?.requestFocus()
-      editTextEmailMsg?.showKeyboard()
+    if (binding?.editTextRecipientTo?.text?.isNotEmpty() == true
+      || binding?.editTextRecipientCc?.text?.isNotEmpty() == true
+    ) {
+      binding?.editTextEmailMessage?.requestFocus()
+      binding?.editTextEmailMessage?.showKeyboard()
     }
   }
 
   private fun updateViewsIfReplyMode() {
     when (folderType) {
       FoldersManager.FolderType.SENT,
-      FoldersManager.FolderType.OUTBOX -> recipientsTo?.setText(prepareRecipients(msgInfo?.getTo()))
+      FoldersManager.FolderType.OUTBOX -> {
+        binding?.editTextRecipientTo?.setText(prepareRecipients(msgInfo?.getTo()))
+      }
 
-      else -> recipientsTo?.setText(
+      else -> binding?.editTextRecipientTo?.setText(
         prepareRecipients(
           if (msgInfo?.getReplyToWithoutOwnerAddress().isNullOrEmpty()) {
             msgInfo?.getTo()
@@ -1348,9 +1361,9 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       )
     }
 
-    if (recipientsTo?.text?.isNotEmpty() == true) {
-      editTextEmailMsg?.requestFocus()
-      editTextEmailMsg?.showKeyboard()
+    if (binding?.editTextRecipientTo?.text?.isNotEmpty() == true) {
+      binding?.editTextEmailMessage?.requestFocus()
+      binding?.editTextEmailMessage?.showKeyboard()
     }
   }
 
@@ -1501,10 +1514,10 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    */
   private fun showAtts() {
     if (atts?.isNotEmpty() == true) {
-      layoutAtts?.removeAllViews()
+      binding?.layoutAtts?.removeAllViews()
       val layoutInflater = LayoutInflater.from(context)
       for (att in atts) {
-        val rootView = layoutInflater.inflate(R.layout.attachment_item, layoutAtts, false)
+        val rootView = layoutInflater.inflate(R.layout.attachment_item, binding?.layoutAtts, false)
 
         val textViewAttName = rootView.findViewById<TextView>(R.id.textViewAttachmentName)
         textViewAttName.text = att.name
@@ -1525,7 +1538,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           imageButtonClearAtt.visibility = View.VISIBLE
           imageButtonClearAtt.setOnClickListener {
             atts.remove(att)
-            layoutAtts?.removeView(rootView)
+            binding?.layoutAtts?.removeView(rootView)
 
             //Remove a temp file which was created by our app
             val uri = att.uri
@@ -1540,10 +1553,10 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         } else {
           imageButtonDownloadAtt.visibility = View.INVISIBLE
         }
-        layoutAtts?.addView(rootView)
+        binding?.layoutAtts?.addView(rootView)
       }
     } else {
-      layoutAtts?.removeAllViews()
+      binding?.layoutAtts?.removeAllViews()
     }
   }
 
@@ -1587,19 +1600,19 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       if (serviceInfo != null) {
         serviceInfo?.let { serviceInfo ->
           if (serviceInfo.isFromFieldEditable) {
-            imageButtonAliases?.visibility = View.VISIBLE
+            binding?.imageButtonAliases?.visibility = View.VISIBLE
           } else {
-            imageButtonAliases?.visibility = View.INVISIBLE
+            binding?.imageButtonAliases?.visibility = View.INVISIBLE
           }
         }
       } else {
         fromAddrs?.count?.let { count: Int ->
           if (count in 0..1) {
-            if (imageButtonAliases?.visibility == View.VISIBLE) {
-              imageButtonAliases?.visibility = View.INVISIBLE
+            if (binding?.imageButtonAliases?.visibility == View.VISIBLE) {
+              binding?.imageButtonAliases?.visibility = View.INVISIBLE
             }
           } else {
-            imageButtonAliases?.visibility = View.VISIBLE
+            binding?.imageButtonAliases?.visibility = View.VISIBLE
           }
         }
       }
@@ -1637,24 +1650,24 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         Result.Status.LOADING -> {
           hostActivity?.countingIdlingResource?.incrementSafely()
           recipientWithPubKeysTo?.clear()
-          progressBarTo?.visibility = View.VISIBLE
+          binding?.progressBarTo?.visible()
           isUpdateToCompleted = false
         }
 
         Result.Status.SUCCESS -> {
           isUpdateToCompleted = true
-          progressBarTo?.visibility = View.INVISIBLE
+          binding?.progressBarTo?.invisible()
 
           recipientWithPubKeysTo = it.data?.toMutableList()
           if (recipientWithPubKeysTo?.isNotEmpty() == true) {
-            updateChips(recipientsTo, recipientWithPubKeysTo)
+            updateChips(binding?.editTextRecipientTo, recipientWithPubKeysTo)
           }
           hostActivity?.countingIdlingResource?.decrementSafely()
         }
 
         Result.Status.ERROR, Result.Status.EXCEPTION -> {
           isUpdateToCompleted = true
-          progressBarTo?.visibility = View.INVISIBLE
+          binding?.progressBarTo?.invisible()
           showInfoSnackbar(view, it.exception?.message ?: getString(R.string.unknown_error))
           hostActivity?.countingIdlingResource?.decrementSafely()
         }
@@ -1668,24 +1681,24 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         Result.Status.LOADING -> {
           hostActivity?.countingIdlingResource?.incrementSafely()
           recipientWithPubKeysCc?.clear()
-          progressBarCc?.visibility = View.VISIBLE
+          binding?.progressBarCc?.visible()
           isUpdateCcCompleted = false
         }
 
         Result.Status.SUCCESS -> {
           isUpdateCcCompleted = true
-          progressBarCc?.visibility = View.INVISIBLE
+          binding?.progressBarCc?.invisible()
           recipientWithPubKeysCc = it.data?.toMutableList()
 
           if (recipientWithPubKeysCc?.isNotEmpty() == true) {
-            updateChips(recipientsCc, recipientWithPubKeysCc)
+            updateChips(binding?.editTextRecipientCc, recipientWithPubKeysCc)
           }
           hostActivity?.countingIdlingResource?.decrementSafely()
         }
 
         Result.Status.ERROR, Result.Status.EXCEPTION -> {
           isUpdateCcCompleted = true
-          progressBarCc?.visibility = View.INVISIBLE
+          binding?.progressBarCc?.invisible()
           showInfoSnackbar(view, it.exception?.message ?: getString(R.string.unknown_error))
           hostActivity?.countingIdlingResource?.decrementSafely()
         }
@@ -1699,24 +1712,24 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         Result.Status.LOADING -> {
           hostActivity?.countingIdlingResource?.incrementSafely()
           recipientWithPubKeysBcc?.clear()
-          progressBarBcc?.visibility = View.VISIBLE
+          binding?.progressBarBcc?.visible()
           isUpdateBccCompleted = false
         }
 
         Result.Status.SUCCESS -> {
           isUpdateBccCompleted = true
-          progressBarBcc?.visibility = View.INVISIBLE
+          binding?.progressBarBcc?.invisible()
           recipientWithPubKeysBcc = it.data?.toMutableList()
 
           if (recipientWithPubKeysBcc?.isNotEmpty() == true) {
-            updateChips(recipientsBcc, recipientWithPubKeysBcc)
+            updateChips(binding?.editTextRecipientBcc, recipientWithPubKeysBcc)
           }
           hostActivity?.countingIdlingResource?.decrementSafely()
         }
 
         Result.Status.ERROR, Result.Status.EXCEPTION -> {
           isUpdateBccCompleted = true
-          progressBarBcc?.visibility = View.INVISIBLE
+          binding?.progressBarBcc?.invisible()
           showInfoSnackbar(view, it.exception?.message ?: getString(R.string.unknown_error))
           hostActivity?.countingIdlingResource?.decrementSafely()
         }

From 041752455f518b8ff4537518be1e6585835ce2a5 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Thu, 23 Dec 2021 16:10:52 +0200
Subject: [PATCH 04/24] CreateMessageActivity. Refactoring and improving the
 code.| #1620

---
 FlowCrypt/src/main/AndroidManifest.xml        |   1 +
 .../jetpack/viewmodel/ComposeMsgViewModel.kt  |  39 +++
 .../ui/activity/CreateMessageActivity.kt      | 198 ++---------
 .../fragment/CreateMessageFragment.kt         | 319 ++++++++++--------
 .../ui/activity/fragment/base/BaseFragment.kt |   8 +
 .../OnChangeMessageEncryptionTypeListener.kt  |  28 --
 .../res/layout/activity_create_message.xml    |  13 +-
 .../main/res/menu/activity_send_message.xml   |  14 -
 .../src/main/res/menu/fragment_compose.xml    |   7 +
 .../main/res/navigation/create_msg_graph.xml  |  36 ++
 10 files changed, 298 insertions(+), 365 deletions(-)
 create mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
 delete mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/listeners/OnChangeMessageEncryptionTypeListener.kt
 delete mode 100644 FlowCrypt/src/main/res/menu/activity_send_message.xml
 create mode 100644 FlowCrypt/src/main/res/navigation/create_msg_graph.xml

diff --git a/FlowCrypt/src/main/AndroidManifest.xml b/FlowCrypt/src/main/AndroidManifest.xml
index 371f2d51c3..7b3495a09d 100644
--- a/FlowCrypt/src/main/AndroidManifest.xml
+++ b/FlowCrypt/src/main/AndroidManifest.xml
@@ -95,6 +95,7 @@
             android:name=".ui.activity.CreateMessageActivity"
             android:exported="true"
             android:screenOrientation="portrait">
+            <nav-graph android:value="@navigation/create_msg_graph" />
             <intent-filter>
                 <!--Handle the clicks on email links in a browser-->
                 <action android:name="android.intent.action.VIEW" />
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
new file mode 100644
index 0000000000..373e93d75c
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
@@ -0,0 +1,39 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.jetpack.viewmodel
+
+import android.app.Application
+import com.flowcrypt.email.model.MessageEncryptionType
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 12/23/21
+ *         Time: 10:44 AM
+ *         E-mail: DenBond7@gmail.com
+ */
+class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Application) :
+  BaseAndroidViewModel(application) {
+  private val messageEncryptionTypeMutableStateFlow: MutableStateFlow<MessageEncryptionType> =
+    MutableStateFlow(
+      if (isCandidateToEncrypt) {
+        MessageEncryptionType.ENCRYPTED
+      } else {
+        MessageEncryptionType.STANDARD
+      }
+    )
+  val messageEncryptionTypeStateFlow: StateFlow<MessageEncryptionType> =
+    messageEncryptionTypeMutableStateFlow.asStateFlow()
+
+  val msgEncryptionType: MessageEncryptionType
+    get() = messageEncryptionTypeStateFlow.value
+
+  fun switchMessageEncryptionType(messageEncryptionType: MessageEncryptionType) {
+    messageEncryptionTypeMutableStateFlow.value = messageEncryptionType
+  }
+}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt
index 12ad3e163e..7541a2c9bc 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt
@@ -9,14 +9,11 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
-import android.view.Menu
-import android.view.MenuItem
 import android.view.View
-import android.widget.TextView
 import android.widget.Toast
+import androidx.navigation.fragment.NavHostFragment
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.email.model.IncomingMessageInfo
-import com.flowcrypt.email.api.email.model.OutgoingMessageInfo
 import com.flowcrypt.email.api.email.model.ServiceInfo
 import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.database.entity.AccountEntity
@@ -24,14 +21,8 @@ import com.flowcrypt.email.extensions.decrementSafely
 import com.flowcrypt.email.extensions.incrementSafely
 import com.flowcrypt.email.model.MessageEncryptionType
 import com.flowcrypt.email.model.MessageType
-import com.flowcrypt.email.service.PrepareOutgoingMessagesJobIntentService
 import com.flowcrypt.email.ui.activity.base.BaseBackStackSyncActivity
-import com.flowcrypt.email.ui.activity.fragment.CreateMessageFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.ChoosePublicKeyDialogFragment
-import com.flowcrypt.email.ui.activity.listeners.OnChangeMessageEncryptionTypeListener
-import com.flowcrypt.email.ui.activity.settings.FeedbackActivity
-import com.flowcrypt.email.util.GeneralUtil
-import com.flowcrypt.email.util.UIUtil
 
 /**
  * This activity describes a logic of send encrypted or standard message.
@@ -42,108 +33,20 @@ import com.flowcrypt.email.util.UIUtil
  * E-mail: DenBond7@gmail.com
  */
 class CreateMessageActivity : BaseBackStackSyncActivity(),
-  CreateMessageFragment.OnMessageSendListener,
-  OnChangeMessageEncryptionTypeListener, ChoosePublicKeyDialogFragment.OnLoadKeysProgressListener {
-
-  private var nonEncryptedHintView: View? = null
-  override lateinit var rootView: View
-
-  override var msgEncryptionType = MessageEncryptionType.ENCRYPTED
-    private set
-  private var serviceInfo: ServiceInfo? = null
-
+  ChoosePublicKeyDialogFragment.OnLoadKeysProgressListener {
   override val contentViewResourceId: Int
     get() = R.layout.activity_create_message
+  override val rootView: View
+    get() = findViewById(R.id.fragmentContainerView)
 
   override fun onCreate(savedInstanceState: Bundle?) {
-    if (intent != null) {
-      serviceInfo = intent.getParcelableExtra(EXTRA_KEY_SERVICE_INFO)
-      msgEncryptionType = intent.getParcelableExtra(EXTRA_KEY_MESSAGE_ENCRYPTION_TYPE)
-        ?: MessageEncryptionType.ENCRYPTED
-    }
-
     super.onCreate(savedInstanceState)
-
-    rootView = findViewById(R.id.createMessageFragment)
-    initNonEncryptedHintView()
-
-    prepareActionBarTitle()
-    onMsgEncryptionTypeChanged(msgEncryptionType)
-  }
-
-  override fun onCreateOptionsMenu(menu: Menu): Boolean {
-    menuInflater.inflate(R.menu.activity_send_message, menu)
-    return super.onCreateOptionsMenu(menu)
-  }
-
-  override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-    super.onPrepareOptionsMenu(menu)
-    val menuActionSwitchType = menu.findItem(R.id.menuActionSwitchType)
-    val titleRes = if (msgEncryptionType === MessageEncryptionType.STANDARD)
-      R.string.switch_to_secure_email
-    else
-      R.string
-        .switch_to_standard_email
-    menuActionSwitchType.setTitle(titleRes)
-
-    if (serviceInfo?.isMsgTypeSwitchable == false) {
-      menu.removeItem(R.id.menuActionSwitchType)
-    }
-
-    if (serviceInfo?.hasAbilityToAddNewAtt == false) {
-      menu.removeItem(R.id.menuActionAttachFile)
-    }
-
-    return true
-  }
-
-  override fun onOptionsItemSelected(item: MenuItem): Boolean {
-    when (item.itemId) {
-      R.id.menuActionHelp -> {
-        FeedbackActivity.show(this)
-        return true
-      }
-
-      R.id.menuActionSwitchType -> {
-        when (msgEncryptionType) {
-          MessageEncryptionType.ENCRYPTED -> onMsgEncryptionTypeChanged(MessageEncryptionType.STANDARD)
-
-          MessageEncryptionType.STANDARD -> onMsgEncryptionTypeChanged(MessageEncryptionType.ENCRYPTED)
+    (supportFragmentManager.findFragmentById(R.id.fragmentContainerView) as? NavHostFragment)
+      ?.navController?.setGraph(R.navigation.create_msg_graph, intent.extras?.apply {
+        if (!containsKey("messageType")) {
+          putParcelable("messageType", MessageType.NEW)
         }
-        return true
-      }
-
-      else -> return super.onOptionsItemSelected(item)
-    }
-  }
-
-  override fun sendMsg(outgoingMsgInfo: OutgoingMessageInfo) {
-    PrepareOutgoingMessagesJobIntentService.enqueueWork(this, outgoingMsgInfo)
-    Toast.makeText(
-      this, if (GeneralUtil.isConnected(this))
-        R.string.sending
-      else
-        R.string.no_conn_msg_sent_later, Toast.LENGTH_SHORT
-    ).show()
-    finish()
-  }
-
-  override fun onMsgEncryptionTypeChanged(messageEncryptionType: MessageEncryptionType) {
-    this.msgEncryptionType = messageEncryptionType
-    when (messageEncryptionType) {
-      MessageEncryptionType.ENCRYPTED -> {
-        appBarLayout?.setBackgroundColor(UIUtil.getColor(this, R.color.colorPrimary))
-        appBarLayout?.removeView(nonEncryptedHintView)
-      }
-
-      MessageEncryptionType.STANDARD -> {
-        appBarLayout?.setBackgroundColor(UIUtil.getColor(this, R.color.red))
-        appBarLayout?.addView(nonEncryptedHintView)
-      }
-    }
-
-    invalidateOptionsMenu()
-    notifyFragmentAboutChangeMsgEncryptionType(messageEncryptionType)
+      })
   }
 
   override fun onAccountInfoRefreshed(accountEntity: AccountEntity?) {
@@ -163,88 +66,27 @@ class CreateMessageActivity : BaseBackStackSyncActivity(),
     }
   }
 
-  private fun prepareActionBarTitle() {
-    if (supportActionBar != null) {
-      if (intent.hasExtra(EXTRA_KEY_MESSAGE_TYPE)) {
-        val msgType = intent.getParcelableExtra<MessageType>(EXTRA_KEY_MESSAGE_TYPE)
-
-        msgType?.let {
-          when (it) {
-            MessageType.NEW -> supportActionBar?.setTitle(R.string.compose)
-            MessageType.REPLY -> supportActionBar?.setTitle(R.string.reply)
-            MessageType.REPLY_ALL -> supportActionBar?.setTitle(R.string.reply_all)
-            MessageType.FORWARD -> supportActionBar?.setTitle(R.string.forward)
-          }
-        }
-      } else {
-        if (intent.getParcelableExtra<Parcelable>(EXTRA_KEY_INCOMING_MESSAGE_INFO) != null) {
-          supportActionBar!!.setTitle(R.string.reply)
-        } else {
-          supportActionBar!!.setTitle(R.string.compose)
-        }
-      }
-    }
-  }
-
-  private fun notifyFragmentAboutChangeMsgEncryptionType(messageEncryptionType: MessageEncryptionType) {
-    val fragment = supportFragmentManager.findFragmentById(
-      R.id
-        .createMessageFragment
-    ) as CreateMessageFragment?
-
-    fragment?.onMsgEncryptionTypeChange(messageEncryptionType)
-  }
-
-  private fun initNonEncryptedHintView() {
-    nonEncryptedHintView =
-      layoutInflater.inflate(R.layout.under_toolbar_line_with_text, appBarLayout, false)
-    val textView = nonEncryptedHintView!!.findViewById<TextView>(R.id.underToolbarTextTextView)
-    textView.setText(R.string.this_message_will_not_be_encrypted)
-  }
-
   companion object {
-
-    val EXTRA_KEY_MESSAGE_ENCRYPTION_TYPE =
-      GeneralUtil.generateUniqueExtraKey(
-        "EXTRA_KEY_MESSAGE_ENCRYPTION_TYPE",
-        CreateMessageActivity::class.java
-      )
-
-    val EXTRA_KEY_INCOMING_MESSAGE_INFO =
-      GeneralUtil.generateUniqueExtraKey(
-        "EXTRA_KEY_INCOMING_MESSAGE_INFO",
-        CreateMessageActivity::class.java
-      )
-
-    val EXTRA_KEY_SERVICE_INFO =
-      GeneralUtil.generateUniqueExtraKey(
-        "EXTRA_KEY_SERVICE_INFO",
-        CreateMessageActivity::class.java
-      )
-
-    val EXTRA_KEY_MESSAGE_TYPE =
-      GeneralUtil.generateUniqueExtraKey(
-        "EXTRA_KEY_MESSAGE_TYPE",
-        CreateMessageActivity::class.java
-      )
-
     fun generateIntent(
-      context: Context, msgInfo: IncomingMessageInfo?,
+      context: Context,
+      msgInfo: IncomingMessageInfo?,
       msgEncryptionType: MessageEncryptionType
     ): Intent {
       return generateIntent(context, msgInfo, MessageType.NEW, msgEncryptionType)
     }
 
     fun generateIntent(
-      context: Context?, msgInfo: IncomingMessageInfo?, messageType: MessageType?,
-      msgEncryptionType: MessageEncryptionType?, serviceInfo: ServiceInfo? = null
+      context: Context?,
+      msgInfo: IncomingMessageInfo?,
+      messageType: MessageType?,
+      msgEncryptionType: MessageEncryptionType?,
+      serviceInfo: ServiceInfo? = null
     ): Intent {
-
       val intent = Intent(context, CreateMessageActivity::class.java)
-      intent.putExtra(EXTRA_KEY_INCOMING_MESSAGE_INFO, msgInfo)
-      intent.putExtra(EXTRA_KEY_MESSAGE_TYPE, messageType as Parcelable)
-      intent.putExtra(EXTRA_KEY_MESSAGE_ENCRYPTION_TYPE, msgEncryptionType as Parcelable)
-      intent.putExtra(EXTRA_KEY_SERVICE_INFO, serviceInfo)
+      intent.putExtra("incomingMessageInfo", msgInfo)
+      intent.putExtra("messageType", messageType as Parcelable)
+      intent.putExtra("encryptedByDefault", msgEncryptionType == MessageEncryptionType.ENCRYPTED)
+      intent.putExtra("serviceInfo", serviceInfo)
       return intent
     }
   }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index 2aaba9cea4..93e4242ce8 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -30,22 +30,23 @@ import android.widget.ArrayAdapter
 import android.widget.FilterQueryProvider
 import android.widget.FrameLayout
 import android.widget.ListView
-import android.widget.ProgressBar
 import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.FileProvider
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.navArgs
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.api.email.FoldersManager
 import com.flowcrypt.email.api.email.model.AttachmentInfo
 import com.flowcrypt.email.api.email.model.ExtraActionInfo
-import com.flowcrypt.email.api.email.model.IncomingMessageInfo
 import com.flowcrypt.email.api.email.model.OutgoingMessageInfo
-import com.flowcrypt.email.api.email.model.ServiceInfo
 import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.AccountEntity
@@ -60,20 +61,21 @@ import com.flowcrypt.email.extensions.org.bouncycastle.openpgp.toPgpKeyDetails
 import com.flowcrypt.email.extensions.showInfoDialog
 import com.flowcrypt.email.extensions.showKeyboard
 import com.flowcrypt.email.extensions.showNeedPassphraseDialog
+import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.extensions.visible
 import com.flowcrypt.email.jetpack.viewmodel.AccountAliasesViewModel
+import com.flowcrypt.email.jetpack.viewmodel.ComposeMsgViewModel
 import com.flowcrypt.email.jetpack.viewmodel.RecipientsViewModel
 import com.flowcrypt.email.model.MessageEncryptionType
 import com.flowcrypt.email.model.MessageType
 import com.flowcrypt.email.security.KeysStorageImpl
-import com.flowcrypt.email.ui.activity.CreateMessageActivity
+import com.flowcrypt.email.service.PrepareOutgoingMessagesJobIntentService
 import com.flowcrypt.email.ui.activity.ImportPublicKeyActivity
 import com.flowcrypt.email.ui.activity.SelectRecipientsActivity
 import com.flowcrypt.email.ui.activity.fragment.base.BaseSyncFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.ChoosePublicKeyDialogFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.FixNeedPassphraseIssueDialogFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.NoPgpFoundDialogFragment
-import com.flowcrypt.email.ui.activity.listeners.OnChangeMessageEncryptionTypeListener
 import com.flowcrypt.email.ui.adapter.FromAddressesAdapter
 import com.flowcrypt.email.ui.adapter.RecipientAdapter
 import com.flowcrypt.email.ui.widget.CustomChipSpanChipCreator
@@ -90,6 +92,7 @@ import com.hootsuite.nachos.NachoTextView
 import com.hootsuite.nachos.chip.Chip
 import com.hootsuite.nachos.terminator.ChipTerminatorHandler
 import com.hootsuite.nachos.validator.ChipifyingNachoValidator
+import kotlinx.coroutines.flow.collect
 import org.apache.commons.io.FileUtils
 import org.bouncycastle.openpgp.PGPSecretKeyRing
 import org.pgpainless.key.OpenPgpV4Fingerprint
@@ -110,12 +113,19 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   AdapterView.OnItemSelectedListener,
   View.OnClickListener, PgpContactsNachoTextView.OnChipLongClickListener {
 
-  private lateinit var onMsgSendListener: OnMessageSendListener
-  private lateinit var listener: OnChangeMessageEncryptionTypeListener
   private lateinit var draftCacheDir: File
 
+  private val args by navArgs<CreateMessageFragmentArgs>()
   private val accountAliasesViewModel: AccountAliasesViewModel by viewModels()
   private val recipientsViewModel: RecipientsViewModel by viewModels()
+  private val composeMsgViewModel: ComposeMsgViewModel by viewModels {
+    object : ViewModelProvider.AndroidViewModelFactory(requireActivity().application) {
+      @Suppress("UNCHECKED_CAST")
+      override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+        return ComposeMsgViewModel(args.encryptedByDefault, requireActivity().application) as T
+      }
+    }
+  }
 
   private var binding: FragmentCreateMessageBinding? = null
   private var recipientWithPubKeysTo: MutableList<RecipientWithPubKeys>? = null
@@ -123,12 +133,11 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private var recipientWithPubKeysBcc: MutableList<RecipientWithPubKeys>? = null
   private val atts: MutableList<AttachmentInfo>?
   private var folderType: FoldersManager.FolderType? = null
-  private var msgInfo: IncomingMessageInfo? = null
-  private var serviceInfo: ServiceInfo? = null
   private var fromAddrs: FromAddressesAdapter<String>? = null
   private var cachedRecipientWithoutPubKeys: RecipientWithPubKeys? = null
   private var extraActionInfo: ExtraActionInfo? = null
   private var messageType = MessageType.NEW
+  private var nonEncryptedHintView: View? = null
 
   private var isUpdateToCompleted = true
   private var isUpdateCcCompleted = true
@@ -137,11 +146,6 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private var isMsgSentToQueue: Boolean = false
   private var originalColor: Int = 0
 
-  private val hostActivity: CreateMessageActivity?
-    get() {
-      return activity as? CreateMessageActivity
-    }
-
   override val contentResourceId: Int = R.layout.fragment_create_message
 
   override val contentView: View?
@@ -157,11 +161,11 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     var msg = binding?.editTextEmailMessage?.text.toString()
     if (messageType == MessageType.REPLY || messageType == MessageType.REPLY_ALL) {
       if (binding?.iBShowQuotedText?.visibility == View.VISIBLE) {
-        msg += EmailUtil.genReplyContent(msgInfo)
+        msg += EmailUtil.genReplyContent(args.incomingMessageInfo)
       }
     }
 
-    val attachments = atts?.minus(forwardedAtts)
+    val attachments = atts?.minus(forwardedAtts.toSet())
     attachments?.forEachIndexed { index, attachmentInfo -> attachmentInfo.path = index.toString() }
 
     return OutgoingMessageInfo(
@@ -175,9 +179,9 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       from = binding?.editTextFrom?.text.toString(),
       atts = attachments,
       forwardedAtts = forwardedAtts,
-      encryptionType = listener.msgEncryptionType,
+      encryptionType = composeMsgViewModel.msgEncryptionType,
       messageType = messageType,
-      replyToMsgEntity = msgInfo?.msgEntity,
+      replyToMsgEntity = args.incomingMessageInfo?.msgEntity,
       uid = EmailUtil.genOutboxUID(context)
     )
   }
@@ -217,7 +221,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       ) {
         return false
       }
-      if (listener.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
+      if (composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
         if (binding?.editTextRecipientTo?.text?.isNotEmpty() == true
           && recipientWithPubKeysTo?.isEmpty() == true
         ) {
@@ -299,21 +303,11 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
   override fun onAttach(context: Context) {
     super.onAttach(context)
-    if (context is OnMessageSendListener) {
-      this.onMsgSendListener = context
-    } else
-      throw IllegalArgumentException(
-        context.toString() + " must implement " +
-            OnMessageSendListener::class.java.simpleName
-      )
-
-    if (context is OnChangeMessageEncryptionTypeListener) {
-      this.listener = context
-    } else
-      throw IllegalArgumentException(
-        context.toString() + " must implement " +
-            OnChangeMessageEncryptionTypeListener::class.java.simpleName
-      )
+    fromAddrs = FromAddressesAdapter(
+      context, android.R.layout.simple_list_item_1, android.R.id.text1, ArrayList()
+    )
+    fromAddrs?.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+    fromAddrs?.setUseKeysInfo(composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED)
 
     initDraftCacheDir(context)
   }
@@ -321,16 +315,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setHasOptionsMenu(true)
-
-    context?.let {
-      fromAddrs = FromAddressesAdapter(
-        it, android.R.layout.simple_list_item_1, android.R.id
-          .text1, ArrayList()
-      )
-    }
-    fromAddrs?.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-    fromAddrs?.setUseKeysInfo(listener.msgEncryptionType === MessageEncryptionType.ENCRYPTED)
-
+    setupComposeMsgViewModel()
     initExtras(activity?.intent)
   }
 
@@ -343,16 +328,15 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
+    updateActionBarTitle()
+    initNonEncryptedHintView()
     initViews()
     setupAccountAliasesViewModel()
     setupPrivateKeysViewModel()
     setupRecipientsViewModel()
-  }
 
-  override fun onActivityCreated(savedInstanceState: Bundle?) {
-    super.onActivityCreated(savedInstanceState)
-    val isEncryptedMode = listener.msgEncryptionType === MessageEncryptionType.ENCRYPTED
-    if (msgInfo != null && GeneralUtil.isConnected(context) && isEncryptedMode) {
+    val isEncryptedMode = composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED
+    if (args.incomingMessageInfo != null && GeneralUtil.isConnected(context) && isEncryptedMode) {
       updateRecipients()
     }
   }
@@ -375,8 +359,9 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
     when (requestCode) {
       REQUEST_CODE_NO_PGP_FOUND_DIALOG -> when (resultCode) {
-        NoPgpFoundDialogFragment.RESULT_CODE_SWITCH_TO_STANDARD_EMAIL ->
-          listener.onMsgEncryptionTypeChanged(MessageEncryptionType.STANDARD)
+        NoPgpFoundDialogFragment.RESULT_CODE_SWITCH_TO_STANDARD_EMAIL -> {
+          composeMsgViewModel.switchMessageEncryptionType(MessageEncryptionType.STANDARD)
+        }
 
         NoPgpFoundDialogFragment.RESULT_CODE_IMPORT_THEIR_PUBLIC_KEY -> if (data != null) {
           val recipientWithPubKeys = data.getParcelableExtra<RecipientWithPubKeys>(
@@ -499,6 +484,25 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     inflater.inflate(R.menu.fragment_compose, menu)
   }
 
+  override fun onPrepareOptionsMenu(menu: Menu) {
+    super.onPrepareOptionsMenu(menu)
+    val menuActionSwitchType = menu.findItem(R.id.menuActionSwitchType)
+    val titleRes = if (composeMsgViewModel.msgEncryptionType === MessageEncryptionType.STANDARD)
+      R.string.switch_to_secure_email
+    else
+      R.string
+        .switch_to_standard_email
+    menuActionSwitchType.setTitle(titleRes)
+
+    if (args.serviceInfo?.isMsgTypeSwitchable == false) {
+      menu.removeItem(R.id.menuActionSwitchType)
+    }
+
+    if (args.serviceInfo?.hasAbilityToAddNewAtt == false) {
+      menu.removeItem(R.id.menuActionAttachFile)
+    }
+  }
+
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
     when (item.itemId) {
       R.id.menuActionSend -> {
@@ -507,7 +511,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         if (isUpdateToCompleted && isUpdateCcCompleted && isUpdateBccCompleted) {
           UIUtil.hideSoftInput(context, view)
           if (isDataCorrect) {
-            if (listener.msgEncryptionType == MessageEncryptionType.ENCRYPTED) {
+            if (composeMsgViewModel.msgEncryptionType == MessageEncryptionType.ENCRYPTED) {
               val keysStorage = KeysStorageImpl.getInstance(requireContext())
               val senderEmail = binding?.editTextFrom?.text.toString()
               val keyRings = keysStorage.getPGPSecretKeyRingsByUserId(senderEmail)
@@ -548,6 +552,18 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         return true
       }
 
+      R.id.menuActionSwitchType -> {
+        when (composeMsgViewModel.msgEncryptionType) {
+          MessageEncryptionType.ENCRYPTED -> composeMsgViewModel.switchMessageEncryptionType(
+            MessageEncryptionType.STANDARD
+          )
+          MessageEncryptionType.STANDARD -> composeMsgViewModel.switchMessageEncryptionType(
+            MessageEncryptionType.ENCRYPTED
+          )
+        }
+        return true
+      }
+
       else -> return super.onOptionsItemSelected(item)
     }
   }
@@ -570,7 +586,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     return when (item.itemId) {
       R.id.menuDeleteQuotedText -> {
         binding?.iBShowQuotedText?.gone()
-        msgInfo?.text = ""
+        args.incomingMessageInfo?.text = ""
         true
       }
 
@@ -581,18 +597,15 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override fun onFocusChange(v: View, hasFocus: Boolean) {
     when (v.id) {
       R.id.editTextRecipientTo -> runUpdateActionForRecipients(
-        recipientWithPubKeysTo, binding?.progressBarTo,
-        RecipientEntity.Type.TO, hasFocus
+        recipientWithPubKeysTo, RecipientEntity.Type.TO, hasFocus
       )
 
       R.id.editTextRecipientCc -> runUpdateActionForRecipients(
-        recipientWithPubKeysCc, binding?.progressBarCc,
-        RecipientEntity.Type.CC, hasFocus
+        recipientWithPubKeysCc, RecipientEntity.Type.CC, hasFocus
       )
 
       R.id.editTextRecipientBcc -> runUpdateActionForRecipients(
-        recipientWithPubKeysBcc, binding?.progressBarBcc,
-        RecipientEntity.Type.BCC, hasFocus
+        recipientWithPubKeysBcc, RecipientEntity.Type.BCC, hasFocus
       )
 
       R.id.editTextEmailSubject, R.id.editTextEmailMessage -> if (hasFocus) {
@@ -623,7 +636,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     when (parent?.id) {
       R.id.spinnerFrom -> {
         binding?.editTextFrom?.setText(parent.adapter.getItem(position) as CharSequence)
-        if (listener.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
+        if (composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
           val adapter = parent.adapter as ArrayAdapter<*>
           val colorGray = UIUtil.getColor(requireContext(), R.color.gray)
           binding?.editTextFrom?.setTextColor(if (adapter.isEnabled(position)) originalColor else colorGray)
@@ -660,9 +673,9 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       R.id.iBShowQuotedText -> {
         val currentCursorPosition = binding?.editTextEmailMessage?.selectionStart ?: 0
         if (binding?.editTextEmailMessage?.text?.isNotEmpty() == true) {
-          binding?.editTextEmailMessage?.append("\n" + EmailUtil.genReplyContent(msgInfo))
+          binding?.editTextEmailMessage?.append("\n" + EmailUtil.genReplyContent(args.incomingMessageInfo))
         } else {
-          binding?.editTextEmailMessage?.append(EmailUtil.genReplyContent(msgInfo))
+          binding?.editTextEmailMessage?.append(EmailUtil.genReplyContent(args.incomingMessageInfo))
         }
         binding?.editTextEmailMessage?.setSelection(currentCursorPosition)
         v.visibility = View.GONE
@@ -681,7 +694,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     }
   }
 
-  fun onMsgEncryptionTypeChange(messageEncryptionType: MessageEncryptionType?) {
+  private fun onMsgEncryptionTypeChange(messageEncryptionType: MessageEncryptionType?) {
     var emailMassageHint: String? = null
     if (messageEncryptionType != null) {
       when (messageEncryptionType) {
@@ -740,26 +753,15 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
   private fun initExtras(intent: Intent?) {
     if (intent != null) {
-      if (intent.hasExtra(CreateMessageActivity.EXTRA_KEY_MESSAGE_TYPE)) {
-        this.messageType =
-          intent.getSerializableExtra(CreateMessageActivity.EXTRA_KEY_MESSAGE_TYPE) as MessageType
-      }
-
-      if (!TextUtils.isEmpty(intent.action) && intent.action?.startsWith("android.intent.action") == true) {
+      if (intent.action?.startsWith("android.intent.action") == true) {
         this.extraActionInfo = ExtraActionInfo.parseExtraActionInfo(requireContext(), intent)
         addAtts()
       } else {
-        this.serviceInfo = intent.getParcelableExtra(CreateMessageActivity.EXTRA_KEY_SERVICE_INFO)
-        this.msgInfo =
-          intent.getParcelableExtra(CreateMessageActivity.EXTRA_KEY_INCOMING_MESSAGE_INFO)
-
-        if (msgInfo != null && msgInfo!!.localFolder != null) {
-          this.folderType = FoldersManager.getFolderType(msgInfo!!.localFolder)
+        args.incomingMessageInfo?.localFolder?.let {
+          this.folderType = FoldersManager.getFolderType(it)
         }
 
-        if (this.serviceInfo != null && this.serviceInfo!!.atts != null) {
-          atts?.addAll(this.serviceInfo!!.atts!!)
-        }
+        this.args.serviceInfo?.atts?.let { atts?.addAll(it) }
       }
     }
   }
@@ -869,18 +871,16 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    * Run an action to update information about some [RecipientWithPubKeys]s.
    *
    * @param recipients Old [RecipientWithPubKeys]s
-   * @param progressBar A [ProgressBar] which is showing an action progress.
    * @param type        A type of recipients
    * @param hasFocus    A value which indicates the view focus.
    * @return A modified recipients list.
    */
   private fun runUpdateActionForRecipients(
     recipients: MutableList<RecipientWithPubKeys>?,
-    progressBar: View?,
     type: RecipientEntity.Type,
     hasFocus: Boolean
   ): List<RecipientWithPubKeys>? {
-    if (listener.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
+    if (composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
       if (hasFocus) {
         recipients?.clear()
       } else {
@@ -922,12 +922,12 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    * @param aliases A list of Gmail aliases.
    */
   private fun prepareAliasForReplyIfNeeded(aliases: List<String>) {
-    val messageEncryptionType = listener.msgEncryptionType
+    val messageEncryptionType = composeMsgViewModel.msgEncryptionType
 
     val toAddresses: List<InternetAddress>? = if (folderType === FoldersManager.FolderType.SENT) {
-      msgInfo?.getFrom()
+      args.incomingMessageInfo?.getFrom()
     } else {
-      msgInfo?.getTo()
+      args.incomingMessageInfo?.getTo()
     }
 
     if (!CollectionUtils.isEmpty(toAddresses)) {
@@ -1111,8 +1111,6 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
   /**
    * Init fragment views
-   *
-   * @param view The root fragment view.
    */
   private fun initViews() {
     initChipsView(binding?.editTextRecipientTo)
@@ -1136,13 +1134,12 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private fun showContent() {
     UIUtil.exchangeViewVisibility(false, progressView, contentView)
 
-    if ((msgInfo != null || extraActionInfo != null) && !isIncomingMsgInfoUsed) {
+    if ((args.incomingMessageInfo != null || extraActionInfo != null) && !isIncomingMsgInfoUsed) {
       this.isIncomingMsgInfoUsed = true
       updateViews()
     }
 
     showAtts()
-    hostActivity?.countingIdlingResource?.decrementSafely("showContent")
   }
 
   /**
@@ -1150,19 +1147,23 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    * screen.
    */
   private fun updateViews() {
-    onMsgEncryptionTypeChange(listener.msgEncryptionType)
+    onMsgEncryptionTypeChange(composeMsgViewModel.msgEncryptionType)
 
     if (extraActionInfo != null) {
       updateViewsFromExtraActionInfo()
     } else {
-      if (msgInfo != null) {
+      if (args.incomingMessageInfo != null) {
         updateViewsFromIncomingMsgInfo()
         binding?.editTextRecipientTo?.chipifyAllUnterminatedTokens()
         binding?.editTextRecipientCc?.chipifyAllUnterminatedTokens()
-        binding?.editTextEmailSubject?.setText(prepareReplySubject(msgInfo?.getSubject() ?: ""))
+        binding?.editTextEmailSubject?.setText(
+          prepareReplySubject(
+            args.incomingMessageInfo?.getSubject() ?: ""
+          )
+        )
       }
 
-      if (serviceInfo != null) {
+      if (args.serviceInfo != null) {
         updateViewsFromServiceInfo()
       }
     }
@@ -1200,18 +1201,20 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   }
 
   private fun updateViewsFromServiceInfo() {
-    binding?.editTextRecipientTo?.isFocusable = serviceInfo?.isToFieldEditable ?: false
-    binding?.editTextRecipientTo?.isFocusableInTouchMode = serviceInfo?.isToFieldEditable ?: false
+    binding?.editTextRecipientTo?.isFocusable = args.serviceInfo?.isToFieldEditable ?: false
+    binding?.editTextRecipientTo?.isFocusableInTouchMode =
+      args.serviceInfo?.isToFieldEditable ?: false
     //todo-denbond7 Need to add a similar option for editTextRecipientCc and editTextRecipientBcc
 
-    binding?.editTextEmailSubject?.isFocusable = serviceInfo?.isSubjectEditable ?: false
-    binding?.editTextEmailSubject?.isFocusableInTouchMode = serviceInfo?.isSubjectEditable ?: false
+    binding?.editTextEmailSubject?.isFocusable = args.serviceInfo?.isSubjectEditable ?: false
+    binding?.editTextEmailSubject?.isFocusableInTouchMode =
+      args.serviceInfo?.isSubjectEditable ?: false
 
-    binding?.editTextEmailMessage?.isFocusable = serviceInfo?.isMsgEditable ?: false
-    binding?.editTextEmailMessage?.isFocusableInTouchMode = serviceInfo?.isMsgEditable ?: false
+    binding?.editTextEmailMessage?.isFocusable = args.serviceInfo?.isMsgEditable ?: false
+    binding?.editTextEmailMessage?.isFocusableInTouchMode = args.serviceInfo?.isMsgEditable ?: false
 
-    if (serviceInfo?.systemMsg?.isNotEmpty() == true) {
-      binding?.editTextEmailMessage?.setText(serviceInfo?.systemMsg)
+    if (args.serviceInfo?.systemMsg?.isNotEmpty() == true) {
+      binding?.editTextEmailMessage?.setText(args.serviceInfo?.systemMsg)
     }
   }
 
@@ -1234,7 +1237,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   }
 
   private fun updateViewsIfFwdMode() {
-    val originalMsgInfo = msgInfo ?: return
+    val originalMsgInfo = args.incomingMessageInfo ?: return
 
     if (!CollectionUtils.isEmpty(originalMsgInfo.atts)) {
       for (att in originalMsgInfo.atts!!) {
@@ -1274,27 +1277,28 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private fun updateViewsIfReplyAllMode() {
     when (folderType) {
       FoldersManager.FolderType.SENT, FoldersManager.FolderType.OUTBOX -> {
-        binding?.editTextRecipientTo?.setText(prepareRecipients(msgInfo?.getTo()))
+        binding?.editTextRecipientTo?.setText(prepareRecipients(args.incomingMessageInfo?.getTo()))
 
-        if (msgInfo?.getCc()?.isNotEmpty() == true) {
+        if (args.incomingMessageInfo?.getCc()?.isNotEmpty() == true) {
           binding?.layoutCc?.visibility = View.VISIBLE
-          binding?.editTextRecipientCc?.append(prepareRecipients(msgInfo?.getCc()))
+          binding?.editTextRecipientCc?.append(prepareRecipients(args.incomingMessageInfo?.getCc()))
         }
       }
 
       else -> {
-        val toRecipients = if (msgInfo?.getReplyToWithoutOwnerAddress().isNullOrEmpty()) {
-          msgInfo?.getTo() ?: emptyList()
-        } else {
-          msgInfo?.getReplyToWithoutOwnerAddress() ?: emptyList()
-        }
+        val toRecipients =
+          if (args.incomingMessageInfo?.getReplyToWithoutOwnerAddress().isNullOrEmpty()) {
+            args.incomingMessageInfo?.getTo() ?: emptyList()
+          } else {
+            args.incomingMessageInfo?.getReplyToWithoutOwnerAddress() ?: emptyList()
+          }
 
         binding?.editTextRecipientTo?.setText(prepareRecipients(toRecipients))
 
         val ccSet = HashSet<InternetAddress>()
 
-        if (msgInfo?.getTo()?.isNotEmpty() == true) {
-          for (address in msgInfo?.getTo() ?: emptyList()) {
+        if (args.incomingMessageInfo?.getTo()?.isNotEmpty() == true) {
+          for (address in args.incomingMessageInfo?.getTo() ?: emptyList()) {
             if (!account?.email.equals(address.address, ignoreCase = true)) {
               ccSet.add(address)
             }
@@ -1315,8 +1319,8 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
         ccSet.removeAll(toRecipients.toSet())
 
-        if (msgInfo?.getCc()?.isNotEmpty() == true) {
-          for (address in msgInfo?.getCc() ?: emptyList()) {
+        if (args.incomingMessageInfo?.getCc()?.isNotEmpty() == true) {
+          for (address in args.incomingMessageInfo?.getCc() ?: emptyList()) {
             if (!account?.email.equals(address.address, ignoreCase = true)) {
               ccSet.add(address)
             }
@@ -1324,7 +1328,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         }
 
         //here we remove the owner address
-        val fromAddress = msgInfo?.msgEntity?.email
+        val fromAddress = args.incomingMessageInfo?.msgEntity?.email
         val finalCcSet = ccSet.filter { fromAddress?.equals(it.address, true) != true }
 
         if (finalCcSet.isNotEmpty()) {
@@ -1347,15 +1351,15 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     when (folderType) {
       FoldersManager.FolderType.SENT,
       FoldersManager.FolderType.OUTBOX -> {
-        binding?.editTextRecipientTo?.setText(prepareRecipients(msgInfo?.getTo()))
+        binding?.editTextRecipientTo?.setText(prepareRecipients(args.incomingMessageInfo?.getTo()))
       }
 
       else -> binding?.editTextRecipientTo?.setText(
         prepareRecipients(
-          if (msgInfo?.getReplyToWithoutOwnerAddress().isNullOrEmpty()) {
-            msgInfo?.getTo()
+          if (args.incomingMessageInfo?.getReplyToWithoutOwnerAddress().isNullOrEmpty()) {
+            args.incomingMessageInfo?.getTo()
           } else {
-            msgInfo?.getReplyToWithoutOwnerAddress()
+            args.incomingMessageInfo?.getReplyToWithoutOwnerAddress()
           }
         )
       )
@@ -1506,7 +1510,15 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    */
   private fun sendMsg() {
     dismissCurrentSnackBar()
-    onMsgSendListener.sendMsg(getOutgoingMsgInfo())
+    val outgoingMessageInfo = getOutgoingMsgInfo()
+    PrepareOutgoingMessagesJobIntentService.enqueueWork(requireContext(), outgoingMessageInfo)
+    toast(
+      if (GeneralUtil.isConnected(requireContext()))
+        R.string.sending
+      else
+        R.string.no_conn_msg_sent_later
+    )
+    activity?.finish()
   }
 
   /**
@@ -1575,7 +1587,6 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
   private fun setupAccountAliasesViewModel() {
     accountAliasesViewModel.fetchUpdates(viewLifecycleOwner)
-    hostActivity?.countingIdlingResource?.incrementSafely()
     accountAliasesViewModel.accountAliasesLiveData.observe(viewLifecycleOwner, {
       val aliases = ArrayList<String>()
       accountAliasesViewModel.activeAccountLiveData.value?.let { accountEntity ->
@@ -1591,14 +1602,14 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
       updateFromAddressAdapter(KeysStorageImpl.getInstance(requireContext()).getPGPSecretKeyRings())
 
-      if (msgInfo != null) {
+      if (args.incomingMessageInfo != null) {
         prepareAliasForReplyIfNeeded(aliases)
-      } else if (listener.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
+      } else if (composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
         showFirstMatchedAliasWithPrvKey(aliases)
       }
 
-      if (serviceInfo != null) {
-        serviceInfo?.let { serviceInfo ->
+      if (args.serviceInfo != null) {
+        args.serviceInfo?.let { serviceInfo ->
           if (serviceInfo.isFromFieldEditable) {
             binding?.imageButtonAliases?.visibility = View.VISIBLE
           } else {
@@ -1648,7 +1659,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     recipientsViewModel.recipientsToLiveData.observe(viewLifecycleOwner, {
       when (it.status) {
         Result.Status.LOADING -> {
-          hostActivity?.countingIdlingResource?.incrementSafely()
+          baseActivity.countingIdlingResource.incrementSafely()
           recipientWithPubKeysTo?.clear()
           binding?.progressBarTo?.visible()
           isUpdateToCompleted = false
@@ -1662,14 +1673,14 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           if (recipientWithPubKeysTo?.isNotEmpty() == true) {
             updateChips(binding?.editTextRecipientTo, recipientWithPubKeysTo)
           }
-          hostActivity?.countingIdlingResource?.decrementSafely()
+          baseActivity.countingIdlingResource.decrementSafely()
         }
 
         Result.Status.ERROR, Result.Status.EXCEPTION -> {
           isUpdateToCompleted = true
           binding?.progressBarTo?.invisible()
           showInfoSnackbar(view, it.exception?.message ?: getString(R.string.unknown_error))
-          hostActivity?.countingIdlingResource?.decrementSafely()
+          baseActivity.countingIdlingResource.decrementSafely()
         }
       }
     })
@@ -1679,7 +1690,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     recipientsViewModel.recipientsCcLiveData.observe(viewLifecycleOwner, {
       when (it.status) {
         Result.Status.LOADING -> {
-          hostActivity?.countingIdlingResource?.incrementSafely()
+          baseActivity.countingIdlingResource.incrementSafely()
           recipientWithPubKeysCc?.clear()
           binding?.progressBarCc?.visible()
           isUpdateCcCompleted = false
@@ -1693,14 +1704,14 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           if (recipientWithPubKeysCc?.isNotEmpty() == true) {
             updateChips(binding?.editTextRecipientCc, recipientWithPubKeysCc)
           }
-          hostActivity?.countingIdlingResource?.decrementSafely()
+          baseActivity.countingIdlingResource.decrementSafely()
         }
 
         Result.Status.ERROR, Result.Status.EXCEPTION -> {
           isUpdateCcCompleted = true
           binding?.progressBarCc?.invisible()
           showInfoSnackbar(view, it.exception?.message ?: getString(R.string.unknown_error))
-          hostActivity?.countingIdlingResource?.decrementSafely()
+          baseActivity.countingIdlingResource.decrementSafely()
         }
       }
     })
@@ -1710,7 +1721,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     recipientsViewModel.recipientsBccLiveData.observe(viewLifecycleOwner, {
       when (it.status) {
         Result.Status.LOADING -> {
-          hostActivity?.countingIdlingResource?.incrementSafely()
+          baseActivity.countingIdlingResource.incrementSafely()
           recipientWithPubKeysBcc?.clear()
           binding?.progressBarBcc?.visible()
           isUpdateBccCompleted = false
@@ -1724,14 +1735,14 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           if (recipientWithPubKeysBcc?.isNotEmpty() == true) {
             updateChips(binding?.editTextRecipientBcc, recipientWithPubKeysBcc)
           }
-          hostActivity?.countingIdlingResource?.decrementSafely()
+          baseActivity.countingIdlingResource.decrementSafely()
         }
 
         Result.Status.ERROR, Result.Status.EXCEPTION -> {
           isUpdateBccCompleted = true
           binding?.progressBarBcc?.invisible()
           showInfoSnackbar(view, it.exception?.message ?: getString(R.string.unknown_error))
-          hostActivity?.countingIdlingResource?.decrementSafely()
+          baseActivity.countingIdlingResource.decrementSafely()
         }
       }
     })
@@ -1780,11 +1791,43 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     }
   }
 
-  /**
-   * This interface will be used when we send a message.
-   */
-  interface OnMessageSendListener {
-    fun sendMsg(outgoingMsgInfo: OutgoingMessageInfo)
+  private fun setupComposeMsgViewModel() {
+    lifecycleScope.launchWhenStarted {
+      composeMsgViewModel.messageEncryptionTypeStateFlow.collect {
+        when (it) {
+          MessageEncryptionType.ENCRYPTED -> {
+            appBarLayout?.setBackgroundColor(
+              UIUtil.getColor(requireContext(), R.color.colorPrimary)
+            )
+            appBarLayout?.removeView(nonEncryptedHintView)
+          }
+
+          MessageEncryptionType.STANDARD -> {
+            appBarLayout?.setBackgroundColor(UIUtil.getColor(requireContext(), R.color.red))
+            appBarLayout?.addView(nonEncryptedHintView)
+          }
+        }
+
+        activity?.invalidateOptionsMenu()
+        onMsgEncryptionTypeChange(it)
+      }
+    }
+  }
+
+  private fun initNonEncryptedHintView() {
+    nonEncryptedHintView =
+      layoutInflater.inflate(R.layout.under_toolbar_line_with_text, appBarLayout, false)
+    val textView = nonEncryptedHintView?.findViewById<TextView>(R.id.underToolbarTextTextView)
+    textView?.setText(R.string.this_message_will_not_be_encrypted)
+  }
+
+  private fun updateActionBarTitle() {
+    when (args.messageType) {
+      MessageType.NEW -> supportActionBar?.setTitle(R.string.compose)
+      MessageType.REPLY -> supportActionBar?.setTitle(R.string.reply)
+      MessageType.REPLY_ALL -> supportActionBar?.setTitle(R.string.reply_all)
+      MessageType.FORWARD -> supportActionBar?.setTitle(R.string.forward)
+    }
   }
 
   companion object {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BaseFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BaseFragment.kt
index 81d23681f1..aaec4a2294 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BaseFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BaseFragment.kt
@@ -26,6 +26,7 @@ import com.flowcrypt.email.model.results.LoaderResult
 import com.flowcrypt.email.ui.activity.base.BaseActivity
 import com.flowcrypt.email.ui.notifications.ErrorNotificationManager
 import com.flowcrypt.email.util.UIUtil
+import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.snackbar.Snackbar
 
 /**
@@ -69,6 +70,13 @@ abstract class BaseFragment : Fragment() {
     } else
       null
 
+  val appBarLayout: AppBarLayout?
+    get() = if (activity is BaseActivity) {
+      (activity as BaseActivity).appBarLayout
+    } else {
+      activity?.findViewById(R.id.appBarLayout)
+    }
+
   val baseActivity: BaseActivity
     get() = activity as BaseActivity
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/listeners/OnChangeMessageEncryptionTypeListener.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/listeners/OnChangeMessageEncryptionTypeListener.kt
deleted file mode 100644
index 0061a90a44..0000000000
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/listeners/OnChangeMessageEncryptionTypeListener.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: DenBond7
- */
-
-package com.flowcrypt.email.ui.activity.listeners
-
-import com.flowcrypt.email.model.MessageEncryptionType
-
-/**
- * This interface can be used when need to notify if [MessageEncryptionType] was changed.
- *
- * @author Denis Bondarenko
- * Date: 28.07.2017
- * Time: 15:39
- * E-mail: DenBond7@gmail.com
- */
-interface OnChangeMessageEncryptionTypeListener {
-
-  val msgEncryptionType: MessageEncryptionType
-
-  /**
-   * Handle a switch of the message encryption type.
-   *
-   * @param messageEncryptionType The new message encryption type.
-   */
-  fun onMsgEncryptionTypeChanged(messageEncryptionType: MessageEncryptionType)
-}
diff --git a/FlowCrypt/src/main/res/layout/activity_create_message.xml b/FlowCrypt/src/main/res/layout/activity_create_message.xml
index 152e112ecf..f55dc7a1a0 100644
--- a/FlowCrypt/src/main/res/layout/activity_create_message.xml
+++ b/FlowCrypt/src/main/res/layout/activity_create_message.xml
@@ -4,20 +4,19 @@
   -->
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/screenContent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.flowcrypt.email.ui.activity.CreateMessageActivity">
 
     <include layout="@layout/toolbar" />
 
-    <androidx.fragment.app.FragmentContainerView xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/createMessageFragment"
-        android:name="com.flowcrypt.email.ui.activity.fragment.CreateMessageFragment"
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragmentContainerView"
+        android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:layout="@layout/fragment_create_message" />
-
+        app:defaultNavHost="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/FlowCrypt/src/main/res/menu/activity_send_message.xml b/FlowCrypt/src/main/res/menu/activity_send_message.xml
deleted file mode 100644
index 71e2bb5a20..0000000000
--- a/FlowCrypt/src/main/res/menu/activity_send_message.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
-  ~ Contributors: DenBond7
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/menuActionSwitchType"
-        android:icon="@drawable/ic_switch_white_24dp"
-        android:orderInCategory="100"
-        android:title="@string/switch_to_standard_email"
-        app:showAsAction="ifRoom" />
-</menu>
diff --git a/FlowCrypt/src/main/res/menu/fragment_compose.xml b/FlowCrypt/src/main/res/menu/fragment_compose.xml
index 5b706c5330..5cf098f649 100644
--- a/FlowCrypt/src/main/res/menu/fragment_compose.xml
+++ b/FlowCrypt/src/main/res/menu/fragment_compose.xml
@@ -31,4 +31,11 @@
         android:orderInCategory="2002"
         android:title="@string/include_public_key"
         app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/menuActionSwitchType"
+        android:icon="@drawable/ic_switch_white_24dp"
+        android:orderInCategory="100"
+        android:title="@string/switch_to_standard_email"
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/FlowCrypt/src/main/res/navigation/create_msg_graph.xml b/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
new file mode 100644
index 0000000000..51e77f2418
--- /dev/null
+++ b/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+  ~ Contributors: DenBond7
+  -->
+
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/create_msg_graph"
+    android:label="fdfdf"
+    app:startDestination="@id/createMessageFragment">
+
+    <fragment
+        android:id="@+id/createMessageFragment"
+        android:name="com.flowcrypt.email.ui.activity.fragment.CreateMessageFragment"
+        android:label="CreateMessageFragment"
+        tools:layout="@layout/fragment_create_message">
+        <argument
+            android:name="encryptedByDefault"
+            android:defaultValue="true"
+            app:argType="boolean" />
+        <argument
+            android:name="serviceInfo"
+            android:defaultValue="@null"
+            app:argType="com.flowcrypt.email.api.email.model.ServiceInfo"
+            app:nullable="true" />
+        <argument
+            android:name="incomingMessageInfo"
+            android:defaultValue="@null"
+            app:argType="com.flowcrypt.email.api.email.model.IncomingMessageInfo"
+            app:nullable="true" />
+        <argument
+            android:name="messageType"
+            app:argType="com.flowcrypt.email.model.MessageType" />
+    </fragment>
+</navigation>

From fc56ca51b9a464e877e52e0faecbc6c4f2894fe1 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Fri, 24 Dec 2021 12:42:21 +0200
Subject: [PATCH 05/24] Refactored code.| #1620

---
 ...ndardReplyWithServiceInfoAndOneFileTest.kt |  19 +-
 .../fragment/CreateMessageFragment.kt         | 482 ++++++++----------
 .../main/res/navigation/create_msg_graph.xml  |   1 -
 3 files changed, 217 insertions(+), 285 deletions(-)

diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt
index ba805a8581..595733420e 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt
@@ -5,8 +5,6 @@
 
 package com.flowcrypt.email.ui.activity
 
-import android.content.Intent
-import android.os.Parcelable
 import android.text.TextUtils
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.replaceText
@@ -88,15 +86,14 @@ class StandardReplyWithServiceInfoAndOneFileTest : BaseTest() {
 
   override val useIntents: Boolean = true
   override val activityScenarioRule = activityScenarioRule<SignInActivity>(
-    intent = Intent(getTargetContext(), CreateMessageActivity::class.java).apply {
-      putExtra(CreateMessageActivity.EXTRA_KEY_INCOMING_MESSAGE_INFO, incomingMsgInfo)
-      putExtra(CreateMessageActivity.EXTRA_KEY_MESSAGE_TYPE, MessageType.REPLY as Parcelable)
-      putExtra(
-        CreateMessageActivity.EXTRA_KEY_MESSAGE_ENCRYPTION_TYPE,
-        MessageEncryptionType.STANDARD as Parcelable
-      )
-      putExtra(CreateMessageActivity.EXTRA_KEY_SERVICE_INFO, serviceInfo)
-    })
+    intent = CreateMessageActivity.generateIntent(
+      getTargetContext(),
+      msgInfo = incomingMsgInfo,
+      messageType = MessageType.REPLY,
+      msgEncryptionType = MessageEncryptionType.STANDARD,
+      serviceInfo = serviceInfo
+    )
+  )
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index 93e4242ce8..65e2216e89 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -30,12 +30,14 @@ import android.widget.ArrayAdapter
 import android.widget.FilterQueryProvider
 import android.widget.FrameLayout
 import android.widget.ListView
+import android.widget.ProgressBar
 import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.FileProvider
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@@ -128,12 +130,12 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   }
 
   private var binding: FragmentCreateMessageBinding? = null
-  private var recipientWithPubKeysTo: MutableList<RecipientWithPubKeys>? = null
-  private var recipientWithPubKeysCc: MutableList<RecipientWithPubKeys>? = null
-  private var recipientWithPubKeysBcc: MutableList<RecipientWithPubKeys>? = null
-  private val atts: MutableList<AttachmentInfo>?
+  private var recipientWithPubKeysTo: MutableList<RecipientWithPubKeys>? = mutableListOf()
+  private var recipientWithPubKeysCc: MutableList<RecipientWithPubKeys>? = mutableListOf()
+  private var recipientWithPubKeysBcc: MutableList<RecipientWithPubKeys>? = mutableListOf()
+  private val attachments: MutableList<AttachmentInfo> = mutableListOf()
   private var folderType: FoldersManager.FolderType? = null
-  private var fromAddrs: FromAddressesAdapter<String>? = null
+  private var fromAddressesAdapter: FromAddressesAdapter<String>? = null
   private var cachedRecipientWithoutPubKeys: RecipientWithPubKeys? = null
   private var extraActionInfo: ExtraActionInfo? = null
   private var messageType = MessageType.NEW
@@ -151,163 +153,13 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override val contentView: View?
     get() = binding?.scrollView
 
-  /**
-   * Generate an outgoing message info from entered information by user.
-   *
-   * @return <tt>OutgoingMessageInfo</tt> Return a created OutgoingMessageInfo object which
-   * contains information about an outgoing message.
-   */
-  private fun getOutgoingMsgInfo(): OutgoingMessageInfo {
-    var msg = binding?.editTextEmailMessage?.text.toString()
-    if (messageType == MessageType.REPLY || messageType == MessageType.REPLY_ALL) {
-      if (binding?.iBShowQuotedText?.visibility == View.VISIBLE) {
-        msg += EmailUtil.genReplyContent(args.incomingMessageInfo)
-      }
-    }
-
-    val attachments = atts?.minus(forwardedAtts.toSet())
-    attachments?.forEachIndexed { index, attachmentInfo -> attachmentInfo.path = index.toString() }
-
-    return OutgoingMessageInfo(
-      account = accountViewModel.activeAccountLiveData.value?.email ?: "",
-      subject = binding?.editTextEmailSubject?.text.toString(),
-      msg = msg,
-      toRecipients = binding?.editTextRecipientTo?.chipValues?.map { InternetAddress(it) }
-        ?: emptyList(),
-      ccRecipients = binding?.editTextRecipientCc?.chipValues?.map { InternetAddress(it) },
-      bccRecipients = binding?.editTextRecipientBcc?.chipValues?.map { InternetAddress(it) },
-      from = binding?.editTextFrom?.text.toString(),
-      atts = attachments,
-      forwardedAtts = forwardedAtts,
-      encryptionType = composeMsgViewModel.msgEncryptionType,
-      messageType = messageType,
-      replyToMsgEntity = args.incomingMessageInfo?.msgEntity,
-      uid = EmailUtil.genOutboxUID(context)
-    )
-  }
-
-  /**
-   * Do a lot of checks to validate an outgoing message info.
-   *
-   * @return <tt>Boolean</tt> true if all information is correct, false otherwise.
-   */
-  private val isDataCorrect: Boolean
-    get() {
-      binding?.editTextRecipientTo?.chipifyAllUnterminatedTokens()
-      binding?.editTextRecipientCc?.chipifyAllUnterminatedTokens()
-      binding?.editTextRecipientBcc?.chipifyAllUnterminatedTokens()
-      if (fromAddrs?.isEnabled(
-          binding?.spinnerFrom?.selectedItemPosition ?: Spinner.INVALID_POSITION
-        ) == false
-      ) {
-        showInfoSnackbar(binding?.editTextRecipientTo, getString(R.string.no_key_available))
-        return false
-      }
-      if (binding?.editTextRecipientTo?.text?.isEmpty() == true) {
-        showInfoSnackbar(
-          binding?.editTextRecipientTo, getString(
-            R.string.text_must_not_be_empty,
-            getString(R.string.prompt_recipients_to)
-          )
-        )
-        binding?.editTextRecipientTo?.requestFocus()
-        return false
-      }
-      if (hasInvalidEmail(
-          binding?.editTextRecipientTo,
-          binding?.editTextRecipientCc,
-          binding?.editTextRecipientBcc
-        )
-      ) {
-        return false
-      }
-      if (composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
-        if (binding?.editTextRecipientTo?.text?.isNotEmpty() == true
-          && recipientWithPubKeysTo?.isEmpty() == true
-        ) {
-          fetchDetailsAboutRecipients(RecipientEntity.Type.TO)
-          return false
-        }
-        if (binding?.editTextRecipientCc?.text?.isNotEmpty() == true
-          && recipientWithPubKeysCc?.isEmpty() == true
-        ) {
-          fetchDetailsAboutRecipients(RecipientEntity.Type.CC)
-          return false
-        }
-        if (binding?.editTextRecipientBcc?.text?.isNotEmpty() == true
-          && recipientWithPubKeysBcc?.isEmpty() == true
-        ) {
-          fetchDetailsAboutRecipients(RecipientEntity.Type.BCC)
-          return false
-        }
-        if (hasUnusableRecipient(
-            recipientWithPubKeysTo,
-            recipientWithPubKeysCc,
-            recipientWithPubKeysBcc
-          )
-        ) {
-          return false
-        }
-      }
-      if (binding?.editTextEmailSubject?.text?.isEmpty() == true) {
-        showInfoSnackbar(
-          binding?.editTextEmailSubject, getString(
-            R.string.text_must_not_be_empty,
-            getString(R.string.prompt_subject)
-          )
-        )
-        binding?.editTextEmailSubject?.requestFocus()
-        return false
-      }
-      if (atts?.isEmpty() == true && binding?.editTextEmailMessage?.text?.isEmpty() == true) {
-        showInfoSnackbar(
-          binding?.editTextEmailMessage,
-          getString(R.string.sending_message_must_not_be_empty)
-        )
-        binding?.editTextEmailMessage?.requestFocus()
-        return false
-      }
-      if (atts?.isEmpty() == true || !hasExternalStorageUris(this.atts)) {
-        return true
-      }
-      return false
-    }
-
-
-  /**
-   * Generate a forwarded attachments list.
-   *
-   * @return The generated list.
-   */
-  private val forwardedAtts: MutableList<AttachmentInfo>
-    get() {
-      val atts = mutableListOf<AttachmentInfo>()
-
-      this.atts?.let {
-        for (att in it) {
-          if (att.id != null && att.isForwarded) {
-            atts.add(att)
-          }
-        }
-      }
-
-      return atts
-    }
-
-  init {
-    recipientWithPubKeysTo = mutableListOf()
-    recipientWithPubKeysCc = mutableListOf()
-    recipientWithPubKeysBcc = mutableListOf()
-    atts = ArrayList()
-  }
-
   override fun onAttach(context: Context) {
     super.onAttach(context)
-    fromAddrs = FromAddressesAdapter(
+    fromAddressesAdapter = FromAddressesAdapter(
       context, android.R.layout.simple_list_item_1, android.R.id.text1, ArrayList()
     )
-    fromAddrs?.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-    fromAddrs?.setUseKeysInfo(composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED)
+    fromAddressesAdapter?.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+    fromAddressesAdapter?.setUseKeysInfo(composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED)
 
     initDraftCacheDir(context)
   }
@@ -344,12 +196,10 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override fun onDestroy() {
     super.onDestroy()
     if (!isMsgSentToQueue) {
-      atts?.let {
-        for (att in it) {
-          att.uri?.let { uri ->
-            if (Constants.FILE_PROVIDER_AUTHORITY.equals(uri.authority, ignoreCase = true)) {
-              context?.contentResolver?.delete(uri, null, null)
-            }
+      for (att in attachments) {
+        att.uri?.let { uri ->
+          if (Constants.FILE_PROVIDER_AUTHORITY.equals(uri.authority, ignoreCase = true)) {
+            context?.contentResolver?.delete(uri, null, null)
           }
         }
       }
@@ -461,8 +311,8 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
               data.getParcelableArrayListExtra(ChoosePublicKeyDialogFragment.KEY_ATTACHMENT_INFO_LIST)
                 ?: return
             val key = keyList.first()
-            if (atts?.none { it.name == key.name && it.encodedSize == key.encodedSize } == true) {
-              atts.add(key)
+            if (attachments.none { it.name == key.name && it.encodedSize == key.encodedSize }) {
+              attachments.add(key)
               showAtts()
             }
           }
@@ -510,7 +360,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
         if (isUpdateToCompleted && isUpdateCcCompleted && isUpdateBccCompleted) {
           UIUtil.hideSoftInput(context, view)
-          if (isDataCorrect) {
+          if (isDataCorrect()) {
             if (composeMsgViewModel.msgEncryptionType == MessageEncryptionType.ENCRYPTED) {
               val keysStorage = KeysStorageImpl.getInstance(requireContext())
               val senderEmail = binding?.editTextFrom?.text.toString()
@@ -653,7 +503,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
   override fun onClick(v: View) {
     when (v.id) {
-      R.id.imageButtonAliases -> if (fromAddrs?.count != 1 && fromAddrs?.count != 0) {
+      R.id.imageButtonAliases -> if (fromAddressesAdapter?.count != 1 && fromAddressesAdapter?.count != 0) {
         binding?.spinnerFrom?.performClick()
       }
 
@@ -688,8 +538,8 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override fun onAccountInfoRefreshed(accountEntity: AccountEntity?) {
     super.onAccountInfoRefreshed(accountEntity)
     accountEntity?.email?.let { email ->
-      if (fromAddrs?.objects?.contains(email) == false) {
-        fromAddrs?.add(email)
+      if (fromAddressesAdapter?.objects?.contains(email) == false) {
+        fromAddressesAdapter?.add(email)
       }
     }
   }
@@ -712,14 +562,14 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
             binding?.editTextRecipientBcc,
             false
           )
-          fromAddrs?.setUseKeysInfo(true)
+          fromAddressesAdapter?.setUseKeysInfo(true)
 
           val colorGray = UIUtil.getColor(requireContext(), R.color.gray)
           val selectedItemPosition = binding?.spinnerFrom?.selectedItemPosition
           if (selectedItemPosition != null && selectedItemPosition != AdapterView.INVALID_POSITION
             && binding?.spinnerFrom?.adapter?.count ?: 0 > selectedItemPosition
           ) {
-            val isItemEnabled = fromAddrs?.isEnabled(selectedItemPosition) ?: true
+            val isItemEnabled = fromAddressesAdapter?.isEnabled(selectedItemPosition) ?: true
             binding?.editTextFrom?.setTextColor(if (isItemEnabled) originalColor else colorGray)
           }
         }
@@ -732,7 +582,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           isUpdateToCompleted = true
           isUpdateCcCompleted = true
           isUpdateBccCompleted = true
-          fromAddrs?.setUseKeysInfo(false)
+          fromAddressesAdapter?.setUseKeysInfo(false)
           binding?.editTextFrom?.setTextColor(originalColor)
         }
       }
@@ -761,7 +611,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           this.folderType = FoldersManager.getFolderType(it)
         }
 
-        this.args.serviceInfo?.atts?.let { atts?.addAll(it) }
+        this.args.serviceInfo?.atts?.let { attachments.addAll(it) }
       }
     }
   }
@@ -816,7 +666,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
               draftAtt
             )
             attachmentInfo.uri = uri
-            atts?.add(attachmentInfo)
+            attachments.add(attachmentInfo)
           }
         } catch (e: IOException) {
           e.printStackTrace()
@@ -937,7 +787,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           for (alias in aliases) {
             if (alias.equals(toAddress.address, ignoreCase = true)) {
               firstFoundedAlias = if (messageEncryptionType === MessageEncryptionType.ENCRYPTED
-                && fromAddrs?.hasPrvKey(alias) == true
+                && fromAddressesAdapter?.hasPrvKey(alias) == true
               ) {
                 alias
               } else {
@@ -952,7 +802,8 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       }
 
       if (firstFoundedAlias != null) {
-        val position = fromAddrs?.getPosition(firstFoundedAlias) ?: Spinner.INVALID_POSITION
+        val position =
+          fromAddressesAdapter?.getPosition(firstFoundedAlias) ?: Spinner.INVALID_POSITION
         if (position != Spinner.INVALID_POSITION) {
           binding?.spinnerFrom?.setSelection(position)
         }
@@ -963,14 +814,15 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private fun showFirstMatchedAliasWithPrvKey(aliases: List<String>) {
     var firstFoundedAliasWithPrvKey: String? = null
     for (alias in aliases) {
-      if (fromAddrs?.hasPrvKey(alias) == true) {
+      if (fromAddressesAdapter?.hasPrvKey(alias) == true) {
         firstFoundedAliasWithPrvKey = alias
         break
       }
     }
 
     if (firstFoundedAliasWithPrvKey != null) {
-      val position = fromAddrs?.getPosition(firstFoundedAliasWithPrvKey) ?: Spinner.INVALID_POSITION
+      val position =
+        fromAddressesAdapter?.getPosition(firstFoundedAliasWithPrvKey) ?: Spinner.INVALID_POSITION
       if (position != Spinner.INVALID_POSITION) {
         binding?.spinnerFrom?.setSelection(position)
       }
@@ -985,7 +837,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       sublist?.let {
         for (recipientWithPubKeys in it) {
           if (!recipientWithPubKeys.hasAtLeastOnePubKey()) {
-            showNoPgpFoundDialog(recipientWithPubKeys, true)
+            showNoPgpFoundDialog(recipientWithPubKeys)
             return true
           }
 
@@ -1118,7 +970,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     initChipsView(binding?.editTextRecipientBcc)
 
     binding?.spinnerFrom?.onItemSelectedListener = this
-    binding?.spinnerFrom?.adapter = fromAddrs
+    binding?.spinnerFrom?.adapter = fromAddressesAdapter
 
     originalColor = requireNotNull(binding?.editTextFrom?.currentTextColor)
 
@@ -1242,7 +1094,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     if (!CollectionUtils.isEmpty(originalMsgInfo.atts)) {
       for (att in originalMsgInfo.atts!!) {
         if (hasAbilityToAddAtt(att)) {
-          atts?.add(att)
+          attachments.add(att)
         } else {
           showInfoSnackbar(
             requireView(), getString(
@@ -1484,7 +1336,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    * @return true if the attachment can be added, otherwise false.
    */
   private fun hasAbilityToAddAtt(newAttInfo: AttachmentInfo?): Boolean {
-    val existedAttsSize = (atts?.map { it.encodedSize.toInt() }?.sum() ?: 0)
+    val existedAttsSize = (attachments.map { it.encodedSize.toInt() }.sum())
     val newAttSize = newAttInfo?.encodedSize?.toInt() ?: 0
     return (existedAttsSize + newAttSize) < Constants.MAX_TOTAL_ATTACHMENT_SIZE_IN_BYTES
   }
@@ -1493,14 +1345,10 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   /**
    * Show a dialog where we can select different actions.
    *
-   * @param recipient            The [RecipientWithPubKeys] which will be used when we select the remove action.
-   * @param isRemoveActionEnabled true if we want to show the remove action, false otherwise.
+   * @param recipient The [RecipientWithPubKeys] which will be used when we select the remove action.
    */
-  private fun showNoPgpFoundDialog(
-    recipient: RecipientWithPubKeys,
-    isRemoveActionEnabled: Boolean
-  ) {
-    val dialogFragment = NoPgpFoundDialogFragment.newInstance(recipient, isRemoveActionEnabled)
+  private fun showNoPgpFoundDialog(recipient: RecipientWithPubKeys) {
+    val dialogFragment = NoPgpFoundDialogFragment.newInstance(recipient, true)
     dialogFragment.setTargetFragment(this, REQUEST_CODE_NO_PGP_FOUND_DIALOG)
     dialogFragment.show(parentFragmentManager, NoPgpFoundDialogFragment::class.java.simpleName)
   }
@@ -1525,10 +1373,10 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    * Show attachments which were added.
    */
   private fun showAtts() {
-    if (atts?.isNotEmpty() == true) {
+    if (attachments.isNotEmpty()) {
       binding?.layoutAtts?.removeAllViews()
       val layoutInflater = LayoutInflater.from(context)
-      for (att in atts) {
+      for (att in attachments) {
         val rootView = layoutInflater.inflate(R.layout.attachment_item, binding?.layoutAtts, false)
 
         val textViewAttName = rootView.findViewById<TextView>(R.id.textViewAttachmentName)
@@ -1549,7 +1397,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           val imageButtonClearAtt = rootView.findViewById<View>(R.id.imageButtonClearAtt)
           imageButtonClearAtt.visibility = View.VISIBLE
           imageButtonClearAtt.setOnClickListener {
-            atts.remove(att)
+            attachments.remove(att)
             binding?.layoutAtts?.removeView(rootView)
 
             //Remove a temp file which was created by our app
@@ -1597,8 +1445,8 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         aliases.add(accountAlias.sendAsEmail)
       }
 
-      fromAddrs?.clear()
-      fromAddrs?.addAll(aliases)
+      fromAddressesAdapter?.clear()
+      fromAddressesAdapter?.addAll(aliases)
 
       updateFromAddressAdapter(KeysStorageImpl.getInstance(requireContext()).getPGPSecretKeyRings())
 
@@ -1617,7 +1465,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           }
         }
       } else {
-        fromAddrs?.count?.let { count: Int ->
+        fromAddressesAdapter?.count?.let { count: Int ->
           if (count in 0..1) {
             if (binding?.imageButtonAliases?.visibility == View.VISIBLE) {
               binding?.imageButtonAliases?.visibility = View.INVISIBLE
@@ -1642,7 +1490,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       .flatten()
       .map { mimeAddress -> mimeAddress.address }
 
-    fromAddrs?.let { adapter ->
+    fromAddressesAdapter?.let { adapter ->
       for (email in adapter.objects) {
         adapter.updateKeyAvailability(email, setOfUsers.contains(email))
       }
@@ -1650,100 +1498,69 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   }
 
   private fun setupRecipientsViewModel() {
-    handleUpdatingToRecipients()
-    handleUpdatingCcRecipients()
-    handleUpdatingBccRecipients()
-  }
-
-  private fun handleUpdatingToRecipients() {
-    recipientsViewModel.recipientsToLiveData.observe(viewLifecycleOwner, {
-      when (it.status) {
-        Result.Status.LOADING -> {
-          baseActivity.countingIdlingResource.incrementSafely()
-          recipientWithPubKeysTo?.clear()
-          binding?.progressBarTo?.visible()
-          isUpdateToCompleted = false
-        }
-
-        Result.Status.SUCCESS -> {
-          isUpdateToCompleted = true
-          binding?.progressBarTo?.invisible()
+    handleUpdatingRecipients(
+      recipientsViewModel.recipientsToLiveData,
+      recipientWithPubKeysTo,
+      binding?.progressBarTo,
+      binding?.editTextRecipientTo
+    ) {
+      isUpdateToCompleted = it
+    }
 
-          recipientWithPubKeysTo = it.data?.toMutableList()
-          if (recipientWithPubKeysTo?.isNotEmpty() == true) {
-            updateChips(binding?.editTextRecipientTo, recipientWithPubKeysTo)
-          }
-          baseActivity.countingIdlingResource.decrementSafely()
-        }
+    handleUpdatingRecipients(
+      recipientsViewModel.recipientsCcLiveData,
+      recipientWithPubKeysCc,
+      binding?.progressBarCc,
+      binding?.editTextRecipientCc
+    ) {
+      isUpdateCcCompleted = it
+    }
 
-        Result.Status.ERROR, Result.Status.EXCEPTION -> {
-          isUpdateToCompleted = true
-          binding?.progressBarTo?.invisible()
-          showInfoSnackbar(view, it.exception?.message ?: getString(R.string.unknown_error))
-          baseActivity.countingIdlingResource.decrementSafely()
-        }
-      }
-    })
+    handleUpdatingRecipients(
+      recipientsViewModel.recipientsBccLiveData,
+      recipientWithPubKeysBcc,
+      binding?.progressBarBcc,
+      binding?.editTextRecipientBcc
+    ) {
+      isUpdateBccCompleted = it
+    }
   }
 
-  private fun handleUpdatingCcRecipients() {
-    recipientsViewModel.recipientsCcLiveData.observe(viewLifecycleOwner, {
+  private fun handleUpdatingRecipients(
+    liveData: LiveData<Result<List<RecipientWithPubKeys>>>,
+    recipientWithPubKeys: MutableList<RecipientWithPubKeys>?,
+    progressBar: ProgressBar?,
+    nachoTextView: PgpContactsNachoTextView?,
+    updateState: (state: Boolean) -> Unit
+  ) {
+    liveData.observe(viewLifecycleOwner, {
       when (it.status) {
         Result.Status.LOADING -> {
+          updateState.invoke(false)
           baseActivity.countingIdlingResource.incrementSafely()
-          recipientWithPubKeysCc?.clear()
-          binding?.progressBarCc?.visible()
-          isUpdateCcCompleted = false
+          recipientWithPubKeys?.clear()
+          progressBar?.visible()
         }
 
         Result.Status.SUCCESS -> {
-          isUpdateCcCompleted = true
-          binding?.progressBarCc?.invisible()
-          recipientWithPubKeysCc = it.data?.toMutableList()
-
-          if (recipientWithPubKeysCc?.isNotEmpty() == true) {
-            updateChips(binding?.editTextRecipientCc, recipientWithPubKeysCc)
+          updateState.invoke(true)
+          progressBar?.invisible()
+          recipientWithPubKeys?.clear()
+          it.data?.let { list -> recipientWithPubKeys?.addAll(list) }
+          if (recipientWithPubKeys?.isNotEmpty() == true) {
+            updateChips(nachoTextView, recipientWithPubKeys)
           }
           baseActivity.countingIdlingResource.decrementSafely()
         }
 
         Result.Status.ERROR, Result.Status.EXCEPTION -> {
-          isUpdateCcCompleted = true
-          binding?.progressBarCc?.invisible()
+          updateState.invoke(true)
+          progressBar?.invisible()
           showInfoSnackbar(view, it.exception?.message ?: getString(R.string.unknown_error))
           baseActivity.countingIdlingResource.decrementSafely()
         }
-      }
-    })
-  }
 
-  private fun handleUpdatingBccRecipients() {
-    recipientsViewModel.recipientsBccLiveData.observe(viewLifecycleOwner, {
-      when (it.status) {
-        Result.Status.LOADING -> {
-          baseActivity.countingIdlingResource.incrementSafely()
-          recipientWithPubKeysBcc?.clear()
-          binding?.progressBarBcc?.visible()
-          isUpdateBccCompleted = false
-        }
-
-        Result.Status.SUCCESS -> {
-          isUpdateBccCompleted = true
-          binding?.progressBarBcc?.invisible()
-          recipientWithPubKeysBcc = it.data?.toMutableList()
-
-          if (recipientWithPubKeysBcc?.isNotEmpty() == true) {
-            updateChips(binding?.editTextRecipientBcc, recipientWithPubKeysBcc)
-          }
-          baseActivity.countingIdlingResource.decrementSafely()
-        }
-
-        Result.Status.ERROR, Result.Status.EXCEPTION -> {
-          isUpdateBccCompleted = true
-          binding?.progressBarBcc?.invisible()
-          showInfoSnackbar(view, it.exception?.message ?: getString(R.string.unknown_error))
-          baseActivity.countingIdlingResource.decrementSafely()
-        }
+        Result.Status.NONE -> {}
       }
     })
   }
@@ -1775,7 +1592,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
           showInfoSnackbar(view, getString(R.string.can_not_attach_this_file), Snackbar.LENGTH_LONG)
           return
         }
-        attachmentInfo?.let { atts?.add(it) }
+        attachmentInfo?.let { attachments.add(it) }
         showAtts()
       } else {
         showInfoSnackbar(
@@ -1830,6 +1647,125 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     }
   }
 
+  /**
+   * Do a lot of checks to validate an outgoing message info.
+   *
+   * @return true if all information is correct, false otherwise.
+   */
+  private fun isDataCorrect(): Boolean {
+    binding?.editTextRecipientTo?.chipifyAllUnterminatedTokens()
+    binding?.editTextRecipientCc?.chipifyAllUnterminatedTokens()
+    binding?.editTextRecipientBcc?.chipifyAllUnterminatedTokens()
+    if (fromAddressesAdapter?.isEnabled(
+        binding?.spinnerFrom?.selectedItemPosition ?: Spinner.INVALID_POSITION
+      ) == false
+    ) {
+      showInfoSnackbar(binding?.editTextRecipientTo, getString(R.string.no_key_available))
+      return false
+    }
+    if (binding?.editTextRecipientTo?.text?.isEmpty() == true) {
+      showInfoSnackbar(
+        binding?.editTextRecipientTo, getString(
+          R.string.text_must_not_be_empty,
+          getString(R.string.prompt_recipients_to)
+        )
+      )
+      binding?.editTextRecipientTo?.requestFocus()
+      return false
+    }
+    if (hasInvalidEmail(
+        binding?.editTextRecipientTo,
+        binding?.editTextRecipientCc,
+        binding?.editTextRecipientBcc
+      )
+    ) {
+      return false
+    }
+    if (composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
+      if (binding?.editTextRecipientTo?.text?.isNotEmpty() == true
+        && recipientWithPubKeysTo?.isEmpty() == true
+      ) {
+        fetchDetailsAboutRecipients(RecipientEntity.Type.TO)
+        return false
+      }
+      if (binding?.editTextRecipientCc?.text?.isNotEmpty() == true
+        && recipientWithPubKeysCc?.isEmpty() == true
+      ) {
+        fetchDetailsAboutRecipients(RecipientEntity.Type.CC)
+        return false
+      }
+      if (binding?.editTextRecipientBcc?.text?.isNotEmpty() == true
+        && recipientWithPubKeysBcc?.isEmpty() == true
+      ) {
+        fetchDetailsAboutRecipients(RecipientEntity.Type.BCC)
+        return false
+      }
+      if (hasUnusableRecipient(
+          recipientWithPubKeysTo,
+          recipientWithPubKeysCc,
+          recipientWithPubKeysBcc
+        )
+      ) {
+        return false
+      }
+    }
+    if (binding?.editTextEmailSubject?.text?.isEmpty() == true) {
+      showInfoSnackbar(
+        binding?.editTextEmailSubject, getString(
+          R.string.text_must_not_be_empty,
+          getString(R.string.prompt_subject)
+        )
+      )
+      binding?.editTextEmailSubject?.requestFocus()
+      return false
+    }
+    if (attachments.isEmpty() && binding?.editTextEmailMessage?.text?.isEmpty() == true) {
+      showInfoSnackbar(
+        binding?.editTextEmailMessage,
+        getString(R.string.sending_message_must_not_be_empty)
+      )
+      binding?.editTextEmailMessage?.requestFocus()
+      return false
+    }
+    if (attachments.isEmpty() || !hasExternalStorageUris(this.attachments)) {
+      return true
+    }
+    return false
+  }
+
+  private fun getOutgoingMsgInfo(): OutgoingMessageInfo {
+    var msg = binding?.editTextEmailMessage?.text.toString()
+    if (messageType == MessageType.REPLY || messageType == MessageType.REPLY_ALL) {
+      if (binding?.iBShowQuotedText?.visibility == View.VISIBLE) {
+        msg += EmailUtil.genReplyContent(args.incomingMessageInfo)
+      }
+    }
+
+    val attachments = attachments.minus(getForwardedAttachments().toSet())
+    attachments.forEachIndexed { index, attachmentInfo -> attachmentInfo.path = index.toString() }
+
+    return OutgoingMessageInfo(
+      account = accountViewModel.activeAccountLiveData.value?.email ?: "",
+      subject = binding?.editTextEmailSubject?.text.toString(),
+      msg = msg,
+      toRecipients = binding?.editTextRecipientTo?.chipValues?.map { InternetAddress(it) }
+        ?: emptyList(),
+      ccRecipients = binding?.editTextRecipientCc?.chipValues?.map { InternetAddress(it) },
+      bccRecipients = binding?.editTextRecipientBcc?.chipValues?.map { InternetAddress(it) },
+      from = binding?.editTextFrom?.text.toString(),
+      atts = attachments,
+      forwardedAtts = getForwardedAttachments(),
+      encryptionType = composeMsgViewModel.msgEncryptionType,
+      messageType = messageType,
+      replyToMsgEntity = args.incomingMessageInfo?.msgEntity,
+      uid = EmailUtil.genOutboxUID(context)
+    )
+  }
+
+  private fun getForwardedAttachments(): List<AttachmentInfo> {
+    return attachments.filter { it.id != null && it.isForwarded }
+  }
+
   companion object {
     private const val REQUEST_CODE_NO_PGP_FOUND_DIALOG = 100
     private const val REQUEST_CODE_IMPORT_PUBLIC_KEY = 101
diff --git a/FlowCrypt/src/main/res/navigation/create_msg_graph.xml b/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
index 51e77f2418..a336f945e6 100644
--- a/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
+++ b/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
@@ -7,7 +7,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/create_msg_graph"
-    android:label="fdfdf"
     app:startDestination="@id/createMessageFragment">
 
     <fragment

From a39eb80aa4a3ae51864742d8384c410d57721276 Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Tue, 11 Jan 2022 10:18:49 +0200
Subject: [PATCH 06/24] CreateMessageFragment. Modified logic to show the
 "Protect with Password" button. Refactored code.| #1620

---
 .../email/database/entity/RecipientEntity.kt  |   5 -
 .../jetpack/viewmodel/ComposeMsgViewModel.kt  |  94 ++++++++++
 .../jetpack/viewmodel/RecipientsViewModel.kt  |  11 +-
 .../fragment/CreateMessageFragment.kt         | 174 ++++++++----------
 .../res/layout/fragment_create_message.xml    |  26 +--
 FlowCrypt/src/main/res/values/dimens.xml      |   1 +
 FlowCrypt/src/main/res/values/strings.xml     |   1 +
 7 files changed, 196 insertions(+), 116 deletions(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/RecipientEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/RecipientEntity.kt
index aeb9ac5ba5..5fb20dc040 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/RecipientEntity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/RecipientEntity.kt
@@ -41,11 +41,6 @@ data class RecipientEntity(
     parcel.readLong()
   )
 
-  //todo-denbond7 need to think about this class.
-  enum class Type {
-    TO, CC, BCC
-  }
-
   override fun writeToParcel(parcel: Parcel, flags: Int) {
     parcel.writeValue(id)
     parcel.writeString(email)
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
index 373e93d75c..07946e563e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
@@ -6,10 +6,14 @@
 package com.flowcrypt.email.jetpack.viewmodel
 
 import android.app.Application
+import com.flowcrypt.email.database.entity.relation.RecipientWithPubKeys
 import com.flowcrypt.email.model.MessageEncryptionType
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import java.io.InvalidObjectException
+import javax.mail.Message
 
 /**
  * @author Denis Bondarenko
@@ -30,10 +34,100 @@ class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Applicatio
   val messageEncryptionTypeStateFlow: StateFlow<MessageEncryptionType> =
     messageEncryptionTypeMutableStateFlow.asStateFlow()
 
+  //session cache for recipients
+  private val recipientsTo = mutableMapOf<String, Recipient>()
+  private val recipientsCc = mutableMapOf<String, Recipient>()
+  private val recipientsBcc = mutableMapOf<String, Recipient>()
+
+  private val recipientsToMutableStateFlow: MutableStateFlow<List<Recipient>> =
+    MutableStateFlow(emptyList())
+  val recipientsToStateFlow: StateFlow<List<Recipient>> =
+    recipientsToMutableStateFlow.asStateFlow()
+  private val recipientsCcMutableStateFlow: MutableStateFlow<List<Recipient>> =
+    MutableStateFlow(emptyList())
+  val recipientsCcStateFlow: StateFlow<List<Recipient>> =
+    recipientsCcMutableStateFlow.asStateFlow()
+  private val recipientsBccMutableStateFlow: MutableStateFlow<List<Recipient>> =
+    MutableStateFlow(emptyList())
+  val recipientsBccStateFlow: StateFlow<List<Recipient>> =
+    recipientsBccMutableStateFlow.asStateFlow()
+
+  val recipientsStateFlow = combine(
+    recipientsToStateFlow,
+    recipientsCcStateFlow,
+    recipientsBccStateFlow
+  ) { a, b, c ->
+    a + b + c
+  }
+
   val msgEncryptionType: MessageEncryptionType
     get() = messageEncryptionTypeStateFlow.value
+  val recipientWithPubKeysTo: List<Recipient>
+    get() = recipientsTo.values.toList()
+  val recipientWithPubKeysCc: List<Recipient>
+    get() = recipientsCc.values.toList()
+  val recipientWithPubKeysBcc: List<Recipient>
+    get() = recipientsBcc.values.toList()
+  val recipientWithPubKeys: List<Recipient>
+    get() = recipientWithPubKeysTo + recipientWithPubKeysCc + recipientWithPubKeysBcc
 
   fun switchMessageEncryptionType(messageEncryptionType: MessageEncryptionType) {
     messageEncryptionTypeMutableStateFlow.value = messageEncryptionType
   }
+
+  fun replaceRecipients(recipientType: Message.RecipientType, list: List<RecipientWithPubKeys>) {
+    val existingRecipients = when (recipientType) {
+      Message.RecipientType.TO -> recipientsTo
+      Message.RecipientType.CC -> recipientsCc
+      Message.RecipientType.BCC -> recipientsBcc
+      else -> throw InvalidObjectException(
+        "unknown RecipientType: $recipientType"
+      )
+    }
+
+    existingRecipients.clear()
+    existingRecipients.putAll(
+      list.associateBy(
+        { it.recipient.email },
+        { Recipient(recipientType, it) })
+    )
+
+    notifyDataChanges(recipientType, existingRecipients)
+  }
+
+  fun removeRecipient(
+    recipientType: Message.RecipientType,
+    recipientWithPubKeys: RecipientWithPubKeys
+  ) {
+    val existingRecipients = when (recipientType) {
+      Message.RecipientType.TO -> recipientsTo
+      Message.RecipientType.CC -> recipientsCc
+      Message.RecipientType.BCC -> recipientsBcc
+      else -> throw InvalidObjectException(
+        "unknown RecipientType: $recipientType"
+      )
+    }
+
+    existingRecipients.remove(recipientWithPubKeys.recipient.email)
+    notifyDataChanges(recipientType, existingRecipients)
+  }
+
+  private fun notifyDataChanges(
+    recipientType: Message.RecipientType,
+    recipients: MutableMap<String, Recipient>
+  ) {
+    when (recipientType) {
+      Message.RecipientType.TO -> recipientsToMutableStateFlow
+      Message.RecipientType.CC -> recipientsCcMutableStateFlow
+      Message.RecipientType.BCC -> recipientsBccMutableStateFlow
+      else -> throw InvalidObjectException(
+        "Attempt to resolve unknown RecipientType: $recipientType"
+      )
+    }.value = recipients.values.toList()
+  }
+
+  data class Recipient(
+    val recipientType: Message.RecipientType,
+    val recipientWithPubKeys: RecipientWithPubKeys
+  )
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/RecipientsViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/RecipientsViewModel.kt
index 2d472ea22d..844258f59d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/RecipientsViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/RecipientsViewModel.kt
@@ -36,6 +36,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.IOException
 import java.util.*
+import javax.mail.Message
 
 /**
  * This is used in the message compose/reply view when recipient public keys need to be retrieved,
@@ -80,7 +81,7 @@ class RecipientsViewModel(application: Application) : AccountViewModel(applicati
     return roomDatabase.recipientDao().getRecipientsWithPubKeysByEmailsLD(recipientEntity.email)
   }
 
-  fun fetchAndUpdateInfoAboutRecipients(type: RecipientEntity.Type, emails: List<String>) {
+  fun fetchAndUpdateInfoAboutRecipients(type: Message.RecipientType, emails: List<String>) {
     viewModelScope.launch {
       if (emails.isEmpty()) {
         return@launch
@@ -248,19 +249,19 @@ class RecipientsViewModel(application: Application) : AccountViewModel(applicati
   }
 
   private fun setResultForRemoteContactsLiveData(
-    type: RecipientEntity.Type,
+    type: Message.RecipientType,
     result: Result<List<RecipientWithPubKeys>>
   ) {
     when (type) {
-      RecipientEntity.Type.TO -> {
+      Message.RecipientType.TO -> {
         recipientsToLiveData.value = result
       }
 
-      RecipientEntity.Type.CC -> {
+      Message.RecipientType.CC -> {
         recipientsCcLiveData.value = result
       }
 
-      RecipientEntity.Type.BCC -> {
+      Message.RecipientType.BCC -> {
         recipientsBccLiveData.value = result
       }
     }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index 65e2216e89..c1a9418948 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -13,7 +13,6 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.SpannableStringBuilder
-import android.text.TextUtils
 import android.text.format.Formatter
 import android.util.Log
 import android.view.ContextMenu
@@ -65,6 +64,7 @@ import com.flowcrypt.email.extensions.showKeyboard
 import com.flowcrypt.email.extensions.showNeedPassphraseDialog
 import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.extensions.visible
+import com.flowcrypt.email.extensions.visibleOrGone
 import com.flowcrypt.email.jetpack.viewmodel.AccountAliasesViewModel
 import com.flowcrypt.email.jetpack.viewmodel.ComposeMsgViewModel
 import com.flowcrypt.email.jetpack.viewmodel.RecipientsViewModel
@@ -94,13 +94,13 @@ import com.hootsuite.nachos.NachoTextView
 import com.hootsuite.nachos.chip.Chip
 import com.hootsuite.nachos.terminator.ChipTerminatorHandler
 import com.hootsuite.nachos.validator.ChipifyingNachoValidator
-import kotlinx.coroutines.flow.collect
 import org.apache.commons.io.FileUtils
 import org.bouncycastle.openpgp.PGPSecretKeyRing
 import org.pgpainless.key.OpenPgpV4Fingerprint
 import java.io.File
 import java.io.IOException
 import java.util.regex.Pattern
+import javax.mail.Message
 import javax.mail.internet.InternetAddress
 
 /**
@@ -130,9 +130,6 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   }
 
   private var binding: FragmentCreateMessageBinding? = null
-  private var recipientWithPubKeysTo: MutableList<RecipientWithPubKeys>? = mutableListOf()
-  private var recipientWithPubKeysCc: MutableList<RecipientWithPubKeys>? = mutableListOf()
-  private var recipientWithPubKeysBcc: MutableList<RecipientWithPubKeys>? = mutableListOf()
   private val attachments: MutableList<AttachmentInfo> = mutableListOf()
   private var folderType: FoldersManager.FolderType? = null
   private var fromAddressesAdapter: FromAddressesAdapter<String>? = null
@@ -251,17 +248,17 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
             removeRecipientWithPubKey(
               recipientWithPubKeys,
               binding?.editTextRecipientTo,
-              recipientWithPubKeysTo
+              Message.RecipientType.TO
             )
             removeRecipientWithPubKey(
               recipientWithPubKeys,
               binding?.editTextRecipientCc,
-              recipientWithPubKeysCc
+              Message.RecipientType.CC
             )
             removeRecipientWithPubKey(
               recipientWithPubKeys,
               binding?.editTextRecipientBcc,
-              recipientWithPubKeysBcc
+              Message.RecipientType.BCC
             )
           }
         }
@@ -286,9 +283,14 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
               )
 
               updateRecipients()
-              updateChips(binding?.editTextRecipientTo, recipientWithPubKeysTo)
-              updateChips(binding?.editTextRecipientCc, recipientWithPubKeysCc)
-              updateChips(binding?.editTextRecipientBcc, recipientWithPubKeysBcc)
+              updateChips(binding?.editTextRecipientTo,
+                composeMsgViewModel.recipientWithPubKeysTo.map { it.recipientWithPubKeys })
+              updateChips(
+                binding?.editTextRecipientCc,
+                composeMsgViewModel.recipientWithPubKeysCc.map { it.recipientWithPubKeys })
+              updateChips(
+                binding?.editTextRecipientBcc,
+                composeMsgViewModel.recipientWithPubKeysBcc.map { it.recipientWithPubKeys })
 
               Toast.makeText(context, R.string.key_successfully_copied, Toast.LENGTH_LONG).show()
             }
@@ -447,20 +449,20 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   override fun onFocusChange(v: View, hasFocus: Boolean) {
     when (v.id) {
       R.id.editTextRecipientTo -> runUpdateActionForRecipients(
-        recipientWithPubKeysTo, RecipientEntity.Type.TO, hasFocus
+        Message.RecipientType.TO, hasFocus, (v as TextView).text.isEmpty()
       )
 
       R.id.editTextRecipientCc -> runUpdateActionForRecipients(
-        recipientWithPubKeysCc, RecipientEntity.Type.CC, hasFocus
+        Message.RecipientType.CC, hasFocus, (v as TextView).text.isEmpty()
       )
 
       R.id.editTextRecipientBcc -> runUpdateActionForRecipients(
-        recipientWithPubKeysBcc, RecipientEntity.Type.BCC, hasFocus
+        Message.RecipientType.BCC, hasFocus, (v as TextView).text.isEmpty()
       )
 
       R.id.editTextEmailSubject, R.id.editTextEmailMessage -> if (hasFocus) {
         var isExpandButtonNeeded = false
-        if (TextUtils.isEmpty(binding?.editTextRecipientCc!!.text)) {
+        if (binding?.editTextRecipientCc?.text?.isEmpty() == true) {
           binding?.layoutCc?.gone()
           isExpandButtonNeeded = true
         }
@@ -471,7 +473,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         }
 
         if (isExpandButtonNeeded) {
-          binding?.imageButtonAdditionalRecipientsVisibility?.gone()
+          binding?.imageButtonAdditionalRecipientsVisibility?.visible()
           val layoutParams = FrameLayout.LayoutParams(
             FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT
           )
@@ -576,9 +578,6 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
         MessageEncryptionType.STANDARD -> {
           emailMassageHint = getString(R.string.prompt_compose_standard_email)
-          recipientWithPubKeysTo?.clear()
-          recipientWithPubKeysCc?.clear()
-          recipientWithPubKeysBcc?.clear()
           isUpdateToCompleted = true
           isUpdateCcCompleted = true
           isUpdateBccCompleted = true
@@ -687,7 +686,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private fun updateRecipients() {
     binding?.editTextRecipientTo?.chipAndTokenValues?.let {
       recipientsViewModel.fetchAndUpdateInfoAboutRecipients(
-        RecipientEntity.Type.TO,
+        Message.RecipientType.TO,
         it
       )
     }
@@ -695,71 +694,68 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     if (binding?.layoutCc?.isVisible == true) {
       binding?.editTextRecipientCc?.chipAndTokenValues?.let {
         recipientsViewModel.fetchAndUpdateInfoAboutRecipients(
-          RecipientEntity.Type.CC,
+          Message.RecipientType.CC,
           it
         )
       }
     } else {
       binding?.editTextRecipientCc?.setText(null as CharSequence?)
-      recipientWithPubKeysCc?.clear()
+      composeMsgViewModel.replaceRecipients(Message.RecipientType.CC, emptyList())
     }
 
     if (binding?.layoutBcc?.isVisible == true) {
       binding?.editTextRecipientBcc?.chipAndTokenValues?.let {
         recipientsViewModel.fetchAndUpdateInfoAboutRecipients(
-          RecipientEntity.Type.BCC,
+          Message.RecipientType.BCC,
           it
         )
       }
     } else {
       binding?.editTextRecipientBcc?.setText(null as CharSequence?)
-      recipientWithPubKeysBcc?.clear()
+      composeMsgViewModel.replaceRecipients(Message.RecipientType.BCC, emptyList())
     }
   }
 
   /**
    * Run an action to update information about some [RecipientWithPubKeys]s.
    *
-   * @param recipients Old [RecipientWithPubKeys]s
    * @param type        A type of recipients
    * @param hasFocus    A value which indicates the view focus.
    * @return A modified recipients list.
    */
   private fun runUpdateActionForRecipients(
-    recipients: MutableList<RecipientWithPubKeys>?,
-    type: RecipientEntity.Type,
-    hasFocus: Boolean
-  ): List<RecipientWithPubKeys>? {
+    type: Message.RecipientType,
+    hasFocus: Boolean,
+    isEmpty: Boolean
+  ) {
     if (composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
-      if (hasFocus) {
-        recipients?.clear()
-      } else {
-        if (isAdded) {
-          fetchDetailsAboutRecipients(type)
-        }
+      if (!hasFocus && isAdded) {
+        fetchDetailsAboutRecipients(type)
       }
     }
 
-    return recipients
+    if (isEmpty) {
+      composeMsgViewModel.replaceRecipients(type, emptyList())
+    }
   }
 
-  private fun fetchDetailsAboutRecipients(type: RecipientEntity.Type) {
+  private fun fetchDetailsAboutRecipients(type: Message.RecipientType) {
     when (type) {
-      RecipientEntity.Type.TO -> {
+      Message.RecipientType.TO -> {
         binding?.editTextRecipientTo?.chipAndTokenValues?.let {
-          recipientsViewModel.fetchAndUpdateInfoAboutRecipients(RecipientEntity.Type.TO, it)
+          recipientsViewModel.fetchAndUpdateInfoAboutRecipients(Message.RecipientType.TO, it)
         }
       }
 
-      RecipientEntity.Type.CC -> {
+      Message.RecipientType.CC -> {
         binding?.editTextRecipientCc?.chipAndTokenValues?.let {
-          recipientsViewModel.fetchAndUpdateInfoAboutRecipients(RecipientEntity.Type.CC, it)
+          recipientsViewModel.fetchAndUpdateInfoAboutRecipients(Message.RecipientType.CC, it)
         }
       }
 
-      RecipientEntity.Type.BCC -> {
+      Message.RecipientType.BCC -> {
         binding?.editTextRecipientBcc?.chipAndTokenValues?.let {
-          recipientsViewModel.fetchAndUpdateInfoAboutRecipients(RecipientEntity.Type.BCC, it)
+          recipientsViewModel.fetchAndUpdateInfoAboutRecipients(Message.RecipientType.BCC, it)
         }
       }
     }
@@ -832,30 +828,27 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   /**
    * Check that all recipients are usable.
    */
-  private fun hasUnusableRecipient(vararg list: List<RecipientWithPubKeys>?): Boolean {
-    for (sublist in list) {
-      sublist?.let {
-        for (recipientWithPubKeys in it) {
-          if (!recipientWithPubKeys.hasAtLeastOnePubKey()) {
-            showNoPgpFoundDialog(recipientWithPubKeys)
-            return true
-          }
+  private fun hasUnusableRecipient(): Boolean {
+    for (recipient in composeMsgViewModel.recipientWithPubKeys) {
+      val recipientWithPubKeys = recipient.recipientWithPubKeys
+      if (!recipientWithPubKeys.hasAtLeastOnePubKey()) {
+        showNoPgpFoundDialog(recipientWithPubKeys)
+        return true
+      }
 
-          if (!recipientWithPubKeys.hasNotExpiredPubKey()) {
-            showInfoDialog(dialogMsg = getString(R.string.warning_one_of_recipients_has_expired_pub_key))
-            return true
-          }
+      if (!recipientWithPubKeys.hasNotExpiredPubKey()) {
+        showInfoDialog(dialogMsg = getString(R.string.warning_one_of_recipients_has_expired_pub_key))
+        return true
+      }
 
-          if (!recipientWithPubKeys.hasNotRevokedPubKey()) {
-            showInfoDialog(dialogMsg = getString(R.string.warning_one_of_recipients_has_revoked_pub_key))
-            return true
-          }
+      if (!recipientWithPubKeys.hasNotRevokedPubKey()) {
+        showInfoDialog(dialogMsg = getString(R.string.warning_one_of_recipients_has_revoked_pub_key))
+        return true
+      }
 
-          if (!recipientWithPubKeys.hasUsablePubKey()) {
-            showInfoDialog(dialogMsg = getString(R.string.warning_one_of_recipients_has_not_usable_pub_key))
-            return true
-          }
-        }
+      if (!recipientWithPubKeys.hasUsablePubKey()) {
+        showInfoDialog(dialogMsg = getString(R.string.warning_one_of_recipients_has_not_usable_pub_key))
+        return true
       }
     }
 
@@ -933,11 +926,10 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    *
    * @param recipientWithPubKeys     The [RecipientWithPubKeys] which will be removed.
    * @param pgpContactsNachoTextView The [NachoTextView] which contains the delete candidate.
-   * @param list                     The list which contains the delete candidate.
    */
   private fun removeRecipientWithPubKey(
     recipientWithPubKeys: RecipientWithPubKeys, pgpContactsNachoTextView: PgpContactsNachoTextView?,
-    list: MutableList<RecipientWithPubKeys>?
+    recipientType: Message.RecipientType
   ) {
     val chipTokenizer = pgpContactsNachoTextView?.chipTokenizer
     pgpContactsNachoTextView?.allChips?.let {
@@ -952,13 +944,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       }
     }
 
-    val iterator = list?.iterator()
-    while (iterator?.hasNext() == true) {
-      val next = iterator.next()
-      if (next.recipient.email.equals(recipientWithPubKeys.recipient.email, ignoreCase = true)) {
-        iterator.remove()
-      }
-    }
+    composeMsgViewModel.removeRecipient(recipientType, recipientWithPubKeys)
   }
 
   /**
@@ -1500,7 +1486,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private fun setupRecipientsViewModel() {
     handleUpdatingRecipients(
       recipientsViewModel.recipientsToLiveData,
-      recipientWithPubKeysTo,
+      Message.RecipientType.TO,
       binding?.progressBarTo,
       binding?.editTextRecipientTo
     ) {
@@ -1509,7 +1495,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
     handleUpdatingRecipients(
       recipientsViewModel.recipientsCcLiveData,
-      recipientWithPubKeysCc,
+      Message.RecipientType.CC,
       binding?.progressBarCc,
       binding?.editTextRecipientCc
     ) {
@@ -1518,7 +1504,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
     handleUpdatingRecipients(
       recipientsViewModel.recipientsBccLiveData,
-      recipientWithPubKeysBcc,
+      Message.RecipientType.BCC,
       binding?.progressBarBcc,
       binding?.editTextRecipientBcc
     ) {
@@ -1528,7 +1514,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
   private fun handleUpdatingRecipients(
     liveData: LiveData<Result<List<RecipientWithPubKeys>>>,
-    recipientWithPubKeys: MutableList<RecipientWithPubKeys>?,
+    recipientType: Message.RecipientType,
     progressBar: ProgressBar?,
     nachoTextView: PgpContactsNachoTextView?,
     updateState: (state: Boolean) -> Unit
@@ -1538,17 +1524,15 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         Result.Status.LOADING -> {
           updateState.invoke(false)
           baseActivity.countingIdlingResource.incrementSafely()
-          recipientWithPubKeys?.clear()
           progressBar?.visible()
         }
 
         Result.Status.SUCCESS -> {
           updateState.invoke(true)
           progressBar?.invisible()
-          recipientWithPubKeys?.clear()
-          it.data?.let { list -> recipientWithPubKeys?.addAll(list) }
-          if (recipientWithPubKeys?.isNotEmpty() == true) {
-            updateChips(nachoTextView, recipientWithPubKeys)
+          it.data?.let { list ->
+            composeMsgViewModel.replaceRecipients(recipientType, list)
+            updateChips(nachoTextView, list)
           }
           baseActivity.countingIdlingResource.decrementSafely()
         }
@@ -1629,6 +1613,13 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
         onMsgEncryptionTypeChange(it)
       }
     }
+
+    lifecycleScope.launchWhenStarted {
+      composeMsgViewModel.recipientsStateFlow.collect { recipients ->
+        binding?.btnPasswordProtected?.visibleOrGone(
+          recipients.any { recipient -> !recipient.recipientWithPubKeys.hasAtLeastOnePubKey() })
+      }
+    }
   }
 
   private fun initNonEncryptedHintView() {
@@ -1683,29 +1674,24 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     }
     if (composeMsgViewModel.msgEncryptionType === MessageEncryptionType.ENCRYPTED) {
       if (binding?.editTextRecipientTo?.text?.isNotEmpty() == true
-        && recipientWithPubKeysTo?.isEmpty() == true
+        && composeMsgViewModel.recipientWithPubKeysTo.isEmpty()
       ) {
-        fetchDetailsAboutRecipients(RecipientEntity.Type.TO)
+        fetchDetailsAboutRecipients(Message.RecipientType.TO)
         return false
       }
       if (binding?.editTextRecipientCc?.text?.isNotEmpty() == true
-        && recipientWithPubKeysCc?.isEmpty() == true
+        && composeMsgViewModel.recipientWithPubKeysCc.isEmpty()
       ) {
-        fetchDetailsAboutRecipients(RecipientEntity.Type.CC)
+        fetchDetailsAboutRecipients(Message.RecipientType.CC)
         return false
       }
       if (binding?.editTextRecipientBcc?.text?.isNotEmpty() == true
-        && recipientWithPubKeysBcc?.isEmpty() == true
+        && composeMsgViewModel.recipientWithPubKeysBcc.isEmpty()
       ) {
-        fetchDetailsAboutRecipients(RecipientEntity.Type.BCC)
+        fetchDetailsAboutRecipients(Message.RecipientType.BCC)
         return false
       }
-      if (hasUnusableRecipient(
-          recipientWithPubKeysTo,
-          recipientWithPubKeysCc,
-          recipientWithPubKeysBcc
-        )
-      ) {
+      if (hasUnusableRecipient()) {
         return false
       }
     }
diff --git a/FlowCrypt/src/main/res/layout/fragment_create_message.xml b/FlowCrypt/src/main/res/layout/fragment_create_message.xml
index ae84451791..c7b89441c7 100644
--- a/FlowCrypt/src/main/res/layout/fragment_create_message.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_create_message.xml
@@ -215,6 +215,19 @@
 
             </FrameLayout>
 
+            <Button
+                android:id="@+id/btnPasswordProtected"
+                style="@style/AppWidget.Button"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/default_button_height_small"
+                android:layout_gravity="center"
+                android:drawableStart="@drawable/ic_password_not_protected_white_24"
+                android:drawablePadding="@dimen/default_margin_small"
+                android:text="@string/tap_to_protect_with_web_portal_password"
+                android:textAllCaps="false"
+                android:theme="@style/AppWidget.Button.Orange"
+                android:visibility="gone" />
+
             <com.google.android.material.textfield.TextInputLayout
                 style="@style/AppWidget.TextInputLayout.GreyBottomLine"
                 android:layout_width="match_parent"
@@ -272,17 +285,6 @@
         </LinearLayout>
     </ScrollView>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fAButtonPasswordProtected"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/create_new_message"
-        android:visibility="gone"
-        app:backgroundTint="@color/colorPrimary"
-        app:layout_constraintBottom_toBottomOf="@+id/scrollView"
-        app:layout_constraintEnd_toEndOf="@+id/scrollView"
-        app:srcCompat="@drawable/ic_password_protected_white_24" />
-
     <include
         android:id="@+id/viewIdStatusView"
         layout="@layout/sync_status"
@@ -299,6 +301,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        app:constraint_referenced_ids="scrollView,fAButtonPasswordProtected"
+        app:constraint_referenced_ids="scrollView"
         tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/FlowCrypt/src/main/res/values/dimens.xml b/FlowCrypt/src/main/res/values/dimens.xml
index 5c0588b083..2ab7b6a662 100644
--- a/FlowCrypt/src/main/res/values/dimens.xml
+++ b/FlowCrypt/src/main/res/values/dimens.xml
@@ -18,6 +18,7 @@
     <dimen name="default_four_dip">4dp</dimen>
 
     <dimen name="default_button_height">64dp</dimen>
+    <dimen name="default_button_height_small">48dp</dimen>
     <dimen name="default_button_width">320dp</dimen>
     <dimen name="default_height_for_click">64dp</dimen>
 
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
index f26603d8a6..4fdbadd446 100644
--- a/FlowCrypt/src/main/res/values/strings.xml
+++ b/FlowCrypt/src/main/res/values/strings.xml
@@ -556,4 +556,5 @@
     <string name="mixed_signed">mixed signed</string>
     <string name="password_protected_msg_promo">%1$s has sent you a password-encrypted email. Follow this link to open it: %2$s</string>
     <string name="can_not_send_password_protected">Can\'t send message: password-protected</string>
+    <string name="tap_to_protect_with_web_portal_password">Tap to protect with web portal Password</string>
 </resources>

From 89d44bad23316fdce784802df5c557d9b4add8f8 Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Tue, 11 Jan 2022 14:08:24 +0200
Subject: [PATCH 07/24] Refactored code.| #1620

---
 .../jetpack/viewmodel/ComposeMsgViewModel.kt  |   9 +
 .../viewmodel/PasswordStrengthViewModel.kt    |  25 ++-
 .../base/BasePassPhraseManagerActivity.kt     |  25 ++-
 .../CheckPassphraseStrengthFragment.kt        | 148 +++----------
 .../fragment/CreateMessageFragment.kt         |  33 ++-
 .../fragment/base/CheckPassphraseBehaviour.kt | 143 +++++++++++++
 ...ovidePasswordToProtectMsgDialogFragment.kt |  67 +++++-
 .../res/layout/fragment_create_message.xml    |   2 +-
 ...agment_provide_password_to_protect_msg.xml | 194 +++++++++---------
 .../main/res/navigation/create_msg_graph.xml  |  13 ++
 FlowCrypt/src/main/res/values-ru/strings.xml  |   5 +
 FlowCrypt/src/main/res/values/strings.xml     |   5 +
 12 files changed, 420 insertions(+), 249 deletions(-)
 create mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
index 07946e563e..5036e94123 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
@@ -34,6 +34,11 @@ class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Applicatio
   val messageEncryptionTypeStateFlow: StateFlow<MessageEncryptionType> =
     messageEncryptionTypeMutableStateFlow.asStateFlow()
 
+  private val webPortalPasswordMutableStateFlow: MutableStateFlow<CharSequence> =
+    MutableStateFlow("")
+  val webPortalPasswordStateFlow: StateFlow<CharSequence> =
+    webPortalPasswordMutableStateFlow.asStateFlow()
+
   //session cache for recipients
   private val recipientsTo = mutableMapOf<String, Recipient>()
   private val recipientsCc = mutableMapOf<String, Recipient>()
@@ -75,6 +80,10 @@ class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Applicatio
     messageEncryptionTypeMutableStateFlow.value = messageEncryptionType
   }
 
+  fun setWebPortalPassword(webPortalPassword: CharSequence) {
+    webPortalPasswordMutableStateFlow.value = webPortalPassword
+  }
+
   fun replaceRecipients(recipientType: Message.RecipientType, list: List<RecipientWithPubKeys>) {
     val existingRecipients = when (recipientType) {
       Message.RecipientType.TO -> recipientsTo
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt
index b5cc4cdae2..92d4e79a9f 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt
@@ -6,7 +6,6 @@
 package com.flowcrypt.email.jetpack.viewmodel
 
 import android.app.Application
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.flowcrypt.email.Constants
@@ -14,7 +13,12 @@ import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.security.pgp.PgpPwd
 import com.flowcrypt.email.util.coroutines.runners.ControlledRunner
 import com.nulabinc.zxcvbn.Zxcvbn
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.util.*
 
 /**
@@ -29,14 +33,21 @@ class PasswordStrengthViewModel(application: Application) : BaseAndroidViewModel
   private val zxcvbn: Zxcvbn = Zxcvbn()
   private val controlledRunnerForZxcvbn = ControlledRunner<Result<PgpPwd.PwdStrengthResult?>>()
 
-  val pwdStrengthResultLiveData: MutableLiveData<Result<PgpPwd.PwdStrengthResult?>> =
-    MutableLiveData()
+  private val pwdStrengthResultMutableStateFlow: MutableStateFlow<Result<PgpPwd.PwdStrengthResult?>> =
+    MutableStateFlow(Result.none())
+  val pwdStrengthResultStateFlow: StateFlow<Result<PgpPwd.PwdStrengthResult?>> =
+    pwdStrengthResultMutableStateFlow.asStateFlow()
 
-  fun check(passphrase: String) {
+  fun check(passphrase: CharSequence) {
     viewModelScope.launch {
-      pwdStrengthResultLiveData.value = Result.loading()
-      val measure = zxcvbn.measure(passphrase, arrayListOf(*Constants.PASSWORD_WEAK_WORDS)).guesses
-      pwdStrengthResultLiveData.value = controlledRunnerForZxcvbn.cancelPreviousThenRun {
+      pwdStrengthResultMutableStateFlow.value = Result.loading()
+      pwdStrengthResultMutableStateFlow.value = controlledRunnerForZxcvbn.cancelPreviousThenRun {
+        val measure = withContext(Dispatchers.IO) {
+          zxcvbn.measure(
+            passphrase,
+            arrayListOf(*Constants.PASSWORD_WEAK_WORDS)
+          ).guesses
+        }
         return@cancelPreviousThenRun Result.success(PgpPwd.estimateStrength(measure.toBigDecimal()))
       }
     }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BasePassPhraseManagerActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BasePassPhraseManagerActivity.kt
index c90c1c68c6..e258309aa4 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BasePassPhraseManagerActivity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BasePassPhraseManagerActivity.kt
@@ -24,6 +24,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
 import androidx.core.widget.addTextChangedListener
+import androidx.lifecycle.lifecycleScope
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.retrofit.response.base.Result
@@ -286,21 +287,23 @@ abstract class BasePassPhraseManagerActivity : BaseBackStackActivity(), View.OnC
       Constants.PASSWORD_QUALITY_POOR -> getString(R.string.password_quality_poor)
       Constants.PASSWORD_QUALITY_WEAK -> getString(R.string.password_quality_weak)
       else -> word?.word
-    }?.toUpperCase(Locale.getDefault())
+    }?.uppercase(Locale.getDefault())
   }
 
   private fun initPasswordStrengthViewModel() {
-    passwordStrengthViewModel.pwdStrengthResultLiveData.observe(this) {
-      when (it.status) {
-        Result.Status.SUCCESS -> {
-          pwdStrengthResult = it.data
-          updateStrengthViews()
-        }
+    lifecycleScope.launchWhenStarted {
+      passwordStrengthViewModel.pwdStrengthResultStateFlow.collect {
+        when (it.status) {
+          Result.Status.SUCCESS -> {
+            pwdStrengthResult = it.data
+            updateStrengthViews()
+          }
 
-        Result.Status.EXCEPTION -> {
-          val msg = it.exception?.message ?: it.exception?.javaClass?.simpleName
-          ?: getString(R.string.unknown_error)
-          Toast.makeText(this, msg, Toast.LENGTH_LONG).show()
+          Result.Status.EXCEPTION -> {
+            val msg = it.exception?.message ?: it.exception?.javaClass?.simpleName
+            ?: getString(R.string.unknown_error)
+            Toast.makeText(this@BasePassPhraseManagerActivity, msg, Toast.LENGTH_LONG).show()
+          }
         }
       }
     }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
index 83114267e4..b9e95cb720 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
@@ -6,41 +6,32 @@
 package com.flowcrypt.email.ui.activity.fragment
 
 import android.content.Context
-import android.graphics.Color
-import android.graphics.Typeface
 import android.os.Bundle
-import android.text.Spannable
-import android.text.SpannableString
 import android.text.TextUtils
-import android.text.style.ForegroundColorSpan
-import android.text.style.StyleSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat
+import android.widget.Button
+import android.widget.ProgressBar
+import android.widget.TextView
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.navArgs
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.NavGraphDirections
 import com.flowcrypt.email.R
-import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.databinding.FragmentCheckPassphraseStrengthBinding
+import com.flowcrypt.email.extensions.hideKeyboard
 import com.flowcrypt.email.extensions.navController
-import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
 import com.flowcrypt.email.security.pgp.PgpPwd
 import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment
+import com.flowcrypt.email.ui.activity.fragment.base.CheckPassphraseBehaviour
 import com.flowcrypt.email.ui.notifications.SystemNotificationManager
-import com.flowcrypt.email.util.UIUtil
 import com.google.android.material.snackbar.Snackbar
 import org.apache.commons.io.IOUtils
 import java.nio.charset.StandardCharsets
-import java.util.Locale
 
 /**
  * This fragment does a reliability check of a provided passphrase.
@@ -50,11 +41,20 @@ import java.util.Locale
  * Time: 20:15
  * E-mail: DenBond7@gmail.com
  */
-class CheckPassphraseStrengthFragment : BaseFragment() {
+class CheckPassphraseStrengthFragment : BaseFragment(), CheckPassphraseBehaviour {
   private val args by navArgs<CheckPassphraseStrengthFragmentArgs>()
   private var binding: FragmentCheckPassphraseStrengthBinding? = null
-  private val passwordStrengthViewModel: PasswordStrengthViewModel by viewModels()
-  private var pwdStrengthResult: PgpPwd.PwdStrengthResult? = null
+  override val currentContext: Context?
+    get() = context
+  override val passwordStrengthViewModel: PasswordStrengthViewModel by viewModels()
+  override val buttonUsePassphrase: Button?
+    get() = binding?.btSetPassphrase
+  override val progressBarPassphraseQuality: ProgressBar?
+    get() = binding?.pBarPassphraseQuality
+  override val textViewPassphraseQuality: TextView?
+    get() = binding?.tVPassphraseQuality
+  private val pwdStrengthResult: PgpPwd.PwdStrengthResult?
+    get() = passwordStrengthViewModel.pwdStrengthResultStateFlow.value.data
 
   override val contentResourceId: Int = R.layout.fragment_check_passphrase_strength
 
@@ -64,6 +64,11 @@ class CheckPassphraseStrengthFragment : BaseFragment() {
       .cancel(SystemNotificationManager.NOTIFICATION_ID_PASSPHRASE_TOO_WEAK)
   }
 
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    initPasswordStrengthViewModel(this)
+  }
+
   override fun onCreateView(
     inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
   ): View? {
@@ -75,7 +80,6 @@ class CheckPassphraseStrengthFragment : BaseFragment() {
     super.onViewCreated(view, savedInstanceState)
     supportActionBar?.title = getString(R.string.security)
     initViews()
-    initPasswordStrengthViewModel()
   }
 
   private fun initViews() {
@@ -107,7 +111,7 @@ class CheckPassphraseStrengthFragment : BaseFragment() {
       return@setOnEditorActionListener when (actionId) {
         EditorInfo.IME_ACTION_DONE -> {
           checkAndMoveOn()
-          UIUtil.hideSoftInput(requireContext(), v)
+          v.hideKeyboard()
           true
         }
         else -> false
@@ -153,110 +157,4 @@ class CheckPassphraseStrengthFragment : BaseFragment() {
       }
     }
   }
-
-  private fun initPasswordStrengthViewModel() {
-    passwordStrengthViewModel.pwdStrengthResultLiveData.observe(viewLifecycleOwner) {
-      when (it.status) {
-        Result.Status.SUCCESS -> {
-          pwdStrengthResult = it.data
-          updateStrengthViews()
-        }
-
-        Result.Status.EXCEPTION -> {
-          toast(
-            it.exception?.message ?: it.exception?.javaClass?.simpleName
-            ?: getString(R.string.unknown_error), Toast.LENGTH_LONG
-          )
-        }
-        else -> {
-        }
-      }
-    }
-  }
-
-  private fun updateStrengthViews() {
-    if (pwdStrengthResult == null) {
-      return
-    }
-
-    val word = pwdStrengthResult?.word
-
-    when (word?.word) {
-      Constants.PASSWORD_QUALITY_WEAK,
-      Constants.PASSWORD_QUALITY_POOR -> {
-        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-          ContextCompat.getColor(requireContext(), R.color.silver), BlendModeCompat.MODULATE
-        )
-        binding?.btSetPassphrase?.background?.colorFilter = colorFilter
-      }
-
-      else -> {
-        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-          ContextCompat.getColor(requireContext(), R.color.colorPrimary), BlendModeCompat.MODULATE
-        )
-        binding?.btSetPassphrase?.background?.colorFilter = colorFilter
-      }
-    }
-
-    val color = parseColor()
-
-    binding?.pBarPassphraseQuality?.progress = word?.bar?.toInt() ?: 0
-    val colorFilter =
-      BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN)
-    binding?.pBarPassphraseQuality?.progressDrawable?.colorFilter = colorFilter
-
-    val qualityValue = getLocalizedPasswordQualityValue(word)
-
-    val qualityValueSpannable = SpannableString(qualityValue)
-    qualityValueSpannable.setSpan(
-      ForegroundColorSpan(color), 0, qualityValueSpannable.length,
-      Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-    )
-    qualityValueSpannable.setSpan(
-      StyleSpan(Typeface.BOLD), 0,
-      qualityValueSpannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-    )
-    binding?.tVPassphraseQuality?.text = qualityValueSpannable
-    binding?.tVPassphraseQuality?.append(" ")
-    binding?.tVPassphraseQuality?.append(getString(R.string.password_quality_subtext))
-
-    val timeSpannable = SpannableString(pwdStrengthResult?.time ?: "")
-    timeSpannable.setSpan(
-      ForegroundColorSpan(color), 0, timeSpannable.length,
-      Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-    )
-    binding?.tVPassphraseQuality?.append(" ")
-    binding?.tVPassphraseQuality?.append(timeSpannable)
-    binding?.tVPassphraseQuality?.append(")")
-  }
-
-  private fun parseColor(): Int {
-    return try {
-      Color.parseColor(pwdStrengthResult?.word?.color)
-    } catch (e: IllegalArgumentException) {
-      e.printStackTrace()
-
-      when (pwdStrengthResult?.word?.color) {
-        "orange" -> Color.parseColor("#FFA500")
-
-        "darkorange" -> Color.parseColor("#FF8C00")
-
-        "darkred" -> Color.parseColor("#8B0000")
-
-        else -> Color.DKGRAY
-      }
-    }
-  }
-
-  private fun getLocalizedPasswordQualityValue(word: PgpPwd.Word?): String? {
-    return when (word?.word) {
-      Constants.PASSWORD_QUALITY_PERFECT -> getString(R.string.password_quality_perfect)
-      Constants.PASSWORD_QUALITY_GREAT -> getString(R.string.password_quality_great)
-      Constants.PASSWORD_QUALITY_GOOD -> getString(R.string.password_quality_good)
-      Constants.PASSWORD_QUALITY_REASONABLE -> getString(R.string.password_quality_reasonable)
-      Constants.PASSWORD_QUALITY_POOR -> getString(R.string.password_quality_poor)
-      Constants.PASSWORD_QUALITY_WEAK -> getString(R.string.password_quality_weak)
-      else -> word?.word
-    }?.toUpperCase(Locale.getDefault())
-  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index c1a9418948..21531c8852 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -58,6 +58,7 @@ import com.flowcrypt.email.extensions.decrementSafely
 import com.flowcrypt.email.extensions.gone
 import com.flowcrypt.email.extensions.incrementSafely
 import com.flowcrypt.email.extensions.invisible
+import com.flowcrypt.email.extensions.navController
 import com.flowcrypt.email.extensions.org.bouncycastle.openpgp.toPgpKeyDetails
 import com.flowcrypt.email.extensions.showInfoDialog
 import com.flowcrypt.email.extensions.showKeyboard
@@ -967,6 +968,12 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     binding?.editTextEmailSubject?.onFocusChangeListener = this
     binding?.editTextEmailMessage?.onFocusChangeListener = this
     binding?.iBShowQuotedText?.setOnClickListener(this)
+    binding?.btnSetWebPortalPassword?.setOnClickListener {
+      navController?.navigate(
+        CreateMessageFragmentDirections
+          .actionCreateMessageFragmentToProvidePasswordToProtectMsgDialogFragment("")
+      )
+    }
   }
 
   private fun showContent() {
@@ -1616,10 +1623,34 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
     lifecycleScope.launchWhenStarted {
       composeMsgViewModel.recipientsStateFlow.collect { recipients ->
-        binding?.btnPasswordProtected?.visibleOrGone(
+        binding?.btnSetWebPortalPassword?.visibleOrGone(
           recipients.any { recipient -> !recipient.recipientWithPubKeys.hasAtLeastOnePubKey() })
       }
     }
+
+    lifecycleScope.launchWhenStarted {
+      composeMsgViewModel.webPortalPasswordStateFlow.collect { webPortalPassword ->
+        binding?.btnSetWebPortalPassword?.apply {
+          if (webPortalPassword.isEmpty()) {
+            setCompoundDrawablesWithIntrinsicBounds(
+              R.drawable.ic_password_not_protected_white_24,
+              0,
+              0,
+              0
+            )
+            setText(R.string.tap_to_protect_with_web_portal_password)
+          } else {
+            setCompoundDrawablesWithIntrinsicBounds(
+              R.drawable.ic_password_protected_white_24,
+              0,
+              0,
+              0
+            )
+            setText(R.string.web_portal_password_added)
+          }
+        }
+      }
+    }
   }
 
   private fun initNonEncryptedHintView() {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt
new file mode 100644
index 0000000000..589cf48b3e
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt
@@ -0,0 +1,143 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.ui.activity.fragment.base
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.Typeface
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
+import android.widget.Button
+import android.widget.ProgressBar
+import android.widget.TextView
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.BlendModeColorFilterCompat
+import androidx.core.graphics.BlendModeCompat
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import com.flowcrypt.email.Constants
+import com.flowcrypt.email.R
+import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.extensions.toast
+import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
+import com.flowcrypt.email.security.pgp.PgpPwd
+
+interface CheckPassphraseBehaviour {
+  val currentContext: Context?
+  val passwordStrengthViewModel: PasswordStrengthViewModel
+  val buttonUsePassphrase: Button?
+  val progressBarPassphraseQuality: ProgressBar?
+  val textViewPassphraseQuality: TextView?
+
+  fun initPasswordStrengthViewModel(lifecycleOwner: LifecycleOwner) {
+    lifecycleOwner.lifecycleScope.launchWhenStarted {
+      passwordStrengthViewModel.pwdStrengthResultStateFlow.collect {
+        when (it.status) {
+          Result.Status.SUCCESS -> {
+            it.data?.let { pwdStrengthResult ->
+              currentContext?.let { context -> updateStrengthViews(context, pwdStrengthResult) }
+            }
+          }
+
+          Result.Status.EXCEPTION -> {
+            currentContext?.let { context ->
+              context.toast(
+                it.exception?.message ?: it.exception?.javaClass?.simpleName
+                ?: context.getString(R.string.unknown_error), Toast.LENGTH_LONG
+              )
+            }
+          }
+          else -> {
+          }
+        }
+      }
+    }
+  }
+
+  private fun updateStrengthViews(context: Context, pwdStrengthResult: PgpPwd.PwdStrengthResult) {
+    val word = pwdStrengthResult.word
+    when (word.word) {
+      Constants.PASSWORD_QUALITY_WEAK,
+      Constants.PASSWORD_QUALITY_POOR -> {
+        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+          ContextCompat.getColor(context, R.color.silver), BlendModeCompat.MODULATE
+        )
+        buttonUsePassphrase?.background?.colorFilter = colorFilter
+      }
+
+      else -> {
+        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+          ContextCompat.getColor(context, R.color.colorPrimary), BlendModeCompat.MODULATE
+        )
+        buttonUsePassphrase?.background?.colorFilter = colorFilter
+      }
+    }
+
+    val color = parseColor(pwdStrengthResult)
+
+    progressBarPassphraseQuality?.progress = word.bar.toInt()
+    val colorFilter =
+      BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN)
+    progressBarPassphraseQuality?.progressDrawable?.colorFilter = colorFilter
+
+    val qualityValue = getLocalizedPasswordQualityValue(context, word)
+
+    val qualityValueSpannable = SpannableString(qualityValue)
+    qualityValueSpannable.setSpan(
+      ForegroundColorSpan(color), 0, qualityValueSpannable.length,
+      Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+    )
+    qualityValueSpannable.setSpan(
+      StyleSpan(Typeface.BOLD), 0,
+      qualityValueSpannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+    )
+    textViewPassphraseQuality?.text = qualityValueSpannable
+    textViewPassphraseQuality?.append(" ")
+    textViewPassphraseQuality?.append(context.getString(R.string.password_quality_subtext))
+
+    val timeSpannable = SpannableString(pwdStrengthResult.time)
+    timeSpannable.setSpan(
+      ForegroundColorSpan(color), 0, timeSpannable.length,
+      Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+    )
+    textViewPassphraseQuality?.append(" ")
+    textViewPassphraseQuality?.append(timeSpannable)
+    textViewPassphraseQuality?.append(")")
+  }
+
+  private fun parseColor(pwdStrengthResult: PgpPwd.PwdStrengthResult): Int {
+    return try {
+      Color.parseColor(pwdStrengthResult.word.color)
+    } catch (e: IllegalArgumentException) {
+      e.printStackTrace()
+
+      when (pwdStrengthResult.word.color) {
+        "orange" -> Color.parseColor("#FFA500")
+
+        "darkorange" -> Color.parseColor("#FF8C00")
+
+        "darkred" -> Color.parseColor("#8B0000")
+
+        else -> Color.DKGRAY
+      }
+    }
+  }
+
+  private fun getLocalizedPasswordQualityValue(context: Context, word: PgpPwd.Word?): String? {
+    return when (word?.word) {
+      Constants.PASSWORD_QUALITY_PERFECT -> context.getString(R.string.password_quality_perfect)
+      Constants.PASSWORD_QUALITY_GREAT -> context.getString(R.string.password_quality_great)
+      Constants.PASSWORD_QUALITY_GOOD -> context.getString(R.string.password_quality_good)
+      Constants.PASSWORD_QUALITY_REASONABLE -> context.getString(R.string.password_quality_reasonable)
+      Constants.PASSWORD_QUALITY_POOR -> context.getString(R.string.password_quality_poor)
+      Constants.PASSWORD_QUALITY_WEAK -> context.getString(R.string.password_quality_weak)
+      else -> word?.word
+    }?.uppercase()
+  }
+}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
index 834694cee2..3e7816d8d3 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
@@ -7,10 +7,24 @@ package com.flowcrypt.email.ui.activity.fragment.dialog
 
 import android.app.AlertDialog
 import android.app.Dialog
+import android.content.Context
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.widget.Button
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.navArgs
+import com.flowcrypt.email.R
 import com.flowcrypt.email.databinding.FragmentProvidePasswordToProtectMsgBinding
+import com.flowcrypt.email.extensions.hideKeyboard
+import com.flowcrypt.email.extensions.toast
+import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
+import com.flowcrypt.email.ui.activity.fragment.base.CheckPassphraseBehaviour
 
 /**
  * @author Denis Bondarenko
@@ -18,8 +32,23 @@ import com.flowcrypt.email.databinding.FragmentProvidePasswordToProtectMsgBindin
  * Time: 10:04
  * E-mail: DenBond7@gmail.com
  */
-class ProvidePasswordToProtectMsgDialogFragment : BaseDialogFragment() {
+class ProvidePasswordToProtectMsgDialogFragment : BaseDialogFragment(), CheckPassphraseBehaviour {
   private var binding: FragmentProvidePasswordToProtectMsgBinding? = null
+  private val args by navArgs<ProvidePasswordToProtectMsgDialogFragmentArgs>()
+  override val currentContext: Context?
+    get() = context
+  override val passwordStrengthViewModel: PasswordStrengthViewModel by viewModels()
+  override val buttonUsePassphrase: Button?
+    get() = binding?.btSetPassphrase
+  override val progressBarPassphraseQuality: ProgressBar?
+    get() = binding?.pBarPassphraseQuality
+  override val textViewPassphraseQuality: TextView?
+    get() = binding?.tVPassphraseQuality
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    initPasswordStrengthViewModel(this)
+  }
 
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
     val builder = AlertDialog.Builder(activity)
@@ -29,17 +58,37 @@ class ProvidePasswordToProtectMsgDialogFragment : BaseDialogFragment() {
       false
     )
 
-    builder.setView(binding!!.root)
+    binding?.eTPassphrase?.addTextChangedListener { editable ->
+      val passphrase = editable.toString()
+      passwordStrengthViewModel.check(passphrase)
+      if (TextUtils.isEmpty(editable)) {
+        binding?.tVPassphraseQuality?.setText(R.string.passphrase_must_be_non_empty)
+      }
+    }
+
+    binding?.eTPassphrase?.setOnEditorActionListener { v, actionId, _ ->
+      return@setOnEditorActionListener when (actionId) {
+        EditorInfo.IME_ACTION_DONE -> {
+          checkAndMoveOn()
+          v.hideKeyboard()
+          true
+        }
+        else -> false
+      }
+    }
+
+    binding?.btSetPassphrase?.setOnClickListener {
+      checkAndMoveOn()
+    }
+
+    binding?.eTPassphrase?.setText(args.defaultPassword)
+
+    builder.setView(binding?.root)
     builder.setTitle(null)
     return builder.create()
   }
 
-  companion object {
-    fun newInstance(): ProvidePasswordToProtectMsgDialogFragment {
-      val args = Bundle()
-      val noPgpFoundDialogFragment = ProvidePasswordToProtectMsgDialogFragment()
-      noPgpFoundDialogFragment.arguments = args
-      return noPgpFoundDialogFragment
-    }
+  private fun checkAndMoveOn() {
+    toast("Not yet implemented")
   }
 }
diff --git a/FlowCrypt/src/main/res/layout/fragment_create_message.xml b/FlowCrypt/src/main/res/layout/fragment_create_message.xml
index c7b89441c7..d05227fceb 100644
--- a/FlowCrypt/src/main/res/layout/fragment_create_message.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_create_message.xml
@@ -216,7 +216,7 @@
             </FrameLayout>
 
             <Button
-                android:id="@+id/btnPasswordProtected"
+                android:id="@+id/btnSetWebPortalPassword"
                 style="@style/AppWidget.Button"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/default_button_height_small"
diff --git a/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml b/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml
index 4905bb33fc..d517013183 100644
--- a/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml
+++ b/FlowCrypt/src/main/res/layout/fragment_provide_password_to_protect_msg.xml
@@ -2,116 +2,120 @@
   ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
   ~ Contributors: DenBond7
   -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/tVTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="The recipients will receive a link to read your message on a web portal, where they will need to enter this password.\n\nThey will have access to this message for 3 days."
-        android:textAlignment="viewStart"
-        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
-        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
-        app:layout_constraintTop_toTopOf="@+id/guidelineTop" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/tILPassphrase"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:hint="Enter web portal password"
-        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
-        app:layout_constraintTop_toBottomOf="@+id/tVTitle"
-        app:passwordToggleContentDescription="description"
-        app:passwordToggleEnabled="true">
+        <TextView
+            android:id="@+id/tVTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/password_protection_usage_explanation"
+            android:textAlignment="viewStart"
+            app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+            app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+            app:layout_constraintTop_toTopOf="@+id/guidelineTop" />
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/eTPassphrase"
-            android:layout_width="match_parent"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/tILPassphrase"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:background="@null"
-            android:ems="10"
-            android:imeOptions="actionDone"
-            android:inputType="textPassword" />
+            android:layout_marginTop="@dimen/default_margin_content"
+            android:hint="@string/enter_web_portal_password"
+            app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+            app:layout_constraintTop_toBottomOf="@+id/tVTitle"
+            app:passwordToggleContentDescription="description"
+            app:passwordToggleEnabled="true">
 
-        <ProgressBar
-            android:id="@+id/pBarPassphraseQuality"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/default_margin_content_small"
-            android:progress="0" />
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/eTPassphrase"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:ems="10"
+                android:imeOptions="actionDone"
+                android:inputType="textPassword" />
 
-        <TextView
-            android:id="@+id/tVPassphraseQuality"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/default_margin_small"
-            android:gravity="center"
-            tools:text="WEAK (average time to crack: 13 seconds)" />
+            <ProgressBar
+                android:id="@+id/pBarPassphraseQuality"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/default_margin_content_small"
+                android:progress="0" />
 
-    </com.google.android.material.textfield.TextInputLayout>
+            <TextView
+                android:id="@+id/tVPassphraseQuality"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/default_margin_small"
+                android:gravity="center"
+                tools:text="WEAK (average time to crack: 13 seconds)" />
 
-    <Button
-        android:id="@+id/btSetPassphrase"
-        style="@style/AppWidget.Button"
-        android:layout_width="0dp"
-        android:layout_marginTop="@dimen/default_margin_content_big"
-        android:text="SET PASSWORD"
-        android:theme="@style/AppWidget.Button.SilverWithWhiteText"
-        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
-        app:layout_constraintTop_toBottomOf="@+id/tILPassphrase" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-    <TextView
-        android:id="@+id/tVLostPassphraseWarning"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/default_margin_content_big"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:text="Do not use your Pass Phrase (that you chose during FlowCrypt Setup). Use some other password that you can share with others.\n\nYou are responsible for sharing this password with recipients (use other medium to share the password - not email)."
-        android:textAlignment="viewStart"
-        android:textColor="@color/red"
-        android:textSize="@dimen/default_text_size_medium"
-        app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"
-        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
-        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
-        app:layout_constraintTop_toBottomOf="@+id/btSetPassphrase"
-        app:layout_constraintVertical_bias="0.0" />
+        <Button
+            android:id="@+id/btSetPassphrase"
+            style="@style/AppWidget.Button"
+            android:layout_width="0dp"
+            android:layout_marginTop="@dimen/default_margin_content"
+            android:text="@string/set_password"
+            android:theme="@style/AppWidget.Button.SilverWithWhiteText"
+            app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+            app:layout_constraintTop_toBottomOf="@+id/tILPassphrase" />
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guidelineLeft"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_begin="@dimen/default_margin_content_big" />
+        <TextView
+            android:id="@+id/tVLostPassphraseWarning"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_margin_content_big"
+            android:layout_marginBottom="@dimen/default_margin_content"
+            android:text="@string/warning_about_password_usage"
+            android:textAlignment="viewStart"
+            android:textColor="@color/red"
+            android:textSize="@dimen/default_text_size_medium"
+            app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"
+            app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+            app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+            app:layout_constraintTop_toBottomOf="@+id/btSetPassphrase"
+            app:layout_constraintVertical_bias="0.0" />
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guidelineTop"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_begin="@dimen/default_margin_content" />
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guidelineLeft"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_begin="@dimen/default_margin_content_big" />
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guidelineRight"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_end="@dimen/default_margin_content_big" />
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guidelineTop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_begin="@dimen/default_margin_content" />
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guidelineBottom"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_end="@dimen/default_margin_content" />
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guidelineRight"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_end="@dimen/default_margin_content_big" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guidelineBottom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_end="@dimen/default_margin_content" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
diff --git a/FlowCrypt/src/main/res/navigation/create_msg_graph.xml b/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
index a336f945e6..3e6cf3f437 100644
--- a/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
+++ b/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
@@ -31,5 +31,18 @@
         <argument
             android:name="messageType"
             app:argType="com.flowcrypt.email.model.MessageType" />
+        <action
+            android:id="@+id/action_createMessageFragment_to_providePasswordToProtectMsgDialogFragment"
+            app:destination="@id/providePasswordToProtectMsgDialogFragment" />
     </fragment>
+
+    <dialog
+        android:id="@+id/providePasswordToProtectMsgDialogFragment"
+        android:name="com.flowcrypt.email.ui.activity.fragment.dialog.ProvidePasswordToProtectMsgDialogFragment"
+        tools:layout="@layout/fragment_provide_password_to_protect_msg">
+        <argument
+            android:name="defaultPassword"
+            android:defaultValue=""
+            app:argType="string" />
+    </dialog>
 </navigation>
diff --git a/FlowCrypt/src/main/res/values-ru/strings.xml b/FlowCrypt/src/main/res/values-ru/strings.xml
index ace2f1bb10..b5d2e99f82 100644
--- a/FlowCrypt/src/main/res/values-ru/strings.xml
+++ b/FlowCrypt/src/main/res/values-ru/strings.xml
@@ -469,4 +469,9 @@
     <string name="password_protected_msg_promo">%1$s отправил Вам сообщение, которое защищено паролем. Вы можете открыт его используя эту ссылку: %2$s</string>
     <string name="hint">Подсказка</string>
     <string name="can_not_send_password_protected">Сбой при отправке: защищено паролем</string>
+    <string name="password_protection_usage_explanation">The recipients will receive a link to read your message on a web portal, where they will need to enter this password.\n\nThey will have access to this message for 3 days.</string>
+    <string name="enter_web_portal_password">Enter web portal password</string>
+    <string name="set_password">set password</string>
+    <string name="warning_about_password_usage">Do not use your Pass Phrase (that you chose during FlowCrypt Setup). Use some other password that you can share with others.\n\nYou are responsible for sharing this password with recipients (use other medium to share the password - not email).</string>
+    <string name="web_portal_password_added">Web portal password added</string>
 </resources>
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
index 4fdbadd446..fd4fb83430 100644
--- a/FlowCrypt/src/main/res/values/strings.xml
+++ b/FlowCrypt/src/main/res/values/strings.xml
@@ -557,4 +557,9 @@
     <string name="password_protected_msg_promo">%1$s has sent you a password-encrypted email. Follow this link to open it: %2$s</string>
     <string name="can_not_send_password_protected">Can\'t send message: password-protected</string>
     <string name="tap_to_protect_with_web_portal_password">Tap to protect with web portal Password</string>
+    <string name="password_protection_usage_explanation">The recipients will receive a link to read your message on a web portal, where they will need to enter this password.\n\nThey will have access to this message for 3 days.</string>
+    <string name="enter_web_portal_password">Enter web portal password</string>
+    <string name="set_password">set password</string>
+    <string name="warning_about_password_usage">Do not use your Pass Phrase (that you chose during FlowCrypt Setup). Use some other password that you can share with others.\n\nYou are responsible for sharing this password with recipients (use other medium to share the password - not email).</string>
+    <string name="web_portal_password_added">Web portal password added</string>
 </resources>

From 7c04874534f761d59ee7a64d185d76388e1d6677 Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Tue, 11 Jan 2022 14:38:35 +0200
Subject: [PATCH 08/24] Added IllegalTextForStrengthMeasuring. Refactored
 code.| #1620

---
 .../viewmodel/PasswordStrengthViewModel.kt        | 12 ++++++++++++
 .../fragment/CheckPassphraseStrengthFragment.kt   |  7 +------
 .../fragment/base/CheckPassphraseBehaviour.kt     | 15 ++++++++++-----
 .../ProvidePasswordToProtectMsgDialogFragment.kt  | 14 +-------------
 .../exception/IllegalTextForStrengthMeasuring.kt  |  8 ++++++++
 FlowCrypt/src/main/res/values-ru/strings.xml      |  1 +
 FlowCrypt/src/main/res/values/strings.xml         |  1 +
 7 files changed, 34 insertions(+), 24 deletions(-)
 create mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/IllegalTextForStrengthMeasuring.kt

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt
index 92d4e79a9f..5d7752a265 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt
@@ -6,12 +6,15 @@
 package com.flowcrypt.email.jetpack.viewmodel
 
 import android.app.Application
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.flowcrypt.email.Constants
+import com.flowcrypt.email.R
 import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.security.pgp.PgpPwd
 import com.flowcrypt.email.util.coroutines.runners.ControlledRunner
+import com.flowcrypt.email.util.exception.IllegalTextForStrengthMeasuring
 import com.nulabinc.zxcvbn.Zxcvbn
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -40,7 +43,16 @@ class PasswordStrengthViewModel(application: Application) : BaseAndroidViewModel
 
   fun check(passphrase: CharSequence) {
     viewModelScope.launch {
+      val context: Context = getApplication()
+      if (passphrase.isEmpty()) {
+        pwdStrengthResultMutableStateFlow.value = Result.exception(
+          IllegalTextForStrengthMeasuring(context.getString(R.string.type_text_to_start_measuring))
+        )
+        return@launch
+      }
+
       pwdStrengthResultMutableStateFlow.value = Result.loading()
+
       pwdStrengthResultMutableStateFlow.value = controlledRunnerForZxcvbn.cancelPreviousThenRun {
         val measure = withContext(Dispatchers.IO) {
           zxcvbn.measure(
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
index b9e95cb720..8c24e31447 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
@@ -7,7 +7,6 @@ package com.flowcrypt.email.ui.activity.fragment
 
 import android.content.Context
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -100,11 +99,7 @@ class CheckPassphraseStrengthFragment : BaseFragment(), CheckPassphraseBehaviour
     }
 
     binding?.eTPassphrase?.addTextChangedListener { editable ->
-      val passphrase = editable.toString()
-      passwordStrengthViewModel.check(passphrase)
-      if (TextUtils.isEmpty(editable)) {
-        binding?.tVPassphraseQuality?.setText(R.string.passphrase_must_be_non_empty)
-      }
+       passwordStrengthViewModel.check(editable.toString())
     }
 
     binding?.eTPassphrase?.setOnEditorActionListener { v, actionId, _ ->
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt
index 589cf48b3e..af5cf76d82 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt
@@ -27,6 +27,7 @@ import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
 import com.flowcrypt.email.security.pgp.PgpPwd
+import com.flowcrypt.email.util.exception.IllegalTextForStrengthMeasuring
 
 interface CheckPassphraseBehaviour {
   val currentContext: Context?
@@ -46,11 +47,15 @@ interface CheckPassphraseBehaviour {
           }
 
           Result.Status.EXCEPTION -> {
-            currentContext?.let { context ->
-              context.toast(
-                it.exception?.message ?: it.exception?.javaClass?.simpleName
-                ?: context.getString(R.string.unknown_error), Toast.LENGTH_LONG
-              )
+            if (it.exception is IllegalTextForStrengthMeasuring) {
+              textViewPassphraseQuality?.text = it.exception.message
+            } else {
+              currentContext?.let { context ->
+                context.toast(
+                  it.exception?.message ?: it.exception?.javaClass?.simpleName
+                  ?: context.getString(R.string.unknown_error), Toast.LENGTH_LONG
+                )
+              }
             }
           }
           else -> {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
index 3e7816d8d3..15cc0bc269 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
@@ -9,7 +9,6 @@ import android.app.AlertDialog
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
@@ -19,19 +18,12 @@ import android.widget.TextView
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.navArgs
-import com.flowcrypt.email.R
 import com.flowcrypt.email.databinding.FragmentProvidePasswordToProtectMsgBinding
 import com.flowcrypt.email.extensions.hideKeyboard
 import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
 import com.flowcrypt.email.ui.activity.fragment.base.CheckPassphraseBehaviour
 
-/**
- * @author Denis Bondarenko
- * Date: 01.08.2017
- * Time: 10:04
- * E-mail: DenBond7@gmail.com
- */
 class ProvidePasswordToProtectMsgDialogFragment : BaseDialogFragment(), CheckPassphraseBehaviour {
   private var binding: FragmentProvidePasswordToProtectMsgBinding? = null
   private val args by navArgs<ProvidePasswordToProtectMsgDialogFragmentArgs>()
@@ -59,11 +51,7 @@ class ProvidePasswordToProtectMsgDialogFragment : BaseDialogFragment(), CheckPas
     )
 
     binding?.eTPassphrase?.addTextChangedListener { editable ->
-      val passphrase = editable.toString()
-      passwordStrengthViewModel.check(passphrase)
-      if (TextUtils.isEmpty(editable)) {
-        binding?.tVPassphraseQuality?.setText(R.string.passphrase_must_be_non_empty)
-      }
+      passwordStrengthViewModel.check(editable.toString())
     }
 
     binding?.eTPassphrase?.setOnEditorActionListener { v, actionId, _ ->
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/IllegalTextForStrengthMeasuring.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/IllegalTextForStrengthMeasuring.kt
new file mode 100644
index 0000000000..2dad5ae1d8
--- /dev/null
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/IllegalTextForStrengthMeasuring.kt
@@ -0,0 +1,8 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: denbond7
+ */
+
+package com.flowcrypt.email.util.exception
+
+class IllegalTextForStrengthMeasuring(message: String) : IllegalArgumentException(message)
diff --git a/FlowCrypt/src/main/res/values-ru/strings.xml b/FlowCrypt/src/main/res/values-ru/strings.xml
index b5d2e99f82..1ae2b500de 100644
--- a/FlowCrypt/src/main/res/values-ru/strings.xml
+++ b/FlowCrypt/src/main/res/values-ru/strings.xml
@@ -474,4 +474,5 @@
     <string name="set_password">set password</string>
     <string name="warning_about_password_usage">Do not use your Pass Phrase (that you chose during FlowCrypt Setup). Use some other password that you can share with others.\n\nYou are responsible for sharing this password with recipients (use other medium to share the password - not email).</string>
     <string name="web_portal_password_added">Web portal password added</string>
+    <string name="type_text_to_start_measuring">Please type text to start measuring</string>
 </resources>
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
index fd4fb83430..7fa19d65b0 100644
--- a/FlowCrypt/src/main/res/values/strings.xml
+++ b/FlowCrypt/src/main/res/values/strings.xml
@@ -562,4 +562,5 @@
     <string name="set_password">set password</string>
     <string name="warning_about_password_usage">Do not use your Pass Phrase (that you chose during FlowCrypt Setup). Use some other password that you can share with others.\n\nYou are responsible for sharing this password with recipients (use other medium to share the password - not email).</string>
     <string name="web_portal_password_added">Web portal password added</string>
+    <string name="type_text_to_start_measuring">Please type text to start measuring</string>
 </resources>

From 77db74b0548db557fa1ea09aa0ddaf9ace81a897 Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Tue, 11 Jan 2022 15:21:11 +0200
Subject: [PATCH 09/24] Added a workable realization to support
 password-protected messages.| #1620

---
 .../jetpack/viewmodel/ComposeMsgViewModel.kt  |  2 +-
 .../fragment/CreateMessageFragment.kt         | 68 ++++++++++++++++---
 .../dialog/NoPgpFoundDialogFragment.kt        | 10 +--
 ...ovidePasswordToProtectMsgDialogFragment.kt | 19 +++++-
 FlowCrypt/src/main/res/values-ru/strings.xml  |  1 +
 FlowCrypt/src/main/res/values/strings.xml     |  1 +
 6 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
index 5036e94123..678e144285 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/ComposeMsgViewModel.kt
@@ -80,7 +80,7 @@ class ComposeMsgViewModel(isCandidateToEncrypt: Boolean, application: Applicatio
     messageEncryptionTypeMutableStateFlow.value = messageEncryptionType
   }
 
-  fun setWebPortalPassword(webPortalPassword: CharSequence) {
+  fun setWebPortalPassword(webPortalPassword: CharSequence = "") {
     webPortalPasswordMutableStateFlow.value = webPortalPassword
   }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index 21531c8852..d81cbc6ac2 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -33,8 +33,12 @@ import android.widget.ProgressBar
 import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.core.graphics.BlendModeColorFilterCompat
+import androidx.core.graphics.BlendModeCompat
 import androidx.core.view.isVisible
+import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
@@ -65,7 +69,6 @@ import com.flowcrypt.email.extensions.showKeyboard
 import com.flowcrypt.email.extensions.showNeedPassphraseDialog
 import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.extensions.visible
-import com.flowcrypt.email.extensions.visibleOrGone
 import com.flowcrypt.email.jetpack.viewmodel.AccountAliasesViewModel
 import com.flowcrypt.email.jetpack.viewmodel.ComposeMsgViewModel
 import com.flowcrypt.email.jetpack.viewmodel.RecipientsViewModel
@@ -79,6 +82,7 @@ import com.flowcrypt.email.ui.activity.fragment.base.BaseSyncFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.ChoosePublicKeyDialogFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.FixNeedPassphraseIssueDialogFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.NoPgpFoundDialogFragment
+import com.flowcrypt.email.ui.activity.fragment.dialog.ProvidePasswordToProtectMsgDialogFragment
 import com.flowcrypt.email.ui.adapter.FromAddressesAdapter
 import com.flowcrypt.email.ui.adapter.RecipientAdapter
 import com.flowcrypt.email.ui.widget.CustomChipSpanChipCreator
@@ -166,6 +170,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     super.onCreate(savedInstanceState)
     setHasOptionsMenu(true)
     setupComposeMsgViewModel()
+    subscribeToSetWebPortalPassword()
     initExtras(activity?.intent)
   }
 
@@ -263,6 +268,10 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
             )
           }
         }
+
+        NoPgpFoundDialogFragment.RESULT_CODE_PROTECT_WITH_PASSWORD -> {
+          binding?.btnSetWebPortalPassword?.callOnClick()
+        }
       }
 
       REQUEST_CODE_IMPORT_PUBLIC_KEY -> when (resultCode) {
@@ -833,8 +842,16 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     for (recipient in composeMsgViewModel.recipientWithPubKeys) {
       val recipientWithPubKeys = recipient.recipientWithPubKeys
       if (!recipientWithPubKeys.hasAtLeastOnePubKey()) {
-        showNoPgpFoundDialog(recipientWithPubKeys)
-        return true
+        //if (EmailUtil.getDomain(binding?.editTextFrom?.text.toString()) == "flowcrypt.com") {
+        if (true) {
+          if (composeMsgViewModel.webPortalPasswordStateFlow.value.isEmpty()) {
+            showNoPgpFoundDialog(recipientWithPubKeys)
+            return true
+          } else continue
+        } else {
+          showNoPgpFoundDialog(recipientWithPubKeys)
+          return true
+        }
       }
 
       if (!recipientWithPubKeys.hasNotExpiredPubKey()) {
@@ -971,7 +988,9 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     binding?.btnSetWebPortalPassword?.setOnClickListener {
       navController?.navigate(
         CreateMessageFragmentDirections
-          .actionCreateMessageFragmentToProvidePasswordToProtectMsgDialogFragment("")
+          .actionCreateMessageFragmentToProvidePasswordToProtectMsgDialogFragment(
+            composeMsgViewModel.webPortalPasswordStateFlow.value.toString()
+          )
       )
     }
   }
@@ -1341,7 +1360,12 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
    * @param recipient The [RecipientWithPubKeys] which will be used when we select the remove action.
    */
   private fun showNoPgpFoundDialog(recipient: RecipientWithPubKeys) {
-    val dialogFragment = NoPgpFoundDialogFragment.newInstance(recipient, true)
+    val dialogFragment = NoPgpFoundDialogFragment.newInstance(
+      RecipientWithPubKeys = recipient,
+      isRemoveActionEnabled = true,
+      //isProtectingWithPasswordEnabled = EmailUtil.getDomain(binding?.editTextFrom?.text.toString()) == "flowcrypt.com"
+      isProtectingWithPasswordEnabled = true
+    )
     dialogFragment.setTargetFragment(this, REQUEST_CODE_NO_PGP_FOUND_DIALOG)
     dialogFragment.show(parentFragmentManager, NoPgpFoundDialogFragment::class.java.simpleName)
   }
@@ -1623,8 +1647,16 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
     lifecycleScope.launchWhenStarted {
       composeMsgViewModel.recipientsStateFlow.collect { recipients ->
-        binding?.btnSetWebPortalPassword?.visibleOrGone(
-          recipients.any { recipient -> !recipient.recipientWithPubKeys.hasAtLeastOnePubKey() })
+        val hasRecipientsWithoutPgp =
+          recipients.any { recipient -> !recipient.recipientWithPubKeys.hasAtLeastOnePubKey() }
+        if (hasRecipientsWithoutPgp) {
+          if (binding?.btnSetWebPortalPassword?.visibility == View.GONE) {
+            composeMsgViewModel.setWebPortalPassword()
+          }
+          binding?.btnSetWebPortalPassword?.visible()
+        } else {
+          binding?.btnSetWebPortalPassword?.gone()
+        }
       }
     }
 
@@ -1639,6 +1671,9 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
               0
             )
             setText(R.string.tap_to_protect_with_web_portal_password)
+            background?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+              ContextCompat.getColor(context, R.color.orange), BlendModeCompat.MODULATE
+            )
           } else {
             setCompoundDrawablesWithIntrinsicBounds(
               R.drawable.ic_password_protected_white_24,
@@ -1647,6 +1682,9 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
               0
             )
             setText(R.string.web_portal_password_added)
+            background?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+              ContextCompat.getColor(context, R.color.colorPrimary), BlendModeCompat.MODULATE
+            )
           }
         }
       }
@@ -1775,7 +1813,11 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       encryptionType = composeMsgViewModel.msgEncryptionType,
       messageType = messageType,
       replyToMsgEntity = args.incomingMessageInfo?.msgEntity,
-      uid = EmailUtil.genOutboxUID(context)
+      uid = EmailUtil.genOutboxUID(context),
+      //password = if (EmailUtil.getDomain(binding?.editTextFrom?.text.toString()) == "flowcrypt.com") {
+      password = if (true) {
+        binding?.editTextFrom?.text?.toString()?.toCharArray()
+      } else null
     )
   }
 
@@ -1783,6 +1825,16 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     return attachments.filter { it.id != null && it.isForwarded }
   }
 
+  private fun subscribeToSetWebPortalPassword() {
+    setFragmentResultListener(
+      ProvidePasswordToProtectMsgDialogFragment.REQUEST_KEY_PASSWORD
+    ) { _, bundle ->
+      val password =
+        bundle.getCharSequence(ProvidePasswordToProtectMsgDialogFragment.KEY_PASSWORD) ?: ""
+      composeMsgViewModel.setWebPortalPassword(password)
+    }
+  }
+
   companion object {
     private const val REQUEST_CODE_NO_PGP_FOUND_DIALOG = 100
     private const val REQUEST_CODE_IMPORT_PUBLIC_KEY = 101
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/NoPgpFoundDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/NoPgpFoundDialogFragment.kt
index 75f96b0243..b6e140de68 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/NoPgpFoundDialogFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/NoPgpFoundDialogFragment.kt
@@ -113,11 +113,11 @@ class NoPgpFoundDialogFragment : BaseDialogFragment(), DialogInterface.OnClickLi
   }
 
   companion object {
-    const val RESULT_CODE_SWITCH_TO_STANDARD_EMAIL = 10
-    const val RESULT_CODE_IMPORT_THEIR_PUBLIC_KEY = 11
-    const val RESULT_CODE_COPY_FROM_OTHER_CONTACT = 12
-    const val RESULT_CODE_REMOVE_CONTACT = 13
-    const val RESULT_CODE_PROTECT_WITH_PASSWORD = 14
+    const val RESULT_CODE_PROTECT_WITH_PASSWORD = 10
+    const val RESULT_CODE_SWITCH_TO_STANDARD_EMAIL = 11
+    const val RESULT_CODE_IMPORT_THEIR_PUBLIC_KEY = 12
+    const val RESULT_CODE_COPY_FROM_OTHER_CONTACT = 13
+    const val RESULT_CODE_REMOVE_CONTACT = 14
 
     val EXTRA_KEY_PGP_CONTACT =
       GeneralUtil.generateUniqueExtraKey(
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
index 15cc0bc269..bee4f6808e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
@@ -15,11 +15,15 @@ import android.view.inputmethod.EditorInfo
 import android.widget.Button
 import android.widget.ProgressBar
 import android.widget.TextView
+import androidx.core.os.bundleOf
 import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.setFragmentResult
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.navArgs
+import com.flowcrypt.email.R
 import com.flowcrypt.email.databinding.FragmentProvidePasswordToProtectMsgBinding
 import com.flowcrypt.email.extensions.hideKeyboard
+import com.flowcrypt.email.extensions.navController
 import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
 import com.flowcrypt.email.ui.activity.fragment.base.CheckPassphraseBehaviour
@@ -77,6 +81,19 @@ class ProvidePasswordToProtectMsgDialogFragment : BaseDialogFragment(), CheckPas
   }
 
   private fun checkAndMoveOn() {
-    toast("Not yet implemented")
+    if (binding?.eTPassphrase?.text?.isEmpty() == true) {
+      toast(getString(R.string.password_cannot_be_empty))
+    } else {
+      navController?.navigateUp()
+      setFragmentResult(
+        REQUEST_KEY_PASSWORD,
+        bundleOf(KEY_PASSWORD to (binding?.eTPassphrase?.text ?: ""))
+      )
+    }
+  }
+
+  companion object {
+    const val REQUEST_KEY_PASSWORD = "REQUEST_KEY_PASSWORD"
+    const val KEY_PASSWORD = "KEY_PASSWORD"
   }
 }
diff --git a/FlowCrypt/src/main/res/values-ru/strings.xml b/FlowCrypt/src/main/res/values-ru/strings.xml
index 1ae2b500de..ae23b75d8c 100644
--- a/FlowCrypt/src/main/res/values-ru/strings.xml
+++ b/FlowCrypt/src/main/res/values-ru/strings.xml
@@ -475,4 +475,5 @@
     <string name="warning_about_password_usage">Do not use your Pass Phrase (that you chose during FlowCrypt Setup). Use some other password that you can share with others.\n\nYou are responsible for sharing this password with recipients (use other medium to share the password - not email).</string>
     <string name="web_portal_password_added">Web portal password added</string>
     <string name="type_text_to_start_measuring">Please type text to start measuring</string>
+    <string name="password_cannot_be_empty">Password cannot be empty</string>
 </resources>
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
index 7fa19d65b0..928c5900cc 100644
--- a/FlowCrypt/src/main/res/values/strings.xml
+++ b/FlowCrypt/src/main/res/values/strings.xml
@@ -563,4 +563,5 @@
     <string name="warning_about_password_usage">Do not use your Pass Phrase (that you chose during FlowCrypt Setup). Use some other password that you can share with others.\n\nYou are responsible for sharing this password with recipients (use other medium to share the password - not email).</string>
     <string name="web_portal_password_added">Web portal password added</string>
     <string name="type_text_to_start_measuring">Please type text to start measuring</string>
+    <string name="password_cannot_be_empty">Password cannot be empty</string>
 </resources>

From b1d1a9d58828430fdc32e196fbb1dd2f0b128acd Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Tue, 11 Jan 2022 19:05:44 +0200
Subject: [PATCH 10/24] Enabled password-protected messages only for
 "flowcrypt.com" domain.| #1620

---
 .../fragment/CreateMessageFragment.kt         | 84 ++++++++++---------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index d81cbc6ac2..dbb715958e 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -842,15 +842,14 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     for (recipient in composeMsgViewModel.recipientWithPubKeys) {
       val recipientWithPubKeys = recipient.recipientWithPubKeys
       if (!recipientWithPubKeys.hasAtLeastOnePubKey()) {
-        //if (EmailUtil.getDomain(binding?.editTextFrom?.text.toString()) == "flowcrypt.com") {
-        if (true) {
+        return if (isPasswordProtectedFunctionalityEnabled()) {
           if (composeMsgViewModel.webPortalPasswordStateFlow.value.isEmpty()) {
             showNoPgpFoundDialog(recipientWithPubKeys)
-            return true
+            true
           } else continue
         } else {
           showNoPgpFoundDialog(recipientWithPubKeys)
-          return true
+          true
         }
       }
 
@@ -1363,8 +1362,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     val dialogFragment = NoPgpFoundDialogFragment.newInstance(
       RecipientWithPubKeys = recipient,
       isRemoveActionEnabled = true,
-      //isProtectingWithPasswordEnabled = EmailUtil.getDomain(binding?.editTextFrom?.text.toString()) == "flowcrypt.com"
-      isProtectingWithPasswordEnabled = true
+      isProtectingWithPasswordEnabled = isPasswordProtectedFunctionalityEnabled()
     )
     dialogFragment.setTargetFragment(this, REQUEST_CODE_NO_PGP_FOUND_DIALOG)
     dialogFragment.show(parentFragmentManager, NoPgpFoundDialogFragment::class.java.simpleName)
@@ -1647,44 +1645,48 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
     lifecycleScope.launchWhenStarted {
       composeMsgViewModel.recipientsStateFlow.collect { recipients ->
-        val hasRecipientsWithoutPgp =
-          recipients.any { recipient -> !recipient.recipientWithPubKeys.hasAtLeastOnePubKey() }
-        if (hasRecipientsWithoutPgp) {
-          if (binding?.btnSetWebPortalPassword?.visibility == View.GONE) {
-            composeMsgViewModel.setWebPortalPassword()
+        if (isPasswordProtectedFunctionalityEnabled()) {
+          val hasRecipientsWithoutPgp =
+            recipients.any { recipient -> !recipient.recipientWithPubKeys.hasAtLeastOnePubKey() }
+          if (hasRecipientsWithoutPgp) {
+            if (binding?.btnSetWebPortalPassword?.visibility == View.GONE) {
+              composeMsgViewModel.setWebPortalPassword()
+            }
+            binding?.btnSetWebPortalPassword?.visible()
+          } else {
+            binding?.btnSetWebPortalPassword?.gone()
           }
-          binding?.btnSetWebPortalPassword?.visible()
-        } else {
-          binding?.btnSetWebPortalPassword?.gone()
         }
       }
     }
 
     lifecycleScope.launchWhenStarted {
       composeMsgViewModel.webPortalPasswordStateFlow.collect { webPortalPassword ->
-        binding?.btnSetWebPortalPassword?.apply {
-          if (webPortalPassword.isEmpty()) {
-            setCompoundDrawablesWithIntrinsicBounds(
-              R.drawable.ic_password_not_protected_white_24,
-              0,
-              0,
-              0
-            )
-            setText(R.string.tap_to_protect_with_web_portal_password)
-            background?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-              ContextCompat.getColor(context, R.color.orange), BlendModeCompat.MODULATE
-            )
-          } else {
-            setCompoundDrawablesWithIntrinsicBounds(
-              R.drawable.ic_password_protected_white_24,
-              0,
-              0,
-              0
-            )
-            setText(R.string.web_portal_password_added)
-            background?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-              ContextCompat.getColor(context, R.color.colorPrimary), BlendModeCompat.MODULATE
-            )
+        if (isPasswordProtectedFunctionalityEnabled()) {
+          binding?.btnSetWebPortalPassword?.apply {
+            if (webPortalPassword.isEmpty()) {
+              setCompoundDrawablesWithIntrinsicBounds(
+                R.drawable.ic_password_not_protected_white_24,
+                0,
+                0,
+                0
+              )
+              setText(R.string.tap_to_protect_with_web_portal_password)
+              background?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+                ContextCompat.getColor(context, R.color.orange), BlendModeCompat.MODULATE
+              )
+            } else {
+              setCompoundDrawablesWithIntrinsicBounds(
+                R.drawable.ic_password_protected_white_24,
+                0,
+                0,
+                0
+              )
+              setText(R.string.web_portal_password_added)
+              background?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+                ContextCompat.getColor(context, R.color.colorPrimary), BlendModeCompat.MODULATE
+              )
+            }
           }
         }
       }
@@ -1814,13 +1816,17 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       messageType = messageType,
       replyToMsgEntity = args.incomingMessageInfo?.msgEntity,
       uid = EmailUtil.genOutboxUID(context),
-      //password = if (EmailUtil.getDomain(binding?.editTextFrom?.text.toString()) == "flowcrypt.com") {
-      password = if (true) {
+      password = if (isPasswordProtectedFunctionalityEnabled()) {
         binding?.editTextFrom?.text?.toString()?.toCharArray()
       } else null
     )
   }
 
+  private fun isPasswordProtectedFunctionalityEnabled(): Boolean {
+    val account = accountViewModel.activeAccountLiveData.value?.email ?: return false
+    return EmailUtil.getDomain(account) == "flowcrypt.com"
+  }
+
   private fun getForwardedAttachments(): List<AttachmentInfo> {
     return attachments.filter { it.id != null && it.isForwarded }
   }

From 0108d261ebb2f5b827cb94a3fe9d05e2a96ab43c Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Wed, 12 Jan 2022 10:15:58 +0200
Subject: [PATCH 11/24] Fixed some bugs. Refactored code.| #1620

---
 .../email/jetpack/viewmodel/PasswordStrengthViewModel.kt | 4 ++--
 .../email/ui/activity/fragment/CreateMessageFragment.kt  | 9 ++++-----
 .../activity/fragment/base/CheckPassphraseBehaviour.kt   | 4 ++--
 ...ng.kt => IllegalTextForStrengthMeasuringException.kt} | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/{IllegalTextForStrengthMeasuring.kt => IllegalTextForStrengthMeasuringException.kt} (61%)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt
index 5d7752a265..9a93193840 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/PasswordStrengthViewModel.kt
@@ -14,7 +14,7 @@ import com.flowcrypt.email.R
 import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.security.pgp.PgpPwd
 import com.flowcrypt.email.util.coroutines.runners.ControlledRunner
-import com.flowcrypt.email.util.exception.IllegalTextForStrengthMeasuring
+import com.flowcrypt.email.util.exception.IllegalTextForStrengthMeasuringException
 import com.nulabinc.zxcvbn.Zxcvbn
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -46,7 +46,7 @@ class PasswordStrengthViewModel(application: Application) : BaseAndroidViewModel
       val context: Context = getApplication()
       if (passphrase.isEmpty()) {
         pwdStrengthResultMutableStateFlow.value = Result.exception(
-          IllegalTextForStrengthMeasuring(context.getString(R.string.type_text_to_start_measuring))
+          IllegalTextForStrengthMeasuringException(context.getString(R.string.type_text_to_start_measuring))
         )
         return@launch
       }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index dbb715958e..ec39a723d3 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -140,7 +140,6 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   private var fromAddressesAdapter: FromAddressesAdapter<String>? = null
   private var cachedRecipientWithoutPubKeys: RecipientWithPubKeys? = null
   private var extraActionInfo: ExtraActionInfo? = null
-  private var messageType = MessageType.NEW
   private var nonEncryptedHintView: View? = null
 
   private var isUpdateToCompleted = true
@@ -1085,7 +1084,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
     binding?.iBShowQuotedText?.visible()
     binding?.iBShowQuotedText?.let { registerForContextMenu(it) }
 
-    when (messageType) {
+    when (args.messageType) {
       MessageType.REPLY -> updateViewsIfReplyMode()
 
       MessageType.REPLY_ALL -> updateViewsIfReplyAllMode()
@@ -1267,7 +1266,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
   }
 
   private fun prepareReplySubject(subject: String): String {
-    val prefix = when (messageType) {
+    val prefix = when (args.messageType) {
       MessageType.REPLY, MessageType.REPLY_ALL -> "Re"
       MessageType.FORWARD -> "Fwd"
       else -> return subject
@@ -1792,7 +1791,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
   private fun getOutgoingMsgInfo(): OutgoingMessageInfo {
     var msg = binding?.editTextEmailMessage?.text.toString()
-    if (messageType == MessageType.REPLY || messageType == MessageType.REPLY_ALL) {
+    if (args.messageType == MessageType.REPLY || args.messageType == MessageType.REPLY_ALL) {
       if (binding?.iBShowQuotedText?.visibility == View.VISIBLE) {
         msg += EmailUtil.genReplyContent(args.incomingMessageInfo)
       }
@@ -1813,7 +1812,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       atts = attachments,
       forwardedAtts = getForwardedAttachments(),
       encryptionType = composeMsgViewModel.msgEncryptionType,
-      messageType = messageType,
+      messageType = args.messageType,
       replyToMsgEntity = args.incomingMessageInfo?.msgEntity,
       uid = EmailUtil.genOutboxUID(context),
       password = if (isPasswordProtectedFunctionalityEnabled()) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt
index af5cf76d82..8a633778e9 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt
@@ -27,7 +27,7 @@ import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
 import com.flowcrypt.email.security.pgp.PgpPwd
-import com.flowcrypt.email.util.exception.IllegalTextForStrengthMeasuring
+import com.flowcrypt.email.util.exception.IllegalTextForStrengthMeasuringException
 
 interface CheckPassphraseBehaviour {
   val currentContext: Context?
@@ -47,7 +47,7 @@ interface CheckPassphraseBehaviour {
           }
 
           Result.Status.EXCEPTION -> {
-            if (it.exception is IllegalTextForStrengthMeasuring) {
+            if (it.exception is IllegalTextForStrengthMeasuringException) {
               textViewPassphraseQuality?.text = it.exception.message
             } else {
               currentContext?.let { context ->
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/IllegalTextForStrengthMeasuring.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/IllegalTextForStrengthMeasuringException.kt
similarity index 61%
rename from FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/IllegalTextForStrengthMeasuring.kt
rename to FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/IllegalTextForStrengthMeasuringException.kt
index 2dad5ae1d8..cfd5171cbc 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/IllegalTextForStrengthMeasuring.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/util/exception/IllegalTextForStrengthMeasuringException.kt
@@ -5,4 +5,4 @@
 
 package com.flowcrypt.email.util.exception
 
-class IllegalTextForStrengthMeasuring(message: String) : IllegalArgumentException(message)
+class IllegalTextForStrengthMeasuringException(message: String) : IllegalArgumentException(message)

From 3a106a5d8983abc4b2692a7e97430bbeb190adeb Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Wed, 12 Jan 2022 10:28:35 +0200
Subject: [PATCH 12/24] Fixed some more bugs.| #1620

---
 .../email/ui/activity/fragment/CreateMessageFragment.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index ec39a723d3..11d921d264 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -1816,7 +1816,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       replyToMsgEntity = args.incomingMessageInfo?.msgEntity,
       uid = EmailUtil.genOutboxUID(context),
       password = if (isPasswordProtectedFunctionalityEnabled()) {
-        binding?.editTextFrom?.text?.toString()?.toCharArray()
+        composeMsgViewModel.webPortalPasswordStateFlow.value.toString().toCharArray()
       } else null
     )
   }

From 76782074e0cd0afcb4329bd94c77ef2dc4b6df89 Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Wed, 12 Jan 2022 13:40:38 +0200
Subject: [PATCH 13/24] Reverted back some changes in
 CheckPassphraseStrengthFragment. Refactored code.| #1620

---
 .../CheckPassphraseStrengthFragment.kt        | 158 +++++++++++++++---
 .../fragment/base/CheckPassphraseBehaviour.kt | 148 ----------------
 ...ovidePasswordToProtectMsgDialogFragment.kt |  25 +--
 3 files changed, 136 insertions(+), 195 deletions(-)
 delete mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
index 8c24e31447..1def4b3dbb 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
@@ -6,31 +6,42 @@
 package com.flowcrypt.email.ui.activity.fragment
 
 import android.content.Context
+import android.graphics.Color
+import android.graphics.Typeface
 import android.os.Bundle
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.TextUtils
+import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import android.widget.Button
-import android.widget.ProgressBar
-import android.widget.TextView
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.BlendModeColorFilterCompat
+import androidx.core.graphics.BlendModeCompat
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.navArgs
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.NavGraphDirections
 import com.flowcrypt.email.R
+import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.databinding.FragmentCheckPassphraseStrengthBinding
-import com.flowcrypt.email.extensions.hideKeyboard
 import com.flowcrypt.email.extensions.navController
+import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
 import com.flowcrypt.email.security.pgp.PgpPwd
 import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment
-import com.flowcrypt.email.ui.activity.fragment.base.CheckPassphraseBehaviour
 import com.flowcrypt.email.ui.notifications.SystemNotificationManager
+import com.flowcrypt.email.util.UIUtil
 import com.google.android.material.snackbar.Snackbar
 import org.apache.commons.io.IOUtils
 import java.nio.charset.StandardCharsets
+import java.util.Locale
 
 /**
  * This fragment does a reliability check of a provided passphrase.
@@ -40,20 +51,11 @@ import java.nio.charset.StandardCharsets
  * Time: 20:15
  * E-mail: DenBond7@gmail.com
  */
-class CheckPassphraseStrengthFragment : BaseFragment(), CheckPassphraseBehaviour {
+class CheckPassphraseStrengthFragment : BaseFragment() {
   private val args by navArgs<CheckPassphraseStrengthFragmentArgs>()
   private var binding: FragmentCheckPassphraseStrengthBinding? = null
-  override val currentContext: Context?
-    get() = context
-  override val passwordStrengthViewModel: PasswordStrengthViewModel by viewModels()
-  override val buttonUsePassphrase: Button?
-    get() = binding?.btSetPassphrase
-  override val progressBarPassphraseQuality: ProgressBar?
-    get() = binding?.pBarPassphraseQuality
-  override val textViewPassphraseQuality: TextView?
-    get() = binding?.tVPassphraseQuality
-  private val pwdStrengthResult: PgpPwd.PwdStrengthResult?
-    get() = passwordStrengthViewModel.pwdStrengthResultStateFlow.value.data
+  private val passwordStrengthViewModel: PasswordStrengthViewModel by viewModels()
+  private var pwdStrengthResult: PgpPwd.PwdStrengthResult? = null
 
   override val contentResourceId: Int = R.layout.fragment_check_passphrase_strength
 
@@ -63,11 +65,6 @@ class CheckPassphraseStrengthFragment : BaseFragment(), CheckPassphraseBehaviour
       .cancel(SystemNotificationManager.NOTIFICATION_ID_PASSPHRASE_TOO_WEAK)
   }
 
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    initPasswordStrengthViewModel(this)
-  }
-
   override fun onCreateView(
     inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
   ): View? {
@@ -79,6 +76,7 @@ class CheckPassphraseStrengthFragment : BaseFragment(), CheckPassphraseBehaviour
     super.onViewCreated(view, savedInstanceState)
     supportActionBar?.title = getString(R.string.security)
     initViews()
+    initPasswordStrengthViewModel()
   }
 
   private fun initViews() {
@@ -99,14 +97,18 @@ class CheckPassphraseStrengthFragment : BaseFragment(), CheckPassphraseBehaviour
     }
 
     binding?.eTPassphrase?.addTextChangedListener { editable ->
-       passwordStrengthViewModel.check(editable.toString())
+      val passphrase = editable.toString()
+      passwordStrengthViewModel.check(passphrase)
+      if (TextUtils.isEmpty(editable)) {
+        binding?.tVPassphraseQuality?.setText(R.string.passphrase_must_be_non_empty)
+      }
     }
 
     binding?.eTPassphrase?.setOnEditorActionListener { v, actionId, _ ->
       return@setOnEditorActionListener when (actionId) {
         EditorInfo.IME_ACTION_DONE -> {
           checkAndMoveOn()
-          v.hideKeyboard()
+          UIUtil.hideSoftInput(requireContext(), v)
           true
         }
         else -> false
@@ -152,4 +154,112 @@ class CheckPassphraseStrengthFragment : BaseFragment(), CheckPassphraseBehaviour
       }
     }
   }
+
+  private fun initPasswordStrengthViewModel() {
+    lifecycleScope.launchWhenStarted {
+      passwordStrengthViewModel.pwdStrengthResultStateFlow.collect {
+        when (it.status) {
+          Result.Status.SUCCESS -> {
+            pwdStrengthResult = it.data
+            updateStrengthViews()
+          }
+
+          Result.Status.EXCEPTION -> {
+            toast(
+              it.exception?.message ?: it.exception?.javaClass?.simpleName
+              ?: getString(R.string.unknown_error), Toast.LENGTH_LONG
+            )
+          }
+          else -> {
+          }
+        }
+      }
+    }
+  }
+
+  private fun updateStrengthViews() {
+    if (pwdStrengthResult == null) {
+      return
+    }
+
+    val word = pwdStrengthResult?.word
+
+    when (word?.word) {
+      Constants.PASSWORD_QUALITY_WEAK,
+      Constants.PASSWORD_QUALITY_POOR -> {
+        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+          ContextCompat.getColor(requireContext(), R.color.silver), BlendModeCompat.MODULATE
+        )
+        binding?.btSetPassphrase?.background?.colorFilter = colorFilter
+      }
+
+      else -> {
+        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+          ContextCompat.getColor(requireContext(), R.color.colorPrimary), BlendModeCompat.MODULATE
+        )
+        binding?.btSetPassphrase?.background?.colorFilter = colorFilter
+      }
+    }
+
+    val color = parseColor()
+
+    binding?.pBarPassphraseQuality?.progress = word?.bar?.toInt() ?: 0
+    val colorFilter =
+      BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN)
+    binding?.pBarPassphraseQuality?.progressDrawable?.colorFilter = colorFilter
+
+    val qualityValue = getLocalizedPasswordQualityValue(word)
+
+    val qualityValueSpannable = SpannableString(qualityValue)
+    qualityValueSpannable.setSpan(
+      ForegroundColorSpan(color), 0, qualityValueSpannable.length,
+      Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+    )
+    qualityValueSpannable.setSpan(
+      StyleSpan(Typeface.BOLD), 0,
+      qualityValueSpannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+    )
+    binding?.tVPassphraseQuality?.text = qualityValueSpannable
+    binding?.tVPassphraseQuality?.append(" ")
+    binding?.tVPassphraseQuality?.append(getString(R.string.password_quality_subtext))
+
+    val timeSpannable = SpannableString(pwdStrengthResult?.time ?: "")
+    timeSpannable.setSpan(
+      ForegroundColorSpan(color), 0, timeSpannable.length,
+      Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+    )
+    binding?.tVPassphraseQuality?.append(" ")
+    binding?.tVPassphraseQuality?.append(timeSpannable)
+    binding?.tVPassphraseQuality?.append(")")
+  }
+
+  private fun parseColor(): Int {
+    return try {
+      Color.parseColor(pwdStrengthResult?.word?.color)
+    } catch (e: IllegalArgumentException) {
+      e.printStackTrace()
+
+      when (pwdStrengthResult?.word?.color) {
+        "orange" -> Color.parseColor("#FFA500")
+
+        "darkorange" -> Color.parseColor("#FF8C00")
+
+        "darkred" -> Color.parseColor("#8B0000")
+
+        else -> Color.DKGRAY
+      }
+    }
+  }
+
+  private fun getLocalizedPasswordQualityValue(word: PgpPwd.Word?): String? {
+    return when (word?.word) {
+      Constants.PASSWORD_QUALITY_PERFECT -> getString(R.string.password_quality_perfect)
+      Constants.PASSWORD_QUALITY_GREAT -> getString(R.string.password_quality_great)
+      Constants.PASSWORD_QUALITY_GOOD -> getString(R.string.password_quality_good)
+      Constants.PASSWORD_QUALITY_REASONABLE -> getString(R.string.password_quality_reasonable)
+      Constants.PASSWORD_QUALITY_POOR -> getString(R.string.password_quality_poor)
+      Constants.PASSWORD_QUALITY_WEAK -> getString(R.string.password_quality_weak)
+      else -> word?.word
+    }?.uppercase(Locale.getDefault())
+  }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt
deleted file mode 100644
index 8a633778e9..0000000000
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CheckPassphraseBehaviour.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
- * Contributors: denbond7
- */
-
-package com.flowcrypt.email.ui.activity.fragment.base
-
-import android.content.Context
-import android.graphics.Color
-import android.graphics.Typeface
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.style.ForegroundColorSpan
-import android.text.style.StyleSpan
-import android.widget.Button
-import android.widget.ProgressBar
-import android.widget.TextView
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import com.flowcrypt.email.Constants
-import com.flowcrypt.email.R
-import com.flowcrypt.email.api.retrofit.response.base.Result
-import com.flowcrypt.email.extensions.toast
-import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
-import com.flowcrypt.email.security.pgp.PgpPwd
-import com.flowcrypt.email.util.exception.IllegalTextForStrengthMeasuringException
-
-interface CheckPassphraseBehaviour {
-  val currentContext: Context?
-  val passwordStrengthViewModel: PasswordStrengthViewModel
-  val buttonUsePassphrase: Button?
-  val progressBarPassphraseQuality: ProgressBar?
-  val textViewPassphraseQuality: TextView?
-
-  fun initPasswordStrengthViewModel(lifecycleOwner: LifecycleOwner) {
-    lifecycleOwner.lifecycleScope.launchWhenStarted {
-      passwordStrengthViewModel.pwdStrengthResultStateFlow.collect {
-        when (it.status) {
-          Result.Status.SUCCESS -> {
-            it.data?.let { pwdStrengthResult ->
-              currentContext?.let { context -> updateStrengthViews(context, pwdStrengthResult) }
-            }
-          }
-
-          Result.Status.EXCEPTION -> {
-            if (it.exception is IllegalTextForStrengthMeasuringException) {
-              textViewPassphraseQuality?.text = it.exception.message
-            } else {
-              currentContext?.let { context ->
-                context.toast(
-                  it.exception?.message ?: it.exception?.javaClass?.simpleName
-                  ?: context.getString(R.string.unknown_error), Toast.LENGTH_LONG
-                )
-              }
-            }
-          }
-          else -> {
-          }
-        }
-      }
-    }
-  }
-
-  private fun updateStrengthViews(context: Context, pwdStrengthResult: PgpPwd.PwdStrengthResult) {
-    val word = pwdStrengthResult.word
-    when (word.word) {
-      Constants.PASSWORD_QUALITY_WEAK,
-      Constants.PASSWORD_QUALITY_POOR -> {
-        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-          ContextCompat.getColor(context, R.color.silver), BlendModeCompat.MODULATE
-        )
-        buttonUsePassphrase?.background?.colorFilter = colorFilter
-      }
-
-      else -> {
-        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-          ContextCompat.getColor(context, R.color.colorPrimary), BlendModeCompat.MODULATE
-        )
-        buttonUsePassphrase?.background?.colorFilter = colorFilter
-      }
-    }
-
-    val color = parseColor(pwdStrengthResult)
-
-    progressBarPassphraseQuality?.progress = word.bar.toInt()
-    val colorFilter =
-      BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN)
-    progressBarPassphraseQuality?.progressDrawable?.colorFilter = colorFilter
-
-    val qualityValue = getLocalizedPasswordQualityValue(context, word)
-
-    val qualityValueSpannable = SpannableString(qualityValue)
-    qualityValueSpannable.setSpan(
-      ForegroundColorSpan(color), 0, qualityValueSpannable.length,
-      Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-    )
-    qualityValueSpannable.setSpan(
-      StyleSpan(Typeface.BOLD), 0,
-      qualityValueSpannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-    )
-    textViewPassphraseQuality?.text = qualityValueSpannable
-    textViewPassphraseQuality?.append(" ")
-    textViewPassphraseQuality?.append(context.getString(R.string.password_quality_subtext))
-
-    val timeSpannable = SpannableString(pwdStrengthResult.time)
-    timeSpannable.setSpan(
-      ForegroundColorSpan(color), 0, timeSpannable.length,
-      Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-    )
-    textViewPassphraseQuality?.append(" ")
-    textViewPassphraseQuality?.append(timeSpannable)
-    textViewPassphraseQuality?.append(")")
-  }
-
-  private fun parseColor(pwdStrengthResult: PgpPwd.PwdStrengthResult): Int {
-    return try {
-      Color.parseColor(pwdStrengthResult.word.color)
-    } catch (e: IllegalArgumentException) {
-      e.printStackTrace()
-
-      when (pwdStrengthResult.word.color) {
-        "orange" -> Color.parseColor("#FFA500")
-
-        "darkorange" -> Color.parseColor("#FF8C00")
-
-        "darkred" -> Color.parseColor("#8B0000")
-
-        else -> Color.DKGRAY
-      }
-    }
-  }
-
-  private fun getLocalizedPasswordQualityValue(context: Context, word: PgpPwd.Word?): String? {
-    return when (word?.word) {
-      Constants.PASSWORD_QUALITY_PERFECT -> context.getString(R.string.password_quality_perfect)
-      Constants.PASSWORD_QUALITY_GREAT -> context.getString(R.string.password_quality_great)
-      Constants.PASSWORD_QUALITY_GOOD -> context.getString(R.string.password_quality_good)
-      Constants.PASSWORD_QUALITY_REASONABLE -> context.getString(R.string.password_quality_reasonable)
-      Constants.PASSWORD_QUALITY_POOR -> context.getString(R.string.password_quality_poor)
-      Constants.PASSWORD_QUALITY_WEAK -> context.getString(R.string.password_quality_weak)
-      else -> word?.word
-    }?.uppercase()
-  }
-}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
index bee4f6808e..bbe3ddd5fd 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/ProvidePasswordToProtectMsgDialogFragment.kt
@@ -7,44 +7,23 @@ package com.flowcrypt.email.ui.activity.fragment.dialog
 
 import android.app.AlertDialog
 import android.app.Dialog
-import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
-import android.widget.Button
-import android.widget.ProgressBar
-import android.widget.TextView
 import androidx.core.os.bundleOf
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.setFragmentResult
-import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.navArgs
 import com.flowcrypt.email.R
 import com.flowcrypt.email.databinding.FragmentProvidePasswordToProtectMsgBinding
 import com.flowcrypt.email.extensions.hideKeyboard
 import com.flowcrypt.email.extensions.navController
 import com.flowcrypt.email.extensions.toast
-import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
-import com.flowcrypt.email.ui.activity.fragment.base.CheckPassphraseBehaviour
 
-class ProvidePasswordToProtectMsgDialogFragment : BaseDialogFragment(), CheckPassphraseBehaviour {
+class ProvidePasswordToProtectMsgDialogFragment : BaseDialogFragment() {
   private var binding: FragmentProvidePasswordToProtectMsgBinding? = null
   private val args by navArgs<ProvidePasswordToProtectMsgDialogFragmentArgs>()
-  override val currentContext: Context?
-    get() = context
-  override val passwordStrengthViewModel: PasswordStrengthViewModel by viewModels()
-  override val buttonUsePassphrase: Button?
-    get() = binding?.btSetPassphrase
-  override val progressBarPassphraseQuality: ProgressBar?
-    get() = binding?.pBarPassphraseQuality
-  override val textViewPassphraseQuality: TextView?
-    get() = binding?.tVPassphraseQuality
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    initPasswordStrengthViewModel(this)
-  }
 
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
     val builder = AlertDialog.Builder(activity)
@@ -55,7 +34,7 @@ class ProvidePasswordToProtectMsgDialogFragment : BaseDialogFragment(), CheckPas
     )
 
     binding?.eTPassphrase?.addTextChangedListener { editable ->
-      passwordStrengthViewModel.check(editable.toString())
+      //check typed password will be added a bit later(soon)
     }
 
     binding?.eTPassphrase?.setOnEditorActionListener { v, actionId, _ ->

From b4dcf024db8dc94d3561954bbbdb32f42763875c Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Wed, 12 Jan 2022 14:04:30 +0200
Subject: [PATCH 14/24] Added missing russian translation.| #1620

---
 FlowCrypt/src/main/res/values-ru/strings.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/FlowCrypt/src/main/res/values-ru/strings.xml b/FlowCrypt/src/main/res/values-ru/strings.xml
index ae23b75d8c..e23f90610c 100644
--- a/FlowCrypt/src/main/res/values-ru/strings.xml
+++ b/FlowCrypt/src/main/res/values-ru/strings.xml
@@ -469,11 +469,12 @@
     <string name="password_protected_msg_promo">%1$s отправил Вам сообщение, которое защищено паролем. Вы можете открыт его используя эту ссылку: %2$s</string>
     <string name="hint">Подсказка</string>
     <string name="can_not_send_password_protected">Сбой при отправке: защищено паролем</string>
-    <string name="password_protection_usage_explanation">The recipients will receive a link to read your message on a web portal, where they will need to enter this password.\n\nThey will have access to this message for 3 days.</string>
-    <string name="enter_web_portal_password">Enter web portal password</string>
-    <string name="set_password">set password</string>
-    <string name="warning_about_password_usage">Do not use your Pass Phrase (that you chose during FlowCrypt Setup). Use some other password that you can share with others.\n\nYou are responsible for sharing this password with recipients (use other medium to share the password - not email).</string>
-    <string name="web_portal_password_added">Web portal password added</string>
-    <string name="type_text_to_start_measuring">Please type text to start measuring</string>
-    <string name="password_cannot_be_empty">Password cannot be empty</string>
+    <string name="enter_web_portal_password">Введите web-пароль</string>
+    <string name="set_password">Установить пароль</string>
+    <string name="web_portal_password_added">Web-пароль добавлен</string>
+    <string name="type_text_to_start_measuring">Пожалуйста, введите текст чтобы начать измерение</string>
+    <string name="password_cannot_be_empty">Пароль не может быть пустым</string>
+    <string name="tap_to_protect_with_web_portal_password">Нажмите, чтобы защитить web-паролем</string>
+    <string name="password_protection_usage_explanation">Получатели получат ссылку, используя которую смогут прочесть Ваше сообщение на web-портале. Для этого им нужно будет ввести этот пароль. Они будут иметь доступ к данному сообщению на протяжении 3 дней.</string>
+    <string name="warning_about_password_usage">Не используйте Вашу парольную фразу(которую вы используете во время настройки FlowCrypt). Используйте какой-то другой пароль, которым можно поделиться с другими. На Вас лежит ответственность за распространение этого пароля между получателями(не используйте почту чтобы поделится этим паролем)</string>
 </resources>

From cf95a12a9f115dd2f86f5d0c759dda4cd7930950 Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Wed, 12 Jan 2022 14:07:54 +0200
Subject: [PATCH 15/24] Fix translation.| #1620

---
 FlowCrypt/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FlowCrypt/src/main/res/values-ru/strings.xml b/FlowCrypt/src/main/res/values-ru/strings.xml
index e23f90610c..43f6e45ac8 100644
--- a/FlowCrypt/src/main/res/values-ru/strings.xml
+++ b/FlowCrypt/src/main/res/values-ru/strings.xml
@@ -476,5 +476,5 @@
     <string name="password_cannot_be_empty">Пароль не может быть пустым</string>
     <string name="tap_to_protect_with_web_portal_password">Нажмите, чтобы защитить web-паролем</string>
     <string name="password_protection_usage_explanation">Получатели получат ссылку, используя которую смогут прочесть Ваше сообщение на web-портале. Для этого им нужно будет ввести этот пароль. Они будут иметь доступ к данному сообщению на протяжении 3 дней.</string>
-    <string name="warning_about_password_usage">Не используйте Вашу парольную фразу(которую вы используете во время настройки FlowCrypt). Используйте какой-то другой пароль, которым можно поделиться с другими. На Вас лежит ответственность за распространение этого пароля между получателями(не используйте почту чтобы поделится этим паролем)</string>
+    <string name="warning_about_password_usage">Не используйте Вашу парольную фразу(которую вы используете во время настройки FlowCrypt). Используйте какой-то другой пароль, которым можно поделиться с другими. На Вас лежит ответственность за распространение этого пароля между получателями(не используйте почту, чтобы поделится этим паролем)</string>
 </resources>

From 914c0b9933c708bf7cf7cf5c8048657f3d5412d0 Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Wed, 12 Jan 2022 14:17:53 +0200
Subject: [PATCH 16/24] Simplified some code.| #1620

---
 .../email/ui/activity/fragment/CreateMessageFragment.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index 11d921d264..7ceb369443 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -514,7 +514,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
   override fun onClick(v: View) {
     when (v.id) {
-      R.id.imageButtonAliases -> if (fromAddressesAdapter?.count != 1 && fromAddressesAdapter?.count != 0) {
+      R.id.imageButtonAliases -> if (fromAddressesAdapter?.count ?: 0 > 1) {
         binding?.spinnerFrom?.performClick()
       }
 

From 59008652d3795ddb55936fe13c96330ba88c6248 Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Wed, 12 Jan 2022 14:45:10 +0200
Subject: [PATCH 17/24] Fixed lint warnings.| #1620

---
 FlowCrypt/src/main/res/values-ru/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FlowCrypt/src/main/res/values-ru/strings.xml b/FlowCrypt/src/main/res/values-ru/strings.xml
index 43f6e45ac8..8a023738a3 100644
--- a/FlowCrypt/src/main/res/values-ru/strings.xml
+++ b/FlowCrypt/src/main/res/values-ru/strings.xml
@@ -477,4 +477,5 @@
     <string name="tap_to_protect_with_web_portal_password">Нажмите, чтобы защитить web-паролем</string>
     <string name="password_protection_usage_explanation">Получатели получат ссылку, используя которую смогут прочесть Ваше сообщение на web-портале. Для этого им нужно будет ввести этот пароль. Они будут иметь доступ к данному сообщению на протяжении 3 дней.</string>
     <string name="warning_about_password_usage">Не используйте Вашу парольную фразу(которую вы используете во время настройки FlowCrypt). Используйте какой-то другой пароль, которым можно поделиться с другими. На Вас лежит ответственность за распространение этого пароля между получателями(не используйте почту, чтобы поделится этим паролем)</string>
+    <string name="protect_with_password">Защитить паролем</string>
 </resources>

From 2320f3875aa71c327ef142f6c3b6df1c72304132 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Thu, 13 Jan 2022 09:45:33 +0200
Subject: [PATCH 18/24] Fixed russian translation.| #1620

---
 FlowCrypt/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FlowCrypt/src/main/res/values-ru/strings.xml b/FlowCrypt/src/main/res/values-ru/strings.xml
index 8a023738a3..e8201cac18 100644
--- a/FlowCrypt/src/main/res/values-ru/strings.xml
+++ b/FlowCrypt/src/main/res/values-ru/strings.xml
@@ -476,6 +476,6 @@
     <string name="password_cannot_be_empty">Пароль не может быть пустым</string>
     <string name="tap_to_protect_with_web_portal_password">Нажмите, чтобы защитить web-паролем</string>
     <string name="password_protection_usage_explanation">Получатели получат ссылку, используя которую смогут прочесть Ваше сообщение на web-портале. Для этого им нужно будет ввести этот пароль. Они будут иметь доступ к данному сообщению на протяжении 3 дней.</string>
-    <string name="warning_about_password_usage">Не используйте Вашу парольную фразу(которую вы используете во время настройки FlowCrypt). Используйте какой-то другой пароль, которым можно поделиться с другими. На Вас лежит ответственность за распространение этого пароля между получателями(не используйте почту, чтобы поделится этим паролем)</string>
+    <string name="warning_about_password_usage">Не используйте Вашу ключевую фразу(которую вы используете во время настройки FlowCrypt). Используйте какой-то другой пароль, которым можно поделиться с другими. На Вас лежит ответственность за распространение этого пароля между получателями(не используйте почту, чтобы поделится этим паролем)</string>
     <string name="protect_with_password">Защитить паролем</string>
 </resources>

From a40dea49c8f27a26dd9878a314e4bbbae51618d3 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Thu, 13 Jan 2022 13:12:42 +0200
Subject: [PATCH 19/24] Fixed some existing tests.| #1620

---
 .../flowcrypt/email/api/email/EmailUtil.kt    |  2 ++
 .../api/email/model/OutgoingMessageInfo.kt    |  6 ++--
 .../com/flowcrypt/email/model/MessageType.kt  | 30 ++++++++-----------
 .../ui/activity/CreateMessageActivity.kt      | 11 ++-----
 .../base/BasePassPhraseManagerActivity.kt     | 17 +++++++++--
 .../fragment/CreateMessageFragment.kt         |  3 --
 .../main/res/navigation/create_msg_graph.xml  |  3 +-
 7 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt
index a906257551..070a6c7ff2 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt
@@ -673,6 +673,8 @@ class EmailUtil {
         MessageType.REPLY, MessageType.REPLY_ALL -> {
           prepareReplyMsg(context, session, outgoingMsgInfo, pubKeys, prvKeys, ringProtector)
         }
+
+        else -> throw IllegalStateException("Unsupported message type")
       }
     }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt
index 620b8461e6..dbf9be1397 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/OutgoingMessageInfo.kt
@@ -31,7 +31,7 @@ data class OutgoingMessageInfo constructor(
   val atts: List<AttachmentInfo>? = null,
   val forwardedAtts: List<AttachmentInfo>? = null,
   val encryptionType: MessageEncryptionType,
-  val messageType: MessageType,
+  @MessageType val messageType: Int,
   val replyToMsgEntity: MessageEntity? = null,
   val uid: Long = 0,
   val password: CharArray? = null
@@ -64,7 +64,7 @@ data class OutgoingMessageInfo constructor(
     parcel.readValue(AttachmentInfo::class.java.classLoader) as List<AttachmentInfo>?,
     parcel.readValue(AttachmentInfo::class.java.classLoader) as List<AttachmentInfo>?,
     parcel.readParcelable<MessageEncryptionType>(MessageEncryptionType::class.java.classLoader)!!,
-    parcel.readParcelable<MessageType>(MessageType::class.java.classLoader)!!,
+    parcel.readInt(),
     parcel.readParcelable<MessageEntity>(MessageEntity::class.java.classLoader),
     parcel.readLong(),
     parcel.createCharArray()
@@ -86,7 +86,7 @@ data class OutgoingMessageInfo constructor(
       writeValue(atts)
       writeValue(forwardedAtts)
       writeParcelable(encryptionType, flags)
-      writeParcelable(messageType, flags)
+      writeInt(messageType)
       writeParcelable(replyToMsgEntity, flags)
       writeLong(uid)
       writeCharArray(password)
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageType.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageType.kt
index 3ff0c69618..2c2d5adaf7 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageType.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/model/MessageType.kt
@@ -5,8 +5,11 @@
 
 package com.flowcrypt.email.model
 
-import android.os.Parcel
-import android.os.Parcelable
+import androidx.annotation.IntDef
+import com.flowcrypt.email.model.MessageType.Companion.FORWARD
+import com.flowcrypt.email.model.MessageType.Companion.NEW
+import com.flowcrypt.email.model.MessageType.Companion.REPLY
+import com.flowcrypt.email.model.MessageType.Companion.REPLY_ALL
 
 /**
  * The message types.
@@ -16,22 +19,13 @@ import android.os.Parcelable
  * Time: 12:55
  * E-mail: DenBond7@gmail.com
  */
-enum class MessageType : Parcelable {
-  NEW, REPLY, REPLY_ALL, FORWARD;
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    dest.writeInt(ordinal)
-  }
-
+@Retention(AnnotationRetention.SOURCE)
+@IntDef(NEW, REPLY, REPLY_ALL, FORWARD)
+annotation class MessageType {
   companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<MessageType> = object : Parcelable.Creator<MessageType> {
-      override fun createFromParcel(source: Parcel): MessageType = values()[source.readInt()]
-      override fun newArray(size: Int): Array<MessageType?> = arrayOfNulls(size)
-    }
+    const val NEW = 0
+    const val REPLY = 1
+    const val REPLY_ALL = 2
+    const val FORWARD = 3
   }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt
index 7541a2c9bc..ecb15c5f8b 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/CreateMessageActivity.kt
@@ -8,7 +8,6 @@ package com.flowcrypt.email.ui.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.View
 import android.widget.Toast
 import androidx.navigation.fragment.NavHostFragment
@@ -42,11 +41,7 @@ class CreateMessageActivity : BaseBackStackSyncActivity(),
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     (supportFragmentManager.findFragmentById(R.id.fragmentContainerView) as? NavHostFragment)
-      ?.navController?.setGraph(R.navigation.create_msg_graph, intent.extras?.apply {
-        if (!containsKey("messageType")) {
-          putParcelable("messageType", MessageType.NEW)
-        }
-      })
+      ?.navController?.setGraph(R.navigation.create_msg_graph, intent.extras)
   }
 
   override fun onAccountInfoRefreshed(accountEntity: AccountEntity?) {
@@ -78,13 +73,13 @@ class CreateMessageActivity : BaseBackStackSyncActivity(),
     fun generateIntent(
       context: Context?,
       msgInfo: IncomingMessageInfo?,
-      messageType: MessageType?,
+      @MessageType messageType: Int,
       msgEncryptionType: MessageEncryptionType?,
       serviceInfo: ServiceInfo? = null
     ): Intent {
       val intent = Intent(context, CreateMessageActivity::class.java)
       intent.putExtra("incomingMessageInfo", msgInfo)
-      intent.putExtra("messageType", messageType as Parcelable)
+      intent.putExtra("messageType", messageType)
       intent.putExtra("encryptedByDefault", msgEncryptionType == MessageEncryptionType.ENCRYPTED)
       intent.putExtra("serviceInfo", serviceInfo)
       return intent
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BasePassPhraseManagerActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BasePassPhraseManagerActivity.kt
index e258309aa4..961b725776 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BasePassPhraseManagerActivity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BasePassPhraseManagerActivity.kt
@@ -28,11 +28,14 @@ import androidx.lifecycle.lifecycleScope
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.retrofit.response.base.Result
+import com.flowcrypt.email.extensions.decrementSafely
+import com.flowcrypt.email.extensions.incrementSafely
 import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
 import com.flowcrypt.email.security.pgp.PgpPwd
 import com.flowcrypt.email.ui.activity.fragment.dialog.InfoDialogFragment
 import com.flowcrypt.email.ui.activity.fragment.dialog.WebViewInfoDialogFragment
 import com.flowcrypt.email.util.UIUtil
+import com.flowcrypt.email.util.exception.IllegalTextForStrengthMeasuringException
 import com.google.android.material.snackbar.Snackbar
 import org.apache.commons.io.IOUtils
 import java.io.IOException
@@ -294,15 +297,23 @@ abstract class BasePassPhraseManagerActivity : BaseBackStackActivity(), View.OnC
     lifecycleScope.launchWhenStarted {
       passwordStrengthViewModel.pwdStrengthResultStateFlow.collect {
         when (it.status) {
+          Result.Status.LOADING -> {
+            countingIdlingResource.incrementSafely()
+          }
+
           Result.Status.SUCCESS -> {
             pwdStrengthResult = it.data
             updateStrengthViews()
+            countingIdlingResource.decrementSafely()
           }
 
           Result.Status.EXCEPTION -> {
-            val msg = it.exception?.message ?: it.exception?.javaClass?.simpleName
-            ?: getString(R.string.unknown_error)
-            Toast.makeText(this@BasePassPhraseManagerActivity, msg, Toast.LENGTH_LONG).show()
+            if (it.exception !is IllegalTextForStrengthMeasuringException) {
+              val msg = it.exception?.message ?: it.exception?.javaClass?.simpleName
+              ?: getString(R.string.unknown_error)
+              Toast.makeText(this@BasePassPhraseManagerActivity, msg, Toast.LENGTH_LONG).show()
+            }
+            countingIdlingResource.decrementSafely()
           }
         }
       }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index 7ceb369443..10ff802b84 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -1090,9 +1090,6 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
       MessageType.REPLY_ALL -> updateViewsIfReplyAllMode()
 
       MessageType.FORWARD -> updateViewsIfFwdMode()
-
-      else -> {
-      }
     }
 
     updateRecipients()
diff --git a/FlowCrypt/src/main/res/navigation/create_msg_graph.xml b/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
index 3e6cf3f437..98649bb76d 100644
--- a/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
+++ b/FlowCrypt/src/main/res/navigation/create_msg_graph.xml
@@ -30,7 +30,8 @@
             app:nullable="true" />
         <argument
             android:name="messageType"
-            app:argType="com.flowcrypt.email.model.MessageType" />
+            android:defaultValue="0"
+            app:argType="integer" />
         <action
             android:id="@+id/action_createMessageFragment_to_providePasswordToProtectMsgDialogFragment"
             app:destination="@id/providePasswordToProtectMsgDialogFragment" />

From e7d414b35ac4639bf90ae4aaf4440eee39f431b2 Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Thu, 13 Jan 2022 20:18:34 +0200
Subject: [PATCH 20/24] Fixed CheckPassphraseStrengthFragmentTest.| #1620

---
 .../CheckPassphraseStrengthFragment.kt        | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
index 1def4b3dbb..ad1f4cde59 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CheckPassphraseStrengthFragment.kt
@@ -31,6 +31,8 @@ import com.flowcrypt.email.NavGraphDirections
 import com.flowcrypt.email.R
 import com.flowcrypt.email.api.retrofit.response.base.Result
 import com.flowcrypt.email.databinding.FragmentCheckPassphraseStrengthBinding
+import com.flowcrypt.email.extensions.decrementSafely
+import com.flowcrypt.email.extensions.incrementSafely
 import com.flowcrypt.email.extensions.navController
 import com.flowcrypt.email.extensions.toast
 import com.flowcrypt.email.jetpack.viewmodel.PasswordStrengthViewModel
@@ -38,6 +40,7 @@ import com.flowcrypt.email.security.pgp.PgpPwd
 import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment
 import com.flowcrypt.email.ui.notifications.SystemNotificationManager
 import com.flowcrypt.email.util.UIUtil
+import com.flowcrypt.email.util.exception.IllegalTextForStrengthMeasuringException
 import com.google.android.material.snackbar.Snackbar
 import org.apache.commons.io.IOUtils
 import java.nio.charset.StandardCharsets
@@ -159,17 +162,26 @@ class CheckPassphraseStrengthFragment : BaseFragment() {
     lifecycleScope.launchWhenStarted {
       passwordStrengthViewModel.pwdStrengthResultStateFlow.collect {
         when (it.status) {
+          Result.Status.LOADING -> {
+            baseActivity.countingIdlingResource.incrementSafely()
+          }
+
           Result.Status.SUCCESS -> {
             pwdStrengthResult = it.data
             updateStrengthViews()
+            baseActivity.countingIdlingResource.decrementSafely()
           }
 
           Result.Status.EXCEPTION -> {
-            toast(
-              it.exception?.message ?: it.exception?.javaClass?.simpleName
-              ?: getString(R.string.unknown_error), Toast.LENGTH_LONG
-            )
+            if (it.exception !is IllegalTextForStrengthMeasuringException) {
+              toast(
+                it.exception?.message ?: it.exception?.javaClass?.simpleName
+                ?: getString(R.string.unknown_error), Toast.LENGTH_LONG
+              )
+            }
+            baseActivity.countingIdlingResource.decrementSafely()
           }
+
           else -> {
           }
         }

From d9d05c682ee9b776d3efb3a11727922dc42ba250 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Fri, 14 Jan 2022 13:51:58 +0200
Subject: [PATCH 21/24] Added CreateMessageFragmentPasswordProtectedTest.|
 #1620

---
 .../email/matchers/CustomMatchers.kt          |   8 ++
 .../email/matchers/TextViewDrawableMatcher.kt |  57 +++++++++
 .../ui/activity/CreateMessageActivityTest.kt  |   3 +-
 ...ateMessageFragmentPasswordProtectedTest.kt | 110 ++++++++++++++++++
 .../fragment/CreateMessageFragment.kt         |   2 +-
 5 files changed, 178 insertions(+), 2 deletions(-)
 create mode 100644 FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/TextViewDrawableMatcher.kt
 create mode 100644 FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageFragmentPasswordProtectedTest.kt

diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/CustomMatchers.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/CustomMatchers.kt
index 61cab3ee61..66f6ec3fc7 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/CustomMatchers.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/CustomMatchers.kt
@@ -7,6 +7,7 @@ package com.flowcrypt.email.matchers
 
 import android.view.View
 import android.widget.ListView
+import androidx.annotation.DrawableRes
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Root
 import androidx.test.espresso.matcher.BoundedMatcher
@@ -115,5 +116,12 @@ class CustomMatchers {
     fun isToast(): BaseMatcher<Root?> {
       return ToastMatcher()
     }
+
+    fun withTextViewDrawable(
+      @DrawableRes resourceId: Int,
+      @TextViewDrawableMatcher.DrawablePosition drawablePosition: Int
+    ): Matcher<View> {
+      return TextViewDrawableMatcher(resourceId, drawablePosition)
+    }
   }
 }
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/TextViewDrawableMatcher.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/TextViewDrawableMatcher.kt
new file mode 100644
index 0000000000..8a1a1eba91
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/TextViewDrawableMatcher.kt
@@ -0,0 +1,57 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.matchers
+
+import android.view.View
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.annotation.IntDef
+import androidx.core.graphics.drawable.toBitmap
+import org.hamcrest.Description
+import org.hamcrest.TypeSafeMatcher
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 1/14/22
+ *         Time: 11:55 AM
+ *         E-mail: DenBond7@gmail.com
+ */
+class TextViewDrawableMatcher(
+  @DrawableRes private val resourceId: Int,
+  @DrawablePosition private val drawablePosition: Int
+) : TypeSafeMatcher<View>() {
+  override fun describeTo(description: Description) {
+    description.appendText(
+      "TextView with compound drawable at position $drawablePosition" +
+          " same as drawable with id $resourceId"
+    )
+  }
+
+  override fun matchesSafely(view: View): Boolean {
+    if (view !is TextView) {
+      return false
+    }
+
+    val expectedBitmap = view.context.getDrawable(resourceId)?.toBitmap()
+    return view.compoundDrawables[drawablePosition].toBitmap().sameAs(expectedBitmap)
+  }
+
+  @Retention(AnnotationRetention.SOURCE)
+  @IntDef(
+    DrawablePosition.LEFT,
+    DrawablePosition.TOP,
+    DrawablePosition.RIGHT,
+    DrawablePosition.BOTTOM
+  )
+  annotation class DrawablePosition {
+    companion object {
+      const val LEFT = 0
+      const val TOP = 1
+      const val RIGHT = 2
+      const val BOTTOM = 3
+    }
+  }
+}
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt
index 829279269d..9827b7340c 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt
@@ -30,6 +30,7 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withParent
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
@@ -728,7 +729,7 @@ class CreateMessageActivityTest : BaseCreateMessageActivityTest() {
   private fun deleteAtt(att: File) {
     onView(
       allOf(
-        withId(R.id.imageButtonClearAtt), ViewMatchers.withParent(
+        withId(R.id.imageButtonClearAtt), withParent(
           allOf(withId(R.id.actionButtons), hasSibling(withText(att.name)))
         )
       )
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageFragmentPasswordProtectedTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageFragmentPasswordProtectedTest.kt
new file mode 100644
index 0000000000..94e71f712c
--- /dev/null
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageFragmentPasswordProtectedTest.kt
@@ -0,0 +1,110 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.ui.activity
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.clearText
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import com.flowcrypt.email.R
+import com.flowcrypt.email.TestConstants
+import com.flowcrypt.email.matchers.CustomMatchers.Companion.withTextViewDrawable
+import com.flowcrypt.email.matchers.TextViewDrawableMatcher
+import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule
+import com.flowcrypt.email.rules.ClearAppSettingsRule
+import com.flowcrypt.email.rules.RetryRule
+import com.flowcrypt.email.rules.ScreenshotTestRule
+import com.flowcrypt.email.ui.activity.base.BaseCreateMessageActivityTest
+import org.hamcrest.Matchers.not
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TemporaryFolder
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 1/14/22
+ *         Time: 11:29 AM
+ *         E-mail: DenBond7@gmail.com
+ */
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class CreateMessageFragmentPasswordProtectedTest : BaseCreateMessageActivityTest() {
+  private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule()
+  private val temporaryFolderRule = TemporaryFolder()
+
+  @get:Rule
+  var ruleChain: TestRule = RuleChain
+    .outerRule(ClearAppSettingsRule())
+    .around(addAccountToDatabaseRule)
+    .around(addPrivateKeyToDatabaseRule)
+    .around(temporaryFolderRule)
+    .around(RetryRule.DEFAULT)
+    .around(activeActivityRule)
+    .around(ScreenshotTestRule())
+
+  @Test
+  fun testShowWebPortalPasswordButton() {
+    activeActivityRule?.launch(intent)
+    registerAllIdlingResources()
+
+    onView(withId(R.id.editTextRecipientTo))
+      .perform(
+        typeText(TestConstants.RECIPIENT_WITHOUT_PUBLIC_KEY_ON_ATTESTER),
+        closeSoftKeyboard()
+      )
+
+    //need to leave focus from 'To' field. move the focus to the next view
+    onView(withId(R.id.editTextEmailSubject))
+      .perform(scrollTo(), click())
+
+    onView(withId(R.id.btnSetWebPortalPassword))
+      .check(matches(isDisplayed()))
+      .check(matches(withText(getResString(R.string.tap_to_protect_with_web_portal_password))))
+      .check(
+        matches(
+          withTextViewDrawable(
+            R.drawable.ic_password_not_protected_white_24,
+            TextViewDrawableMatcher.DrawablePosition.LEFT
+          )
+        )
+      )
+  }
+
+  @Test
+  fun testWebPortalPasswordButtonVisibility() {
+    activeActivityRule?.launch(intent)
+    registerAllIdlingResources()
+
+    onView(withId(R.id.editTextRecipientTo))
+      .perform(
+        typeText(TestConstants.RECIPIENT_WITHOUT_PUBLIC_KEY_ON_ATTESTER),
+        closeSoftKeyboard()
+      )
+    //need to leave focus from 'To' field. move the focus to the next view
+    onView(withId(R.id.editTextEmailSubject))
+      .perform(scrollTo(), click())
+    onView(withId(R.id.editTextRecipientTo))
+      .perform(
+        clearText(), typeText("some text"), clearText(),
+      )
+    //need to leave focus from 'To' field. move the focus to the next view
+    onView(withId(R.id.editTextEmailSubject))
+      .perform(scrollTo(), click())
+    onView(withId(R.id.btnSetWebPortalPassword))
+      .check(matches(not(isDisplayed())))
+  }
+}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
index 10ff802b84..4d213b28f6 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragment.kt
@@ -1820,7 +1820,7 @@ class CreateMessageFragment : BaseSyncFragment(), View.OnFocusChangeListener,
 
   private fun isPasswordProtectedFunctionalityEnabled(): Boolean {
     val account = accountViewModel.activeAccountLiveData.value?.email ?: return false
-    return EmailUtil.getDomain(account) == "flowcrypt.com"
+    return EmailUtil.getDomain(account) in listOf("flowcrypt.com", "flowcrypt.test")
   }
 
   private fun getForwardedAttachments(): List<AttachmentInfo> {

From 7c99246c86f5bd9031a5766e82bd8c9210bafd0a Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Mon, 17 Jan 2022 16:06:11 +0200
Subject: [PATCH 22/24] Modifed logic in BetterInternetAddressTest to fix tests
 that use "localhost" as an email domain.| #1620

---
 .../email/api/retrofit/FlowcryptApiRepository.kt  |  3 +--
 .../java/com/flowcrypt/email/api/wkd/WkdClient.kt | 11 +++++------
 .../email/extensions/kotlin/StringExt.kt          |  4 ----
 .../flowcrypt/email/util/BetterEmailAddress.kt    | 15 +++++----------
 .../email/util/BetterInternetAddressTest.kt       |  6 +++---
 5 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/FlowcryptApiRepository.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/FlowcryptApiRepository.kt
index 5fe0309cd2..c5274ee6b4 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/FlowcryptApiRepository.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/FlowcryptApiRepository.kt
@@ -26,7 +26,6 @@ import com.flowcrypt.email.api.retrofit.response.model.OrgRules
 import com.flowcrypt.email.api.retrofit.response.oauth2.MicrosoftOAuth2TokenResponse
 import com.flowcrypt.email.api.wkd.WkdClient
 import com.flowcrypt.email.extensions.kotlin.isValidEmail
-import com.flowcrypt.email.extensions.kotlin.isValidLocalhostEmail
 import com.flowcrypt.email.extensions.org.bouncycastle.openpgp.armor
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
@@ -140,7 +139,7 @@ class FlowcryptApiRepository : ApiRepository {
         }
       }
 
-      if (identData.isValidEmail() || identData.isValidLocalhostEmail()) {
+      if (identData.isValidEmail()) {
         val wkdResult = getResult(requestCode = requestCode) {
           val pgpPublicKeyRingCollection = WkdClient.lookupEmail(context, identData)
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/wkd/WkdClient.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/wkd/WkdClient.kt
index 031a017494..717aa4f19d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/wkd/WkdClient.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/wkd/WkdClient.kt
@@ -10,7 +10,6 @@ import android.content.Context
 import com.flowcrypt.email.api.retrofit.ApiHelper
 import com.flowcrypt.email.api.retrofit.ApiService
 import com.flowcrypt.email.extensions.kotlin.isValidEmail
-import com.flowcrypt.email.extensions.kotlin.isValidLocalhostEmail
 import com.flowcrypt.email.util.BetterInternetAddress
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -33,12 +32,12 @@ object WkdClient {
   suspend fun lookupEmail(context: Context, email: String): PGPPublicKeyRingCollection? =
     withContext(Dispatchers.IO) {
       val pgpPublicKeyRingCollection = rawLookupEmail(context, email)
-      val lowerCaseEmail = email.toLowerCase(Locale.ROOT)
+      val lowerCaseEmail = email.lowercase()
       val matchingKeys = pgpPublicKeyRingCollection?.keyRings?.asSequence()?.filter {
         for (userId in it.publicKey.userIDs) {
           try {
             val parsed = BetterInternetAddress(userId)
-            if (parsed.emailAddress.toLowerCase(Locale.ROOT) == lowerCaseEmail) return@filter true
+            if (parsed.emailAddress.lowercase() == lowerCaseEmail) return@filter true
           } catch (ex: Exception) {
             ex.printStackTrace()
           }
@@ -55,13 +54,13 @@ object WkdClient {
     email: String,
     wkdPort: Int? = null
   ): PGPPublicKeyRingCollection? = withContext(Dispatchers.IO) {
-    if (!email.isValidEmail() && !email.isValidLocalhostEmail()) {
+    if (!email.isValidEmail()) {
       throw IllegalArgumentException("Invalid email address")
     }
 
     val parts = email.split('@')
-    val user = parts[0].toLowerCase(Locale.ROOT)
-    val directDomain = parts[1].toLowerCase(Locale.ROOT)
+    val user = parts[0].lowercase(Locale.ROOT)
+    val directDomain = parts[1].lowercase(Locale.ROOT)
 
     val advancedDomainPrefix = if (directDomain == "localhost") "" else "openpgpkey."
     val hu = ZBase32().encodeAsString(DigestUtils.sha1(user.toByteArray()))
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt
index e4967f145e..f8a53d3655 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/kotlin/StringExt.kt
@@ -162,7 +162,3 @@ fun String.stripTrailing(ch: Char): String {
 fun String.isValidEmail(): Boolean {
   return BetterInternetAddress.isValidEmail(this)
 }
-
-fun String.isValidLocalhostEmail(): Boolean {
-  return BetterInternetAddress.isValidLocalhostEmail(this)
-}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/util/BetterEmailAddress.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/util/BetterEmailAddress.kt
index 3414c4f31d..fdab28c14d 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/util/BetterEmailAddress.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/util/BetterEmailAddress.kt
@@ -15,7 +15,7 @@ class BetterInternetAddress(str: String, verifySpecialCharacters: Boolean = true
 
   init {
     val personalNameWithEmailMatch = validPersonalNameWithEmailRegex.find(str)
-    val emailMatch = str.matches(validEmailRegex) || str.matches(validLocalhostEmailRegex)
+    val emailMatch = str.matches(validEmailRegex)
     when {
       personalNameWithEmailMatch != null -> {
         val group = personalNameWithEmailMatch.groupValues
@@ -48,14 +48,15 @@ class BetterInternetAddress(str: String, verifySpecialCharacters: Boolean = true
       "(?:[${ALPHANUM}!#\$%&'*+/=?^_`{|}~-]+(?:\\.[${ALPHANUM}!#\$%&'*+/=?^" +
           "_`{|}~-]+)*|\"(?:[\\x01-\\x08" +
           "\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f" +
-          "])*\")@(?:(?:[${ALPHANUM}](?:[${ALPHANUM}-]*[${ALPHANUM}])?\\.)+[${ALPHANUM}](?:[" +
+          "])*\")@((?:(?:[${ALPHANUM}](?:[${ALPHANUM}-]*[${ALPHANUM}])?\\.)+[${ALPHANUM}](?:[" +
           "${ALPHANUM}-]*[${ALPHANUM}])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:" +
           "25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[${ALPHANUM}-]*[${ALPHANUM}]:(?:[\\x01-\\x08\\x0b" +
-          "\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)])"
+          "\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)])" +
+          "|localhost)"
     private const val VALID_PERSONAL_NAME_WITH_EMAIL =
       "([$ALPHANUM\\p{Punct}\\p{Space}]*)<($VALID_EMAIL)>"
 
-    private val validEmailRegex = VALID_EMAIL.toRegex()
+    private val validEmailRegex = VALID_EMAIL.toRegex(RegexOption.IGNORE_CASE)
     private val validPersonalNameWithEmailRegex = VALID_PERSONAL_NAME_WITH_EMAIL.toRegex()
 
     // if these appear in the display-name they must be double quoted
@@ -63,7 +64,6 @@ class BetterInternetAddress(str: String, verifySpecialCharacters: Boolean = true
 
     // double quotes at ends only
     private val doubleQuotedTextRegex = "\"[^\"]*\"".toRegex()
-    private val validLocalhostEmailRegex = Regex("([a-zA-z])([a-zA-z0-9])+@localhost")
     private const val maxLocalPartLength = 64
 
     fun isValidEmail(email: String): Boolean {
@@ -71,11 +71,6 @@ class BetterInternetAddress(str: String, verifySpecialCharacters: Boolean = true
       return email.indexOf('@') < maxLocalPartLength
     }
 
-    fun isValidLocalhostEmail(email: String): Boolean {
-      if (validLocalhostEmailRegex.matchEntire(email) == null) return false
-      return email.indexOf('@') < maxLocalPartLength
-    }
-
     @Suppress("unused")
     fun areValidEmails(emails: Iterable<String>): Boolean {
       return emails.all { it.isValidEmail() }
diff --git a/FlowCrypt/src/test/java/com/flowcrypt/email/util/BetterInternetAddressTest.kt b/FlowCrypt/src/test/java/com/flowcrypt/email/util/BetterInternetAddressTest.kt
index b47e32c84c..f5e72b3f4d 100644
--- a/FlowCrypt/src/test/java/com/flowcrypt/email/util/BetterInternetAddressTest.kt
+++ b/FlowCrypt/src/test/java/com/flowcrypt/email/util/BetterInternetAddressTest.kt
@@ -106,7 +106,7 @@ class BetterInternetAddressTest {
     for (email in validEmails) {
       assertTrue(
         "valid localhost email '$email' detected as invalid",
-        BetterInternetAddress.isValidLocalhostEmail(email)
+        BetterInternetAddress.isValidEmail(email)
       )
       // doesn't work
       // val parsedEmail = BetterInternetAddress(email)
@@ -120,8 +120,8 @@ class BetterInternetAddressTest {
     for (email in invalidEmails) {
       assertFalse(
         "invalid localhost email '$email' detected as valid",
-        BetterInternetAddress.isValidLocalhostEmail(email)
+        BetterInternetAddress.isValidEmail(email)
       )
     }
   }
-}
\ No newline at end of file
+}

From f7e489c6b7af1d31755b3b8b2db4c862a784ed5e Mon Sep 17 00:00:00 2001
From: Denys Bondarenko <denbond7@gmail.com>
Date: Mon, 17 Jan 2022 21:36:30 +0200
Subject: [PATCH 23/24] Fixed "com.project.starter:easylauncher" usage.| #1620

---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index e2ce2f6e86..12081b3957 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,11 +11,10 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
-
         maven {
             url "https://plugins.gradle.org/m2/"
         }
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.4'

From f8d89909a6a8c7676e767ed58b41e694cca18009 Mon Sep 17 00:00:00 2001
From: DenBond7 <DenBond7@gmail.com>
Date: Wed, 19 Jan 2022 14:11:18 +0200
Subject: [PATCH 24/24] Modified tests. Fixed rules ordering. Refactored code.|
 #1620

---
 .../androidTest/java/com/flowcrypt/email/base/BaseTest.kt  | 3 ---
 .../email/ui/activity/AddOtherAccountFragmentTest.kt       | 4 ++--
 .../email/ui/activity/AttesterSettingsFragmentTest.kt      | 4 ++--
 .../email/ui/activity/BackupKeysFragmentNoKeysTest.kt      | 4 ++--
 .../activity/BackupKeysFragmentNoPrvBackupOrgRuleTest.kt   | 4 ++--
 .../BackupKeysFragmentSingleKeyPassphraseInRamTest.kt      | 4 ++--
 .../BackupKeysFragmentSingleKeyWeakPassphraseTest.kt       | 4 ++--
 .../flowcrypt/email/ui/activity/BackupKeysFragmentTest.kt  | 4 ++--
 .../BackupKeysFragmentTwoKeysDiffPassphraseInRamTest.kt    | 4 ++--
 .../BackupKeysFragmentTwoKeysDiffPassphrasesTest.kt        | 4 ++--
 .../BackupKeysFragmentTwoKeysSamePassphraseTest.kt         | 4 ++--
 .../activity/ChangePassphraseOfImportedKeysFragmentTest.kt | 4 ++--
 .../email/ui/activity/CheckKeysActivityTestMultiBackups.kt | 4 ++--
 .../ui/activity/CheckKeysActivityWithExistingKeysTest.kt   | 4 ++--
 .../activity/CheckKeysActivityWithoutExistingKeysTest.kt   | 4 ++--
 .../ui/activity/CheckPassphraseStrengthFragmentTest.kt     | 7 +++----
 .../email/ui/activity/CreateMessageActivityReplyAllTest.kt | 4 ++--
 .../email/ui/activity/CreateMessageActivityReplyTest.kt    | 4 ++--
 .../email/ui/activity/CreateMessageActivityTest.kt         | 4 ++--
 .../ui/activity/CreateMessageActivityTestPassInRamTest.kt  | 4 ++--
 .../email/ui/activity/CreateMessageActivityWkdTest.kt      | 4 ++--
 .../activity/CreateMessageFragmentPasswordProtectedTest.kt | 4 ++--
 .../ui/activity/CreateOrImportKeyActivityWithKeysTest.kt   | 4 ++--
 .../email/ui/activity/CreatePrivateKeyActivityTest.kt      | 4 ++--
 .../email/ui/activity/EmailManagerActivityTest.kt          | 4 ++--
 .../email/ui/activity/HtmlViewFromAssetsRawActivityTest.kt | 4 ++--
 ...gpContactActivityDisallowAttesterSearchForDomainTest.kt | 4 ++--
 .../ImportPgpContactActivityDisallowAttesterSearchTest.kt  | 4 ++--
 .../email/ui/activity/ImportPgpContactActivityTest.kt      | 4 ++--
 .../activity/ImportPrivateKeyActivityFromSettingsTest.kt   | 4 ++--
 .../activity/ImportPrivateKeyActivityNoPubOrgRulesTest.kt  | 4 ++--
 .../email/ui/activity/ImportPublicKeyActivityTest.kt       | 4 ++--
 .../email/ui/activity/LegalSettingsFragmentTest.kt         | 4 ++--
 .../email/ui/activity/MessageDetailsActivityEkmTest.kt     | 4 ++--
 .../activity/MessageDetailsActivityPassphraseInRamTest.kt  | 4 ++--
 .../email/ui/activity/MessageDetailsActivityTest.kt        | 4 ++--
 .../ui/activity/PreviewImportPgpContactActivityTest.kt     | 4 ++--
 .../email/ui/activity/PrivateKeysListFragmentTest.kt       | 4 ++--
 .../email/ui/activity/PublicKeyDetailsFragmentTest.kt      | 4 ++--
 .../ui/activity/RecheckProvidedPassphraseFragmentTest.kt   | 4 ++--
 .../email/ui/activity/RecipientsListFragmentTest.kt        | 4 ++--
 .../SearchBackupsInEmailFragmentDefaultAccountTest.kt      | 4 ++--
 .../email/ui/activity/SearchBackupsInEmailFragmentTest.kt  | 4 ++--
 .../email/ui/activity/SearchMessagesActivityTest.kt        | 4 ++--
 .../email/ui/activity/SecuritySettingsFragmentTest.kt      | 4 ++--
 .../email/ui/activity/SelectRecipientsActivityTest.kt      | 4 ++--
 .../flowcrypt/email/ui/activity/SettingsActivityTest.kt    | 4 ++--
 .../com/flowcrypt/email/ui/activity/ShareIntentsTest.kt    | 4 ++--
 .../com/flowcrypt/email/ui/activity/SignInActivityTest.kt  | 4 ++--
 .../activity/StandardReplyWithServiceInfoAndOneFileTest.kt | 4 ++--
 .../ui/activity/base/BaseCreateOrImportKeyActivityTest.kt  | 5 -----
 .../enterprise/AddNewAccountActivityEnterpriseTest.kt      | 4 ++--
 .../enterprise/CreateOrImportKeyActivityEnterpriseTest.kt  | 4 ++--
 .../enterprise/CreatePrivateKeyActivityEnterpriseTest.kt   | 4 ++--
 .../activity/enterprise/SettingsActivityEnterpriseTest.kt  | 4 ++--
 .../ui/activity/enterprise/SignInActivityEnterpriseTest.kt | 4 ++--
 ...teMessageFragmentDisallowAttesterSearchForDomainTest.kt | 4 ++--
 .../CreateMessageFragmentDisallowAttesterSearchTest.kt     | 4 ++--
 .../activity/fragment/PrivateKeyDetailsFragmentEkmTest.kt  | 4 ++--
 .../ui/activity/fragment/PrivateKeyDetailsFragmentTest.kt  | 4 ++--
 .../ui/activity/fragment/PrivateKeysListFragmentEkmTest.kt | 4 ++--
 61 files changed, 119 insertions(+), 128 deletions(-)

diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt
index 559e6d9140..ea0e0e3ffa 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt
@@ -22,7 +22,6 @@ import androidx.test.espresso.matcher.RootMatchers.withDecorView
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
 import androidx.test.platform.app.InstrumentationRegistry
 import com.flowcrypt.email.R
@@ -40,7 +39,6 @@ import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.not
 import org.junit.After
 import org.junit.Before
-import org.junit.runner.RunWith
 import java.io.InputStream
 import java.util.*
 import javax.mail.Session
@@ -54,7 +52,6 @@ import javax.mail.internet.MimeMessage
  * Time: 16:37
  * E-mail: DenBond7@gmail.com
  */
-@RunWith(AndroidJUnit4::class)
 abstract class BaseTest : BaseActivityTestImplementation {
   val roomDatabase: FlowCryptRoomDatabase = FlowCryptRoomDatabase.getDatabase(getTargetContext())
   private var countingIdlingResource: IdlingResource? = null
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AddOtherAccountFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AddOtherAccountFragmentTest.kt
index d632dbaa81..1bcd16f4fe 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AddOtherAccountFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AddOtherAccountFragmentTest.kt
@@ -79,8 +79,8 @@ class AddOtherAccountFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsFragmentTest.kt
index 8f0cd42a95..72c12c70a0 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsFragmentTest.kt
@@ -55,9 +55,9 @@ class AttesterSettingsFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(accountRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentNoKeysTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentNoKeysTest.kt
index 2ce182d479..486f5f6f3f 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentNoKeysTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentNoKeysTest.kt
@@ -37,9 +37,9 @@ class BackupKeysFragmentNoKeysTest : BaseBackupKeysFragmentTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentNoPrvBackupOrgRuleTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentNoPrvBackupOrgRuleTest.kt
index b289390538..4bf7d2078d 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentNoPrvBackupOrgRuleTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentNoPrvBackupOrgRuleTest.kt
@@ -53,9 +53,9 @@ class BackupKeysFragmentNoPrvBackupOrgRuleTest : BaseBackupKeysFragmentTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentSingleKeyPassphraseInRamTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentSingleKeyPassphraseInRamTest.kt
index b424404d98..e97f6f41da 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentSingleKeyPassphraseInRamTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentSingleKeyPassphraseInRamTest.kt
@@ -51,10 +51,10 @@ class BackupKeysFragmentSingleKeyPassphraseInRamTest : BaseBackupKeysFragmentTes
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentSingleKeyWeakPassphraseTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentSingleKeyWeakPassphraseTest.kt
index d0e6fea67f..ee37101662 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentSingleKeyWeakPassphraseTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentSingleKeyWeakPassphraseTest.kt
@@ -42,7 +42,8 @@ class BackupKeysFragmentSingleKeyWeakPassphraseTest : BaseBackupKeysFragmentTest
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(
       AddPrivateKeyToDatabaseRule(
@@ -52,7 +53,6 @@ class BackupKeysFragmentSingleKeyWeakPassphraseTest : BaseBackupKeysFragmentTest
         sourceType = KeyImportDetails.SourceType.EMAIL
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTest.kt
index 852c0bffdc..e8448c4b6c 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTest.kt
@@ -40,10 +40,10 @@ class BackupKeysFragmentTest : BaseBackupKeysFragmentTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysDiffPassphraseInRamTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysDiffPassphraseInRamTest.kt
index bec8b4e42e..1ff839bfec 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysDiffPassphraseInRamTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysDiffPassphraseInRamTest.kt
@@ -50,7 +50,8 @@ class BackupKeysFragmentTwoKeysDiffPassphraseInRamTest : BaseBackupKeysFragmentT
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
     .around(
@@ -62,7 +63,6 @@ class BackupKeysFragmentTwoKeysDiffPassphraseInRamTest : BaseBackupKeysFragmentT
         passphraseType = KeyEntity.PassphraseType.RAM
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysDiffPassphrasesTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysDiffPassphrasesTest.kt
index fe05926579..a509959b97 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysDiffPassphrasesTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysDiffPassphrasesTest.kt
@@ -43,7 +43,8 @@ class BackupKeysFragmentTwoKeysDiffPassphrasesTest : BaseBackupKeysFragmentTest(
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
     .around(
@@ -54,7 +55,6 @@ class BackupKeysFragmentTwoKeysDiffPassphrasesTest : BaseBackupKeysFragmentTest(
         sourceType = KeyImportDetails.SourceType.EMAIL
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysSamePassphraseTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysSamePassphraseTest.kt
index 2938417e96..dacd20ce41 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysSamePassphraseTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/BackupKeysFragmentTwoKeysSamePassphraseTest.kt
@@ -42,7 +42,8 @@ class BackupKeysFragmentTwoKeysSamePassphraseTest : BaseBackupKeysFragmentTest()
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
     .around(
@@ -53,7 +54,6 @@ class BackupKeysFragmentTwoKeysSamePassphraseTest : BaseBackupKeysFragmentTest()
         sourceType = KeyImportDetails.SourceType.EMAIL
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ChangePassphraseOfImportedKeysFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ChangePassphraseOfImportedKeysFragmentTest.kt
index 720b33c494..c9a0535eeb 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ChangePassphraseOfImportedKeysFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ChangePassphraseOfImportedKeysFragmentTest.kt
@@ -55,10 +55,10 @@ class ChangePassphraseOfImportedKeysFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityTestMultiBackups.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityTestMultiBackups.kt
index 3bff37ca23..90a85091fb 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityTestMultiBackups.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityTestMultiBackups.kt
@@ -52,8 +52,8 @@ class CheckKeysActivityTestMultiBackups : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityWithExistingKeysTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityWithExistingKeysTest.kt
index 58a25d5d34..2dff046350 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityWithExistingKeysTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityWithExistingKeysTest.kt
@@ -65,7 +65,8 @@ class CheckKeysActivityWithExistingKeysTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(
       AddPrivateKeyToDatabaseRule(
@@ -75,7 +76,6 @@ class CheckKeysActivityWithExistingKeysTest : BaseTest() {
         sourceType = KeyImportDetails.SourceType.EMAIL
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityWithoutExistingKeysTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityWithoutExistingKeysTest.kt
index 31903390d6..4c258faae2 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityWithoutExistingKeysTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckKeysActivityWithoutExistingKeysTest.kt
@@ -61,8 +61,8 @@ class CheckKeysActivityWithoutExistingKeysTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckPassphraseStrengthFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckPassphraseStrengthFragmentTest.kt
index a67da573e9..51755bc531 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckPassphraseStrengthFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CheckPassphraseStrengthFragmentTest.kt
@@ -33,7 +33,6 @@ import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
-import java.util.Locale
 
 /**
  * @author Denis Bondarenko
@@ -58,10 +57,10 @@ class CheckPassphraseStrengthFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
@@ -105,7 +104,7 @@ class CheckPassphraseStrengthFragmentTest : BaseTest() {
         .check(matches(isDisplayed()))
         .perform(replaceText(passPhrases[i]))
       onView(withId(R.id.tVPassphraseQuality))
-        .check(matches(withText(startsWith(degreeOfReliabilityOfPassPhrase[i].toUpperCase(Locale.getDefault())))))
+        .check(matches(withText(startsWith(degreeOfReliabilityOfPassPhrase[i].uppercase()))))
       onView(withId(R.id.eTPassphrase))
         .check(matches(isDisplayed()))
         .perform(clearText())
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityReplyAllTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityReplyAllTest.kt
index 0c8149a8b0..32a2c88dcb 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityReplyAllTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityReplyAllTest.kt
@@ -56,10 +56,10 @@ class CreateMessageActivityReplyAllTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule(account))
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityReplyTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityReplyTest.kt
index 3e2fd46faf..44e8e95158 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityReplyTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityReplyTest.kt
@@ -46,10 +46,10 @@ class CreateMessageActivityReplyTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt
index 9827b7340c..0517ddd42f 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTest.kt
@@ -104,11 +104,11 @@ class CreateMessageActivityTest : BaseCreateMessageActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
     .around(temporaryFolderRule)
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTestPassInRamTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTestPassInRamTest.kt
index 62460db1e7..61b48bb993 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTestPassInRamTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityTestPassInRamTest.kt
@@ -50,10 +50,10 @@ class CreateMessageActivityTestPassInRamTest : BaseCreateMessageActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityWkdTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityWkdTest.kt
index 734721d42c..59de52dfb2 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityWkdTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageActivityWkdTest.kt
@@ -87,11 +87,11 @@ class CreateMessageActivityWkdTest : BaseCreateMessageActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(mockWebServerRule)
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageFragmentPasswordProtectedTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageFragmentPasswordProtectedTest.kt
index 94e71f712c..93c2718681 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageFragmentPasswordProtectedTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateMessageFragmentPasswordProtectedTest.kt
@@ -48,11 +48,11 @@ class CreateMessageFragmentPasswordProtectedTest : BaseCreateMessageActivityTest
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
     .around(temporaryFolderRule)
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateOrImportKeyActivityWithKeysTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateOrImportKeyActivityWithKeysTest.kt
index f9b939c0cc..b07e9b2ede 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateOrImportKeyActivityWithKeysTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreateOrImportKeyActivityWithKeysTest.kt
@@ -52,8 +52,8 @@ class CreateOrImportKeyActivityWithKeysTest : BaseCreateOrImportKeyActivityTest(
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreatePrivateKeyActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreatePrivateKeyActivityTest.kt
index 3b42a87a14..11bd6db822 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreatePrivateKeyActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/CreatePrivateKeyActivityTest.kt
@@ -49,8 +49,8 @@ class CreatePrivateKeyActivityTest : BasePassphraseActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/EmailManagerActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/EmailManagerActivityTest.kt
index 343ed05b64..7ec15b7da4 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/EmailManagerActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/EmailManagerActivityTest.kt
@@ -67,11 +67,11 @@ class EmailManagerActivityTest : BaseEmailListActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule(userWithoutLetters))
     .around(AddAccountToDatabaseRule(userWithMoreThan21LettersAccount))
     .around(AddLabelsToDatabaseRule(userWithMoreThan21LettersAccount, LOCAL_FOLDERS))
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/HtmlViewFromAssetsRawActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/HtmlViewFromAssetsRawActivityTest.kt
index aa92512f2b..9682293be3 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/HtmlViewFromAssetsRawActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/HtmlViewFromAssetsRawActivityTest.kt
@@ -45,8 +45,8 @@ class HtmlViewFromAssetsRawActivityTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityDisallowAttesterSearchForDomainTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityDisallowAttesterSearchForDomainTest.kt
index c41e5d9e41..8ba8b48a52 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityDisallowAttesterSearchForDomainTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityDisallowAttesterSearchForDomainTest.kt
@@ -67,9 +67,9 @@ class ImportPgpContactActivityDisallowAttesterSearchForDomainTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityDisallowAttesterSearchTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityDisallowAttesterSearchTest.kt
index 7f8ecdb526..4a9d8160aa 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityDisallowAttesterSearchTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityDisallowAttesterSearchTest.kt
@@ -67,9 +67,9 @@ class ImportPgpContactActivityDisallowAttesterSearchTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityTest.kt
index 03d128e869..2d9272c670 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPgpContactActivityTest.kt
@@ -105,10 +105,10 @@ class ImportPgpContactActivityTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(mockWebServerRule)
     .around(addAccountToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityFromSettingsTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityFromSettingsTest.kt
index 936cd48930..3b14715979 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityFromSettingsTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityFromSettingsTest.kt
@@ -77,9 +77,9 @@ class ImportPrivateKeyActivityFromSettingsTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityNoPubOrgRulesTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityNoPubOrgRulesTest.kt
index 0bcee69b89..02e5454385 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityNoPubOrgRulesTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPrivateKeyActivityNoPubOrgRulesTest.kt
@@ -69,8 +69,8 @@ class ImportPrivateKeyActivityNoPubOrgRulesTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPublicKeyActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPublicKeyActivityTest.kt
index ba627a9746..9fef782311 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPublicKeyActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ImportPublicKeyActivityTest.kt
@@ -73,9 +73,9 @@ class ImportPublicKeyActivityTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/LegalSettingsFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/LegalSettingsFragmentTest.kt
index 4774f96397..6f5644d19a 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/LegalSettingsFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/LegalSettingsFragmentTest.kt
@@ -49,9 +49,9 @@ class LegalSettingsFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityEkmTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityEkmTest.kt
index de3e1c69e8..68fdb70ea0 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityEkmTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityEkmTest.kt
@@ -64,10 +64,10 @@ class MessageDetailsActivityEkmTest : BaseMessageDetailsActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityPassphraseInRamTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityPassphraseInRamTest.kt
index 6639026aef..9e584759da 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityPassphraseInRamTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityPassphraseInRamTest.kt
@@ -54,10 +54,10 @@ class MessageDetailsActivityPassphraseInRamTest : BaseMessageDetailsActivityTest
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule(passphraseType = KeyEntity.PassphraseType.RAM))
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt
index 58944995b0..df2260da53 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt
@@ -98,10 +98,10 @@ class MessageDetailsActivityTest : BaseMessageDetailsActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PreviewImportPgpContactActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PreviewImportPgpContactActivityTest.kt
index 1006919760..ddee7c0841 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PreviewImportPgpContactActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PreviewImportPgpContactActivityTest.kt
@@ -48,9 +48,9 @@ class PreviewImportPgpContactActivityTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt
index 7ac1b975ac..2ec541ca5a 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt
@@ -66,10 +66,10 @@ class PrivateKeysListFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PublicKeyDetailsFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PublicKeyDetailsFragmentTest.kt
index bf6942035e..30a1b43b12 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PublicKeyDetailsFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PublicKeyDetailsFragmentTest.kt
@@ -81,7 +81,8 @@ class PublicKeyDetailsFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
     .around(
       AddRecipientsToDatabaseRule(
@@ -93,7 +94,6 @@ class PublicKeyDetailsFragmentTest : BaseTest() {
         )
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/RecheckProvidedPassphraseFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/RecheckProvidedPassphraseFragmentTest.kt
index 62e809ccd3..c0da55c830 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/RecheckProvidedPassphraseFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/RecheckProvidedPassphraseFragmentTest.kt
@@ -56,10 +56,10 @@ class RecheckProvidedPassphraseFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/RecipientsListFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/RecipientsListFragmentTest.kt
index 0b252fb731..e01c5a37a6 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/RecipientsListFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/RecipientsListFragmentTest.kt
@@ -56,9 +56,9 @@ class RecipientsListFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchBackupsInEmailFragmentDefaultAccountTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchBackupsInEmailFragmentDefaultAccountTest.kt
index a7fe9b3731..345a4e8293 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchBackupsInEmailFragmentDefaultAccountTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchBackupsInEmailFragmentDefaultAccountTest.kt
@@ -44,10 +44,10 @@ class SearchBackupsInEmailFragmentDefaultAccountTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
     .around(AddPrivateKeyToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchBackupsInEmailFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchBackupsInEmailFragmentTest.kt
index 42f726a962..c434174e31 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchBackupsInEmailFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchBackupsInEmailFragmentTest.kt
@@ -51,8 +51,8 @@ class SearchBackupsInEmailFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchMessagesActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchMessagesActivityTest.kt
index 6ec2f66cd1..4fc67e7ea3 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchMessagesActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SearchMessagesActivityTest.kt
@@ -70,9 +70,9 @@ class SearchMessagesActivityTest : BaseEmailListActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(accountRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SecuritySettingsFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SecuritySettingsFragmentTest.kt
index b735ffe4cb..ac9c4d5a40 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SecuritySettingsFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SecuritySettingsFragmentTest.kt
@@ -54,10 +54,10 @@ class SecuritySettingsFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SelectRecipientsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SelectRecipientsActivityTest.kt
index 6af486a7c1..22f9601a0e 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SelectRecipientsActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SelectRecipientsActivityTest.kt
@@ -63,10 +63,10 @@ class SelectRecipientsActivityTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
     .around(AddRecipientsToDatabaseRule(CONTACTS))
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SettingsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SettingsActivityTest.kt
index 050668ce45..4d9f0d6c0d 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SettingsActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SettingsActivityTest.kt
@@ -45,9 +45,9 @@ class SettingsActivityTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ShareIntentsTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ShareIntentsTest.kt
index 212e4f6840..5c8132216b 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ShareIntentsTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ShareIntentsTest.kt
@@ -91,10 +91,10 @@ class ShareIntentsTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(mockWebServerRule)
     .around(AddAccountToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SignInActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SignInActivityTest.kt
index 6243b1e4f5..9e2afa9f52 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SignInActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/SignInActivityTest.kt
@@ -45,8 +45,8 @@ class SignInActivityTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt
index 595733420e..e4f2f4ac08 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/StandardReplyWithServiceInfoAndOneFileTest.kt
@@ -97,9 +97,9 @@ class StandardReplyWithServiceInfoAndOneFileTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseCreateOrImportKeyActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseCreateOrImportKeyActivityTest.kt
index 3a5fa3052d..5ff276afb5 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseCreateOrImportKeyActivityTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseCreateOrImportKeyActivityTest.kt
@@ -15,8 +15,6 @@ import androidx.test.espresso.intent.Intents.intending
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtraWithKey
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.MediumTest
 import com.flowcrypt.email.R
 import com.flowcrypt.email.base.BaseTest
 import com.flowcrypt.email.ui.activity.CreateOrImportKeyActivity
@@ -24,7 +22,6 @@ import com.flowcrypt.email.ui.activity.ImportPrivateKeyActivity
 import org.hamcrest.Matchers.allOf
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 
 /**
  * @author Denis Bondarenko
@@ -32,8 +29,6 @@ import org.junit.runner.RunWith
  *         Time: 10:11 AM
  *         E-mail: DenBond7@gmail.com
  */
-@MediumTest
-@RunWith(AndroidJUnit4::class)
 abstract class BaseCreateOrImportKeyActivityTest : BaseTest() {
 
   @Test
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/AddNewAccountActivityEnterpriseTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/AddNewAccountActivityEnterpriseTest.kt
index 7cc539a9e5..a8062113a9 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/AddNewAccountActivityEnterpriseTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/AddNewAccountActivityEnterpriseTest.kt
@@ -58,9 +58,9 @@ class AddNewAccountActivityEnterpriseTest : BaseSignActivityTest() {
 
   @get:Rule
   val ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(AddAccountToDatabaseRule())
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/CreateOrImportKeyActivityEnterpriseTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/CreateOrImportKeyActivityEnterpriseTest.kt
index 0d4c538da5..752621ade7 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/CreateOrImportKeyActivityEnterpriseTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/CreateOrImportKeyActivityEnterpriseTest.kt
@@ -46,8 +46,8 @@ class CreateOrImportKeyActivityEnterpriseTest : BaseCreateOrImportKeyActivityTes
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
-    .around(RetryRule.DEFAULT)
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/CreatePrivateKeyActivityEnterpriseTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/CreatePrivateKeyActivityEnterpriseTest.kt
index fc3aaaf04d..8eb2fd2f4e 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/CreatePrivateKeyActivityEnterpriseTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/CreatePrivateKeyActivityEnterpriseTest.kt
@@ -86,9 +86,9 @@ class CreatePrivateKeyActivityEnterpriseTest : BasePassphraseActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(mockWebServerRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SettingsActivityEnterpriseTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SettingsActivityEnterpriseTest.kt
index 36742077db..3b33a36d52 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SettingsActivityEnterpriseTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SettingsActivityEnterpriseTest.kt
@@ -39,13 +39,13 @@ class SettingsActivityEnterpriseTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(
       AddAccountToDatabaseRule(
         AccountDaoManager.getAccountDao("enterprise_account_no_prv_backup.json")
       )
     )
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SignInActivityEnterpriseTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SignInActivityEnterpriseTest.kt
index df1334e2b3..7cb4f409b1 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SignInActivityEnterpriseTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/enterprise/SignInActivityEnterpriseTest.kt
@@ -110,9 +110,9 @@ class SignInActivityEnterpriseTest : BaseSignActivityTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(mockWebServerRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragmentDisallowAttesterSearchForDomainTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragmentDisallowAttesterSearchForDomainTest.kt
index b437a3ea51..8264ef26f6 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragmentDisallowAttesterSearchForDomainTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragmentDisallowAttesterSearchForDomainTest.kt
@@ -66,10 +66,10 @@ class CreateMessageFragmentDisallowAttesterSearchForDomainTest : BaseCreateMessa
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activeActivityRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragmentDisallowAttesterSearchTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragmentDisallowAttesterSearchTest.kt
index a237345d74..56de819386 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragmentDisallowAttesterSearchTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/CreateMessageFragmentDisallowAttesterSearchTest.kt
@@ -74,10 +74,10 @@ class CreateMessageFragmentDisallowAttesterSearchTest : BaseCreateMessageActivit
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentEkmTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentEkmTest.kt
index f7ebf85b87..5ead28ac18 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentEkmTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentEkmTest.kt
@@ -82,10 +82,10 @@ class PrivateKeyDetailsFragmentEkmTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentTest.kt
index 91f1c8dc81..325960fc6a 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragmentTest.kt
@@ -74,10 +74,10 @@ class PrivateKeyDetailsFragmentTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())
 
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragmentEkmTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragmentEkmTest.kt
index 7fcd79c3b1..df51db4397 100644
--- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragmentEkmTest.kt
+++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragmentEkmTest.kt
@@ -74,10 +74,10 @@ class PrivateKeysListFragmentEkmTest : BaseTest() {
 
   @get:Rule
   var ruleChain: TestRule = RuleChain
-    .outerRule(ClearAppSettingsRule())
+    .outerRule(RetryRule.DEFAULT)
+    .around(ClearAppSettingsRule())
     .around(addAccountToDatabaseRule)
     .around(addPrivateKeyToDatabaseRule)
-    .around(RetryRule.DEFAULT)
     .around(activityScenarioRule)
     .around(ScreenshotTestRule())