moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-18 06:45:03 -05:00
Code Issues Releases Wiki Activity

Added exception is null option to display nothing if no error occured

Browse Source
This commit is contained in:
Daniel Haß 2014-03-04 13:56:46 +01:00
parent d691d4c965
commit a12b67c538
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
View File

@ -225,14 +225,16 @@ public class ImportKeysListFragment extends ListFragment implements
switch (loader.getId()) { switch (loader.getId()) {
case LOADER_ID_BYTES: case LOADER_ID_BYTES:
if(error instanceof ImportKeysListLoader.FileHasNoContent) { if(error == null){
// No error
} else if(error instanceof ImportKeysListLoader.FileHasNoContent) {
AppMsg.makeText(getActivity(), R.string.error_import_file_no_content, AppMsg.makeText(getActivity(), R.string.error_import_file_no_content,
AppMsg.STYLE_ALERT).show(); AppMsg.STYLE_ALERT).show();
} else if(error instanceof ImportKeysListLoader.NonPGPPart) { } else if(error instanceof ImportKeysListLoader.NonPgpPart) {
AppMsg.makeText(getActivity(), AppMsg.makeText(getActivity(),
((ImportKeysListLoader.NonPGPPart) error).getCount() + " " + getResources(). ((ImportKeysListLoader.NonPgpPart) error).getCount() + " " + getResources().
getQuantityString(R.plurals.error_import_non_pgp_part, getQuantityString(R.plurals.error_import_non_pgp_part,
((ImportKeysListLoader.NonPGPPart) error).getCount()), ((ImportKeysListLoader.NonPgpPart) error).getCount()),
new AppMsg.Style(AppMsg.LENGTH_LONG, R.color.confirm)).show(); new AppMsg.Style(AppMsg.LENGTH_LONG, R.color.confirm)).show();
} else { } else {
AppMsg.makeText(getActivity(), R.string.error_generic_report_bug, AppMsg.makeText(getActivity(), R.string.error_generic_report_bug,