Noissue - Lint adjustments and optimizations

adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/engine/Engine.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 26 matching lines @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
 
 import org.adblockplus.adblockplussbrowser.R;
 import org.adblockplus.sbrowser.contentblocker.MainPreferences;

[jens, 2017/06/02 10:50:01]

Am I wrong, or is this an unused import?

[diegocarloslima, 2017/06/02 21:03:42]

Yes, but this will be removed by the other NoIssue review, which cleans all
unused stuff

[jens, 2017/06/06 09:39:55]

Acknowledged.

 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
+import android.text.format.DateUtils;
 import android.util.Log;
 
 public final class Engine
 {
   private static final String TAG = Engine.class.getSimpleName();
 
   // TODO make use of this regex's
   public static final Pattern RE_SUBSCRIPTION_HEADER = Pattern.compile(
       "\\[Adblock(?:\\s*Plus\\s*([\\d\\.]+)?)?\\]", Pattern.CASE_INSENSITIVE);
   public static final Pattern RE_FILTER_META = Pattern.compile("^\\s*!\\s*(\\w+)\\s*:\\s*(.*)");
   public static final Pattern RE_FILTER_ELEMHIDE = Pattern
       .compile("^([^\\/\\*\\|\\@\"!]*?)#(\\@)?(?:([\\w\\-]+|\\*)((?:\\([\\w\\-]+(?:[$^*]?=[^\\(\\)\"]*)?\\))*)|#([^{}]+))$");
   public static final Pattern RE_FILTER_REGEXP = Pattern
       .compile("^(@@)?\\/.*\\/(?:\\$~?[\\w\\-]+(?:=[^,\\s]+)?(?:,~?[\\w\\-]+(?:=[^,\\s]+)?)*)?$");
   public static final Pattern RE_FILTER_OPTIONS = Pattern
       .compile("\\$(~?[\\w\\-]+(?:=[^,\\s]+)?(?:,~?[\\w\\-]+(?:=[^,\\s]+)?)*)$");
   public static final Pattern RE_FILTER_CSSPROPERTY = Pattern
       .compile("\\[\\-abp\\-properties=([\"'])([^\"']+)\\1\\]");
 
   public static final String USER_FILTERS_TITLE = "__filters";
   public static final String USER_EXCEPTIONS_TITLE = "__exceptions";
 
   public static final String SBROWSER_APP_ID = "com.sec.android.app.sbrowser";
-  public static final String ACTION_OPEN_SETTINGS = "com.samsung.android.sbrowser.contentBlocker.ACTION_SETTING";
-  public static final String ACTION_UPDATE = "com.samsung.android.sbrowser.contentBlocker.ACTION_UPDATE";
-  public static final String EASYLIST_URL = "https://easylist-downloads.adblockplus.org/easylist.txt";
+  private static final String ACTION_OPEN_SETTINGS = "com.samsung.android.sbrowser.contentBlocker.ACTION_SETTING";
+  private static final String ACTION_UPDATE = "com.samsung.android.sbrowser.contentBlocker.ACTION_UPDATE";
+  private static final String EASYLIST_URL = "https://easylist-downloads.adblockplus.org/easylist.txt";
 
   public static final String SUBSCRIPTIONS_EXCEPTIONSURL = "subscriptions_exceptionsurl";
 
   private static final String PREFS_KEY_PREVIOUS_VERSION = "key_previous_version";
 
   // The value below specifies an interval of [x, 2*x[, where x =
-  // INITIAL_UPDATE_CHECK_DELAY_SECONDS
-  private static final long INITIAL_UPDATE_CHECK_DELAY_SECONDS = 5;
-  private static final long UPDATE_CHECK_INTERVAL_MINUTES = 30;
-  private static final long BROADCAST_COMBINATION_DELAY_MILLIS = 2500;
-
-  public static final long MILLIS_PER_SECOND = 1000;
-  public static final long MILLIS_PER_MINUTE = 60 * MILLIS_PER_SECOND;
-  public static final long MILLIS_PER_HOUR = 60 * MILLIS_PER_MINUTE;
-  public static final long MILLIS_PER_DAY = 24 * MILLIS_PER_HOUR;
+  // INITIAL_UPDATE_CHECK_DELAY
+  private static final long INITIAL_UPDATE_CHECK_DELAY = 5 * DateUtils.SECOND_IN_MILLIS;
+  private static final long UPDATE_CHECK_INTERVAL = 30 * DateUtils.MINUTE_IN_MILLIS;
+  private static final long BROADCAST_COMBINATION_DELAY = 2500;
 
   private static final int NO_FLAG = 0;
   private static final int OLDEST_SAMSUNG_INTERNET_5_VERSIONCODE = 500000000;
 
   private final ReentrantLock accessLock = new ReentrantLock();
   private DefaultSubscriptions defaultSubscriptions;
   private Subscriptions subscriptions;
   private JSONPrefs jsonPrefs;
   private AppInfo appInfo;
-  private LinkedBlockingQueue<EngineEvent> engineEvents = new LinkedBlockingQueue<>();
+  private final LinkedBlockingQueue<EngineEvent> engineEvents = new LinkedBlockingQueue<>();
   private Thread handlerThread;
   private Downloader downloader;
   private final Context serviceContext;
   private boolean wasFirstRun = false;
   private long nextUpdateBroadcast = Long.MAX_VALUE;
 
   private Engine(final Context context)
   {
     this.serviceContext = context;
   }
@@ skipping 64 matching lines @@
       Log.d(TAG, "No compatible Samsung Browser found.", e);
       return false;
     }
   }
 
   public void requestUpdateBroadcast()
   {
     this.lock();
     try
     {
-      this.nextUpdateBroadcast = System.currentTimeMillis() + BROADCAST_COMBINATION_DELAY_MILLIS;
+      this.nextUpdateBroadcast = System.currentTimeMillis() + BROADCAST_COMBINATION_DELAY;
     }
     finally
     {
       this.unlock();
     }
   }
 
   private void writeFileAndSendUpdateBroadcast()
   {
     createAndWriteFile();
@@ skipping 228 matching lines @@
       }
 
       Log.d(TAG, "Added " + additional + " additional default/built-in subscriptions");
       engine.subscriptions.persistSubscriptions();
     }
 
     engine.handlerThread = new Thread(new EventHandler(engine));
     engine.handlerThread.setDaemon(true);
     engine.handlerThread.start();
 
-    engine.downloader = Downloader.create(context, engine);
+    engine.downloader = Downloader.create(engine);
 
     final File cachedFilterFile = getCachedFilterFile(context);
     if (cachedFilterFile == null || !cachedFilterFile.exists())
     {
       engine.writeFileAndSendUpdateBroadcast();
     }
 
     return engine;
   }
 
@@ skipping 73 matching lines @@
         try
         {
           final URI uri = new URI(url);
           final String host = uri.getHost() != null ? uri.getHost() : uri.getPath();
           w.write("@@||" + host + "^$document");
           w.write('\n');
         }
         catch (URISyntaxException e)
         {
           Log.w(TAG, "Failed to parse whitelisted website: " + url);
           continue;

[jens, 2017/06/02 10:50:01]

I think this continue statement can be deleted.

[diegocarloslima, 2017/06/02 21:03:42]

Yeah, this one will be removed in the cleanup Noissue review as well

[jens, 2017/06/06 09:39:55]

Acknowledged.

         }
       }
     }
   }
 
   private static File getCachedFilterFile(Context context)
   {
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
     final String cachedFilterPath = prefs.getString(context.getString(R.string.key_cached_filter_path), null);
     if (cachedFilterPath != null)
@@ skipping 70 matching lines @@
     {
       this.engine = engine;
     }
 
     @Override
     public void run()
     {
       Log.d(TAG, "Handler thread started");
       boolean interrupted = false;
       long nextUpdateCheck = System.currentTimeMillis()
-          + (long) ((1 + Math.random()) * INITIAL_UPDATE_CHECK_DELAY_SECONDS * MILLIS_PER_SECOND);
+          + (long) ((1 + Math.random()) * INITIAL_UPDATE_CHECK_DELAY);
       while (!interrupted)
       {
         try
         {
           final EngineEvent event = this.engine.engineEvents.poll(100, TimeUnit.MILLISECONDS);
           engine.lock();
           try
           {
             if (event != null)
             {
@@ skipping 17 matching lines @@
                 }
                 default:
                   Log.d(TAG, "Unhandled type: " + event.getType());
                   break;
               }
             }
 
             final long currentTime = System.currentTimeMillis();
             if (currentTime > nextUpdateCheck)
             {
-              nextUpdateCheck = currentTime + UPDATE_CHECK_INTERVAL_MINUTES * MILLIS_PER_MINUTE;
+              nextUpdateCheck = currentTime + UPDATE_CHECK_INTERVAL;
 
               this.engine.subscriptions.checkForUpdates();
             }
 
             if (currentTime > this.engine.nextUpdateBroadcast)
             {
               this.engine.nextUpdateBroadcast = Long.MAX_VALUE;
               Log.d(TAG, "Sending update broadcast");
               this.engine.writeFileAndSendUpdateBroadcast();
             }
@@ skipping 21 matching lines @@
   {
     public enum EngineEventType
     {
       CHANGE_ENABLED_STATE,
       FORCE_DOWNLOAD,
       DOWNLOAD_FINISHED
     }
 
     private final EngineEventType type;
 
-    protected EngineEvent(final EngineEventType type)
+    EngineEvent(final EngineEventType type)
     {
       this.type = type;
     }
 
     public EngineEventType getType()
     {
       return this.type;
     }
   }
 
@@ skipping 54 matching lines @@
       Log.d(TAG, headers.toString());
       this.downloader.enqueueDownload(this.createDownloadURL(sub), sub.getId(), headers);
     }
   }
 
   public void connectivityChanged()
   {
     this.downloader.connectivityChanged();
   }
 }