-implementation of "--send-key"

-implementation of "--sign-key"
-partial implementation of exchanging/verifying keys via QR Code

1 files changed, 7 insertions, 7 deletions

diff --git a/src/org/thialfihar/android/apg/KeyServerQueryActivity.java b/src/org/thialfihar/android/apg/KeyServerQueryActivity.java
index 01cfec0c0..2b04d7bac 100644
--- a/src/org/thialfihar/android/apg/KeyServerQueryActivity.java
+++ b/src/org/thialfihar/android/apg/KeyServerQueryActivity.java
@@ -99,7 +99,7 @@ public class KeyServerQueryActivity extends BaseActivity {
 
     private void search(String query) {
         showDialog(Id.dialog.querying);
-        mQueryType = Id.query.search;
+        mQueryType = Id.keyserver.search;
         mQueryString = query;
         mAdapter.setKeys(new Vector<KeyInfo>());
         startThread();
@@ -107,11 +107,11 @@ public class KeyServerQueryActivity extends BaseActivity {
 
     private void get(long keyId) {
         showDialog(Id.dialog.querying);
-        mQueryType = Id.query.get;
+        mQueryType = Id.keyserver.get;
         mQueryId = keyId;
         startThread();
     }
-
+    
     protected Dialog onCreateDialog(int id) {
         ProgressDialog progress = (ProgressDialog) super.onCreateDialog(id);
         progress.setMessage(this.getString(R.string.progress_queryingServer,
@@ -127,9 +127,9 @@ public class KeyServerQueryActivity extends BaseActivity {
 
         try {
             HkpKeyServer server = new HkpKeyServer((String)mKeyServer.getSelectedItem());
-            if (mQueryType == Id.query.search) {
+            if (mQueryType == Id.keyserver.search) {
                 mSearchResult = server.search(mQueryString);
-            } else if (mQueryType == Id.query.get) {
+            } else if (mQueryType == Id.keyserver.get) {
                 mKeyData = server.get(mQueryId);
             }
         } catch (QueryException e) {
@@ -163,12 +163,12 @@ public class KeyServerQueryActivity extends BaseActivity {
             return;
         }
 
-        if (mQueryType == Id.query.search) {
+        if (mQueryType == Id.keyserver.search) {
             if (mSearchResult != null) {
                 Toast.makeText(this, getString(R.string.keysFound, mSearchResult.size()), Toast.LENGTH_SHORT).show();
                 mAdapter.setKeys(mSearchResult);
             }
-        } else if (mQueryType == Id.query.get) {
+        } else if (mQueryType == Id.keyserver.get) {
             Intent orgIntent = getIntent();
             if (Apg.Intent.LOOK_UP_KEY_ID_AND_RETURN.equals(orgIntent.getAction())) {
                 if (mKeyData != null) {