Merge pull request #986 from ably/fix/clear_shared_pref_storage

Fix shared pref storage
ably · Feb 5, 2024 · accf93b · accf93b
2 parents 72992c9 + 379081c
commit accf93b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/android/src/androidTest/java/io/ably/lib/push/LocalDeviceStorageTest.java b/android/src/androidTest/java/io/ably/lib/push/LocalDeviceStorageTest.java
@@ -49,7 +49,7 @@ public int get(String key, int defaultValue) {
         }
 
         @Override
-        public void clear(Field[] fields) {
+        public void clear(String[] keys) {
             hashMap = new HashMap<>();
         }
     };

diff --git a/android/src/main/java/io/ably/lib/push/LocalDevice.java b/android/src/main/java/io/ably/lib/push/LocalDevice.java
@@ -144,7 +144,7 @@ public void reset() {
         this.clientId = null;
         this.clearRegistrationToken();
 
-        storage.clear(SharedPrefKeys.class.getDeclaredFields());
+        storage.clear(SharedPrefKeys.getAllKeys());
     }
 
     boolean isRegistered() {
@@ -170,6 +170,12 @@ private static class SharedPrefKeys {
         static final String DEVICE_TOKEN = "ABLY_DEVICE_IDENTITY_TOKEN";
         static final String TOKEN_TYPE = "ABLY_REGISTRATION_TOKEN_TYPE";
         static final String TOKEN = "ABLY_REGISTRATION_TOKEN";
+
+        static String[] getAllKeys() {
+            return new String[]{
+              DEVICE_ID, CLIENT_ID, DEVICE_SECRET, DEVICE_TOKEN, TOKEN_TYPE, TOKEN
+            };
+        }
     }
 
     private static String generateSecret() {

diff --git a/android/src/main/java/io/ably/lib/push/SharedPreferenceStorage.java b/android/src/main/java/io/ably/lib/push/SharedPreferenceStorage.java
@@ -3,7 +3,6 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-import java.lang.reflect.Field;
 
 public class SharedPreferenceStorage implements Storage{
 
@@ -38,14 +37,10 @@ public int get(String key, int defaultValue) {
     }
 
     @Override
-    public void clear(Field[] fields) {
+    public void clear(String[] keys) {
         SharedPreferences.Editor editor = activationContext.getPreferences().edit();
-        for (Field f : fields) {
-            try {
-                editor.remove((String) f.get(null));
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
-            }
+        for (String key : keys) {
+            editor.remove(key);
         }
         editor.commit();
     }

diff --git a/lib/src/main/java/io/ably/lib/push/Storage.java b/lib/src/main/java/io/ably/lib/push/Storage.java
@@ -1,7 +1,5 @@
 package io.ably.lib.push;
 
-import java.lang.reflect.Field;
-
 /**
  * Interface for an entity that supplies key value store
  */
@@ -38,8 +36,8 @@ public interface Storage {
     int get(String key, int defaultValue);
 
     /**
-     * Removes fields from storage
-     * @param fields array of keys which values should be removed from storage
+     * Removes keys from storage
+     * @param keys array of keys which values should be removed from storage
      */
-    void clear(Field[] fields);
+    void clear(String[] keys);
 }
diff --git a/lib/src/test/java/io/ably/lib/test/common/Helpers.java b/lib/src/test/java/io/ably/lib/test/common/Helpers.java
@@ -263,7 +263,7 @@ public MessageWaiter(Channel channel, String event) {
          */
         public synchronized void waitFor(int count) {
             while(receivedMessages.size() < count)
-                try { wait(); } catch(InterruptedException e) {}
+                try { wait(); } catch(InterruptedException ignored) {}
         }
 
         /**
@@ -274,7 +274,7 @@ public synchronized void waitFor(int count, long time) {
             long targetTime = System.currentTimeMillis() + time;
             long remaining = time;
             while(receivedMessages.size() < count && remaining > 0) {
-                try { wait(remaining); } catch(InterruptedException e) {}
+                try { wait(remaining); } catch(InterruptedException ignored) {}
                 remaining = targetTime - System.currentTimeMillis();
             }
         }

diff --git a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeDeltaDecoderTest.java b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeDeltaDecoderTest.java
@@ -62,7 +62,7 @@ public void simple_delta_codec() {
                 Message message = messageWaiter.receivedMessages.get(i);
                 int messageIndex = Integer.parseInt(message.name);
                 assertEquals("Verify message order", i, messageIndex);
-                assertEquals("Verify message data", true, testData[messageIndex].equals(message.data));
+                assertEquals("Verify message data", testData[messageIndex], message.data);
             }
         } catch(Exception e) {
             fail(testName + ": Unexpected exception " + e.getMessage());