Ripple

24 files changed, 40 insertions, 44 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
index 07144e264..1413273e8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
@@ -386,7 +386,7 @@ public class ContactHelper {
 
                 // Do not store expired or revoked keys in contact db - and remove them if they already exist
                 if (isExpired || isRevoked) {
-                    Log.d(Constants.TAG, "Expired or revoked: Deleting " + rawContactId);
+                    Log.d(Constants.TAG, "Expired or revoked: Deleting rawContactId " + rawContactId);
                     if (rawContactId != -1) {
                         deleteRawContactById(resolver, rawContactId);
                     }
@@ -423,8 +423,6 @@ public class ContactHelper {
 
     /**
      * Delete all raw contacts associated to OpenKeychain.
-     * <p/>
-     * TODO: Does this work?
      */
     private static int debugDeleteRawContacts(ContentResolver resolver) {
         //allows us to actually wipe the RawContact from the device, otherwise would be just flagged
diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index f9a8e9933..88b96284f 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -72,7 +72,7 @@
 
     <TextView
         android:id="@+id/api_account_settings_create_key"
-        style="@style/SelectableItem"
+        android:background="?android:selectableItemBackground"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
index c1227f906..23685ce15 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
@@ -77,7 +77,7 @@
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
             android:paddingRight="4dp"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <TextView
diff --git a/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml b/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml
index 91ba72884..0968f3a63 100644
--- a/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml
@@ -23,6 +23,6 @@
         android:padding="8dp"
         android:src="@drawable/ic_close_grey_24dp"
         android:layout_gravity="center_vertical"
-        style="@style/SelectableItem" />
+        android:background="?android:selectableItemBackground" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 830f039f7..e085fcb09 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -113,7 +113,7 @@
                     android:minHeight="?android:attr/listPreferredItemHeight"
                     android:gravity="center_vertical"
                     android:clickable="true"
-                    style="@style/SelectableItem"
+                    android:background="?android:selectableItemBackground"
                     android:layout_gravity="center_vertical" />
             </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index a5646dc26..2ef411eaf 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -32,7 +32,7 @@
 
                 android:id="@+id/decrypt_file_browse"
                 android:clickable="true"
-                style="@style/SelectableItem">
+                android:background="?android:selectableItemBackground">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -81,7 +81,7 @@
                     android:minHeight="?android:attr/listPreferredItemHeight"
                     android:text="@string/btn_decrypt_verify_file"
                     android:clickable="true"
-                    style="@style/SelectableItem"
+                    android:background="?android:selectableItemBackground"
                     android:drawableRight="@drawable/ic_save_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 9d47009b9..debc1106f 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -75,7 +75,7 @@
             android:clickable="true"
             android:layout_marginLeft="32dp"
             android:paddingRight="4dp"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <LinearLayout
@@ -121,7 +121,7 @@
                 android:drawableRight="@drawable/ic_vpn_key_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
index 0f341b2d6..fb01a5ef0 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
@@ -48,7 +48,7 @@
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:clickable="true"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <TextView
@@ -79,7 +79,7 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry.xml b/OpenKeychain/src/main/res/layout/file_list_entry.xml
index fafdd1713..ca78ad161 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry.xml
@@ -56,5 +56,5 @@
             android:src="@drawable/ic_close_grey_24dp"
             android:clickable="true"
             android:layout_centerVertical="true"
-            style="@style/SelectableItem"/>
+        android:background="?android:selectableItemBackground"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index bab9e2e27..9b37766e9 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -43,7 +43,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:clickable="true"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
             <View
                 android:layout_width="1dp"
@@ -67,7 +67,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:clickable="true"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
 
@@ -87,7 +87,7 @@
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:gravity="center"
             android:clickable="true"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:layout_gravity="center_horizontal" />
 
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 6ac0b468c..2cba78f37 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -77,7 +77,7 @@
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:clickable="true"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
index a7234d848..1fc8cfdcb 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
@@ -31,7 +31,7 @@
             android:padding="8dp"
             android:src="@drawable/ic_search_grey_24dp"
             android:layout_gravity="center_vertical"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
         <View
             android:layout_width="1dip"
@@ -48,7 +48,7 @@
             android:padding="8dp"
             android:src="@drawable/ic_settings_grey_24dp"
             android:layout_gravity="center_vertical"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
index bde4dafc0..c1b9eb276 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:clickable="true"
-        style="@style/SelectableItem"
+        android:background="?android:selectableItemBackground"
         android:orientation="horizontal">
 
         <TextView
@@ -40,7 +40,7 @@
             android:padding="8dp"
             android:src="@drawable/ic_content_paste_grey_24dp"
             android:layout_gravity="center_vertical"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
index 9007d2149..80e59ad18 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:clickable="true"
-        style="@style/SelectableItem"
+        android:background="?android:selectableItemBackground"
         android:orientation="horizontal">
 
         <TextView
@@ -40,7 +40,7 @@
             android:padding="8dp"
             android:src="@drawable/ic_nfc_white_24dp"
             android:layout_gravity="center_vertical"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 595dcd77b..db0462c6d 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -60,7 +60,7 @@
             android:layout_gravity="center"
             android:src="@drawable/ic_repeat_grey_24dp"
             android:padding="12dp"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml
index 42baa6a0d..d509fbeec 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml
@@ -33,7 +33,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:clickable="true"
             android:onClick="noPassphrase"
-            style="@style/SelectableItem"/>
+            android:background="?android:selectableItemBackground"/>
 
         <View
             android:layout_width="match_parent"
@@ -51,7 +51,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:clickable="true"
             android:onClick="passphrase"
-            style="@style/SelectableItem"/>
+            android:background="?android:selectableItemBackground"/>
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
@@ -67,7 +67,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:clickable="true"
             android:onClick="startLockpattern"
-            style="@style/SelectableItem"/>
+            android:background="?android:selectableItemBackground"/>
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
@@ -83,7 +83,7 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:clickable="true"
             android:onClick="NFC"
-            style="@style/SelectableItem"/>
+            android:background="?android:selectableItemBackground"/>
 
     </LinearLayout>
 </ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index bafad173b..eb8547ade 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -51,7 +51,7 @@
                 android:layout_height="?android:attr/listPreferredItemHeight"
                 android:clickable="true"
                 android:paddingRight="4dp"
-                style="@style/SelectableItem"
+                android:background="?android:selectableItemBackground"
                 android:orientation="horizontal">
 
                 <TextView
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index 6b7390b27..6a0be9ce5 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -63,7 +63,7 @@
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:clickable="true"
-                    style="@style/SelectableItem" />
+                    android:background="?android:selectableItemBackground" />
 
             </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index 08be4ab05..789c7c774 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -211,7 +211,7 @@
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:clickable="true"
-                style="@style/SelectableItem"
+                android:background="?android:selectableItemBackground"
                 android:text="@string/btn_view_cert_key"
                 android:layout_weight="1"
                 android:drawableRight="@drawable/ic_person_grey_24dp"
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index ec26b4a76..6a21e0dc1 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -27,7 +27,7 @@
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <TextView
@@ -59,7 +59,7 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
 
@@ -103,7 +103,7 @@
             android:layout_width="match_parent"
             android:layout_height="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal">
 
             <TextView
@@ -133,7 +133,7 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
             <View
                 android:layout_width="1dip"
@@ -150,7 +150,7 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_repeat_grey_24dp"
                 android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
+                android:background="?android:selectableItemBackground" />
 
         </LinearLayout>
 
@@ -168,7 +168,7 @@
             android:layout_height="wrap_content"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:clickable="true"
-            style="@style/SelectableItem"
+            android:background="?android:selectableItemBackground"
             android:text="@string/key_view_action_upload"
             android:layout_weight="1"
             android:drawableRight="@drawable/ic_file_upload_grey_24dp"
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
index 28eef58a4..c9eb37f5e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:padding="8dp"
             android:src="@drawable/ic_close_grey_24dp"
-            style="@style/SelectableItem" />
+            android:background="?android:selectableItemBackground" />
 
     </FrameLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
index cd7a79663..1c55a1446 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -75,6 +75,6 @@
         android:padding="8dp"
         android:src="@drawable/ic_close_grey_24dp"
         android:layout_gravity="center_vertical"
-        style="@style/SelectableItem" />
+        android:background="?android:selectableItemBackground" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 59939d8fa..454d5f9c7 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -64,6 +64,8 @@
 
                 <LinearLayout
                     android:id='@+id/system_contact_layout'
+                    android:clickable="true"
+                    android:background="?android:selectableItemBackground"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index 8d8797bf0..9ac60c397 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -21,10 +21,6 @@
         <item name="android:textSize">14sp</item>
     </style>
 
-    <style name="SelectableItem">
-        <item name="android:background">@drawable/selector_transparent_button</item>
-    </style>
-
     <style name="FabMenuStyle">
         <item name="android:background">@drawable/fab_label_background</item>
         <item name="android:textColor">@color/white</item>