Issue 6454 - IllegalStateException crash

adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/engine/Engine.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 34 matching lines @@
 import org.adblockplus.adblockplussbrowser.R;
 import org.adblockplus.sbrowser.contentblocker.util.ConnectivityUtils;
 import org.adblockplus.sbrowser.contentblocker.util.SharedPrefsUtils;
 import org.adblockplus.sbrowser.contentblocker.util.SubscriptionUtils;
 
 import android.content.Context;
 import android.content.Intent;
 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.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
 import android.widget.Toast;
 
 public final class Engine
 {
@@ skipping 20 matching lines @@
 
   private final ReentrantLock accessLock = new ReentrantLock();
   private DefaultSubscriptions defaultSubscriptions;
   private Subscriptions subscriptions;
   private JSONPrefs jsonPrefs;
   private AppInfo appInfo;
   private final LinkedBlockingQueue<EngineEvent> engineEvents = new LinkedBlockingQueue<>();
   private Thread handlerThread;
   private Downloader downloader;
   private SubscriptionUpdateCallback subscriptionUpdateCallback;
-  private final Context serviceContext;
+  private final Context context;
   private boolean wasFirstRun = false;
   private long nextUpdateBroadcast = Long.MAX_VALUE;
 
   private Engine(final Context context)
   {
-    this.serviceContext = context;
+    this.context = context;
   }
 
   public String getPrefsDefault(final String key)
   {
     return this.jsonPrefs.getDefaults(key);
   }
 
   DefaultSubscriptionInfo getDefaultSubscriptionInfo(final Subscription sub)
   {
     return this.defaultSubscriptions.getForUrl(sub.getURL());
   }
 
   void lock()
   {
     this.accessLock.lock();
   }
 
   void unlock()
   {
     this.accessLock.unlock();
   }
 
-  public static boolean openSBrowserSettings(final Context activityContext)
+  public static boolean openSBrowserSettings(final Context context)
   {
     final Intent intent = new Intent(ACTION_OPEN_SETTINGS);
-    final List<ResolveInfo> list = activityContext.getPackageManager()
+    final List<ResolveInfo> list = context.getPackageManager()
         .queryIntentActivities(intent, 0);
     if (list.size() > 0)
     {
-      activityContext.startActivity(intent);
+      context.startActivity(intent);
     }
     return list.size() > 0;
   }
 
-  public static boolean hasCompatibleSBrowserInstalled(final Context activityContext)
+  public static boolean hasCompatibleSBrowserInstalled(final Context context)
   {
     try
     {
-      return activityContext.getPackageManager()
+      return context.getPackageManager()
           .queryIntentActivities(new Intent(ACTION_OPEN_SETTINGS), 0).size() > 0;
     }
     catch (final Throwable t)
     {
       return false;
     }
   }
 
   /**
    * Starting with Samsung Internet 5.0, the way to enable ad blocking has changed. As a result, we
    * need to check for the version of Samsung Internet and apply text changes to the first run slide.
    *
-   * @param activityContext
+   * @param context
    * @return a boolean that indicates, if the user has Samsung Internet version 5.x
    */
-  public static boolean hasSamsungInternetVersion5OrNewer(final Context activityContext)
+  public static boolean hasSamsungInternetVersion5OrNewer(final Context context)
   {
     try
     {
-      PackageInfo packageInfo = activityContext.getPackageManager().getPackageInfo(SBROWSER_APP_ID, NO_FLAG);
+      PackageInfo packageInfo = context.getPackageManager().getPackageInfo(SBROWSER_APP_ID, NO_FLAG);
       return packageInfo.versionCode >= OLDEST_SAMSUNG_INTERNET_5_VERSIONCODE;
     }
     catch (PackageManager.NameNotFoundException e)
     {
       // Should never happen, as checkAAStatusAndProceed() should not be called if the user
       // has no compatible SBrowser installed. Nevertheless we have to handle the Exception.
       Log.d(TAG, "No compatible Samsung Browser found.", e);
       return false;
     }
   }
@@ skipping 12 matching lines @@
   {
     createAndWriteFile();
 
     runOnUiThread(new Runnable()
     {
       @Override
       public void run()
       {
         final Intent intent = new Intent();
         intent.setAction(ACTION_UPDATE);
-        intent.setData(Uri.parse("package:" + Engine.this.serviceContext.getPackageName()));
-        Engine.this.serviceContext.sendBroadcast(intent);
+        intent.setData(Uri.parse("package:" + Engine.this.context.getPackageName()));
+        Engine.this.context.sendBroadcast(intent);
       }
     });
   }
 
   boolean canUseInternet(final boolean allowMetered)
   {
     // allow a metered connection to update default subscriptions at the first run.
     // See https://issues.adblockplus.org/ticket/5237
-    return ConnectivityUtils.canUseInternet(serviceContext, allowMetered || wasFirstRun());
+    return ConnectivityUtils.canUseInternet(context, allowMetered || wasFirstRun());
   }
 
   public void forceUpdateSubscriptions(final boolean allowMetered)
   {
     try
     {
       subscriptions.checkForUpdates(true, allowMetered);
-      Toast.makeText(serviceContext, serviceContext.getText(R.string.updating_subscriptions), Toast.LENGTH_LONG).show();
+      Toast.makeText(context, context.getText(R.string.updating_subscriptions), Toast.LENGTH_LONG).show();
     }
     catch (IOException e)
     {
       Log.e(TAG, "Failed checking for updates", e);
     }
   }
 
   public List<SubscriptionInfo> getListedSubscriptions()
   {
     return this.subscriptions.getSubscriptions(this);
@@ skipping 38 matching lines @@
     this.engineEvents.add(new DownloadFinishedEvent(id, responseCode, response, headers));
   }
 
   private void createAndWriteFile()
   {
     this.lock();
     try
     {
       Log.d(TAG, "Writing filters...");
       final File filterFile = this.subscriptions.createAndWriteFile();
-      writeWhitelistedWebsites(this.serviceContext, filterFile);
+      writeWhitelistedWebsites(this.context, filterFile);
 
       SharedPrefsUtils.putString(
-          this.serviceContext, R.string.key_cached_filter_path, filterFile.getAbsolutePath());
+          this.context, R.string.key_cached_filter_path, filterFile.getAbsolutePath());
 
       Log.d(TAG, "Cleaning up cache...");
-      final File dummyFile = getDummyFilterFile(this.serviceContext);
-      final File[] cacheDirFiles = getFilterCacheDir(this.serviceContext).listFiles();
+      final File dummyFile = getDummyFilterFile(this.context);
+      final File[] cacheDirFiles = getFilterCacheDir(this.context).listFiles();
       if (cacheDirFiles != null)
       {
         for (final File file : cacheDirFiles)
         {
           if (!file.equals(dummyFile) && !file.equals(filterFile))
           {
             Log.d(TAG, "Deleting file:" + file);
             file.delete();
           }
         }
@@ skipping 503 matching lines @@
   {
     void subscriptionUpdateRequested(boolean enabled);
     void subscriptionUpdatedApplied();
   }
 
   public interface SubscriptionAddedCallback
   {
     void subscriptionAdded();
   }
 }