squid:S1066 - Collapsible "if" statements should be merged

https://dev.eclipse.org/sonar/rules/show/squid:S1066

Author: George Kankava

app/src/main/java/com/zulip/android/activities/MessageListFragment.java

@@ -180,19 +180,15 @@ public void onScroll(AbsListView view, int firstVisibleItem,
                 if (!paused && !loadingMessages && firstMessageId > 0
                         && lastMessageId > 0) {
                     if (firstVisibleItem + visibleItemCount > totalItemCount
-                            - near) {
+                            - near && !loadedToBottom) {
                         // At the bottom of the list
-                        if (!loadedToBottom) {
-                            Log.i("scroll", "Starting request below");
-                            loadMoreMessages(LoadPosition.BELOW);
-                        }
+                        Log.i("scroll", "Starting request below");
+                        loadMoreMessages(LoadPosition.BELOW);
                     }
-                    if (firstVisibleItem < near) {
+                    if (firstVisibleItem < near && !loadedToTop) {
                         // At the top of the list
-                        if (!loadedToTop) {
-                            Log.i("scroll", "Starting request above");
-                            loadMoreMessages(LoadPosition.ABOVE);
-                        }
+                        Log.i("scroll", "Starting request above");
+                        loadMoreMessages(LoadPosition.ABOVE);
                     }
                 }
 
@@ -444,15 +440,13 @@ public void onMessages(Message[] messages, LoadPosition pos,
         }
         int addedCount = 0;
 
-        if (pos == LoadPosition.NEW) {
-            if (!loadedToBottom) {
-                // If we don't have intermediate messages loaded, don't add new
-                // messages -- they'll be loaded when we scroll down.
-                Log.i("onMessage",
-                        "skipping new message " + messages[0].getID() + " "
-                                + app.getMaxMessageId());
-                return;
-            }
+        if (pos == LoadPosition.NEW && !loadedToBottom) {
+            // If we don't have intermediate messages loaded, don't add new
+            // messages -- they'll be loaded when we scroll down.
+            Log.i("onMessage",
+                    "skipping new message " + messages[0].getID() + " "
+                            + app.getMaxMessageId());
+            return;
         }
 
         for (int i = 0; i < messages.length; i++) {

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

@@ -197,11 +197,11 @@ public void addToList(Message message) {
     public void muteTopic(Message message) {
         app.muteTopic(message);
         for (int i = homeList.adapter.getCount() - 1; i >= 0; i--) {
-            if (homeList.adapter.getItem(i).getStream() != null) {
-                if (homeList.adapter.getItem(i).getStream().getId() == message.getStream().getId() && homeList.adapter.getItem(i).getSubject().equals(message.getSubject())) {
-                    mutedTopics.add(homeList.adapter.getItem(i));
-                    homeList.adapter.remove(homeList.adapter.getItem(i));
-                }
+            if (homeList.adapter.getItem(i).getStream() != null
+                    && homeList.adapter.getItem(i).getStream().getId() == message.getStream().getId()
+                    && homeList.adapter.getItem(i).getSubject().equals(message.getSubject())) {
+                mutedTopics.add(homeList.adapter.getItem(i));
+                homeList.adapter.remove(homeList.adapter.getItem(i));
             }
         }
         homeList.adapter.notifyDataSetChanged();

app/src/main/java/com/zulip/android/networking/AsyncGetOldMessages.java

@@ -159,21 +159,19 @@ protected String doInBackground(String... params) {
                     Log.w("db_gom", "No messages found in specified range!");
                 }
             }
-            if (fetchMessages(mainAnchor, before, after, params)) {
-                if (filter == null) {
-                    int lowest = receivedMessages.get(0).getID();
-                    int highest = receivedMessages.get(
-                            receivedMessages.size() - 1).getID();
-
-                    // We know there are no messages between the anchor and what
-                    // we received or we would have fetched them.
-                    if (lowest > mainAnchor)
-                        lowest = mainAnchor;
-                    if (highest < mainAnchor)
-                        highest = mainAnchor;
-
-                    MessageRange.markRange(app, lowest, highest);
-                }
+            if (fetchMessages(mainAnchor, before, after, params) && filter == null) {
+                int lowest = receivedMessages.get(0).getID();
+                int highest = receivedMessages.get(
+                        receivedMessages.size() - 1).getID();
+
+                // We know there are no messages between the anchor and what
+                // we received or we would have fetched them.
+                if (lowest > mainAnchor)
+                    lowest = mainAnchor;
+                if (highest < mainAnchor)
+                    highest = mainAnchor;
+
+                MessageRange.markRange(app, lowest, highest);
             }
         } catch (SQLException e) {
             // Still welp.

app/src/main/java/com/zulip/android/networking/AsyncStatusUpdate.java

@@ -77,12 +77,10 @@ private JSONObject chooseLatestPresence(JSONObject person)
                             // status
                             latestPresence = presence;
                         }
-                    } else if (status.equals(PresenceType.IDLE.toString())) {
-                        if (latestStatus.equals(PresenceType.IDLE.toString())) {
-                            if (latestPresence.getLong(TIMESTAMP) < timestamp) {
-                                latestPresence = presence;
-                            }
-                        }
+                    } else if (status.equals(PresenceType.IDLE.toString())
+                                && latestStatus.equals(PresenceType.IDLE.toString())
+                                && latestPresence.getLong(TIMESTAMP) < timestamp) {
+                            latestPresence = presence;
                     }
                 }
             }

app/src/main/java/com/zulip/android/util/CustomHtmlToSpannedConverter.java

@@ -101,11 +101,10 @@ public Spanned convert() {
             int end = mSpannableStringBuilder.getSpanEnd(obj[i]);
 
             // If the last line of the range is blank, back off by one.
-            if (end - 2 >= 0) {
-                if (mSpannableStringBuilder.charAt(end - 1) == '\n'
-                        && mSpannableStringBuilder.charAt(end - 2) == '\n') {
-                    end--;
-                }
+            if (end - 2 >= 0
+                    && mSpannableStringBuilder.charAt(end - 1) == '\n'
+                    && mSpannableStringBuilder.charAt(end - 2) == '\n') {
+                end--;
             }
 
             if (end == start) {