From 3ce3909ade09b25e48e0f79d60ffc94ae1ec4983 Mon Sep 17 00:00:00 2001
From: knuthy <knuthy@gmail.com>
Date: Sun, 10 Aug 2014 18:40:55 +0100
Subject: handle the case when no account name was set

---
 app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 9cb1276a..9655180e 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -275,7 +275,7 @@ public class PgpHandler extends Activity {
         public void onReturn(Intent result) {
             switch (result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) {
                 case OpenPgpApi.RESULT_CODE_SUCCESS: {
-                    showToast("RESULT_CODE_SUCCESS");
+                    showToast("SUCCESS");
 
                     // encrypt/decrypt/sign/verify
                     if (requestCode == REQUEST_CODE_DECRYPT_AND_VERIFY && os != null) {
@@ -342,7 +342,7 @@ public class PgpHandler extends Activity {
                     break;
                 }
                 case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: {
-                    showToast("RESULT_CODE_USER_INTERACTION_REQUIRED");
+                    Log.i("PgpHandler", "RESULT_CODE_USER_INTERACTION_REQUIRED");
 
                     PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
                     try {
@@ -354,7 +354,7 @@ public class PgpHandler extends Activity {
                     break;
                 }
                 case OpenPgpApi.RESULT_CODE_ERROR: {
-                    showToast("RESULT_CODE_ERROR");
+                    showToast("ERROR");
 
                     OpenPgpError error = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR);
                     handleError(error);
@@ -367,9 +367,11 @@ public class PgpHandler extends Activity {
 
     public void getKeyIds(Intent data) {
         accountName = settings.getString("openpgp_account_name", "");
+        if (accountName.isEmpty())
+            showToast("Please set your account name in settings whenever you can");
 
         data.setAction(OpenPgpApi.ACTION_GET_KEY_IDS);
-        data.putExtra(OpenPgpApi.EXTRA_USER_IDS, new String[]{accountName});
+        data.putExtra(OpenPgpApi.EXTRA_USER_IDS, new String[]{accountName.isEmpty() ? "default" : accountName});
 
         OpenPgpApi api = new OpenPgpApi(this, mServiceConnection.getService());
 
-- 
cgit v1.2.3