diff options
| author | Dominik <dominik@dominikschuermann.de> | 2012-03-09 11:08:22 +0100 |
|---|---|---|
| committer | Dominik <dominik@dominikschuermann.de> | 2012-03-09 11:08:22 +0100 |
| commit | 781f089ee1730f596015145706f2302218efeaed (patch) | |
| tree | 4dc61e290f4f90ae59f236b50235dbd787b32a6c /src/org/thialfihar/android/apg/KeyServerQueryActivity.java | |
| parent | 5ede7d475617257656bf894d39b5eed1853a7231 (diff) | |
| parent | debb90409a0a90ce9351c83e42cb72f8935bacb1 (diff) | |
| download | open-keychain-781f089ee1730f596015145706f2302218efeaed.tar.gz open-keychain-781f089ee1730f596015145706f2302218efeaed.tar.bz2 open-keychain-781f089ee1730f596015145706f2302218efeaed.zip | |
merged senecasos repo
Diffstat (limited to 'src/org/thialfihar/android/apg/KeyServerQueryActivity.java')
| -rw-r--r-- | src/org/thialfihar/android/apg/KeyServerQueryActivity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/thialfihar/android/apg/KeyServerQueryActivity.java b/src/org/thialfihar/android/apg/KeyServerQueryActivity.java index 8c4829dda..ccf4e33d8 100644 --- a/src/org/thialfihar/android/apg/KeyServerQueryActivity.java +++ b/src/org/thialfihar/android/apg/KeyServerQueryActivity.java @@ -97,7 +97,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(); @@ -105,7 +105,7 @@ 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(); } @@ -126,9 +126,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) { @@ -162,12 +162,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) { |