diff options
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 79b8dbb27..337ad73e0 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -56,14 +56,20 @@ <!-- CAMERA permission requested by ZXing library --> <!-- contact group --> - <uses-permission android:name="android.permission.GET_ACCOUNTS" /> + <!-- + AUTHENTICATE_ACCOUNTS and MANAGE_ACCOUNTS removed in Android >= 6, + see https://code.google.com/p/android-developer-preview/issues/detail?id=2592 + also READ_PROFILE, WRITE_PROFILE? + --> <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> - <uses-permission android:name="android.permission.READ_CONTACTS" /> - <uses-permission android:name="android.permission.WRITE_CONTACTS" /> <uses-permission android:name="android.permission.READ_PROFILE" /> <uses-permission android:name="android.permission.WRITE_PROFILE" /> + <uses-permission android:name="android.permission.GET_ACCOUNTS" /> + <uses-permission android:name="android.permission.READ_CONTACTS" /> + <uses-permission android:name="android.permission.WRITE_CONTACTS" /> + <!-- storage group --> <!-- No need on >= Android 4.4 for WRITE_EXTERNAL_STORAGE, because we use Storage Access Framework, @@ -840,10 +846,10 @@ <meta-data android:name="android.content.SyncAdapter" - android:resource="@xml/sync_adapter_desc" /> + android:resource="@xml/sync_adapter_contacts" /> <meta-data android:name="android.provider.CONTACTS_STRUCTURE" - android:resource="@xml/custom_pgp_contacts_structure" /> + android:resource="@xml/sync_adapter_contacts_structure" /> </service> <service @@ -857,7 +863,7 @@ <meta-data android:name="android.content.SyncAdapter" - android:resource="@xml/keyserver_sync_adapter_desc" /> + android:resource="@xml/sync_adapter_keys" /> </service> <!-- Storage Provider for temporary decrypted files --> |