diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-07-16 20:18:43 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-07-16 20:18:43 +0000 |
| commit | 93835f55953dc069430c0692bc30ef7f1cfc349d (patch) | |
| tree | abaaa5d6dfd8d57fd77e8bd0507292b00c99a742 /src | |
| parent | f5efd73d33e80657b1d4af300f0916ea756e5753 (diff) | |
| download | open-keychain-93835f55953dc069430c0692bc30ef7f1cfc349d.tar.gz open-keychain-93835f55953dc069430c0692bc30ef7f1cfc349d.tar.bz2 open-keychain-93835f55953dc069430c0692bc30ef7f1cfc349d.zip | |
1.0.x changes merged into trunk
Diffstat (limited to 'src')
5 files changed, 15 insertions, 7 deletions
diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java index 58639cee0..5983bef1b 100644 --- a/src/org/thialfihar/android/apg/Apg.java +++ b/src/org/thialfihar/android/apg/Apg.java @@ -127,6 +127,7 @@ public class Apg { public static final String EXTRA_SIGNATURE_SUCCESS = "signatureSuccess"; public static final String EXTRA_SIGNATURE_UNKNOWN = "signatureUnknown"; public static final String EXTRA_USER_ID = "userId"; + public static final String EXTRA_USER_IDS = "userIds"; public static final String EXTRA_KEY_ID = "keyId"; public static final String EXTRA_REPLY_TO = "replyTo"; public static final String EXTRA_SEND_TO = "sendTo"; diff --git a/src/org/thialfihar/android/apg/SelectPublicKeyListActivity.java b/src/org/thialfihar/android/apg/SelectPublicKeyListActivity.java index ef734a789..53cf5f720 100644 --- a/src/org/thialfihar/android/apg/SelectPublicKeyListActivity.java +++ b/src/org/thialfihar/android/apg/SelectPublicKeyListActivity.java @@ -141,17 +141,21 @@ public class SelectPublicKeyListActivity extends BaseActivity { private void okClicked() { Intent data = new Intent(); - Vector<Long> vector = new Vector<Long>(); + Vector<Long> keys = new Vector<Long>(); + Vector<String> userIds = new Vector<String>(); for (int i = 0; i < mList.getCount(); ++i) { if (mList.isItemChecked(i)) { - vector.add(mList.getItemIdAtPosition(i)); + keys.add(mList.getItemIdAtPosition(i)); + userIds.add((String) mList.getItemAtPosition(i)); } } - long selectedKeyIds[] = new long[vector.size()]; - for (int i = 0; i < vector.size(); ++i) { - selectedKeyIds[i] = vector.get(i); + long selectedKeyIds[] = new long[keys.size()]; + for (int i = 0; i < keys.size(); ++i) { + selectedKeyIds[i] = keys.get(i); } + String userIdArray[] = new String[0]; data.putExtra(Apg.EXTRA_SELECTION, selectedKeyIds); + data.putExtra(Apg.EXTRA_USER_IDS, userIds.toArray(userIdArray)); setResult(RESULT_OK, data); finish(); } diff --git a/src/org/thialfihar/android/apg/SelectPublicKeyListAdapter.java b/src/org/thialfihar/android/apg/SelectPublicKeyListAdapter.java index cbbb88371..d7359dbf2 100644 --- a/src/org/thialfihar/android/apg/SelectPublicKeyListAdapter.java +++ b/src/org/thialfihar/android/apg/SelectPublicKeyListAdapter.java @@ -150,7 +150,8 @@ public class SelectPublicKeyListAdapter extends BaseAdapter { @Override public Object getItem(int position) { - return position; + mCursor.moveToPosition(position); + return mCursor.getString(2); // USER_ID } @Override diff --git a/src/org/thialfihar/android/apg/SelectSecretKeyListActivity.java b/src/org/thialfihar/android/apg/SelectSecretKeyListActivity.java index 0b18ecc15..36bd482e5 100644 --- a/src/org/thialfihar/android/apg/SelectSecretKeyListActivity.java +++ b/src/org/thialfihar/android/apg/SelectSecretKeyListActivity.java @@ -52,6 +52,7 @@ public class SelectSecretKeyListActivity extends BaseActivity { public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) { Intent data = new Intent(); data.putExtra(Apg.EXTRA_KEY_ID, id); + data.putExtra(Apg.EXTRA_USER_ID, (String)mList.getItemAtPosition(position)); setResult(RESULT_OK, data); finish(); } diff --git a/src/org/thialfihar/android/apg/SelectSecretKeyListAdapter.java b/src/org/thialfihar/android/apg/SelectSecretKeyListAdapter.java index 898a9e6da..440461aca 100644 --- a/src/org/thialfihar/android/apg/SelectSecretKeyListAdapter.java +++ b/src/org/thialfihar/android/apg/SelectSecretKeyListAdapter.java @@ -109,7 +109,8 @@ public class SelectSecretKeyListAdapter extends BaseAdapter { @Override public Object getItem(int position) { - return position; + mCursor.moveToPosition(position); + return mCursor.getString(2); // USER_ID } @Override |