Issue 2720 - [Adblocking settings] Add the other filter lists category

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

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 15 matching lines @@
 import java.util.concurrent.Semaphore;
 
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.util.NativeJSObject;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
 
 public class SubscriptionPreferenceCategory extends PreferenceCategory
 {
-  private static final HandlerThread HANDLER_THREAD;
-  private static final Handler HANDLER;
-
   private volatile static SubscriptionContainer subscriptionContainer = null;
   private final CheckBoxChangeListener checkBoxChangeListener = new CheckBoxChangeListener();
   private boolean isEnabledList = false;
   private ProgressDialog progressDialog;
 
-  static
-  {
-    HANDLER_THREAD = new HandlerThread("subscription-preference-background");
-    HANDLER_THREAD.setDaemon(true);
-    HANDLER_THREAD.start();
-    HANDLER = new Handler(HANDLER_THREAD.getLooper());
-  }
-
   public SubscriptionPreferenceCategory(Context context)
   {
     super(context);
   }
 
   public SubscriptionPreferenceCategory(Context context, AttributeSet attrs)
   {
     super(context, attrs);
   }
 
@@ skipping 23 matching lines @@
 
     this.setEnabled(false);
     this.setShouldDisableView(true);
 
     super.onAttachedToActivity();
 
     this.progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
     this.progressDialog.setMessage(this.getContext().getString(R.string.abb_adblocking_waiting));
     this.progressDialog.show();
 
-    HANDLER.post(new Runnable()
+    AddOnBridge.handlerPost(new Runnable()
     {
       @Override
       public void run()
       {
         initSubscriptions();
         ThreadUtils.postToUiThread(new Runnable()
         {
           @Override
           public void run()
           {
@@ skipping 77 matching lines @@
         final CheckBoxPreference cbp = (CheckBoxPreference) preference;
         final boolean enable = ((Boolean) newValue).booleanValue();
         SubscriptionPreferenceCategory.subscriptionContainer.changeSubscriptionState(
             cbp.getKey(),
             enable);
       }
       return true;
     }
   }
 
-  private final static class SubscriptionContainer implements AdblockPlusApiCallback
+  final static class SubscriptionContainer implements AdblockPlusApiCallback
   {
     private static final String TAG = SubscriptionContainer.class.getName();
     private final ConcurrentHashMap<String, Boolean> enableState = new ConcurrentHashMap<String, Boolean>();
     private final Semaphore entriesReady = new Semaphore(0);
     private final List<Subscription> entries = new ArrayList<Subscription>();
     private final HashMap<String, Subscription> urlMap = new HashMap<String, Subscription>();
 
     private SubscriptionContainer()
     {
       // prevent external instantiation
     }
 
     public final static SubscriptionContainer create()
     {
+      return create(true);
+    }
+
+    public final static SubscriptionContainer create(final boolean refresh)
+    {
       final SubscriptionContainer sc = new SubscriptionContainer();
       AddOnBridge.queryValue(sc, "subscriptionsXml");
       sc.entriesReady.acquireUninterruptibly();
 
       for (final Subscription e : sc.entries)
       {
         sc.urlMap.put(e.url, e);
         sc.enableState.put(e.url, Boolean.FALSE);
       }
 
-      sc.refresh();
+      if (refresh)
+      {
+        sc.refresh();
+      }
 
       return sc;
     }
 
     public void refresh()
     {
       if (!this.entries.isEmpty())
       {
         for (int i = 0; i < this.entries.size(); i++)
         {
@@ skipping 194 matching lines @@
 
       @Override
       public String toString()
       {
         return this.specialization + " (" + this.title + ") @ " + this.url;
       }
     }
   }
 }