Refactored code.| #1264 (#1265)

* Refactored code.| #1264

* Fixed missed import.| #1264

* Fixed EOL at EOF.| #1264

* Fixed some formatting issues.| #1264

* Fixed EOL at EOF in resources.| #1264

* Fixed compilation bug.| #1264

Author: DenBond7

Diff for: .gitignore

@@ -33,4 +33,3 @@ local.properties
 /compile.sh
 /ctest.sh
 /test.sh
-

Diff for: .idea/codeStyles/Project.xml

@@ -20,4 +20,4 @@
         <!-- This file is needed for debug purposes -->
         <ignore path="res/raw/debug_certificate.crt" />
     </issue>
-</lint>
+</lint>

Diff for: FlowCrypt/lint.xml

@@ -17,4 +17,3 @@ Content-Transfer-Encoding: 8bit
 Text: Ваше оголошення
 </body>
 </html>
-

Diff for: FlowCrypt/src/androidTest/assets/messages/mime/8bit-utf8.txt

@@ -71,4 +71,3 @@ vT56K5RcJnyZkFMaxqqKa6qBJ7XXL3nn2ePquNwj3zO59yVoF2AeoipJCTLE
 C/jf1vpjTJlbneWAjUWjm8+SlfCY1V/oERo=
 =UCCQ
 -----END PGP MESSAGE-----
-

Diff for: FlowCrypt/src/androidTest/assets/messages/mime/encrypted_msg_info_plain_text_error_badly_formatted.txt

@@ -161,4 +161,3 @@ YHAmeAIbDAUWAgMBAAQLCQgHBRUKCQgLAh4BAAoJEMyEq3t0m4PryFkA/jZ7HuJK
 qH98S9dQSRizw3hxAg==
 =g+Is
 -----END PGP PRIVATE KEY BLOCK-----
-

Diff for: FlowCrypt/src/androidTest/assets/pgp/keys/10_prv_and_pub_keys_armored_own_header.asc

@@ -121,4 +121,3 @@ q00PAwEIB4h1BBgWCgAdBQJgcCU5AhsMBRYCAwEABAsJCAcFFQoJCAsCHgEACgkQ
 0oMmO25amIOvw4zoOJDypIQ+wNp+62iNde0pukwP
 =8kgY
 -----END PGP PUBLIC KEY BLOCK-----
-

Diff for: FlowCrypt/src/androidTest/assets/pgp/keys/10_prv_and_pub_keys_armored_own_with_single_header.asc

@@ -177,4 +177,3 @@ oPnfUupWCMKXM3PN/Sw6Zn5Zja3DRuFxrSXIAQCOXPE4EOucuOmMCi2JcfkVmpfE
 ReZjtUMWEusItbv4Cg==
 =I9MB
 -----END PGP PRIVATE KEY BLOCK-----
-

Diff for: FlowCrypt/src/androidTest/assets/pgp/keys/10_prv_keys_armored_own_header.asc

@@ -142,4 +142,3 @@ z++0ULA1AQDAfGX9fWSFkFJeUEMf3wdtH4f7uBnpHFed9T7ccHh1hgD/YkNbtpMI
 EdJrIZnU/alchpAYC5JRJuaoyuaOgWxAgQI=
 =E5rK
 -----END PGP PRIVATE KEY BLOCK-----
-

Diff for: FlowCrypt/src/androidTest/assets/pgp/keys/10_prv_keys_armored_own_with_single_header.asc

@@ -137,4 +137,3 @@ CAsCHgEACgkQCW1r0sdsyuuVRQD/TsQc21Kg+d9S6lYIwpczc839LDpmflmNrcNG
 4XGtJcgBAI5c8TgQ65y46YwKLYlx+RWal8RF5mO1QxYS6wi1u/gK
 =tPlZ
 -----END PGP PUBLIC KEY BLOCK-----
-

Diff for: FlowCrypt/src/androidTest/assets/pgp/keys/10_pub_keys_armored_own_header.asc

@@ -107,4 +107,3 @@ YHADnhIKKwYBBAGXVQEFAQEHQCL+4AjWCMUzWCsMmSJGF3WcUNOLFNR4zWsLtJl2
 W7aTCBHSayGZ1P2pXIaQGAuSUSbmqMrmjoFsQIEC
 =wEh7
 -----END PGP PUBLIC KEY BLOCK-----
-

Diff for: FlowCrypt/src/androidTest/assets/pgp/keys/10_pub_keys_armored_own_with_single_header.asc

@@ -28,4 +28,4 @@ class DebugTestingTest {
   @Test
   fun alwaysSuccessTestSecond() {
   }
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/DebugTestingTest.kt

@@ -27,4 +27,4 @@ interface BaseActivityTestImplementation {
 
   val useIntents: Boolean
     get() = false
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseActivityTestImplementation.kt

@@ -122,8 +122,8 @@ abstract class BaseTest : BaseActivityTestImplementation {
    */
   protected fun isToastDisplayed(decorView: View?, message: String) {
     onView(withText(message))
-        .inRoot(withDecorView(not(`is`(decorView))))
-        .check(matches(isDisplayed()))
+      .inRoot(withDecorView(not(`is`(decorView))))
+      .check(matches(isDisplayed()))
   }
 
   /**
@@ -133,8 +133,8 @@ abstract class BaseTest : BaseActivityTestImplementation {
    */
   protected fun isDialogWithTextDisplayed(decorView: View?, message: String) {
     onView(withText(message))
-        .inRoot(withDecorView(not(`is`(decorView))))
-        .check(matches(isDisplayed()))
+      .inRoot(withDecorView(not(`is`(decorView))))
+      .check(matches(isDisplayed()))
   }
 
   /**
@@ -143,15 +143,15 @@ abstract class BaseTest : BaseActivityTestImplementation {
   //todo-denbond7 - fix me
   protected fun testHelpScreen() {
     onView(withId(R.id.menuActionHelp))
-        .check(matches(isDisplayed()))
-        .perform(click())
+      .check(matches(isDisplayed()))
+      .perform(click())
 
     onView(withId(R.id.textViewAuthorHint))
-        .check(matches(isDisplayed()))
-        .check(matches(withText(R.string.i_will_usually_reply_within_an_hour_except_when_i_sleep_tom)))
+      .check(matches(isDisplayed()))
+      .check(matches(withText(R.string.i_will_usually_reply_within_an_hour_except_when_i_sleep_tom)))
 
     onView(withText(R.string.help_feedback_or_question))
-        .check(matches(isDisplayed()))
+      .check(matches(isDisplayed()))
   }
 
   /**
@@ -163,8 +163,8 @@ abstract class BaseTest : BaseActivityTestImplementation {
     onView(withText(message)).check(matches(isDisplayed()))
 
     onView(withId(com.google.android.material.R.id.snackbar_action))
-        .check(matches(isDisplayed()))
-        .perform(click())
+      .check(matches(isDisplayed()))
+      .perform(click())
   }
 
   /**
@@ -173,11 +173,11 @@ abstract class BaseTest : BaseActivityTestImplementation {
   protected fun checkIsSnackBarDisplayed(text: String? = null) {
     if (text.isNullOrEmpty()) {
       onView(withId(com.google.android.material.R.id.snackbar_action))
-          .check(matches(isDisplayed()))
+        .check(matches(isDisplayed()))
     } else {
       onView(withId(com.google.android.material.R.id.snackbar_text))
-          .check(matches(isDisplayed()))
-          .check(matches(withText(text)))
+        .check(matches(isDisplayed()))
+        .check(matches(withText(text)))
     }
   }
 
@@ -186,7 +186,7 @@ abstract class BaseTest : BaseActivityTestImplementation {
    */
   protected fun checkIsSnackBarNotDisplayed() {
     onView(withId(com.google.android.material.R.id.snackbar_action))
-        .check(doesNotExist())
+      .check(doesNotExist())
   }
 
   /**
@@ -198,14 +198,16 @@ abstract class BaseTest : BaseActivityTestImplementation {
    */
   protected fun addTextToClipboard(label: String, text: String) {
     runOnUiThread {
-      val clipboard = getTargetContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+      val clipboard =
+        getTargetContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
       val clip = ClipData.newPlainText(label, text)
       clipboard.setPrimaryClip(clip)
     }
   }
 
   protected fun checkClipboardText(text: CharSequence) {
-    val clipboardManager = getTargetContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+    val clipboardManager =
+      getTargetContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
     val primaryClip: ClipData? = clipboardManager.primaryClip
 
     var clipboardText: CharSequence? = null
@@ -239,14 +241,20 @@ abstract class BaseTest : BaseActivityTestImplementation {
     return InstrumentationRegistry.getInstrumentation().context
   }
 
-  fun getMsgInfo(path: String, mimeMsgPath: String, vararg atts: AttachmentInfo?): IncomingMessageInfo? {
+  fun getMsgInfo(
+    path: String,
+    mimeMsgPath: String,
+    vararg atts: AttachmentInfo?
+  ): IncomingMessageInfo? {
     val incomingMsgInfo = TestGeneralUtil.getObjectFromJson(path, IncomingMessageInfo::class.java)
     incomingMsgInfo?.msgEntity?.let {
       val uri = roomDatabase.msgDao().insert(it)
       val attEntities = mutableListOf<AttachmentEntity>()
 
       for (attInfo in atts) {
-        attInfo?.let { info -> AttachmentEntity.fromAttInfo(info)?.let { candidate -> attEntities.add(candidate) } }
+        attInfo?.let { info ->
+          AttachmentEntity.fromAttInfo(info)?.let { candidate -> attEntities.add(candidate) }
+        }
       }
 
       roomDatabase.attachmentDao().insert(attEntities)

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt

@@ -40,9 +40,9 @@ class MigrationTest {
 
   @get:Rule
   val migrationTestHelper: MigrationTestHelper = MigrationTestHelper(
-      InstrumentationRegistry.getInstrumentation(),
-      FlowCryptRoomDatabase::class.java.canonicalName,
-      FrameworkSQLiteOpenHelperFactory()
+    InstrumentationRegistry.getInstrumentation(),
+    FlowCryptRoomDatabase::class.java.canonicalName,
+    FrameworkSQLiteOpenHelperFactory()
   )
 
   @Test
@@ -55,8 +55,8 @@ class MigrationTest {
 
     // Open latest version of the DB. Room will validate the schema once all migrations execute.
     Room.databaseBuilder(
-        InstrumentationRegistry.getInstrumentation().targetContext,
-        FlowCryptRoomDatabase::class.java, FlowCryptRoomDatabase.DB_NAME
+      InstrumentationRegistry.getInstrumentation().targetContext,
+      FlowCryptRoomDatabase::class.java, FlowCryptRoomDatabase.DB_NAME
     ).addMigrations(*arrayOfMigrations).build().apply {
       openHelper.writableDatabase
       close()
@@ -66,4 +66,4 @@ class MigrationTest {
   companion object {
     const val INIT_DATABASE_VERSION = 19
   }
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/database/MigrationTest.kt

@@ -14,4 +14,4 @@ package com.flowcrypt.email.junit.annotations
  *         E-mail: [email protected]
  */
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-annotation class DebugTest
+annotation class DebugTest

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/annotations/DebugTest.kt

@@ -15,4 +15,4 @@ package com.flowcrypt.email.junit.annotations
  *         E-mail: [email protected]
  */
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-annotation class DependsOnMailServer
+annotation class DependsOnMailServer

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/annotations/DependsOnMailServer.kt

@@ -15,4 +15,4 @@ package com.flowcrypt.email.junit.annotations
  *         E-mail: [email protected]
  */
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-annotation class NotReadyForCI
+annotation class NotReadyForCI

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/annotations/NotReadyForCI.kt

@@ -23,4 +23,4 @@ class DependsOnMailServerFilter : ReadyForCIFilter() {
   }
 
   override fun describe() = "Filter tests that depend on an email server"
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/DependsOnMailServerFilter.kt

@@ -23,4 +23,4 @@ class DoesNotNeedMailServerFilter : ReadyForCIFilter() {
   }
 
   override fun describe() = "Filter tests that don't need an email server"
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/DoesNotNeedMailServerFilter.kt

@@ -23,4 +23,4 @@ open class NotReadyForCIFilter : ParentFilter() {
   }
 
   override fun describe() = "Filter tests that can't be run on CI yet"
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/NotReadyForCIFilter.kt

@@ -19,8 +19,10 @@ class OtherTestsFilter : ParentFilter() {
   private val doesNotNeedMailServerFilter = DoesNotNeedMailServerFilter()
 
   override fun evaluateTest(description: Description?): Boolean {
-    return (!dependsOnMailServerFilter.shouldRun(description) && !doesNotNeedMailServerFilter.shouldRun(description))
+    return (!dependsOnMailServerFilter.shouldRun(description) && !doesNotNeedMailServerFilter.shouldRun(
+      description
+    ))
   }
 
   override fun describe() = "Filter tests that are not related to any conditions"
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/OtherTestsFilter.kt

@@ -18,8 +18,10 @@ import org.junit.runner.Description
 open class ReadyForCIFilter : ParentFilter() {
   override fun evaluateTest(description: Description?): Boolean {
     val annotationClass = NotReadyForCI::class.java
-    return (description?.testClass?.isAnnotationPresent(annotationClass) == false && description.getAnnotation(annotationClass) == null)
+    return (description?.testClass?.isAnnotationPresent(annotationClass) == false && description.getAnnotation(
+      annotationClass
+    ) == null)
   }
 
   override fun describe() = "Filter tests that are ready to be run on a CI server"
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/junit/filters/ReadyForCIFilter.kt

@@ -17,8 +17,8 @@ import org.hamcrest.Description
  *         Time: 3:17 PM
  *         E-mail: [email protected]
  */
-class AppBarLayoutBackgroundColorMatcher(val color: Int)
-  : BoundedMatcher<View, AppBarLayout>(AppBarLayout::class.java) {
+class AppBarLayoutBackgroundColorMatcher(val color: Int) :
+  BoundedMatcher<View, AppBarLayout>(AppBarLayout::class.java) {
   public override fun matchesSafely(appBarLayout: AppBarLayout): Boolean {
     return if (appBarLayout.background is ColorDrawable) {
       color == (appBarLayout.background as ColorDrawable).color
@@ -28,4 +28,4 @@ class AppBarLayoutBackgroundColorMatcher(val color: Int)
   override fun describeTo(description: Description) {
     description.appendText("Background color AppBarLayout: $color")
   }
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/AppBarLayoutBackgroundColorMatcher.kt

@@ -45,7 +45,8 @@ class DrawableMatcher(private val expectedId: Int) : TypeSafeMatcher<View>(View:
       ANY -> return target.drawable != null
       else -> {
         val resources = target.getContext().resources
-        val expectedDrawable = resources.getDrawable(expectedId, target.getContext().theme) ?: return false
+        val expectedDrawable =
+          resources.getDrawable(expectedId, target.getContext().theme) ?: return false
         resourceName = resources.getResourceEntryName(expectedId)
 
         val bitmap = getBitmap(target.drawable)
@@ -56,7 +57,11 @@ class DrawableMatcher(private val expectedId: Int) : TypeSafeMatcher<View>(View:
   }
 
   private fun getBitmap(drawable: Drawable): Bitmap {
-    val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
+    val bitmap = Bitmap.createBitmap(
+      drawable.intrinsicWidth,
+      drawable.intrinsicHeight,
+      Bitmap.Config.ARGB_8888
+    )
     val canvas = Canvas(bitmap)
     drawable.setBounds(0, 0, canvas.width, canvas.height)
     drawable.draw(canvas)
@@ -67,4 +72,4 @@ class DrawableMatcher(private val expectedId: Int) : TypeSafeMatcher<View>(View:
     const val EMPTY = -1
     const val ANY = -2
   }
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/DrawableMatcher.kt

@@ -28,4 +28,4 @@ class EmptyListViewMather<T : View> : BaseMatcher<T>() {
   override fun describeTo(description: Description) {
     description.appendText("List is not empty")
   }
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/EmptyListViewMather.kt

@@ -28,4 +28,4 @@ class EmptyRecyclerViewMatcher<T : View> : BaseMatcher<T>() {
   override fun describeTo(description: Description) {
     description.appendText("RecyclerView is not empty")
   }
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/EmptyRecyclerViewMatcher.kt

@@ -35,4 +35,4 @@ class ListViewItemCountMatcher<T : View>(val itemCount: Int) : BaseMatcher<T>()
   override fun describeTo(description: Description) {
     description.appendText("The size of the list is not equal = $itemCount")
   }
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/ListViewItemCountMatcher.kt

@@ -17,9 +17,10 @@ import org.hamcrest.Description
  *         Time: 10:19 AM
  *         E-mail: [email protected]
  */
-class NachoTextViewChipBackgroundColorMatcher(private val chipText: String,
-                                              private val backgroundColor: Int)
-  : BoundedMatcher<View, NachoTextView>(NachoTextView::class.java) {
+class NachoTextViewChipBackgroundColorMatcher(
+  private val chipText: String,
+  private val backgroundColor: Int
+) : BoundedMatcher<View, NachoTextView>(NachoTextView::class.java) {
   public override fun matchesSafely(nachoTextView: NachoTextView): Boolean {
     val expectedChip = nachoTextView.allChips.firstOrNull { it.text == chipText } ?: return false
     val pgpContactChipSpan = expectedChip as? PGPContactChipSpan ?: return false
@@ -29,4 +30,4 @@ class NachoTextViewChipBackgroundColorMatcher(private val chipText: String,
   override fun describeTo(description: Description) {
     description.appendText("Chip details: text = $chipText, color = $backgroundColor")
   }
-}
+}

Diff for: FlowCrypt/src/androidTest/java/com/flowcrypt/email/matchers/NachoTextViewChipBackgroundColorMatcher.kt

@@ -28,4 +28,4 @@ class RecyclerViewItemCountMatcher<T : View>(private val itemCount: Int) : BaseM
   override fun describeTo(description: Description) {
     description.appendText("The count of the RecyclerView is not equal = $itemCount")
   }
-}
+}