cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged senecasos repo

Browse Source
This commit is contained in:
Dominik
2012-03-09 11:08:22 +01:00
parent 5ede7d4756 debb90409a
commit 781f089ee1
20 changed files with 997 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/thialfihar/android/apg/KeyServerQueryActivity.java
View File

@@ -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) {