summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java50
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java126
2 files changed, 68 insertions, 108 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 60808ae4..f5f7dc60 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
@@ -218,31 +218,25 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
int itemId = item.getItemId();
if (itemId == R.id.browse_headlines) {
- if (true) {
- FeedCategory cat = getCategoryAtPosition(info.position);
- if (cat != null) {
- m_activity.onCatSelected(cat, true);
- //setSelectedCategory(cat);
- }
- }
+ FeedCategory cat = getCategoryAtPosition(info.position);
+ if (cat != null) {
+ m_activity.onCatSelected(cat, true);
+ //setSelectedCategory(cat);
+ }
return true;
} else if (itemId == R.id.browse_feeds) {
- if (true) {
- FeedCategory cat = getCategoryAtPosition(info.position);
- if (cat != null) {
- m_activity.onCatSelected(cat, false);
- //cf.setSelectedCategory(cat);
- }
- }
+ FeedCategory cat = getCategoryAtPosition(info.position);
+ if (cat != null) {
+ m_activity.onCatSelected(cat, false);
+ //cf.setSelectedCategory(cat);
+ }
return true;
} else if (itemId == R.id.catchup_category) {
- if (true) {
- final FeedCategory cat = getCategoryAtPosition(info.position);
+ final FeedCategory cat = getCategoryAtPosition(info.position);
- if (cat != null) {
- m_activity.catchupDialog(new Feed(cat.id, cat.title, true));
- }
- }
+ if (cat != null) {
+ m_activity.catchupDialog(new Feed(cat.id, cat.title, true));
+ }
return true;
}
Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
@@ -325,7 +319,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
public void onResume() {
super.onResume();
- getLoaderManager().initLoader(0, null, this).forceLoad();
+ LoaderManager.getInstance(this).initLoader(0, null, this).forceLoad();
m_activity.invalidateOptionsMenu();
}
@@ -337,7 +331,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
m_swipeLayout.setRefreshing(true);
}
- getLoaderManager().restartLoader(0, null, this).forceLoad();
+ LoaderManager.getInstance(this).restartLoader(0, null, this).forceLoad();
}
private class FeedCategoryListAdapter extends ArrayAdapter<FeedCategory> {
@@ -410,19 +404,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
tu.setText(String.valueOf(cat.unread));
tu.setVisibility((cat.unread > 0) ? View.VISIBLE : View.INVISIBLE);
}
-
- /*ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
-
- if (ib != null) {
- ib.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- getActivity().openContextMenu(v);
- }
- });
- } */
-
return v;
}
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index 34116fcb..9f4063d5 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -236,64 +236,56 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
public boolean onContextItemSelected(MenuItem item) {
AdapterContextMenuInfo info = (AdapterContextMenuInfo) item
.getMenuInfo();
- int itemId = item.getItemId();
- if (itemId == R.id.browse_headlines) {
- if (true) {
- Feed feed = getFeedAtPosition(info.position);
- if (feed != null) {
- m_activity.onFeedSelected(feed);
- }
- }
- return true;
- } else if (itemId == R.id.browse_feeds) {
- if (true) {
- Feed feed = getFeedAtPosition(info.position);
- if (feed != null) {
- m_activity.onCatSelected(new FeedCategory(feed.id, feed.title, feed.unread), false);
- }
- }
- return true;
- } else if (itemId == R.id.unsubscribe_feed) {
- if (true) {
- final Feed feed = getFeedAtPosition(info.position);
-
- MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext())
- .setMessage(getString(R.string.unsubscribe_from_prompt, feed.title))
- .setPositiveButton(R.string.unsubscribe,
- new Dialog.OnClickListener() {
- public void onClick(DialogInterface dialog,
- int which) {
-
- m_activity.unsubscribeFeed(feed);
-
- }
- })
- .setNegativeButton(R.string.dialog_cancel,
- new Dialog.OnClickListener() {
- public void onClick(DialogInterface dialog,
- int which) {
-
- }
- });
-
- Dialog dlg = builder.create();
- dlg.show();
- }
-
- return true;
- } else if (itemId == R.id.catchup_feed) {
- if (true) {
- Feed feed = getFeedAtPosition(info.position);
-
- if (feed != null) {
- m_activity.catchupDialog(feed);
- }
- }
- return true;
- }
- Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
- return super.onContextItemSelected(item);
- }
+ int itemId = item.getItemId();
+ if (itemId == R.id.browse_headlines) {
+ Feed feed = getFeedAtPosition(info.position);
+ if (feed != null) {
+ m_activity.onFeedSelected(feed);
+ }
+ return true;
+ } else if (itemId == R.id.browse_feeds) {
+ Feed feed = getFeedAtPosition(info.position);
+ if (feed != null) {
+ m_activity.onCatSelected(new FeedCategory(feed.id, feed.title, feed.unread), false);
+ }
+ return true;
+ } else if (itemId == R.id.unsubscribe_feed) {
+ final Feed feed = getFeedAtPosition(info.position);
+
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext())
+ .setMessage(getString(R.string.unsubscribe_from_prompt, feed.title))
+ .setPositiveButton(R.string.unsubscribe,
+ new Dialog.OnClickListener() {
+ public void onClick(DialogInterface dialog,
+ int which) {
+
+ m_activity.unsubscribeFeed(feed);
+
+ }
+ })
+ .setNegativeButton(R.string.dialog_cancel,
+ new Dialog.OnClickListener() {
+ public void onClick(DialogInterface dialog,
+ int which) {
+
+ }
+ });
+
+ Dialog dlg = builder.create();
+ dlg.show();
+
+ return true;
+ } else if (itemId == R.id.catchup_feed) {
+ Feed feed = getFeedAtPosition(info.position);
+
+ if (feed != null) {
+ m_activity.catchupDialog(feed);
+ }
+ return true;
+ }
+ Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
+ return super.onContextItemSelected(item);
+ }
@Override
public void onCreateContextMenu(ContextMenu menu, View v,
@@ -405,7 +397,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
public void onResume() {
super.onResume();
- getLoaderManager().initLoader(0, null, this).forceLoad();
+ LoaderManager.getInstance(this).initLoader(0, null, this).forceLoad();
m_activity.invalidateOptionsMenu();
}
@@ -436,7 +428,6 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
}
}
- @SuppressWarnings({ "serial" })
public void refresh() {
if (!isAdded()) return;
@@ -444,7 +435,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
m_swipeLayout.setRefreshing(true);
}
- getLoaderManager().restartLoader(0, null, this).forceLoad();
+ LoaderManager.getInstance(this).restartLoader(0, null, this).forceLoad();
}
private class FeedListAdapter extends ArrayAdapter<Feed> {
@@ -554,17 +545,6 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
tu.setVisibility((feed.unread > 0) ? View.VISIBLE : View.INVISIBLE);
}
- /*ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
-
- if (ib != null) {
- ib.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- getActivity().openContextMenu(v);
- }
- });
- }*/
-
return v;
}
}
@@ -601,8 +581,6 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
String key) {
sortFeeds();
- //m_enableFeedIcons = m_prefs.getBoolean("download_feed_icons", false);
-
}
public Feed getFeedAtPosition(int position) {
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-14 22:10:34 +0000