Added Block Checks to checkstyle.xml.| #352

DenBond7 · DenBond7 · commit 418c069c5ae6 · 2018-11-26T15:50:22.000+02:00
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.java b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.java
@@ -512,19 +512,21 @@ public static StringBuilder prepareFetchCommand(FetchProfile fetchProfile, boole
     }
 
     if (fetchProfile.contains(IMAPFolder.FetchProfileItem.HEADERS)) {
-      if (isRev1)
+      if (isRev1) {
         command.append(first ?
             "BODY.PEEK[HEADER]" : " BODY.PEEK[HEADER]");
-      else
+      } else {
         command.append(first ? "RFC822.HEADER" : " RFC822.HEADER");
+      }
       first = false;
     }
 
     if (fetchProfile.contains(IMAPFolder.FetchProfileItem.MESSAGE)) {
-      if (isRev1)
+      if (isRev1) {
         command.append(first ? "BODY.PEEK[]" : " BODY.PEEK[]");
-      else
+      } else {
         command.append(first ? "RFC822" : " RFC822");
+      }
       first = false;
     }
 
@@ -780,8 +782,9 @@ public Object doCommand(IMAPProtocol imapProtocol) throws ProtocolException {
 
         if (serverStatusResponse.isOK()) {
           for (Response response : responses) {
-            if (!(response instanceof FetchResponse))
+            if (!(response instanceof FetchResponse)) {
               continue;
+            }
 
             FetchResponse fetchResponse = (FetchResponse) response;
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/CustomGmailFolder.java b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/CustomGmailFolder.java
@@ -82,9 +82,9 @@ public synchronized void fetchGeneralInfo(Message[] messages, FetchProfile fetch
       // the messages that need to be prefetched.
       MessageSet[] msgsets = Utility.toMessageSetSorted(messages, condition);
 
-      if (msgsets == null)
-        // We already have what we need.
+      if (msgsets == null) {// We already have what we need.
         return;
+      }
 
       Response[] responseArray = null;
       // to collect non-FETCH responses & unsolicited FETCH FLAG responses
@@ -99,12 +99,14 @@ public synchronized void fetchGeneralInfo(Message[] messages, FetchProfile fetch
         throw new MessagingException(pex.getMessage(), pex);
       }
 
-      if (responseArray == null)
+      if (responseArray == null) {
         return;
+      }
 
       for (Response response : responseArray) {
-        if (response == null)
+        if (response == null) {
           continue;
+        }
         if (!(response instanceof FetchResponse)) {
           responseArrayList.add(response); // Unsolicited Non-FETCH response
           continue;
@@ -121,13 +123,15 @@ public synchronized void fetchGeneralInfo(Message[] messages, FetchProfile fetch
         for (int j = 0; j < count; j++) {
           Item item = fetchResponse.getItem(j);
           // Check for the FLAGS item
-          if (item instanceof Flags &&
-              (!fetchProfile.contains(FetchProfile.Item.FLAGS) ||
-                  msg == null)) {
+          if (!(item instanceof Flags) ||
+              (fetchProfile.contains(FetchProfile.Item.FLAGS) &&
+                  msg != null)) {
+            if (msg != null) {
+              msg.handleFetchItemWithCustomBody(item, null, allHeaders);
+            }
+          } else {
             // Ok, Unsolicited FLAGS update.
             unsolicitedFlags = true;
-          } else if (msg != null) {
-            msg.handleFetchItemWithCustomBody(item, null, allHeaders);
           }
         }
 
@@ -147,8 +151,9 @@ public synchronized void fetchGeneralInfo(Message[] messages, FetchProfile fetch
         Response[] responses = new Response[responseArrayList.size()];
         responseArrayList.toArray(responses);
         for (Response aR : responseArray) {
-          if (aR != null)
+          if (aR != null) {
             handleResponse(aR);
+          }
         }
       }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/CustomGmailMessage.java b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/CustomGmailMessage.java
@@ -85,18 +85,16 @@ public boolean handleFetchItemWithCustomBody(Item item, String[] hdrs, boolean a
         || item instanceof UID
         || item instanceof RFC822DATA) {
       return handleFetchItem(item, hdrs, allHeaders);
-    }
-
-    // Check for header items
-    else if (item instanceof BODY) {
+    } else if (item instanceof BODY) {// Check for header items
       ByteArrayInputStream bodyStream;
       bodyStream = ((BODY) item).getByteArrayInputStream();
 
       if (!((BODY) item).isHeader()) {
         content = ASCIIUtility.toString(bodyStream).getBytes();
       }
-    } else
+    } else {
       return false;    // not handled
+    }
     return true;        // something above handled it
   }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/CustomIMAPFolder.java b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/CustomIMAPFolder.java
@@ -81,9 +81,9 @@ public void fetchGeneralInfo(Message[] messages, FetchProfile fetchProfile) thro
       // the messages that need to be prefetched.
       MessageSet[] msgsets = Utility.toMessageSetSorted(messages, condition);
 
-      if (msgsets == null)
-        // We already have what we need.
+      if (msgsets == null) {// We already have what we need.
         return;
+      }
 
       Response[] responseArray = null;
       // to collect non-FETCH responses & unsolicited FETCH FLAG responses
@@ -98,12 +98,14 @@ public void fetchGeneralInfo(Message[] messages, FetchProfile fetchProfile) thro
         throw new MessagingException(pex.getMessage(), pex);
       }
 
-      if (responseArray == null)
+      if (responseArray == null) {
         return;
+      }
 
       for (Response response : responseArray) {
-        if (response == null)
+        if (response == null) {
           continue;
+        }
         if (!(response instanceof FetchResponse)) {
           responseArrayList.add(response); // Unsolicited Non-FETCH response
           continue;
@@ -146,8 +148,9 @@ public void fetchGeneralInfo(Message[] messages, FetchProfile fetchProfile) thro
         Response[] responses = new Response[responseArrayList.size()];
         responseArrayList.toArray(responses);
         for (Response aR : responseArray) {
-          if (aR != null)
+          if (aR != null) {
             handleResponse(aR);
+          }
         }
       }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/CustomIMAPMessage.java b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/CustomIMAPMessage.java
@@ -60,18 +60,16 @@ public boolean handleFetchItemWithCustomBody(Item item, String[] hdrs, boolean a
         || item instanceof UID
         || item instanceof RFC822DATA) {
       return handleFetchItem(item, hdrs, allHeaders);
-    }
-
-    // Check for header items
-    else if (item instanceof BODY) {
+    } else if (item instanceof BODY) {// Check for header items
       ByteArrayInputStream bodyStream;
       bodyStream = ((BODY) item).getByteArrayInputStream();
 
       if (!((BODY) item).isHeader()) {
         content = ASCIIUtility.toString(bodyStream).getBytes();
       }
-    } else
+    } else {
       return false;    // not handled
+    }
     return true;        // something above handled it
   }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/sync/tasks/LoadMessageDetailsSyncTask.java b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/sync/tasks/LoadMessageDetailsSyncTask.java
@@ -79,8 +79,9 @@ public Object doCommand(IMAPProtocol imapProtocol)
 
           if (serverStatusResponse.isOK()) {
             for (Response response : responses) {
-              if (!(response instanceof FetchResponse))
+              if (!(response instanceof FetchResponse)) {
                 continue;
+              }
 
               FetchResponse fetchResponse = (FetchResponse) response;
               BODY body = fetchResponse.getItem(BODY.class);
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/BaseRequest.java b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/request/BaseRequest.java
@@ -39,9 +39,12 @@ public boolean equals(Object o) {
 
     BaseRequest<?> that = (BaseRequest<?>) o;
 
-    if (queryMap != null ? !queryMap.equals(that.queryMap) : that.queryMap != null)
+    if (queryMap != null ? !queryMap.equals(that.queryMap) : that.queryMap != null) {
       return false;
-    if (apiName != that.apiName) return false;
+    }
+    if (apiName != that.apiName) {
+      return false;
+    }
     return requestModel != null ? requestModel.equals(that.requestModel) : that.requestModel
         == null;
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/security/KeyStoreCryptoManager.java b/FlowCrypt/src/main/java/com/flowcrypt/email/security/KeyStoreCryptoManager.java
@@ -123,9 +123,10 @@ public static String generateAlgorithmParameterSpecString() {
   public static String normalizeAlgorithmParameterSpecString(String rawString) {
     if (!TextUtils.isEmpty(rawString) && rawString.length() >= SIZE_OF_ALGORITHM_PARAMETER_SPEC) {
       return rawString.substring(0, SIZE_OF_ALGORITHM_PARAMETER_SPEC);
-    } else
+    } else {
       throw new IllegalArgumentException("The rawString must be equals or longer then " +
           SIZE_OF_ALGORITHM_PARAMETER_SPEC + " bytes");
+    }
   }
 
   /**
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SelectContactsActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SelectContactsActivity.java
@@ -91,9 +91,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     this.listViewContacts = findViewById(R.id.listViewContacts);
     this.listViewContacts.setAdapter(contactsListCursorAdapter);
     this.listViewContacts.setChoiceMode(isMultiply ? ListView.CHOICE_MODE_MULTIPLE : ListView.CHOICE_MODE_SINGLE);
-    if (isMultiply) {
-      //this.listViewContacts.setMultiChoiceModeListener(this);
-    } else {
+    if (!isMultiply) {
       this.listViewContacts.setOnItemClickListener(this);
     }
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CreateMessageFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/CreateMessageFragment.java
@@ -914,9 +914,9 @@ private List<String> selectOnlyValidEmails(List<String> emails) {
    */
   private OutgoingMessageInfo getOutgoingMessageInfo() {
     OutgoingMessageInfo outgoingMessageInfo = new OutgoingMessageInfo();
-    if (incomingMessageInfo != null && !TextUtils.isEmpty(incomingMessageInfo.getHtmlMessage())) {
+    /*if (incomingMessageInfo != null && !TextUtils.isEmpty(incomingMessageInfo.getHtmlMessage())) {
       //todo-denbond7 Need to think how forward HTML
-    }
+    }*/
     outgoingMessageInfo.setMessage(editTextEmailMessage.getText().toString());
     outgoingMessageInfo.setSubject(editTextEmailSubject.getText().toString());
 
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessageListAdapter.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MessageListAdapter.java
@@ -247,12 +247,14 @@ private void clearItem(@NonNull ViewHolder viewHolder) {
   }
 
   private String generateAddresses(InternetAddress[] internetAddresses) {
-    if (internetAddresses == null)
+    if (internetAddresses == null) {
       return "null";
+    }
 
     int iMax = internetAddresses.length - 1;
-    if (iMax == -1)
+    if (iMax == -1) {
       return "";
+    }
 
     StringBuilder b = new StringBuilder();
     for (int i = 0; ; i++) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/loader/ApiServiceAsyncTaskLoader.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/loader/ApiServiceAsyncTaskLoader.java
@@ -46,8 +46,9 @@ public ApiServiceAsyncTaskLoader(Context context, BaseRequest baseRequest) {
 
   @Override
   public void onStartLoading() {
-    if (takeContentChanged())
+    if (takeContentChanged()) {
       forceLoad();
+    }
   }
 
   @Override
@@ -147,10 +148,12 @@ public boolean equals(Object o) {
     ApiServiceAsyncTaskLoader that = (ApiServiceAsyncTaskLoader) o;
 
     if (apiHelper != null ? !apiHelper.equals(that.apiHelper) : that
-        .apiHelper != null)
+        .apiHelper != null) {
       return false;
-    if (baseRequest != null ? !baseRequest.equals(that.baseRequest) : that.baseRequest != null)
+    }
+    if (baseRequest != null ? !baseRequest.equals(that.baseRequest) : that.baseRequest != null) {
       return false;
+    }
     return !(apiService != null ? !apiService.equals(that.apiService) : that.apiService !=
         null);
 
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -23,5 +23,16 @@
         <module name="MethodCount" />
         <module name="MethodLength" />
 
+        <!-- Block Checks.                    -->
+        <!-- See http://checkstyle.sourceforge.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks" />
+        <module name="EmptyBlock" />
+        <module name="EmptyCatchBlock" />
+        <module name="LeftCurly" />
+        <module name="NeedBraces">
+            <property name="allowSingleLineStatement" value="true" />
+        </module>
+        <module name="RightCurly" />
+
     </module>
 </module>
