diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-11 17:12:07 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-11 17:12:07 +0200 |
| commit | baea31847022ce88906a0190638ddffed82c8a7c (patch) | |
| tree | cdd080f224a82a377295a02f64f62fb7534012cb /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | c8790f404aaf76db967a16c8fea79eb6f90c8bce (diff) | |
| parent | 98ba424576946d2f5ef529c5506113b71b0266c4 (diff) | |
| download | open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.gz open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.bz2 open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.zip | |
Merge remote-tracking branch 'origin/master' into v/multi-decrypt
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index f10547a0b..75d94ae69 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -2,9 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="org.sufficientlysecure.keychain" - android:installLocation="auto" - android:versionCode="32300" - android:versionName="3.2.3"> + android:installLocation="auto"> <!-- General remarks @@ -50,9 +48,9 @@ android:name="android.hardware.screen.portrait" android:required="false" /> - <permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" /> + <permission android:name="${applicationId}.WRITE_TEMPORARY_STORAGE" /> - <uses-permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" /> + <uses-permission android:name="${applicationId}.WRITE_TEMPORARY_STORAGE" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> @@ -724,13 +722,10 @@ <service android:name=".service.KeychainService" android:exported="false" /> - <service - android:name=".service.CloudImportService" - android:exported="false" /> <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) --> @@ -808,9 +803,9 @@ <!-- Storage Provider for temporary decrypted files --> <provider android:name=".provider.TemporaryStorageProvider" - android:authorities="org.sufficientlysecure.keychain.tempstorage" + android:authorities="${applicationId}.tempstorage" android:exported="true" - android:writePermission="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" /> + android:writePermission="${applicationId}.WRITE_TEMPORARY_STORAGE" /> </application> |