diff options
author | Markus Doits <markus.doits@gmail.com> | 2011-01-23 21:36:51 +0000 |
---|---|---|
committer | Markus Doits <markus.doits@gmail.com> | 2011-01-23 21:36:51 +0000 |
commit | cb4f1933d55abeda08623115464e393a886b8032 (patch) | |
tree | fd72ab4fafbf057d0c42429270227904d7f05e42 | |
parent | efc5575d56e4888f8335a76a7a44472aa53965ea (diff) | |
download | open-keychain-cb4f1933d55abeda08623115464e393a886b8032.tar.gz open-keychain-cb4f1933d55abeda08623115464e393a886b8032.tar.bz2 open-keychain-cb4f1933d55abeda08623115464e393a886b8032.zip |
Dont remove result and warnings from result
Some more debug output, too
-rw-r--r-- | src/org/thialfihar/android/apg/ApgService.java | 2 | ||||
-rw-r--r-- | src/org/thialfihar/android/apg/utils/ApgCon.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/thialfihar/android/apg/ApgService.java b/src/org/thialfihar/android/apg/ApgService.java index 20bd1b1e3..87437e629 100644 --- a/src/org/thialfihar/android/apg/ApgService.java +++ b/src/org/thialfihar/android/apg/ApgService.java @@ -380,6 +380,7 @@ public class ApgService extends Service { /* return if errors happened */ 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()); return false; } @@ -460,6 +461,7 @@ public class ApgService extends Service { ArrayList<String> fprints = new ArrayList<String>(); ArrayList<String> ids = new ArrayList<String>(); while (mCursor.moveToNext()) { + Log.v(TAG, "adding key "+Apg.getSmallFingerPrint(mCursor.getLong(0))); fprints.add(Apg.getSmallFingerPrint(mCursor.getLong(0))); ids.add(mCursor.getString(1)); } diff --git a/src/org/thialfihar/android/apg/utils/ApgCon.java b/src/org/thialfihar/android/apg/utils/ApgCon.java index 9a0ccb44b..0388f4d18 100644 --- a/src/org/thialfihar/android/apg/utils/ApgCon.java +++ b/src/org/thialfihar/android/apg/utils/ApgCon.java @@ -345,8 +345,6 @@ public class ApgCon { Boolean success = (Boolean) IApgService.class.getMethod(function, Bundle.class, Bundle.class).invoke(apgService, pArgs, pReturn); error_list.addAll(pReturn.getStringArrayList(ret.ERRORS.name())); warning_list.addAll(pReturn.getStringArrayList(ret.WARNINGS.name())); - pReturn.remove(ret.ERRORS.name()); - pReturn.remove(ret.WARNINGS.name()); return success; } catch (NoSuchMethodException e) { if (stacktraces) |