From dfcfe15dd043e5957b196da072b5bf4aa93049ce Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Mon, 25 May 2015 21:48:06 -0400 Subject: * Less picky about the mime type's we accept. * Handling content and files the same way * Improved support for sharing files in fixes AntennaPod/AntennaPod#827 --- .../activity/OpmlImportFromIntentActivity.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java') diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java index e42072ead..f7e9256c0 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java @@ -1,18 +1,27 @@ package de.danoeh.antennapod.activity; import android.app.AlertDialog; +import android.net.Uri; import android.os.Bundle; +import android.util.Log; + import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.util.LangUtils; import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; import java.io.InputStreamReader; +import java.io.Reader; import java.net.URL; /** Lets the user start the OPML-import process. */ public class OpmlImportFromIntentActivity extends OpmlImportBaseActivity { - @Override + private static final String TAG = "OpmlImportFromIntentAct"; + + + @Override protected void onCreate(Bundle savedInstanceState) { setTheme(UserPreferences.getTheme()); super.onCreate(savedInstanceState); @@ -20,10 +29,10 @@ public class OpmlImportFromIntentActivity extends OpmlImportBaseActivity { getSupportActionBar().setDisplayHomeAsUpEnabled(true); try { - URL mOpmlURL = new URL(getIntent().getData().toString()); - BufferedReader in = new BufferedReader(new InputStreamReader(mOpmlURL.openStream(), - LangUtils.UTF_8)); - startImport(in); + Uri uri = getIntent().getData(); + + Reader mReader = new InputStreamReader(getContentResolver().openInputStream(uri), LangUtils.UTF_8); + startImport(mReader); } catch (Exception e) { new AlertDialog.Builder(this).setMessage("Cannot open XML - Reason: " + e.getMessage()).show(); } -- cgit v1.2.3