Fix saving filters; remove keywords

3 files changed, 17 insertions, 18 deletions

diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
index 12231e0..f498e8e 100644
--- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
+++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
@@ -44,7 +44,7 @@ public class FilterSettingsActivity extends ActionBarActivity {
         try {
             filtersList = FiltersList.getInstance(this);
         } catch (IOException e) {
-            Toast.makeText(this, "Something went wrong...", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, getResources().getString(R.string.error_load_filters), Toast.LENGTH_SHORT).show();
         }
 
         Intent intent = getIntent();
@@ -66,13 +66,16 @@ public class FilterSettingsActivity extends ActionBarActivity {
         keywordsListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-                filter.getKeywords().remove(keywordAdapter.getItem(position));
+                Keyword keyword = keywordAdapter.getItem(position);
                 try {
+                    filter.getKeywords().remove(keyword);
                     filtersList.save();
                     keywordAdapter.notifyDataSetChanged();
                     return true;
                 } catch (IOException e) {
-                    Toast.makeText(getBaseContext(), getResources().getString(R.string.error_save_filter), Toast.LENGTH_SHORT).show();
+                    filter.getKeywords().add(keyword);
+                    keywordAdapter.notifyDataSetChanged();
+                    Toast.makeText(getBaseContext(), getResources().getString(R.string.error_save_filters), Toast.LENGTH_SHORT).show();
                     return false;
                 }
             }
@@ -138,11 +141,11 @@ public class FilterSettingsActivity extends ActionBarActivity {
                     public void onClick(DialogInterface dialog, int whichButton) {
                         String value = input.getText().toString();
                         try {
-                            filtersList.save();
                             filter.setTitle(value);
+                            filtersList.save();
                             setTitle();
                         } catch (IOException e) {
-                            Toast.makeText(getBaseContext(), getResources().getString(R.string.error_save_filter), Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getBaseContext(), getResources().getString(R.string.error_save_filters), Toast.LENGTH_SHORT).show();
                         }
                     }
                 })
@@ -164,9 +167,7 @@ public class FilterSettingsActivity extends ActionBarActivity {
         try {
             filtersList.save();
             keywordAdapter.notifyDataSetChanged();
-            Log.d("FSA", "New keyword saved");
         } catch (IOException e) {
-            Log.e("FSA", "Couldn't save new keyword", e);
             filter.getKeywords().remove(k);
             keywordAdapter.notifyDataSetChanged();
         }
@@ -189,7 +190,7 @@ public class FilterSettingsActivity extends ActionBarActivity {
             builder.setMessage(R.string.filter_settings_feeds)
                     .setPositiveButton(R.string.button_apply, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
-                            // FIRE ZE MISSILES!
+                            // @todo FIRE ZE MISSILES!
                         }
                     })
                     .setNegativeButton(R.string.button_cancel, null);
diff --git a/app/src/main/java/org/rssin/android/FiltersActivity.java b/app/src/main/java/org/rssin/android/FiltersActivity.java
index 74490c8..fd569be 100644
--- a/app/src/main/java/org/rssin/android/FiltersActivity.java
+++ b/app/src/main/java/org/rssin/android/FiltersActivity.java
@@ -11,7 +11,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -35,7 +34,7 @@ import java.util.List;
  */
 public class FiltersActivity extends ActionBarActivity {
 
-    private FiltersList filters;
+    private FiltersList filtersList;
     private ListView filtersView;
 
     private AdapterView.OnItemClickListener onFilterClickListener;
@@ -49,7 +48,7 @@ public class FiltersActivity extends ActionBarActivity {
         filtersView = (ListView) findViewById(R.id.filters_list);
 
         try {
-            filters = FiltersList.getInstance(this);
+            filtersList = FiltersList.getInstance(this);
         } catch (IOException ex) {
             Toast.makeText(this, "Couldn't load filters.", Toast.LENGTH_SHORT).show();
             Log.e("FILTER", "IOException", ex);
@@ -58,14 +57,13 @@ public class FiltersActivity extends ActionBarActivity {
 
         //putDummyFilter();
 
-        final FilterAdapter adapter = new FilterAdapter(this, R.layout.item_filter, filters.getFilters());
+        final FilterAdapter adapter = new FilterAdapter(this, R.layout.item_filter, filtersList.getFilters());
         filtersView.setAdapter(adapter);
 
         try {
-            filters.save();
+            filtersList.save();
         } catch (IOException ex) {
-            Toast.makeText(this, "Couldn't save filters.", Toast.LENGTH_SHORT).show();
-            Log.e("FILTER", "IOException", ex);
+            Toast.makeText(this, getResources().getString(R.string.error_save_filters), Toast.LENGTH_SHORT).show();
         }
 
         setupListeners();
@@ -151,7 +149,7 @@ public class FiltersActivity extends ActionBarActivity {
      * Dummy filter for testing
      */
     private void putDummyFilter() {
-        filters.getFilters().clear();
+        filtersList.getFilters().clear();
 
         Filter filter = new Filter("Filter test");
         filter.getKeywords().add(new Keyword("Test"));
@@ -161,7 +159,7 @@ public class FiltersActivity extends ActionBarActivity {
         try {
             filter.getFeeds().add(new Feed("http://nu.nl/sport.rss", "Feed test 2"));
         } catch (MalformedURLException e) {}
-        filters.getFilters().add(filter);
+        filtersList.getFilters().add(filter);
     }
 
 }
diff --git a/app/src/main/java/org/rssin/android/FiltersList.java b/app/src/main/java/org/rssin/android/FiltersList.java
index 3a88f0c..bae8dc6 100644
--- a/app/src/main/java/org/rssin/android/FiltersList.java
+++ b/app/src/main/java/org/rssin/android/FiltersList.java
@@ -3,7 +3,6 @@ package org.rssin.android;
 import android.content.Context;
 import android.preference.PreferenceManager;
 import android.util.Base64;
-import android.widget.Toast;
 
 import org.rssin.rssin.Filter;
 
@@ -70,6 +69,7 @@ public class FiltersList {
         oos.writeObject(filters);
         oos.close();
         String string = Base64.encodeToString(baos.toByteArray(), Base64.DEFAULT);
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(PREF_KEY, string).commit();
     }
 
 }