remove confirm catchup preference (force on)

6 files changed, 97 insertions, 221 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
index 43a1d6d4..dedc1b4b 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
@@ -251,37 +251,9 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
 		case R.id.catchup_category:
 			if (true) {
 				final FeedCategory cat = getCategoryAtPosition(info.position);
-				if (cat != null) {
 
+				if (cat != null) {
 					m_activity.catchupDialog(new Feed(cat.id, cat.title, true));
-
-					/* if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
-						AlertDialog.Builder builder = new AlertDialog.Builder(
-								m_activity)
-								.setMessage(getString(R.string.context_confirm_catchup, cat.title))
-								.setPositiveButton(R.string.catchup,
-										new Dialog.OnClickListener() {
-											public void onClick(DialogInterface dialog,
-													int which) {
-	
-												m_activity.catchupFeed(new Feed(cat.id, cat.title, true), "all");
-												
-											}
-										})
-								.setNegativeButton(R.string.dialog_cancel,
-										new Dialog.OnClickListener() {
-											public void onClick(DialogInterface dialog,
-													int which) {
-		
-											}
-										});
-		
-						AlertDialog dlg = builder.create();
-						dlg.show();						
-					} else {
-						m_activity.catchupFeed(new Feed(cat.id, cat.title, true));
-					} */
-
 				}
 			}
 			return true;
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 b060871b..22ac8e9b 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
@@ -187,35 +187,30 @@ public class HeadlinesFragment extends StateSavedFragment {
 			case R.id.catchup_above:
 				if (true) {
 
-					if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
-						final Article fa = article;
+					final Article fa = article;
 
-						AlertDialog.Builder builder = new AlertDialog.Builder(
-								m_activity)
-								.setMessage(R.string.confirm_catchup_above)
-								.setPositiveButton(R.string.dialog_ok,
-										new Dialog.OnClickListener() {
-											public void onClick(DialogInterface dialog,
-																int which) {
+					AlertDialog.Builder builder = new AlertDialog.Builder(
+							m_activity)
+							.setMessage(R.string.confirm_catchup_above)
+							.setPositiveButton(R.string.dialog_ok,
+									new Dialog.OnClickListener() {
+										public void onClick(DialogInterface dialog,
+															int which) {
 
-												catchupAbove(fa);
+											catchupAbove(fa);
 
-											}
-										})
-								.setNegativeButton(R.string.dialog_cancel,
-										new Dialog.OnClickListener() {
-											public void onClick(DialogInterface dialog,
-																int which) {
-
-											}
-										});
+										}
+									})
+							.setNegativeButton(R.string.dialog_cancel,
+									new Dialog.OnClickListener() {
+										public void onClick(DialogInterface dialog,
+															int which) {
 
-						AlertDialog dlg = builder.create();
-						dlg.show();
-					} else {
-						catchupAbove(article);
-					}
+										}
+									});
 
+					AlertDialog dialog = builder.create();
+					dialog.show();
 				}
 				return true;
 			default:
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index 7403985a..a5ea4778 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -142,33 +142,6 @@ public class OnlineActivity extends CommonActivity {
 			AlertDialog dialog = builder.create();
 			dialog.show();
 		}
-
-				/* if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
-					AlertDialog.Builder builder = new AlertDialog.Builder(
-							m_activity)
-							.setMessage(getString(R.string.context_confirm_catchup, feed.title))
-							.setPositiveButton(R.string.catchup,
-									new Dialog.OnClickListener() {
-										public void onClick(DialogInterface dialog,
-												int which) {
-
-											m_activity.catchupFeed(feed);
-
-										}
-									})
-							.setNegativeButton(R.string.dialog_cancel,
-									new Dialog.OnClickListener() {
-										public void onClick(DialogInterface dialog,
-												int which) {
-
-										}
-									});
-
-					AlertDialog dlg = builder.create();
-					dlg.show();
-				} else {
-					m_activity.catchupFeed(feed);
-				} */
 	}
 
 	//protected PullToRefreshAttacher m_pullToRefreshAttacher;
@@ -717,39 +690,6 @@ public class OnlineActivity extends CommonActivity {
 				if (feed != null) {
 					catchupDialog(hf.getFeed());
 				}
-
-				/*int count = hf.getUnreadArticles().size();
-
-				boolean confirm = m_prefs.getBoolean("confirm_headlines_catchup", true);
-				
-				if (count > 0) {
-					if (confirm) {
-						AlertDialog.Builder builder = new AlertDialog.Builder(
-								OnlineActivity.this)
-								.setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count))
-								.setPositiveButton(R.string.catchup,
-										new Dialog.OnClickListener() {
-											public void onClick(DialogInterface dialog,
-													int which) {
-	
-												catchupVisibleArticles();											
-												
-											}
-										})
-								.setNegativeButton(R.string.dialog_cancel,
-										new Dialog.OnClickListener() {
-											public void onClick(DialogInterface dialog,
-													int which) {
-		
-											}
-										});
-		
-						AlertDialog dlg = builder.create();
-						dlg.show();
-					} else {
-						catchupVisibleArticles();
-					}
-				} */
 			}
 			return true;
 		case R.id.headlines_view_mode:
@@ -931,33 +871,28 @@ public class OnlineActivity extends CommonActivity {
 		case R.id.catchup_above:
 			if (hf != null) {
 
-				if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
-
-					AlertDialog.Builder builder = new AlertDialog.Builder(
-							OnlineActivity.this)
-							.setMessage(R.string.confirm_catchup_above)
-							.setPositiveButton(R.string.dialog_ok,
-									new Dialog.OnClickListener() {
-										public void onClick(DialogInterface dialog,
-															int which) {
+				AlertDialog.Builder builder = new AlertDialog.Builder(
+						OnlineActivity.this)
+						.setMessage(R.string.confirm_catchup_above)
+						.setPositiveButton(R.string.dialog_ok,
+								new Dialog.OnClickListener() {
+									public void onClick(DialogInterface dialog,
+														int which) {
 
-											catchupAbove(hf, ap);
+										catchupAbove(hf, ap);
 
-										}
-									})
-							.setNegativeButton(R.string.dialog_cancel,
-									new Dialog.OnClickListener() {
-										public void onClick(DialogInterface dialog,
-															int which) {
+									}
+								})
+						.setNegativeButton(R.string.dialog_cancel,
+								new Dialog.OnClickListener() {
+									public void onClick(DialogInterface dialog,
+														int which) {
 
-										}
-									});
+									}
+								});
 
-					AlertDialog dlg = builder.create();
-					dlg.show();
-				} else {
-					catchupAbove(hf, ap);
-				}
+				AlertDialog dialog = builder.create();
+				dialog.show();
 
 			}
 			return true;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index 185f8fb7..e2864d4e 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -393,37 +393,30 @@ public class OfflineActivity extends CommonActivity {
 				final boolean isCat = ohf.getFeedIsCat();
 				
 				int count = getUnreadArticleCount(feedId, isCat);
-				boolean confirm = m_prefs.getBoolean("confirm_headlines_catchup", true);
-				
+
 				if (count > 0) {
-					if (confirm) {
-						AlertDialog.Builder builder = new AlertDialog.Builder(
-								OfflineActivity.this)
-								.setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count))
-								.setPositiveButton(R.string.catchup,
-										new Dialog.OnClickListener() {
-											public void onClick(DialogInterface dialog,
-													int which) {
-	
-												catchupFeed(feedId, isCat);											
-												
-											}
-										})
-								.setNegativeButton(R.string.dialog_cancel,
-										new Dialog.OnClickListener() {
-											public void onClick(DialogInterface dialog,
-													int which) {
-		
-											}
-										});
-		
-						AlertDialog dlg = builder.create();
-						dlg.show();					
-					
-						
-					} else {
-						catchupFeed(feedId, isCat);
-					}				
+					AlertDialog.Builder builder = new AlertDialog.Builder(
+							OfflineActivity.this)
+							.setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count))
+							.setPositiveButton(R.string.catchup,
+									new Dialog.OnClickListener() {
+										public void onClick(DialogInterface dialog,
+												int which) {
+
+											catchupFeed(feedId, isCat);
+
+										}
+									})
+							.setNegativeButton(R.string.dialog_cancel,
+									new Dialog.OnClickListener() {
+										public void onClick(DialogInterface dialog,
+												int which) {
+
+										}
+									});
+
+					AlertDialog dlg = builder.create();
+					dlg.show();
 				}
 			}
 			return true;
@@ -514,33 +507,28 @@ public class OfflineActivity extends CommonActivity {
 			return true;
 		case R.id.catchup_above:
 			if (oap != null) {
-				if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
-
-					AlertDialog.Builder builder = new AlertDialog.Builder(
-							OfflineActivity.this)
-							.setMessage(R.string.confirm_catchup_above)
-							.setPositiveButton(R.string.dialog_ok,
-									new Dialog.OnClickListener() {
-										public void onClick(DialogInterface dialog,
-															int which) {
+				AlertDialog.Builder builder = new AlertDialog.Builder(
+						OfflineActivity.this)
+						.setMessage(R.string.confirm_catchup_above)
+						.setPositiveButton(R.string.dialog_ok,
+								new Dialog.OnClickListener() {
+									public void onClick(DialogInterface dialog,
+														int which) {
 
-											catchupAbove(oap);
+										catchupAbove(oap);
 
-										}
-									})
-							.setNegativeButton(R.string.dialog_cancel,
-									new Dialog.OnClickListener() {
-										public void onClick(DialogInterface dialog,
-															int which) {
+									}
+								})
+						.setNegativeButton(R.string.dialog_cancel,
+								new Dialog.OnClickListener() {
+									public void onClick(DialogInterface dialog,
+														int which) {
 
-										}
-									});
+									}
+								});
 
-					AlertDialog dlg = builder.create();
-					dlg.show();
-				} else {
-					catchupAbove(oap);
-				}
+				AlertDialog dlg = builder.create();
+				dlg.show();
 			}
 			return true;
 		default:
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 6cf273e0..3d9e1229 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -201,34 +201,28 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 				return true;
 			case R.id.catchup_above:
 				if (true) {
-					if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
+					AlertDialog.Builder builder = new AlertDialog.Builder(
+							m_activity)
+							.setMessage(R.string.confirm_catchup_above)
+							.setPositiveButton(R.string.dialog_ok,
+									new Dialog.OnClickListener() {
+										public void onClick(DialogInterface dialog,
+															int which) {
 
-						AlertDialog.Builder builder = new AlertDialog.Builder(
-								m_activity)
-								.setMessage(R.string.confirm_catchup_above)
-								.setPositiveButton(R.string.dialog_ok,
-										new Dialog.OnClickListener() {
-											public void onClick(DialogInterface dialog,
-																int which) {
+											catchupAbove(articleId);
 
-												catchupAbove(articleId);
-
-											}
-										})
-								.setNegativeButton(R.string.dialog_cancel,
-										new Dialog.OnClickListener() {
-											public void onClick(DialogInterface dialog,
-																int which) {
-
-											}
-										});
+										}
+									})
+							.setNegativeButton(R.string.dialog_cancel,
+									new Dialog.OnClickListener() {
+										public void onClick(DialogInterface dialog,
+															int which) {
 
-						AlertDialog dlg = builder.create();
-						dlg.show();
-					} else {
-						catchupAbove(articleId);
-					}
+										}
+									});
 
+					AlertDialog dialog = builder.create();
+					dialog.show();
 				}
 				return true;
 			default:
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 9cf7bec1..fb0354fc 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -162,14 +162,6 @@
             android:key="use_volume_keys"
             android:summary="@string/use_volume_keys_long"
             android:title="@string/use_volume_keys" />
-        <!-- <org.fox.ttrss.util.LessBrokenSwitchPreference
-            android:defaultValue="false"
-            android:key="full_screen_mode"
-            android:title="@string/prefs_fullscreen_mode" /> -->
-        <org.fox.ttrss.util.LessBrokenSwitchPreference
-            android:defaultValue="true"
-            android:key="confirm_headlines_catchup"
-            android:title="@string/prefs_confirm_headlines_catchup" />
         <org.fox.ttrss.util.LessBrokenSwitchPreference
             android:defaultValue="true"
             android:key="enable_article_fab"