Merge pull request #360 from FlowCrypt/0.6.8

0.6.8: Queue Improvements

Author: tomholub

FlowCrypt/build.gradle

@@ -250,7 +250,7 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-gson:${RETROFIT_VERSION}"
     implementation "com.squareup.okhttp3:logging-interceptor:${OKHTTP_VERSION}"
 
-    implementation ("com.sun.mail:android-mail:${JAVA_MAIL_VERSION}"){
+    implementation("com.sun.mail:android-mail:${JAVA_MAIL_VERSION}") {
         exclude group: 'javax.activation'
     }
 

FlowCrypt/src/androidTest/java/com/flowcrypt/email/TestConstants.java

@@ -7,19 +7,19 @@
 
 /**
  * @author Denis Bondarenko
- *         Date: 17.01.2018
- *         Time: 15:15
- *         E-mail: [email protected]
+ * Date: 17.01.2018
+ * Time: 15:15
+ * E-mail: [email protected]
  */
 public class TestConstants {
-    public static final String IMAP = "IMAP";
-    public static final String SMTP = "SMTP";
+  public static final String IMAP = "IMAP";
+  public static final String SMTP = "SMTP";
 
-    public static final char COMMERCIAL_AT_SYMBOL = '@';
+  public static final char COMMERCIAL_AT_SYMBOL = '@';
 
-    public static final String RECIPIENT_WITH_PUBLIC_KEY_ON_ATTESTER = "[email protected]";
-    public static final String RECIPIENT_WITHOUT_PUBLIC_KEY_ON_ATTESTER = "[email protected]";
+  public static final String RECIPIENT_WITH_PUBLIC_KEY_ON_ATTESTER = "[email protected]";
+  public static final String RECIPIENT_WITHOUT_PUBLIC_KEY_ON_ATTESTER = "[email protected]";
 
-    public static final String DEFAULT_STRONG_PASSWORD = "My supper strange password 2018";
-    public static final String DEFAULT_PASSWORD = "android";
+  public static final String DEFAULT_STRONG_PASSWORD = "My supper strange password 2018";
+  public static final String DEFAULT_PASSWORD = "android";
 }

FlowCrypt/src/androidTest/java/com/flowcrypt/email/assertions/RecyclerViewItemCountAssertion.java

@@ -22,20 +22,20 @@
  * E-mail: [email protected]
  */
 public class RecyclerViewItemCountAssertion implements ViewAssertion {
-    private final int expectedCount;
+  private final int expectedCount;
 
-    public RecyclerViewItemCountAssertion(int expectedCount) {
-        this.expectedCount = expectedCount;
-    }
-
-    @Override
-    public void check(View view, NoMatchingViewException noViewFoundException) {
-        if (noViewFoundException != null) {
-            throw noViewFoundException;
-        }
+  public RecyclerViewItemCountAssertion(int expectedCount) {
+    this.expectedCount = expectedCount;
+  }
 
-        RecyclerView recyclerView = (RecyclerView) view;
-        RecyclerView.Adapter adapter = recyclerView.getAdapter();
-        assertThat(adapter.getItemCount(), is(expectedCount));
+  @Override
+  public void check(View view, NoMatchingViewException noViewFoundException) {
+    if (noViewFoundException != null) {
+      throw noViewFoundException;
     }
+
+    RecyclerView recyclerView = (RecyclerView) view;
+    RecyclerView.Adapter adapter = recyclerView.getAdapter();
+    assertThat(adapter.getItemCount(), is(expectedCount));
+  }
 }