Issue 5810 - Use "specialization" as Subscription display title

libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/SharedPrefsStorage.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 16 matching lines @@
 /**
  * Settings storage implementation in Shared Preferences
  */
 public class SharedPrefsStorage extends AdblockSettingsStorage
 {
   private static final String SETTINGS_ENABLED_KEY = "enabled";
   private static final String SETTINGS_AA_ENABLED_KEY = "aa_enabled";
   private static final String SETTINGS_SUBSCRIPTIONS_KEY = "subscriptions";
   private static final String SETTINGS_SUBSCRIPTION_KEY = "subscription";
   private static final String SETTINGS_SUBSCRIPTION_URL_KEY = "url";
+  private static final String SETTINGS_SUBSCRIPTION_SPECIALIZATION_KEY = "specialization";
   private static final String SETTINGS_SUBSCRIPTION_TITLE_KEY = "title";
   private static final String SETTINGS_WL_DOMAINS_KEY = "whitelisted_domains";
   private static final String SETTINGS_WL_DOMAIN_KEY = "domain";
   private static final String SETTINGS_ALLOWED_CONNECTION_TYPE_KEY = "allowed_connection_type";
 
   private SharedPreferences prefs;
   private boolean commit = true;
 
   public SharedPrefsStorage(SharedPreferences prefs)
   {
@@ skipping 61 matching lines @@
       // count
       int subscriptionsCount = prefs.getInt(SETTINGS_SUBSCRIPTIONS_KEY, 0);
 
       // each subscription
       List<Subscription> subscriptions = new LinkedList<Subscription>();
       for (int i = 0; i < subscriptionsCount; i++)
       {
         Subscription subscription = new Subscription();
         subscription.title = prefs.getString(getSubscriptionTitleKey(i), "");
         subscription.url = prefs.getString(getSubscriptionURLKey(i), "");
+        subscription.specialization = prefs.getString(getSubscriptionSpecializationKey(i), "");
         subscriptions.add(subscription);
       }
       settings.setSubscriptions(subscriptions);
     }
   }
 
   private String getArrayItemKey(int index, String entity)
   {
     // f.e. "domain0"
     return entity + index;
   }
 
   private String getArrayItemKey(int index, String entity, String field)
   {
     // f.e. `subscription0.field`
     return getArrayItemKey(index, entity) + "." + field;
   }
 
   private String getSubscriptionTitleKey(int index)
   {
     return getArrayItemKey(index, SETTINGS_SUBSCRIPTION_KEY, SETTINGS_SUBSCRIPTION_TITLE_KEY);
   }
 
   private String getSubscriptionURLKey(int index)
   {
     return getArrayItemKey(index, SETTINGS_SUBSCRIPTION_KEY, SETTINGS_SUBSCRIPTION_URL_KEY);
   }
 
+  private String getSubscriptionSpecializationKey(int index)
+  {
+    return getArrayItemKey(index, SETTINGS_SUBSCRIPTION_KEY, SETTINGS_SUBSCRIPTION_SPECIALIZATION_KEY);
+  }
+
   @Override
   public void save(AdblockSettings settings)
   {
     SharedPreferences.Editor editor = prefs
       .edit()
       .clear()
       .putBoolean(SETTINGS_ENABLED_KEY, settings.isAdblockEnabled())
       .putBoolean(SETTINGS_AA_ENABLED_KEY, settings.isAcceptableAdsEnabled());
 
     if (settings.getAllowedConnectionType() != null)
@@ skipping 36 matching lines @@
     if (settings.getSubscriptions() != null)
     {
       // count
       editor.putInt(SETTINGS_SUBSCRIPTIONS_KEY, settings.getSubscriptions().size());
 
       // each subscription
       for (int i = 0; i < settings.getSubscriptions().size(); i++)
       {
         Subscription eachSubscription = settings.getSubscriptions().get(i);
 
-        // warning: saving `title` and `url` fields only
+        // warning: saving `title`, `url` and `specialization` fields only
         editor.putString(getSubscriptionTitleKey(i), eachSubscription.title);
         editor.putString(getSubscriptionURLKey(i), eachSubscription.url);
+        editor.putString(getSubscriptionSpecializationKey(i), eachSubscription.url);

[diegocarloslima, 2017/09/29 14:27:20]

Shouldn't it be `eachSubscription.specialization` here?

[anton, 2017/09/29 20:39:35]

Yes, sure. Silly mistake.

       }
     }
   }
 }