From a43e09b891151c577f9939bd30394eeae070a20f Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Fri, 4 Oct 2013 15:59:43 +0200 Subject: [PATCH] Support file downloads via AndFTP (and possibly plain ftp:// intents). --- core/res/values/changelog.xml | 1 + core/res/values/strings.xml | 1 + .../transdroid/core/gui/DetailsActivity.java | 1 + .../transdroid/core/gui/DetailsFragment.java | 68 +++++++++++++++++-- .../transdroid/core/gui/TorrentsActivity.java | 1 + lite/AndroidManifest.xml | 8 +++ 6 files changed, 75 insertions(+), 5 deletions(-) diff --git a/core/res/values/changelog.xml b/core/res/values/changelog.xml index 2061b237..000c8fdd 100644 --- a/core/res/values/changelog.xml +++ b/core/res/values/changelog.xml @@ -19,6 +19,7 @@ Transdroid 2.0.0\n - Allow changing of storage location (Deluge and Transmission)\n +- Allow file downloads via AndFTP\n - UI improvements for Lite version\n \n Transdroid 2.0.0-alpha4\n diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml index cb3b21fa..92e97c81 100644 --- a/core/res/values/strings.xml +++ b/core/res/values/strings.xml @@ -356,6 +356,7 @@ Please enter a positive number Please enter a valid label or pick from the list Please wait until the torrent details have been loaded + No app found that can download %1$s New Transdroid version available New Transdroid search module available diff --git a/core/src/org/transdroid/core/gui/DetailsActivity.java b/core/src/org/transdroid/core/gui/DetailsActivity.java index c34b0149..3f6e1bd0 100644 --- a/core/src/org/transdroid/core/gui/DetailsActivity.java +++ b/core/src/org/transdroid/core/gui/DetailsActivity.java @@ -126,6 +126,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent // Connect to the last used server ServerSetting lastUsed = applicationSettings.getLastUsedServer(); + fragmentDetails.setCurrentServerSettings(lastUsed); currentConnection = lastUsed.createServerAdapter(connectivityHelper.getConnectedNetworkName()); // Show details and load fine stats and torrent files diff --git a/core/src/org/transdroid/core/gui/DetailsFragment.java b/core/src/org/transdroid/core/gui/DetailsFragment.java index 91c7917f..2697335b 100644 --- a/core/src/org/transdroid/core/gui/DetailsFragment.java +++ b/core/src/org/transdroid/core/gui/DetailsFragment.java @@ -27,6 +27,7 @@ import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsMenu; import org.androidannotations.annotations.ViewById; import org.transdroid.core.R; +import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.gui.lists.DetailsAdapter; import org.transdroid.core.gui.lists.SimpleListItemAdapter; @@ -46,6 +47,9 @@ import org.transdroid.daemon.Torrent; import org.transdroid.daemon.TorrentDetails; import org.transdroid.daemon.TorrentFile; +import android.annotation.SuppressLint; +import android.content.Intent; +import android.net.Uri; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; @@ -81,6 +85,7 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat protected ArrayList