cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into v/multi-decrypt

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-06-11 17:12:07 +02:00
parent c8790f404a 98ba424576
commit baea318470
145 changed files with 254 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenKeychain/src/main/AndroidManifest.xml
View File

@@ -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>