moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

Dont remove result and warnings from result

Browse Source 
Some more debug output, too
This commit is contained in:
Markus Doits 2011-01-23 21:36:51 +00:00
parent efc5575d56
commit cb4f1933d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thialfihar/android/apg/ApgService.java
View File

@ -380,6 +380,7 @@ public class ApgService extends Service {
/* return if errors happened */ /* return if errors happened */
if (pReturn.getStringArrayList(ret.ERRORS.name()).size() != 0) { if (pReturn.getStringArrayList(ret.ERRORS.name()).size() != 0) {
Log.v(TAG, "Errors after preparing, not executing "+call);
pReturn.putInt(ret.ERROR.name(), error.ARGUMENTS_MISSING.shifted_ordinal()); pReturn.putInt(ret.ERROR.name(), error.ARGUMENTS_MISSING.shifted_ordinal());
return false; return false;
} }
@ -460,6 +461,7 @@ public class ApgService extends Service {
ArrayList<String> fprints = new ArrayList<String>(); ArrayList<String> fprints = new ArrayList<String>();
ArrayList<String> ids = new ArrayList<String>(); ArrayList<String> ids = new ArrayList<String>();
while (mCursor.moveToNext()) { while (mCursor.moveToNext()) {
Log.v(TAG, "adding key "+Apg.getSmallFingerPrint(mCursor.getLong(0)));
fprints.add(Apg.getSmallFingerPrint(mCursor.getLong(0))); fprints.add(Apg.getSmallFingerPrint(mCursor.getLong(0)));
ids.add(mCursor.getString(1)); ids.add(mCursor.getString(1));
} }

2
src/org/thialfihar/android/apg/utils/ApgCon.java
View File

@ -345,8 +345,6 @@ public class ApgCon {
Boolean success = (Boolean) IApgService.class.getMethod(function, Bundle.class, Bundle.class).invoke(apgService, pArgs, pReturn); Boolean success = (Boolean) IApgService.class.getMethod(function, Bundle.class, Bundle.class).invoke(apgService, pArgs, pReturn);
error_list.addAll(pReturn.getStringArrayList(ret.ERRORS.name())); error_list.addAll(pReturn.getStringArrayList(ret.ERRORS.name()));
warning_list.addAll(pReturn.getStringArrayList(ret.WARNINGS.name())); warning_list.addAll(pReturn.getStringArrayList(ret.WARNINGS.name()));
pReturn.remove(ret.ERRORS.name());
pReturn.remove(ret.WARNINGS.name());
return success; return success;
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
if (stacktraces) if (stacktraces)