Merge pull request codinguser#342 from rivaldi8/bugfix-341-no-applica…

…tion-selected-import Fix crash if no application is selected to choose a file to import accounts.
fifa0329 · Jun 16, 2015 · 7dbab98 · 7dbab98
2 parents a2ce02d + 18a35b5
commit 7dbab98
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/app/src/main/java/org/gnucash/android/ui/settings/SettingsActivity.java b/app/src/main/java/org/gnucash/android/ui/settings/SettingsActivity.java
@@ -573,12 +573,14 @@ public void onClick(DialogInterface dialog, int which) {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case AccountsActivity.REQUEST_PICK_ACCOUNTS_FILE:
-                try {
-                    InputStream accountInputStream = getContentResolver().openInputStream(data.getData());
-                    new ImportAsyncTask(this).execute(accountInputStream);
-                } catch (FileNotFoundException e) {
-                    Crashlytics.logException(e);
-                    Toast.makeText(this, R.string.toast_error_importing_accounts, Toast.LENGTH_SHORT).show();
+                if (resultCode == Activity.RESULT_OK && data != null) {
+                    try {
+                        InputStream accountInputStream = getContentResolver().openInputStream(data.getData());
+                        new ImportAsyncTask(this).execute(accountInputStream);
+                    } catch (FileNotFoundException e) {
+                        Crashlytics.logException(e);
+                        Toast.makeText(this, R.string.toast_error_importing_accounts, Toast.LENGTH_SHORT).show();
+                    }
                 }
                 break;
             case PasscodePreferenceFragment.PASSCODE_REQUEST_CODE: