Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #830 from CWftw/develop 

Fixed import Google Drive
This commit is contained in:
Tom Hennen 2015-05-25 20:33:23 -04:00
parent 1e37a26b9d 94c826a4ce
commit c9ef2d37bb
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java
View File

@ -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));
}
}
}