Bug 831785 - Code cleanup. r=trivial

mobile/android/base/background/announcements/AnnouncementsBroadcastService.java

@@ -123,13 +123,12 @@ public class AnnouncementsBroadcastService extends IntentService {
       Logger.error(LOG_TAG, "Method " + BackgroundConstants.GECKO_PREFERENCES_CLASS + "/" + BackgroundConstants.GECKO_BROADCAST_METHOD + " not found!");
       return;
     } catch (IllegalArgumentException e) {
-      // Fall through.
+      Logger.error(LOG_TAG, "Got exception invoking " + BackgroundConstants.GECKO_BROADCAST_METHOD + ".");
     } catch (IllegalAccessException e) {
-      // Fall through.
+      Logger.error(LOG_TAG, "Got exception invoking " + BackgroundConstants.GECKO_BROADCAST_METHOD + ".");
     } catch (InvocationTargetException e) {
-      // Fall through.
+      Logger.error(LOG_TAG, "Got exception invoking " + BackgroundConstants.GECKO_BROADCAST_METHOD + ".");
     }
-    Logger.error(LOG_TAG, "Got exception invoking " + BackgroundConstants.GECKO_BROADCAST_METHOD + ".");
   }
 
   /**

mobile/android/base/sync/ExtendedJSONObject.java

@@ -41,7 +41,8 @@ public class ExtendedJSONObject {
   /**
    * Parse a JSON encoded string.
    *
-   * @param input JSON encoded input string to parse; not necessarily a JSON object.
+   * @param in <code>Reader</code> over a JSON-encoded input to parse; not
+   *            necessarily a JSON object.
    * @return a regular Java <code>Object</code>.
    * @throws ParseException
    * @throws IOException
@@ -55,7 +56,7 @@ public class ExtendedJSONObject {
    * <p>
    * You should prefer the streaming interface {@link #parseRaw(Reader)}.
    *
-   * @param input JSON encoded input string to parse; not necessarily a JSON object.
+   * @param input JSON-encoded input string to parse; not necessarily a JSON object.
    * @return a regular Java <code>Object</code>.
    * @throws ParseException
    */
@@ -66,7 +67,7 @@ public class ExtendedJSONObject {
   /**
    * Helper method to get a JSON array from a stream.
    *
-   * @param jsonString input.
+   * @param in <code>Reader</code> over a JSON-encoded array to parse.
    * @throws ParseException
    * @throws IOException
    * @throws NonArrayJSONException if the object is valid JSON, but not an array.

mobile/android/base/sync/crypto/KeyBundle.java

@@ -131,4 +131,9 @@ public class KeyBundle {
       return Arrays.equals(other.encryptionKey, this.encryptionKey) &&
              Arrays.equals(other.hmacKey, this.hmacKey);
     }
+
+    @Override
+    public int hashCode() {
+      throw new UnsupportedOperationException("No hashCode for KeyBundle.");
+    }
 }

mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionFetchRecordsDelegate.java

@@ -6,7 +6,6 @@ package org.mozilla.gecko.sync.repositories.delegates;
 
 import java.util.concurrent.ExecutorService;
 
-import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate;
 import org.mozilla.gecko.sync.repositories.domain.Record;
 
 public class DeferredRepositorySessionFetchRecordsDelegate implements RepositorySessionFetchRecordsDelegate {

mobile/android/base/sync/setup/SyncAuthenticatorService.java

@@ -117,8 +117,10 @@ public class SyncAuthenticatorService extends Service {
       result.putString(Constants.OPTION_USERNAME, username);
     } catch (NoSuchAlgorithmException e) {
       // Do nothing. Calling code must check for missing value.
+      Logger.debug(LOG_TAG, "Exception in account lookup: " + e);
     } catch (UnsupportedEncodingException e) {
       // Do nothing. Calling code must check for missing value.
+      Logger.debug(LOG_TAG, "Exception in account lookup: " + e);
     }
 
     // Sync key.

mobile/android/base/sync/setup/activities/AccountActivity.java

@@ -322,7 +322,6 @@ public class AccountActivity extends AccountAuthenticatorActivity {
         }
       }
     });
-    return;
   }
 
   /**

mobile/android/base/sync/setup/activities/WebURLFinder.java

@@ -118,6 +118,7 @@ public class WebURLFinder {
         }
       } catch (URISyntaxException e) {
         // Ignore: on to the next.
+        continue;
       }
     }