diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
| commit | 4afd6b881edfd0bc404734a4e8959a7a0fa785a7 (patch) | |
| tree | 63a051fb595d168f8ddbfd76a51bb2319889d40b /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | ba7d8a58673d55660bc7faf68970229f17458514 (diff) | |
| parent | db39b779c984a758e13adc16837893509f3b364f (diff) | |
| download | open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.gz open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.bz2 open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 3030cdbf2..fc6a9e81e 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" package="org.sufficientlysecure.keychain" android:installLocation="auto" - android:versionCode="31201" - android:versionName="3.2beta1"> + android:versionCode="31202" + android:versionName="3.2beta2"> <!-- General remarks @@ -65,6 +65,7 @@ <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" /> <!-- android:allowBackup="false": Don't allow backup over adb backup or other apps! --> <application @@ -716,6 +717,12 @@ android:launchMode="singleTop" android:process=":remote_api" /> <activity + android:name=".remote.ui.SelectSignKeyIdActivity" + android:exported="false" + android:label="@string/app_name" + android:launchMode="singleTop" + android:process=":remote_api" /> + <activity android:name=".remote.ui.AppSettingsActivity" android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:exported="false"> |