Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a010ef4d authored by Cedric Beust's avatar Cedric Beust
Browse files

Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).

Change-Id: I154e27f615932bfcc08993aa361a6d2ffbc51d74
parent 6f4a8a58
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -1548,11 +1548,12 @@ public final class Gmail {
                    getLabelIdValues(labelId).getAsInteger(LabelColumns.NUM_UNREAD_CONVERSATIONS);
            // There seems to be a race condition here that can get the label maps into a bad
            // state and lose state on a particular label.
            if (unreadConversations == null) {
                return 0;
            } else {
                return unreadConversations < 0 ? 0 : unreadConversations;
            int result = 0;
            if (unreadConversations != null) {
                result = unreadConversations < 0 ? 0 : unreadConversations;
            }

            return result;
        }

        /**