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

Merge pull request #1705 from mfietz/issue/1704-opml-import-npe 

OPML Import: Show dialog when no file has been selected
This commit is contained in:
Martin Fietz 2016-03-16 20:36:31 +01:00
parent 30be1ad36e 4fca673d1f
commit 3449357c14
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Environment;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import android.support.v7.app.ActionBarActivity;
import android.util.Log;
@ -31,7 +32,7 @@ public class OpmlImportBaseActivity extends ActionBarActivity {
private OpmlImportWorker importWorker;
private static final int PERMISSION_REQUEST_READ_EXTERNAL_STORAGE = 5;
private Uri uri;
@Nullable private Uri uri;
/**
* Handles the choices made by the user in the OpmlFeedChooserActivity and
@ -67,7 +68,14 @@ public class OpmlImportBaseActivity extends ActionBarActivity {
}
}
protected void importUri(Uri uri) {
protected void importUri(@Nullable Uri uri) {
if(uri == null) {
new MaterialDialog.Builder(this)
.content(R.string.opml_import_error_no_file)
.positiveText(android.R.string.ok)
.show();
return;
}
this.uri = uri;
if(uri.toString().contains(Environment.getExternalStorageDirectory().toString())) {
int permission = ActivityCompat.checkSelfPermission(this, android.Manifest.permission.READ_EXTERNAL_STORAGE);
@ -127,8 +135,9 @@ public class OpmlImportBaseActivity extends ActionBarActivity {
importWorker.executeAsync();
} catch (Exception e) {
Log.d(TAG, Log.getStackTraceString(e));
String message = getString(R.string.opml_reader_error);
new MaterialDialog.Builder(this)
.content("Cannot open OPML file: " + e.getMessage())
.content(message + " " + e.getMessage())
.positiveText(android.R.string.ok)
.show();
}

4
core/src/main/res/values/strings.xml
View File

@ -413,8 +413,8 @@
<string name="opml_import_label">OPML Import</string>
<string name="opml_directory_error">ERROR!</string>
<string name="reading_opml_label">Reading OPML file</string>
<string name="opml_reader_error">An error has occurred while reading the opml document:</string>
<string name="opml_import_error_dir_empty">The import directory is empty.</string>
<string name="opml_reader_error">An error has occurred while reading the OPML document:</string>
<string name="opml_import_error_no_file">No file selected!</string>
<string name="select_all_label">Select all</string>
<string name="deselect_all_label">Deselect all</string>
<string name="select_options_label">Select&#8230;</string>