From a519e70fd9c71804175de7c1a275b28426aeeaee Mon Sep 17 00:00:00 2001 From: Twig Nguyen Date: Mon, 27 Feb 2017 20:38:58 +1100 Subject: [PATCH] - upgraded gradle - no longer pass remote RSS feeds to RemoteRssActivity it now pulls it from the connection itself. this avoids having an Intent that's too large and causing the app to crash without warning --- .../java/org/transdroid/core/gui/TorrentsActivity.java | 3 ++- .../transdroid/core/gui/remoterss/RemoteRssActivity.java | 9 +++------ build.gradle | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java b/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java index e30469a5..9da9c472 100644 --- a/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java @@ -861,8 +861,9 @@ public class TorrentsActivity extends AppCompatActivity implements TorrentTasksE return; } + // Passing the items over as a feed can overload the Intent size limit and crash without a stack trace! RemoteRssActivity_.intent(this) - .feeds(rssFeedItems) +// .feeds(rssFeedItems) .start() ; } diff --git a/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssActivity.java b/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssActivity.java index 5d9c1a3d..a67f138d 100644 --- a/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssActivity.java @@ -29,7 +29,6 @@ import android.widget.ListView; import org.androidannotations.annotations.AfterViews; import org.androidannotations.annotations.Bean; import org.androidannotations.annotations.EActivity; -import org.androidannotations.annotations.Extra; import org.androidannotations.annotations.FragmentById; import org.androidannotations.annotations.InstanceState; import org.androidannotations.annotations.ItemClick; @@ -42,6 +41,7 @@ import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.gui.lists.SimpleListItemAdapter; import org.transdroid.core.gui.remoterss.data.RemoteRssChannel; import org.transdroid.core.gui.remoterss.data.RemoteRssItem; +import org.transdroid.core.gui.remoterss.data.RemoteRssSupplier; import org.transdroid.core.service.ConnectivityHelper; import org.transdroid.daemon.IDaemonAdapter; @@ -62,7 +62,7 @@ import java.util.List; */ @EActivity(R.layout.activity_remoterss) public class RemoteRssActivity extends AppCompatActivity { - @Extra +// @Extra @InstanceState protected ArrayList feeds; @@ -102,10 +102,6 @@ public class RemoteRssActivity extends AppCompatActivity { @AfterViews protected void init() { - if (feeds == null) { - feeds = new ArrayList<>(); - } - // Simple action bar with up, torrent name as title and refresh button torrentsToolbar.setNavigationIcon(R.drawable.ic_action_drawer); setSupportActionBar(torrentsToolbar); @@ -114,6 +110,7 @@ public class RemoteRssActivity extends AppCompatActivity { // Connect to the last used server ServerSetting lastUsed = applicationSettings.getLastUsedServer(); currentConnection = lastUsed.createServerAdapter(connectivityHelper.getConnectedNetworkName(), this); + feeds = ((RemoteRssSupplier) (currentConnection)).getRemoteRssChannels(); // Fill in the filter list showChannelFilters(); diff --git a/build.gradle b/build.gradle index 5657e594..1017cb40 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' } }