summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttrss/src/main')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java17
-rwxr-xr-xorg.fox.ttrss/src/main/res/xml/preferences.xml1
2 files changed, 11 insertions, 7 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 849eb8c5..8c881924 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -312,7 +312,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
refresh(false);
}
- if (m_prefs.getBoolean("headlines_swipe_to_dismiss", true) && !m_prefs.getBoolean("headlines_mark_read_scroll", false) ) {
+ if (m_prefs.getBoolean("headlines_swipe_to_dismiss", true) /*&& !m_prefs.getBoolean("headlines_mark_read_scroll", false) */) {
ItemTouchHelper swipeHelper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
@@ -357,8 +357,11 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
wasUnread = false;
}
- Application.getArticles().remove(adapterPosition);
- m_adapter.notifyItemRemoved(adapterPosition);
+ ArticleList tmpRemove = new ArticleList();
+ tmpRemove.addAll(Application.getArticles());
+ tmpRemove.remove(adapterPosition);
+
+ Application.getInstance().getHeadlinesModel().update(tmpRemove);
Snackbar.make(m_list, R.string.headline_undo_row_prompt, Snackbar.LENGTH_LONG)
.setAction(getString(R.string.headline_undo_row_button), v -> {
@@ -368,9 +371,11 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
m_activity.saveArticleUnread(article);
}
- Application.getArticles().add(adapterPosition, article);
- m_adapter.notifyItemInserted(adapterPosition);
- m_adapter.notifyItemRangeChanged(adapterPosition, 1);
+ ArticleList tmpInsert = new ArticleList();
+ tmpInsert.addAll(Application.getArticles());
+ tmpInsert.add(adapterPosition, article);
+
+ Application.getInstance().getHeadlinesModel().update(tmpInsert);
}).show();
}
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 94cf71db..8d064587 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -108,7 +108,6 @@
<SwitchPreferenceCompat
android:defaultValue="true"
- android:dependency="headlines_mark_read_scroll"
android:key="headlines_swipe_to_dismiss"
android:summary="@string/pref_headlines_swipe_to_dismiss_long"
android:title="@string/pref_headlines_swipe_to_dismiss" />