From cdb95ee844e2fe2f4b15ccdd9eeace760cf46b8e Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 30 Jun 2018 12:31:57 +0200 Subject: [PATCH] make single-choice mode work in KeyChoiceAdapter --- .../keychain/ui/adapter/KeyChoiceAdapter.java | 3 +++ OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml | 1 - .../main/res/layout/api_remote_select_authentication_key.xml | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyChoiceAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyChoiceAdapter.java index 107628eab..84a48c00e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyChoiceAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyChoiceAdapter.java @@ -82,6 +82,8 @@ public class KeyChoiceAdapter extends FlexibleAdapter { throw new IllegalStateException("Cannot get active item in single select mode!"); } + clearSelection(); + Integer prevActiveItem = this.activeItem; this.activeItem = newActiveItem; @@ -89,6 +91,7 @@ public class KeyChoiceAdapter extends FlexibleAdapter { notifyItemChanged(prevActiveItem); } if (newActiveItem != null) { + toggleSelection(newActiveItem); notifyItemChanged(newActiveItem); } } diff --git a/OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml b/OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml index d2b1461b4..b86c109ed 100644 --- a/OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml +++ b/OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml @@ -132,7 +132,6 @@ android:layout_height="wrap_content" android:text="Select" android:id="@+id/button_select" - android:enabled="false" style="?buttonBarButtonStyle" /> diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_authentication_key.xml b/OpenKeychain/src/main/res/layout/api_remote_select_authentication_key.xml index 72dda13b0..953d05ba1 100644 --- a/OpenKeychain/src/main/res/layout/api_remote_select_authentication_key.xml +++ b/OpenKeychain/src/main/res/layout/api_remote_select_authentication_key.xml @@ -116,7 +116,6 @@ android:layout_height="wrap_content" android:text="Select" android:id="@+id/button_select" - android:enabled="false" style="?buttonBarButtonStyle" />