| Index: mobile/android/thirdparty/org/adblockplus/browser/MoreSubscriptionsPreferenceGroup.java |
| =================================================================== |
| --- a/mobile/android/thirdparty/org/adblockplus/browser/MoreSubscriptionsPreferenceGroup.java |
| +++ b/mobile/android/thirdparty/org/adblockplus/browser/MoreSubscriptionsPreferenceGroup.java |
| @@ -37,18 +37,18 @@ import android.util.AttributeSet; |
| import android.util.Log; |
| import android.view.View; |
| import android.view.ViewGroup; |
| public class MoreSubscriptionsPreferenceGroup extends PreferenceGroup implements |
| 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 final HashMap<String, Integer> BUILTIN_URL_TO_INDEX = new HashMap<>(); |
| + private static final HashSet<String> IGNORED_URLS = new HashSet<>(); |
| private static SubscriptionContainer recommendedSubscriptions = null; |
| private final CheckBoxChangeListener checkBoxChangeListener = new CheckBoxChangeListener(); |
| private final ActiveSubscriptionContainer activeSubscriptions; |
| private ProgressDialog progressDialog; |
| private static final int[] BUILTIN_TITLES = |
| { |
| @@ -69,17 +69,17 @@ public class MoreSubscriptionsPreference |
| "Fanboy's Social Blocking List", |
| "https://easylist-downloads.adblockplus.org/fanboy-social.txt" |
| }; |
| static |
| { |
| for (int i = 0; i < BUILTIN_TITLES.length; i++) |
| { |
| - BUILTIN_URL_TO_INDEX.put(BUILTIN_LISTS[i * 2 + 1], Integer.valueOf(i)); |
| + BUILTIN_URL_TO_INDEX.put(BUILTIN_LISTS[i * 2 + 1], i); |
| } |
| IGNORED_URLS.add("https://easylist-downloads.adblockplus.org/exceptionrules.txt"); |
| } |
| private synchronized static void initRecommendedSubscriptions() |
| { |
| if (recommendedSubscriptions == null) |
| @@ -107,35 +107,16 @@ public class MoreSubscriptionsPreference |
| @Override |
| protected View onCreateView(final ViewGroup parent) |
| { |
| this.setLayoutResource(R.layout.abb_minimal_widget); |
| return super.onCreateView(parent); |
| } |
| - public static Preference createCheckBoxOrSwitch(final Context context) |
| - { |
| - if (Build.VERSION.SDK_INT < 14) |
| - { |
| - return new CustomCheckBoxPreference(context); |
| - } |
| - try |
| - { |
| - return (Preference) Class.forName("android.preference.SwitchPreference") |
| - .getConstructor(Context.class) |
| - .newInstance(context); |
| - } |
| - catch (Exception e) |
| - { |
| - Log.e(TAG, "Failed to create SwitchPreference, falling back to CheckBoxPreference", e); |
| - return new CustomCheckBoxPreference(context); |
| - } |
| - } |
| - |
| @Override |
| protected void onAttachedToActivity() |
| { |
| this.setEnabled(false); |
| this.setShouldDisableView(true); |
| super.onAttachedToActivity(); |
| @@ -273,17 +254,17 @@ public class MoreSubscriptionsPreference |
| } |
| Log.d(TAG, "Adding: " + url); |
| this.addNewSubscription(url); |
| } |
| private static class ActiveSubscriptionContainer implements AdblockPlusApiCallback |
| { |
| - public final HashMap<String, String> enabledSubscriptions = new HashMap<String, String>(); |
| + public final HashMap<String, String> enabledSubscriptions = new HashMap<>(); |
| private final Semaphore entriesReady = new Semaphore(0); |
| private final Context context; |
| ActiveSubscriptionContainer(Context context) |
| { |
| this.context = context; |
| } |
| @@ -297,21 +278,21 @@ public class MoreSubscriptionsPreference |
| public void onApiRequestSucceeded(NativeJSObject jsObject) |
| { |
| try |
| { |
| this.enabledSubscriptions.clear(); |
| if (jsObject.getBoolean("success")) |
| { |
| NativeJSObject[] subs = jsObject.getObjectArray("value"); |
| - for (int i = 0; i < subs.length; i++) |
| + for (final NativeJSObject sub : subs) |
| { |
| - final String url = subs[i].getString("url"); |
| + final String url = sub.getString("url"); |
| - String title = subs[i].has("title") ? subs[i].getString("title") : url; |
| + String title = sub.has("title") ? sub.getString("title") : url; |
| if (title.startsWith("~user~")) |
| { |
| title = this.context.getString(R.string.abb_pref_category_whitelisted_sites); |
| } |
| if (!IGNORED_URLS.contains(url)) |
| { |
| Log.d(TAG, "Adding: " + url + ", " + title); |
| @@ -337,17 +318,17 @@ public class MoreSubscriptionsPreference |
| AdblockPlusApiCallback |
| { |
| @Override |
| public boolean onPreferenceChange(Preference preference, Object newValue) |
| { |
| if (preference instanceof CheckBoxPreference && newValue instanceof Boolean) |
| { |
| final CheckBoxPreference cbp = (CheckBoxPreference) preference; |
| - final boolean enable = ((Boolean) newValue).booleanValue(); |
| + final boolean enable = (Boolean) newValue; |
| if (enable) |
| { |
| AddOnBridge.addSubscription(this, cbp.getKey(), null); |
| } |
| else |
| { |
| AddOnBridge.removeSubscription(this, cbp.getKey()); |