summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorColin Willson <Colin@CWftw.me>2015-05-24 06:53:12 -0400
committerColin Willson <Colin@CWftw.me>2015-05-24 06:53:12 -0400
commit94c826a4ce4e03981bac1698252a487792c34192 (patch)
tree7ed7f22e04958dfc7a23494489459ae31dcc129f /app/src/main
parent1e37a26b9df203002b1786d89d03ac281a00ce1b (diff)
downloadAntennaPod-94c826a4ce4e03981bac1698252a487792c34192.zip
Fixed import Google Drive
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java15
1 files changed, 13 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
index c1bbb7e52..74d22d9ff 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
@@ -172,8 +172,19 @@ public class OpmlImportFromPathActivity extends OpmlImportBaseActivity {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK && requestCode == CHOOSE_OPML_FILE) {
- String filename = data.getData().getPath();
- startImport(new File(filename));
+ Uri uri = data.getData();
+
+ if ("content".equals(uri.getScheme())) {
+ try {
+ Reader mReader = new InputStreamReader(getContentResolver().openInputStream(uri), LangUtils.UTF_8);
+ startImport(mReader);
+ } catch (FileNotFoundException e) {
+ Log.d(TAG, "File not found");
+ }
+ } else {
+ String filename = uri.getPath();
+ startImport(new File(filename));
+ }
}
}