diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-11 00:31:41 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-11 00:31:41 +0200 |
commit | 6749b03d9a7e0ab84934789adcb59d848ffb8b46 (patch) | |
tree | 6d1109f66a0067fdfd59c080ecec04c130951717 /OpenKeychain/src/main | |
parent | d16b09b2a6be41319b993c27e69b85067a7f1c46 (diff) | |
download | open-keychain-6749b03d9a7e0ab84934789adcb59d848ffb8b46.tar.gz open-keychain-6749b03d9a7e0ab84934789adcb59d848ffb8b46.tar.bz2 open-keychain-6749b03d9a7e0ab84934789adcb59d848ffb8b46.zip |
Fix debug/release build separation
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 884aa6544..89bdc49ac 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -722,7 +722,7 @@ <provider android:name=".provider.KeychainProvider" - android:authorities="org.sufficientlysecure.keychain.provider" + android:authorities="${applicationId}.provider" android:exported="false" /> <!-- Internal classes of the remote APIs (not exported) --> @@ -800,7 +800,7 @@ <!-- Storage Provider for temporary decrypted files --> <provider android:name=".provider.TemporaryStorageProvider" - android:authorities="@string/tempstorage_authority" + android:authorities="${applicationId}.tempstorage" android:exported="true" android:writePermission="${applicationId}.WRITE_TEMPORARY_STORAGE" /> diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index f0e922a2f..b6e6a819f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -39,8 +39,8 @@ public final class Constants { public static final String ACCOUNT_TYPE = BuildConfig.ACCOUNT_TYPE; public static final String CUSTOM_CONTACT_DATA_MIME_TYPE = "vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"; - public static final String PROVIDER_AUTHORITY = BuildConfig.PROVIDER_AUTHORITY; - public static final String TEMPSTORAGE_AUTHORITY = BuildConfig.TEMPSTORAGE_AUTHORITY; + public static final String PROVIDER_AUTHORITY = BuildConfig.APPLICATION_ID + ".provider"; + public static final String TEMPSTORAGE_AUTHORITY = BuildConfig.APPLICATION_ID + ".tempstorage"; // as defined in http://tools.ietf.org/html/rfc3156, section 7 public static final String NFC_MIME = "application/pgp-keys"; |