3 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/java/org/rssin/android/FilterActivity.java b/app/src/main/java/org/rssin/android/FilterActivity.java
index 5003cfb..189fd55 100755
--- a/app/src/main/java/org/rssin/android/FilterActivity.java
+++ b/app/src/main/java/org/rssin/android/FilterActivity.java
@@ -45,7 +45,7 @@ public class FilterActivity extends ActionBarActivity {
 
         // @todo Check on -1? Shouldn't happen anyway.
         filter = filtersList.getFilterFromHashCode(filterHashCode);
-        filter.ensureFeedSorter(DefaultStorageProvider.getInstance(this));
+        filter.ensureFeedSorter(InternalStorageProvider.getInstance(this));
 
         setTitle(filter.getTitle());
 
@@ -90,7 +90,7 @@ public class FilterActivity extends ActionBarActivity {
     protected void onDestroy() {
         super.onDestroy();
         try {
-            filter.storeFeedSorter(DefaultStorageProvider.getInstance(this));
+            filter.storeFeedSorter(InternalStorageProvider.getInstance(this));
         } catch (Exception e) {
             Frontend.warning(this, R.string.error_save_feedsorter, e);
         }
diff --git a/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java b/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java
index ec8dce7..5a11621 100755
--- a/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java
+++ b/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java
@@ -41,7 +41,7 @@ public class UnifiedInboxActivity extends ActionBarActivity {
             filtersList = FiltersList.getInstance(this);
 
             for(Filter filter : filtersList.getFilters()) {
-                filter.ensureFeedSorter(DefaultStorageProvider.getInstance(this));
+                filter.ensureFeedSorter(InternalStorageProvider.getInstance(this));
                 filter.ensureFeeds(DefaultStorageProvider.getInstance(this));
             }
 
diff --git a/app/src/main/java/org/rssin/rssin/Filter.java b/app/src/main/java/org/rssin/rssin/Filter.java
index be4ed4d..e7e0158 100755
--- a/app/src/main/java/org/rssin/rssin/Filter.java
+++ b/app/src/main/java/org/rssin/rssin/Filter.java
@@ -1,5 +1,6 @@
 package org.rssin.rssin;
 
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import org.json.JSONArray;
@@ -173,8 +174,8 @@ public class Filter implements Storable, Comparable<Filter>, Jsonable {
     }
 
     @Override
-    public int compareTo(Filter another) {
-        return title.compareTo(another.title);
+    public int compareTo(@Nullable Filter another) {
+        return another == null ? -1 : title.compareTo(another.title);
     }
 
     @Override
@@ -190,7 +191,6 @@ public class Filter implements Storable, Comparable<Filter>, Jsonable {
     public void fromJson(JSONObject json) throws JSONException {
         title = json.getString("title");
         feedHashCodes = JsonSerializer.integersListFromJson(json.getJSONArray("feedHashCodes"));
-        JSONArray keywordsJson = json.getJSONArray("keywords");
         storageKey = json.getString("storageKey");
     }