From 5467a2d2694284130bdfbec7c78c0559b236f7de Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Thu, 18 Jul 2013 14:07:54 +0200 Subject: [PATCH] Fixed RSS feed persistence (and thereby the RSS details screen on phones) and properly supply torrent title when adding torrent from an RSS feed. --- core/src/org/transdroid/core/gui/TorrentsActivity.java | 6 +++--- core/src/org/transdroid/core/gui/rss/RssitemsFragment.java | 4 +++- core/src/org/transdroid/core/rssparser/Channel.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java index 920156c0..b52bb65b 100644 --- a/core/src/org/transdroid/core/gui/TorrentsActivity.java +++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java @@ -639,7 +639,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi @Background public void addTorrentByUrl(String url, String title) { DaemonTaskResult result = AddByUrlTask.create(currentConnection, url, title).execute(); - if (result instanceof DaemonTaskResult) { + if (result instanceof DaemonTaskSuccessResult) { onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_added, title)); refreshTorrents(); } else { @@ -650,7 +650,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi @Background protected void addTorrentByMagnetUrl(String url) { DaemonTaskResult result = AddByMagnetUrlTask.create(currentConnection, url).execute(); - if (result instanceof DaemonTaskResult) { + if (result instanceof DaemonTaskSuccessResult) { onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_added, "Torrent")); refreshTorrents(); } else { @@ -661,7 +661,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi @Background protected void addTorrentByFile(String localFile, String title) { DaemonTaskResult result = AddByFileTask.create(currentConnection, localFile).execute(); - if (result instanceof DaemonTaskResult) { + if (result instanceof DaemonTaskSuccessResult) { onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_added, title)); refreshTorrents(); } else { diff --git a/core/src/org/transdroid/core/gui/rss/RssitemsFragment.java b/core/src/org/transdroid/core/gui/rss/RssitemsFragment.java index 6c334f1a..f58d0ff2 100644 --- a/core/src/org/transdroid/core/gui/rss/RssitemsFragment.java +++ b/core/src/org/transdroid/core/gui/rss/RssitemsFragment.java @@ -83,7 +83,9 @@ public class RssitemsFragment extends SherlockFragment { @ItemClick(resName = "rssitems_list") protected void onItemClicked(Item item) { - startActivity(new Intent(Intent.ACTION_VIEW, item.getTheLinkUri())); + Intent i = new Intent(Intent.ACTION_VIEW, item.getTheLinkUri()); + i.putExtra("TORRENT_TITLE", item.getTitle()); + startActivity(i); } private MultiChoiceModeListenerCompat onItemsSelected = new MultiChoiceModeListenerCompat() { diff --git a/core/src/org/transdroid/core/rssparser/Channel.java b/core/src/org/transdroid/core/rssparser/Channel.java index 5ad32cfa..68d105ed 100644 --- a/core/src/org/transdroid/core/rssparser/Channel.java +++ b/core/src/org/transdroid/core/rssparser/Channel.java @@ -121,8 +121,8 @@ public class Channel implements Parcelable { out.writeString(description); out.writeLong(pubDate == null ? -1 : pubDate.getTime()); out.writeLong(lastBuildDate); - out.writeStringList(categories); out.writeTypedList(items); + out.writeStringList(categories); out.writeString(image); }