Removed JSON write&readObject as it was too buggy

2 files changed, 10 insertions, 11 deletions

diff --git a/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java b/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java
index 61f28cd..4c23fa9 100644
--- a/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java
+++ b/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java
@@ -69,12 +69,15 @@ class SharedPreferencesStorageProvider implements StorageProvider, FilterStorage
         ObjectOutputStream oos = new ObjectOutputStream(baos);
         oos.writeObject(element);
         oos.close();
-        String string = Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
+        baos.close();
+        String base64 = Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
 
         context.getSharedPreferences(key.toString(), Context.MODE_PRIVATE)
                 .edit()
-                .putString(element.getClass().getName(), string)
+                .putString(element.getClass().getName(), base64)
                 .apply();
+
+        Log.v("SPSP", "Store to " + key.toString() + ":\n" + base64);
     }
 
     @Override
@@ -83,8 +86,9 @@ class SharedPreferencesStorageProvider implements StorageProvider, FilterStorage
         if (serialized == null) {
             throw new IOException("No sharedPreference with key " + key.toString() + " and class " + className.getName());
         }
-        ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(Base64.decode(serialized, Base64.DEFAULT)));
+        ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(Base64.decode(serialized.getBytes(), Base64.DEFAULT)));
         Object obj = ois.readObject();
+        Log.v("SPSP", "Fetch " + className.toString() + " from " + key.toString() + ": " + obj.toString());
         return (Storable) className.cast(obj);
     }
 
@@ -112,8 +116,10 @@ class SharedPreferencesStorageProvider implements StorageProvider, FilterStorage
                 .getStringSet("filters", new HashSet<String>());
         List<Filter> filters = new ArrayList<>();
         for (String name : names) {
+            Log.v("SPSP", "allFilters: " + name);
             Filter filter = getFilter(name);
             if (filter != null) {
+                Log.v("SPSP", "allFilters: not null, returning");
                 filters.add(filter);
             }
         }
@@ -131,6 +137,7 @@ class SharedPreferencesStorageProvider implements StorageProvider, FilterStorage
         try {
             return (Filter) fetch(key.toString(), Filter.class);
         } catch (Exception e) {
+            Log.w("SPSP", "Fetch filter " + key.toString(), e);
             return null;
         }
     }
diff --git a/app/src/main/java/org/rssin/rssin/Filter.java b/app/src/main/java/org/rssin/rssin/Filter.java
index 7f1d95e..be4ed4d 100755
--- a/app/src/main/java/org/rssin/rssin/Filter.java
+++ b/app/src/main/java/org/rssin/rssin/Filter.java
@@ -73,14 +73,6 @@ public class Filter implements Storable, Comparable<Filter>, Jsonable {
         setTitle(title);
     }
 
-    private void writeObject(ObjectOutputStream stream) throws JSONException, IOException {
-        stream.writeObject(toJson().toString());
-    }
-
-    private void readObject(ObjectInputStream stream) throws JSONException, IOException, ClassNotFoundException {
-        fromJson(new JSONObject((String) stream.readObject()));
-    }
-
     public List<Integer> getFeedHashCodes() {
         return feedHashCodes;
     }