Noissue - Lint adjustments

mobile/android/thirdparty/org/adblockplus/browser/AddOnBridge.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 16 matching lines @@
 import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.Log;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.util.BundleEventListener;
 import org.mozilla.gecko.util.EventCallback;
+import org.mozilla.gecko.util.GeckoBundle;
 import org.mozilla.gecko.util.GeckoRequest;
-import org.mozilla.gecko.util.NativeEventListener;
 import org.mozilla.gecko.util.NativeJSObject;
 
 @SuppressLint("DefaultLocale")
 public class AddOnBridge
 {
   private static final String TAG = "AdblockBrowser.AddOnBridge";
   private static final String REQUEST_NAME = "AdblockPlus:Api";
   // Handler+HandlerThread for posting delayed re-tries without interfering with
   // other threads (e.g. the UI or Gecko thread)
   private static final HandlerThread PRIVATE_HANDLER_THREAD;
@@ skipping 146 matching lines @@
     {
       Log.e(TAG, "Failed to parse json to request list with error: " + e.getMessage(), e);
     }
     return requestList;
   }
 
   private static void storeStringPref(String key, String value)
   {
     final SharedPreferences.Editor editor = sharedPrefs.edit();
     editor.putString(key, value);
-    editor.commit();
+    editor.apply();

[anton, 2017/10/10 12:19:43]

this seems to be not lint change: apply returns immediately but commit blocks
the thread until it's actually written.
I'd suggest it to be done in separate code review as it changes app logics (not
just code style for lint).

[diegocarloslima, 2017/10/10 14:54:18]

Actually this is a lint warning, but I agree with you, since this is not just a
coding style or best practice and is more prone to bugs, it would make more
sense to treat it separately

[anton, 2017/10/12 05:50:17]

okay, waiting for the next patch set to LGTM it

   }
 
   public static boolean getBooleanFromJsObject(final NativeJSObject obj, final String name,
       final boolean defaultValue)
   {
     try
     {
       return obj.getBoolean(name);
     }
     catch (final Exception e)
@@ skipping 38 matching lines @@
       obj.put("enable", enable);
     }
     catch (JSONException e)
     {
       // we're only adding sane objects
       Log.e(TAG, "Creating request data failed with: " + e.getMessage(), e);
     }
     return obj;
   }
 
-  public static String makeFirstCharacterUppercase(String str)
+  private static String makeFirstCharacterUppercase(String str)
   {
     if (Character.isUpperCase(str.charAt(0)))
     {
       return str;
     }
     return Character.toString(Character.toUpperCase(str.charAt(0))) + str.substring(1);
   }
 
   public static void queryValue(final AdblockPlusApiCallback callback, final String name)
   {
@@ skipping 42 matching lines @@
     if (resendIfAborted)
     {
       storePendingRequest(request);
     }
   }
 
   public static void querySubscriptionListStatus(final AdblockPlusApiCallback callback,
       final String url)
   {
     Log.d(TAG, "querySubscriptionListStatus for " + url);
-    final Map<String, Object> parameters = new HashMap<String, Object>();
+    final Map<String, Object> parameters = new HashMap<>();
     parameters.put("url", url);
     callFunction(callback, "isSubscriptionListed", parameters);
   }
 
   public static void addSubscription(final AdblockPlusApiCallback callback,
       final String url, final String title)
   {
     Log.d(TAG, "addSubscription for " + url + " (" + title + ")");
-    final Map<String, Object> parameters = new HashMap<String, Object>();
+    final Map<String, Object> parameters = new HashMap<>();
     parameters.put("url", url);
     if (title != null)
     {
       parameters.put("title", title);
     }
     callFunction(callback, "addSubscription", parameters, true);
   }
 
   public static void queryActiveSubscriptions(final AdblockPlusApiCallback callback)
   {
     Log.d(TAG, "queryActiveSubscriptions");
-    final Map<String, Object> parameters = new HashMap<String, Object>();
+    final Map<String, Object> parameters = new HashMap<>();
     callFunction(callback, "getActiveSubscriptions", parameters);
   }
 
   public static void removeSubscription(final AdblockPlusApiCallback callback,
       final String url)
   {
     Log.d(TAG, "removeSubscription for " + url);
-    final Map<String, Object> parameters = new HashMap<String, Object>();
+    final Map<String, Object> parameters = new HashMap<>();
     parameters.put("url", url);
     callFunction(callback, "removeSubscription", parameters, true);
   }
 
   public static void queryIsLocal(final AdblockPlusApiCallback callback,
       final String url)
   {
     Log.d(TAG, "queryIsLocal for " + url);
-    final Map<String, Object> parameters = new HashMap<String, Object>();
+    final Map<String, Object> parameters = new HashMap<>();
     parameters.put("url", url);
     callFunction(callback, "isLocal", parameters);
   }
 
   public static void queryIsPageWhitelisted(final AdblockPlusApiCallback callback,
       final String url)
   {
     Log.d(TAG, "queryIsPageWhitelisted for " + url);
-    final Map<String, Object> parameters = new HashMap<String, Object>();
+    final Map<String, Object> parameters = new HashMap<>();
     parameters.put("url", url);
     callFunction(callback, "isPageWhitelisted", parameters);
   }
 
   public static void whitelistSite(final AdblockPlusApiCallback callback, final String url,
       final boolean whitelisted)
   {
     Log.d(TAG, "whitelistSite for " + url);
-    final Map<String, Object> parameters = new HashMap<String, Object>();
+    final Map<String, Object> parameters = new HashMap<>();
     parameters.put("url", url);
     parameters.put("whitelisted", whitelisted);
     callFunction(callback, "whitelistSite", parameters, true);
   }
 
   private static class AddOnRequest extends GeckoRequest
   {
     private final JSONObject value;
     private final AdblockPlusApiCallback apiCallback;
 
@@ skipping 47 matching lines @@
       {
         this.invokeSuccessCallback(jsObject);
       }
       else
       {
         this.invokeFailureCallback(jsObject);
       }
     }
   }
 
-  private static class AddOnEventListener implements NativeEventListener
+  private static class AddOnEventListener implements BundleEventListener

[anton, 2017/10/10 12:19:42]

is it lint change too? seems to be not.

[diegocarloslima, 2017/10/10 14:54:18]

Yeah, actually this was a deprecation warning in

EventDispatcher.getInstance().registerGeckoThreadListener(ADD_ON_EVENT_LISTENER,
ON_FILTERS_LOAD_EVENT, ON_FILTERS_SAVE_EVENT);

which uses this deprecated method
https://hg.adblockplus.org/adblockbrowser/file/7018960f20ac/mobile/android/ge...

[anton, 2017/10/12 05:50:17]

Acknowledged.

   {
     @Override
-    public void handleMessage(String event, NativeJSObject message, EventCallback callback)
+    public void handleMessage(String event, GeckoBundle message, EventCallback callback)
     {
       if (ON_FILTERS_LOAD_EVENT.equals(event))
       {
         // The filters have been loaded by the extension. Given that, we can send all pending requests
         filtersLoaded = true;
         sendPendingRequests();
       }
       else if (ON_FILTERS_SAVE_EVENT.equals(event))
       {
         // All changes have been saved by the extension. That way, we can clear our list of
         // pending requests
         // See https://issues.adblockplus.org/ticket/2853
         clearPendingRequests();
       }
     }
   }
 }