From b6dea1cf58cceaa20b5dbde6df69991b50f68ede Mon Sep 17 00:00:00 2001 From: Twig N Date: Thu, 23 Jan 2020 20:56:18 +1100 Subject: [PATCH] - revert some stuff closer to master branch - adjust some comments - removed RemoteRssFragment.getRssActivity() --- .../core/gui/remoterss/RemoteRssFragment.java | 7 ++----- .../transdroid/core/gui/rss/RssfeedsActivity.java | 12 ++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssFragment.java b/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssFragment.java index d742aa24..6c14f567 100644 --- a/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssFragment.java @@ -76,10 +76,6 @@ public class RemoteRssFragment extends Fragment { torrentsList.setFastScrollEnabled(true); } - protected RssfeedsActivity getRssActivity() { - return (RssfeedsActivity) getActivity(); - } - @Override public void onResume() { super.onResume(); @@ -88,7 +84,8 @@ public class RemoteRssFragment extends Fragment { @OptionsItem(R.id.action_refresh) protected void refreshScreen() { - getRssActivity().refreshRemoteFeeds(); + RssfeedsActivity rssActivity = (RssfeedsActivity) getActivity(); + rssActivity.refreshRemoteFeeds(); } @OptionsItem(R.id.action_settings) diff --git a/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java index 9070f2e6..6c6dda99 100644 --- a/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java @@ -87,12 +87,12 @@ public class RssfeedsActivity extends AppCompatActivity { protected static final int RSS_FEEDS_LOCAL = 0; protected static final int RSS_FEEDS_REMOTE = 1; - @FragmentById(R.id.remoterss_fragment) - protected RemoteRssFragment fragmentRemoteFeeds; - @FragmentById(R.id.rssitems_fragment) - protected RssitemsFragment fragmentItems; @FragmentById(R.id.rssfeeds_fragment) protected RssfeedsFragment fragmentLocalFeeds; + @FragmentById(R.id.rssitems_fragment) + protected RssitemsFragment fragmentItems; + @FragmentById(R.id.remoterss_fragment) + protected RemoteRssFragment fragmentRemoteFeeds; @ViewById protected Toolbar rssfeedsToolbar; @@ -311,7 +311,7 @@ public class RssfeedsActivity extends AppCompatActivity { return lastUsed.createServerAdapter(connectivityHelper.getConnectedNetworkName(), this); } -// @Background + // @Background public void refreshRemoteFeeds() { // Connect to the last used server IDaemonAdapter currentConnection = this.getCurrentConnection(); @@ -350,7 +350,7 @@ public class RssfeedsActivity extends AppCompatActivity { return; } -// @UIThread + // @UIThread fragmentRemoteFeeds.updateRemoteItems( selectedFilter == 0 ? recentItems : feeds.get(selectedFilter -1).getItems(), false /* allow android to restore scroll position */ );