Issue 6289 - Fix OnSharedPreferenceChangeListener

adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/util/SharedPrefsUtils.java

Index: adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/util/SharedPrefsUtils.java
===================================================================
--- a/adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/util/SharedPrefsUtils.java
+++ b/adblockplussbrowser/src/main/java/org/adblockplus/sbrowser/contentblocker/util/SharedPrefsUtils.java
@@ -18,22 +18,24 @@
 package org.adblockplus.sbrowser.contentblocker.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
 import java.util.Set;
 
+import static android.content.SharedPreferences.*;

[diegocarloslima, 2018/01/19 14:26:11]

We usually try to avoid the wildcard import

[jens, 2018/01/19 14:36:07]

Acknowledged.

+
 public class SharedPrefsUtils
 {
 
   public static void putBoolean(Context context, int keyResId, boolean value)
   {
-    final SharedPreferences.Editor editor = getDefaultSharedPreferences(context).edit();
+    final Editor editor = getDefaultSharedPreferences(context).edit();
     editor.putBoolean(context.getString(keyResId), value).apply();
   }
 
   public static boolean getBoolean(Context context, int keyResId, boolean defValue)
   {
     final SharedPreferences preferences = getDefaultSharedPreferences(context);
     try
     {
@@ -42,17 +44,17 @@ public class SharedPrefsUtils
     catch (ClassCastException e)
     {
       return defValue;
     }
   }
 
   public static void putInt(Context context, int keyResId, int value)
   {
-    final SharedPreferences.Editor editor = getDefaultSharedPreferences(context).edit();
+    final Editor editor = getDefaultSharedPreferences(context).edit();
     editor.putInt(context.getString(keyResId), value).apply();
   }
 
   public static int getInt(Context context, int keyResId, int defValue)
   {
     final SharedPreferences preferences = getDefaultSharedPreferences(context);
     try
     {
@@ -61,17 +63,17 @@ public class SharedPrefsUtils
     catch (ClassCastException e)
     {
       return defValue;
     }
   }
 
   public static void putString(Context context, int keyResId, String value)
   {
-    final SharedPreferences.Editor editor = getDefaultSharedPreferences(context).edit();
+    final Editor editor = getDefaultSharedPreferences(context).edit();
     editor.putString(context.getString(keyResId), value).apply();
   }
 
   public static String getString(Context context, int keyResId, String defValue)
   {
     final SharedPreferences preferences = getDefaultSharedPreferences(context);
     try
     {
@@ -80,17 +82,17 @@ public class SharedPrefsUtils
     catch (ClassCastException e)
     {
       return defValue;
     }
   }
 
   public static void putStringSet(Context context, int keyResId, Set<String> values)
   {
-    final SharedPreferences.Editor editor = getDefaultSharedPreferences(context).edit();
+    final Editor editor = getDefaultSharedPreferences(context).edit();
     editor.putStringSet(context.getString(keyResId), values).apply();
   }
 
   public static Set<String> getStringSet(Context context, int keyResId, Set<String> defValues)
   {
     final SharedPreferences preferences = getDefaultSharedPreferences(context);
     try
     {
@@ -100,68 +102,35 @@ public class SharedPrefsUtils
     {
       return defValues;
     }
   }
 
   public static void registerOnSharedPreferenceChangeListener(Context context,
       OnSharedPreferenceChangeListener listener)
   {
-    getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(
-        new OnSharedPreferenceChangeListenerWrapper(listener)
-    );
+    getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(listener);
   }
 
   public static void unregisterOnSharedPreferenceChangeListener(Context context,
       OnSharedPreferenceChangeListener listener)
   {
-    getDefaultSharedPreferences(context).unregisterOnSharedPreferenceChangeListener(
-        new OnSharedPreferenceChangeListenerWrapper(listener)
-    );
+    getDefaultSharedPreferences(context).unregisterOnSharedPreferenceChangeListener(listener);
   }
 
   private static SharedPreferences getDefaultSharedPreferences(Context context)
   {
     return PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
   }
 
-  private static class OnSharedPreferenceChangeListenerWrapper
+  public abstract static class OnSharedPreferenceChangeListener
       implements SharedPreferences.OnSharedPreferenceChangeListener
   {
 
-    private final OnSharedPreferenceChangeListener listener;
-
-    OnSharedPreferenceChangeListenerWrapper(OnSharedPreferenceChangeListener listener) {
-      this.listener = listener;
-    }
-
     @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
+    public final void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
     {
-      this.listener.onSharedPreferenceChanged(key);
+      this.onSharedPreferenceChanged(key);
     }
 
-    @Override
-    public boolean equals(Object obj)
-    {
-      if (this == obj)
-      {
-        return true;
-      }
-      else if (obj instanceof OnSharedPreferenceChangeListenerWrapper)
-      {
-        return this.listener.equals(((OnSharedPreferenceChangeListenerWrapper) obj).listener);
-      }
-      return false;
-    }
-
-    @Override
-    public int hashCode()
-    {
-      return this.listener.hashCode();
-    }
-  }
-
-  public interface OnSharedPreferenceChangeListener
-  {
-    void onSharedPreferenceChanged(String key);
+    protected abstract void onSharedPreferenceChanged(String key);
   }
 }