From c5bcbce28fa45d8d1e5714d111f3cc24a2c99d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 23 Nov 2015 09:06:12 +0100
Subject: Show notification when READ_CONTACTS permission is denied in sync
 service, hide linked contact card if permission is denied

---
 .../src/main/res/xml/cloud_search_preferences.xml  | 21 +++++++++++++
 .../src/main/res/xml/cloud_search_prefs.xml        | 21 -------------
 .../main/res/xml/custom_pgp_contacts_structure.xml |  6 ----
 .../main/res/xml/keyserver_sync_adapter_desc.xml   |  8 -----
 .../src/main/res/xml/proxy_preferences.xml         | 34 ++++++++++++++++++++++
 OpenKeychain/src/main/res/xml/proxy_prefs.xml      | 34 ----------------------
 .../src/main/res/xml/sync_adapter_contacts.xml     |  8 +++++
 .../res/xml/sync_adapter_contacts_structure.xml    |  6 ++++
 .../src/main/res/xml/sync_adapter_desc.xml         |  8 -----
 .../src/main/res/xml/sync_adapter_keys.xml         |  8 +++++
 10 files changed, 77 insertions(+), 77 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/xml/cloud_search_preferences.xml
 delete mode 100644 OpenKeychain/src/main/res/xml/cloud_search_prefs.xml
 delete mode 100644 OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml
 delete mode 100644 OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml
 create mode 100644 OpenKeychain/src/main/res/xml/proxy_preferences.xml
 delete mode 100644 OpenKeychain/src/main/res/xml/proxy_prefs.xml
 create mode 100644 OpenKeychain/src/main/res/xml/sync_adapter_contacts.xml
 create mode 100644 OpenKeychain/src/main/res/xml/sync_adapter_contacts_structure.xml
 delete mode 100644 OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
 create mode 100644 OpenKeychain/src/main/res/xml/sync_adapter_keys.xml

(limited to 'OpenKeychain/src/main/res/xml')

diff --git a/OpenKeychain/src/main/res/xml/cloud_search_preferences.xml b/OpenKeychain/src/main/res/xml/cloud_search_preferences.xml
new file mode 100644
index 000000000..85d6a6bca
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/cloud_search_preferences.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+        android:defaultValue="true"
+        android:key="search_keyserver_pref"
+        android:summary="@string/pref_keyserver_summary"
+        android:title="@string/pref_keyserver" />
+
+    <PreferenceScreen
+        android:dependency="search_keyserver_pref"
+        android:key="keyServers"
+        android:persistent="false"
+        android:title="@string/label_keyservers" />
+
+    <SwitchPreference
+        android:defaultValue="true"
+        android:key="search_keybase_pref"
+        android:summary="@string/pref_keybase_summary"
+        android:title="@string/pref_keybase" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml
deleted file mode 100644
index 85d6a6bca..000000000
--- a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
-        android:defaultValue="true"
-        android:key="search_keyserver_pref"
-        android:summary="@string/pref_keyserver_summary"
-        android:title="@string/pref_keyserver" />
-
-    <PreferenceScreen
-        android:dependency="search_keyserver_pref"
-        android:key="keyServers"
-        android:persistent="false"
-        android:title="@string/label_keyservers" />
-
-    <SwitchPreference
-        android:defaultValue="true"
-        android:key="search_keybase_pref"
-        android:summary="@string/pref_keybase_summary"
-        android:title="@string/pref_keybase" />
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml
deleted file mode 100644
index 39dd8bc91..000000000
--- a/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
-    <ContactsDataKind
-        android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"
-        android:detailColumn="data1" />
-</ContactsSource>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml
deleted file mode 100644
index 3923fae59..000000000
--- a/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="@string/provider_content_authority"
-    android:accountType="@string/account_type"
-    android:supportsUploading="false"
-    android:userVisible="true"
-    android:allowParallelSyncs="false"
-    android:isAlwaysSyncable="true" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/xml/proxy_preferences.xml b/OpenKeychain/src/main/res/xml/proxy_preferences.xml
new file mode 100644
index 000000000..fbb83eb12
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/proxy_preferences.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreference
+            android:key="useTorProxy"
+            android:persistent="true"
+            android:title="@string/pref_proxy_tor_title"
+            android:summary="@string/pref_proxy_tor_summary" />
+    <SwitchPreference
+            android:key="useNormalProxy"
+            android:persistent="true"
+            android:title="@string/pref_proxy_normal_title" />
+    <EditTextPreference
+        android:key="proxyHost"
+        android:persistent="true"
+        android:defaultValue="127.0.0.1"
+        android:title="@string/pref_proxy_host_title"
+        android:cursorVisible="true"
+        android:textCursorDrawable="@null"
+        android:inputType="textEmailAddress"/>
+    <EditTextPreference
+            android:key="proxyPort"
+            android:defaultValue="8118"
+            android:persistent="true"
+            android:title="@string/pref_proxy_port_title"
+            android:textCursorDrawable="@null"
+            android:inputType="number" />
+    <ListPreference
+            android:entries="@array/pref_proxy_type_entries"
+            android:entryValues="@array/pref_proxy_type_values"
+            android:defaultValue="proxyHttp"
+            android:key="proxyType"
+            android:persistent="true"
+            android:title="@string/pref_proxy_type_title" />
+</PreferenceScreen>
diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml
deleted file mode 100644
index fbb83eb12..000000000
--- a/OpenKeychain/src/main/res/xml/proxy_prefs.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
-            android:key="useTorProxy"
-            android:persistent="true"
-            android:title="@string/pref_proxy_tor_title"
-            android:summary="@string/pref_proxy_tor_summary" />
-    <SwitchPreference
-            android:key="useNormalProxy"
-            android:persistent="true"
-            android:title="@string/pref_proxy_normal_title" />
-    <EditTextPreference
-        android:key="proxyHost"
-        android:persistent="true"
-        android:defaultValue="127.0.0.1"
-        android:title="@string/pref_proxy_host_title"
-        android:cursorVisible="true"
-        android:textCursorDrawable="@null"
-        android:inputType="textEmailAddress"/>
-    <EditTextPreference
-            android:key="proxyPort"
-            android:defaultValue="8118"
-            android:persistent="true"
-            android:title="@string/pref_proxy_port_title"
-            android:textCursorDrawable="@null"
-            android:inputType="number" />
-    <ListPreference
-            android:entries="@array/pref_proxy_type_entries"
-            android:entryValues="@array/pref_proxy_type_values"
-            android:defaultValue="proxyHttp"
-            android:key="proxyType"
-            android:persistent="true"
-            android:title="@string/pref_proxy_type_title" />
-</PreferenceScreen>
diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_contacts.xml b/OpenKeychain/src/main/res/xml/sync_adapter_contacts.xml
new file mode 100644
index 000000000..a134fdebe
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/sync_adapter_contacts.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
+    android:contentAuthority="com.android.contacts"
+    android:accountType="@string/account_type"
+    android:supportsUploading="false"
+    android:userVisible="true"
+    android:allowParallelSyncs="false"
+    android:isAlwaysSyncable="true" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_contacts_structure.xml b/OpenKeychain/src/main/res/xml/sync_adapter_contacts_structure.xml
new file mode 100644
index 000000000..39dd8bc91
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/sync_adapter_contacts_structure.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
+    <ContactsDataKind
+        android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"
+        android:detailColumn="data1" />
+</ContactsSource>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
deleted file mode 100644
index a134fdebe..000000000
--- a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="com.android.contacts"
-    android:accountType="@string/account_type"
-    android:supportsUploading="false"
-    android:userVisible="true"
-    android:allowParallelSyncs="false"
-    android:isAlwaysSyncable="true" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_keys.xml b/OpenKeychain/src/main/res/xml/sync_adapter_keys.xml
new file mode 100644
index 000000000..3923fae59
--- /dev/null
+++ b/OpenKeychain/src/main/res/xml/sync_adapter_keys.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
+    android:contentAuthority="@string/provider_content_authority"
+    android:accountType="@string/account_type"
+    android:supportsUploading="false"
+    android:userVisible="true"
+    android:allowParallelSyncs="false"
+    android:isAlwaysSyncable="true" />
\ No newline at end of file
-- 
cgit v1.2.3