From 5cb9de01adc23de896aa81b2edc120423ae711db Mon Sep 17 00:00:00 2001
From: Tobias Erthal <tobias.erthal@gmail.com>
Date: Sat, 3 Dec 2016 19:39:27 +0100
Subject: [PATCH] Fixed id offset, minor changes.

---
 .../keychain/remote/ui/SelectSignKeyIdListFragment.java       | 1 +
 .../keychain/remote/ui/adapter/SelectSignKeyAdapter.java      | 4 ++--
 .../keychain/ui/adapter/KeyCursorAdapter.java                 | 1 +
 OpenKeychain/src/main/res/layout/select_sign_key_item.xml     | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdListFragment.java
index f3972623d..f4a788daf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/SelectSignKeyIdListFragment.java
@@ -179,6 +179,7 @@ public class SelectSignKeyIdListFragment extends RecyclerFragment<SelectSignKeyA
         mApiDao.addAllowedKeyIdForApp(allowedKeysUri, masterKeyId);
         mResult.putExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, masterKeyId);
 
+        Log.d(Constants.TAG, "allowedKeyId: " + masterKeyId);
         Log.d(Constants.TAG, "allowedKeysUri: " + allowedKeysUri);
 
         getActivity().setResult(Activity.RESULT_OK, mResult);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectSignKeyAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectSignKeyAdapter.java
index ef153a88a..4d89a09d9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectSignKeyAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/adapter/SelectSignKeyAdapter.java
@@ -40,10 +40,10 @@ public class SelectSignKeyAdapter extends KeyCursorAdapter<CursorAdapter.KeyCurs
 
     @Override
     public long getItemId(int pos) {
-        if(pos < (super.getItemCount() - 1)) {
+        if(pos < super.getItemCount()) {
             return super.getItemId(pos);
         } else {
-            return 0L;
+            return RecyclerView.NO_ID;
         }
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyCursorAdapter.java
index 2e5556f69..bb112e541 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyCursorAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyCursorAdapter.java
@@ -14,6 +14,7 @@ public abstract class KeyCursorAdapter<C extends CursorAdapter.KeyCursor, VH ext
 
     public KeyCursorAdapter(Context context, C cursor){
         super(context, cursor, 0);
+        setHasStableIds(true);
     }
 
     public void setQuery(String query) {
diff --git a/OpenKeychain/src/main/res/layout/select_sign_key_item.xml b/OpenKeychain/src/main/res/layout/select_sign_key_item.xml
index e27eb2518..2caf89d31 100644
--- a/OpenKeychain/src/main/res/layout/select_sign_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/select_sign_key_item.xml
@@ -8,6 +8,7 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingLeft="4dp"
     android:paddingRight="?android:attr/scrollbarSize"
+    android:background="?android:selectableItemBackground"
     android:maxLines="1">
 
     <LinearLayout