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

mobile/android/thirdparty/org/adblockplus/browser/MoreSubscriptionsPreferenceGroup.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 19 matching lines @@
 import android.content.Context;
 import android.os.Build;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
 public class MoreSubscriptionsPreferenceGroup extends PreferenceGroup implements

[Felix Dahlke, 2015/07/29 20:32:07]

Naming nit again: Seems you're still mostly calling subcriptions "filter_list"
in the code. I think we should settle one one term here to avoid confusion. I'd
lean towards subscription because that's the technical term used under the hood,
regardless of what we call them on the UI.

[René Jeschke, 2015/07/30 09:26:44]

Done.

     UrlInputDialog.UrlReadyCallback
 {
   private static final String TAG = "AdblockBrowser.OtherPreferenceGroup";
   private static final HashMap<String, Integer> BUILTIN_URL_TO_INDEX = new HashMap<String, Integer>();
   private static final HashSet<String> IGNORED_URLS = new HashSet<String>();
   private static SubscriptionContainer recommendedSubscriptions = null;
 
   private final CheckBoxChangeListener checkBoxChangeListener = new CheckBoxChangeListener();
   private final ActiveSubscriptionContainer activeSubscriptions = new ActiveSubscriptionContainer();
   private ProgressDialog progressDialog;
 
   private static final int[] BUILTIN_TITLES =
   {
-      R.string.abb_list_disable_tracking,
-      R.string.abb_list_disable_malware,
-      R.string.abb_list_disable_anti_adblock,
-      R.string.abb_list_disable_social_media
+      R.string.abb_subscription_disable_tracking,
+      R.string.abb_subscription_disable_malware,
+      R.string.abb_subscription_disable_anti_adblock,
+      R.string.abb_subscription_disable_social_media
   };
 
   private static final String[] BUILTIN_LISTS =
   {
       "EasyPrivacy",
       "https://easylist-downloads.adblockplus.org/easyprivacy.txt",
       "Malware Domains",
       "https://easylist-downloads.adblockplus.org/malwaredomains_full.txt",
       "Adblock Warning Removal List",
       "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt",
@@ skipping 69 matching lines @@
 
     super.onAttachedToActivity();
 
     this.progressDialog = new ProgressDialog(this.getContext());
     this.progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
     this.progressDialog.setMessage(this.getContext().getString(R.string.abb_adblocking_waiting));
     this.progressDialog.show();
 
     UrlInputOpenerPreference.setRedirectUrlReadyCallback(this);
 
-    AddOnBridge.handlerPost(new Runnable()
+    AddOnBridge.postToHandler(new Runnable()
     {
       @Override
       public void run()
       {
         initRecommendedSubscriptions();
         MoreSubscriptionsPreferenceGroup.this.activeSubscriptions.refresh();
 
         ThreadUtils.postToUiThread(new Runnable()
         {
           @Override
@@ skipping 45 matching lines @@
       this.progressDialog.dismiss();
       this.progressDialog = null;
     }
   }
 
   private void addNewSubscription(final String url)
   {
     this.progressDialog = new ProgressDialog(this.getContext());
     this.progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
     this.progressDialog
-        .setMessage(this.getContext().getString(R.string.abb_add_filter_list_adding));
+        .setMessage(this.getContext().getString(R.string.abb_add_subscription_adding));
     this.progressDialog.show();
 
-    AddOnBridge.handlerPost(new Runnable()
+    AddOnBridge.postToHandler(new Runnable()
     {
       @Override
       public void run()
       {
         try
         {
           final Semaphore finished = new Semaphore(0);
 
           AddOnBridge.addSubscription(new AdblockPlusApiCallback()
           {
@@ skipping 121 matching lines @@
       // ignored
     }
 
     @Override
     public void onApiRequestFailed(String errorMessage)
     {
       // ignored
     }
   }
 }