diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-15 15:23:13 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-15 15:23:13 +0200 |
| commit | 468b7181e92689831d5414abf027794570a45125 (patch) | |
| tree | 00856ae46059b1ad92a6ea69feea2af7f71dc0c8 | |
| parent | 312b735fbd0303a49e3d2efbefd2076c432f276f (diff) | |
| download | open-keychain-468b7181e92689831d5414abf027794570a45125.tar.gz open-keychain-468b7181e92689831d5414abf027794570a45125.tar.bz2 open-keychain-468b7181e92689831d5414abf027794570a45125.zip | |
reorder manifest
| -rw-r--r-- | OpenPGP-Keychain/AndroidManifest.xml | 18 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java | 4 |
2 files changed, 10 insertions, 12 deletions
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml index 6febe57f4..b9410030e 100644 --- a/OpenPGP-Keychain/AndroidManifest.xml +++ b/OpenPGP-Keychain/AndroidManifest.xml @@ -350,6 +350,7 @@ android:name=".ui.HelpActivity" android:label="@string/title_help" /> + <!-- Internal services/content provider (not exported) --> <service android:name=".service.PassphraseCacheService" android:exported="false" @@ -363,15 +364,7 @@ android:authorities="org.sufficientlysecure.keychain.provider" android:exported="false" /> - <!-- TODO: authority! Make this API with content provider uris --> - <!-- <provider --> - <!-- android:name="org.sufficientlysecure.keychain.provider.KeychainServiceBlobProvider" --> - <!-- android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider" --> - <!-- android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" /> --> - - - <!-- OpenPGP Remote API internal classes (not exported) --> - + <!-- Internal classes of OpenPGP (not exported) --> <activity android:name="org.sufficientlysecure.keychain.service.remote.RemoteServiceActivity" android:exported="false" @@ -390,7 +383,6 @@ android:exported="false" /> <!-- OpenPGP Remote API --> - <service android:name="org.sufficientlysecure.keychain.service.remote.OpenPgpService" android:enabled="true" @@ -420,6 +412,12 @@ android:name="api_version" android:value="1" /> </service> + + <!-- TODO: authority! Make this API with content provider uris --> + <!-- <provider --> + <!-- android:name="org.sufficientlysecure.keychain.provider.KeychainServiceBlobProvider" --> + <!-- android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider" --> + <!-- android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" /> --> </application> </manifest>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java index ed2c12419..3a8c6059e 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java @@ -422,8 +422,8 @@ public class OpenPgpService extends RemoteService { OpenPgpSignatureResult sigResult = null; if (signature) { - long signatureKeyId = outputBundle - .getLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID); + // long signatureKeyId = outputBundle + // .getLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID); String signatureUserId = outputBundle .getString(KeychainIntentService.RESULT_SIGNATURE_USER_ID); boolean signatureSuccess = outputBundle |