aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org
diff options
context:
space:
mode:
authorCamil Staps2015-05-21 16:04:57 +0200
committerCamil Staps2015-05-21 16:04:57 +0200
commit68e4893da5d6411349b855dd1a003d62a6029fc7 (patch)
tree02e26defb8c18a3fb22a4c988012612effefe848 /app/src/main/java/org
parentMerge branch 'app' (diff)
parentDelete filters (diff)
Merge branch 'app'
Diffstat (limited to 'app/src/main/java/org')
-rw-r--r--app/src/main/java/org/rssin/android/FilterSettingsActivity.java22
1 files changed, 16 insertions, 6 deletions
diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
index 8d59a3b..bfe9261 100644
--- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
+++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
@@ -94,12 +94,22 @@ public class FilterSettingsActivity extends ActionBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
- if (id == R.id.filter_settings_action_feeds) {
- openFeedsDialog();
- return true;
- } else if (id == R.id.filter_settings_action_title) {
- openTitleDialog();
- return true;
+ switch (id) {
+ case R.id.filter_settings_action_feeds:
+ openFeedsDialog();
+ return true;
+ case R.id.filter_settings_action_title:
+ openTitleDialog();
+ return true;
+ case R.id.filter_settings_action_delete:
+ filtersList.getFilters().remove(filter);
+ try {
+ filtersList.save();
+ finish();
+ } catch (IOException e) {
+ Toast.makeText(this, getResources().getString(R.string.error_delete_filter), Toast.LENGTH_SHORT).show();
+ }
+ return true;
}
return super.onOptionsItemSelected(item);