aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-17 13:29:54 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-17 13:29:54 +0100
commitdbcb7a9e10ec4418337e0dce1b4227cbc3b7bd4a (patch)
tree069faf020f7b39adc3d294edb7871feeac522c9f /OpenKeychain/src
parent7f2a89e125ce89446da5cc34c5cc7298b255515a (diff)
downloadopen-keychain-dbcb7a9e10ec4418337e0dce1b4227cbc3b7bd4a.tar.gz
open-keychain-dbcb7a9e10ec4418337e0dce1b4227cbc3b7bd4a.tar.bz2
open-keychain-dbcb7a9e10ec4418337e0dce1b4227cbc3b7bd4a.zip
Manifest cleanup
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml21
1 files changed, 12 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index cd4dc6940..91c84fb18 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -414,7 +414,7 @@
<activity
android:name=".ui.ViewKeyAdvActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
- android:label="@string/title_advanced_key_info"/>
+ android:label="@string/title_advanced_key_info" />
<activity
android:name=".ui.SettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
@@ -657,6 +657,10 @@
android:value=".ui.MainActivity" />
</activity>
<activity
+ android:name=".ui.LogDisplayActivity"
+ android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+ android:label="@string/title_log_display" />
+ <activity
android:name=".ui.ConsolidateDialogActivity"
android:theme="@android:style/Theme.NoDisplay" />
<activity
@@ -743,13 +747,10 @@
</intent-filter>
</service>
- <activity
- android:name=".ui.LogDisplayActivity"
- android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
- android:label="@string/title_log_display"
- android:exported="false" />
-
- <service android:name=".service.DummyAccountService">
+ <!-- Contact Sync services -->
+ <service
+ android:name=".service.DummyAccountService"
+ tools:ignore="ExportedService">
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator" />
</intent-filter>
@@ -761,7 +762,8 @@
<service
android:name=".service.ContactSyncAdapterService"
android:exported="true"
- android:process=":sync">
+ android:process=":sync"
+ tools:ignore="ExportedService">
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>
@@ -774,6 +776,7 @@
android:resource="@xml/custom_pgp_contacts_structure" />
</service>
+ <!-- Storage Provider for temporary decrypted files -->
<provider
android:name=".provider.TemporaryStorageProvider"
android:authorities="org.sufficientlysecure.keychain.tempstorage"