1.0.x changes merged into trunk

10 files changed, 94 insertions, 86 deletions

diff --git a/res/anim/push_left_in.xml b/res/anim/push_left_in.xml
index b7d2d0da0..45fb4875a 100644
--- a/res/anim/push_left_in.xml
+++ b/res/anim/push_left_in.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Copyright (C) 2007 The Android Open Source Project

-

-     Licensed under the Apache License, Version 2.0 (the "License");

-     you may not use this file except in compliance with the License.

-     You may obtain a copy of the License at

-

-          http://www.apache.org/licenses/LICENSE-2.0

-

-     Unless required by applicable law or agreed to in writing, software

-     distributed under the License is distributed on an "AS IS" BASIS,

-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-     See the License for the specific language governing permissions and

-     limitations under the License.

--->

-

-<set xmlns:android="http://schemas.android.com/apk/res/android">

-  <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="500"/>

-  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

-</set>

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>
diff --git a/res/anim/push_left_out.xml b/res/anim/push_left_out.xml
index 6bdc0ce47..845679f16 100644
--- a/res/anim/push_left_out.xml
+++ b/res/anim/push_left_out.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Copyright (C) 2007 The Android Open Source Project

-

-     Licensed under the Apache License, Version 2.0 (the "License");

-     you may not use this file except in compliance with the License.

-     You may obtain a copy of the License at

-

-          http://www.apache.org/licenses/LICENSE-2.0

-

-     Unless required by applicable law or agreed to in writing, software

-     distributed under the License is distributed on an "AS IS" BASIS,

-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-     See the License for the specific language governing permissions and

-     limitations under the License.

--->

-

-<set xmlns:android="http://schemas.android.com/apk/res/android">

-  <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="500"/>

-  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
 </set>
\ No newline at end of file
diff --git a/res/anim/push_right_in.xml b/res/anim/push_right_in.xml
index 89daae972..09a244406 100644
--- a/res/anim/push_right_in.xml
+++ b/res/anim/push_right_in.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Copyright (C) 2007 The Android Open Source Project

-

-     Licensed under the Apache License, Version 2.0 (the "License");

-     you may not use this file except in compliance with the License.

-     You may obtain a copy of the License at

-

-          http://www.apache.org/licenses/LICENSE-2.0

-

-     Unless required by applicable law or agreed to in writing, software

-     distributed under the License is distributed on an "AS IS" BASIS,

-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-     See the License for the specific language governing permissions and

-     limitations under the License.

--->

-

-<set xmlns:android="http://schemas.android.com/apk/res/android">

-  <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="500"/>

-  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

-</set>

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>
diff --git a/res/anim/push_right_out.xml b/res/anim/push_right_out.xml
index b4b796b52..e8893a69a 100644
--- a/res/anim/push_right_out.xml
+++ b/res/anim/push_right_out.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Copyright (C) 2007 The Android Open Source Project

-

-     Licensed under the Apache License, Version 2.0 (the "License");

-     you may not use this file except in compliance with the License.

-     You may obtain a copy of the License at

-

-          http://www.apache.org/licenses/LICENSE-2.0

-

-     Unless required by applicable law or agreed to in writing, software

-     distributed under the License is distributed on an "AS IS" BASIS,

-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-     See the License for the specific language governing permissions and

-     limitations under the License.

--->

-

-<set xmlns:android="http://schemas.android.com/apk/res/android">

-  <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="500"/>

-  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
 </set>
\ No newline at end of file
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index dd123b370..f57578846 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -12,7 +12,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
-     
+
      Author: 359 <359@siol.com>
 -->
 
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