moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

reorder manifest

Browse Source
This commit is contained in:
Dominik Schürmann 2013-09-15 15:23:13 +02:00
parent 312b735fbd
commit 468b7181e9
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenPGP-Keychain/AndroidManifest.xml
View File

@ -350,6 +350,7 @@
android:name=".ui.HelpActivity" android:name=".ui.HelpActivity"
android:label="@string/title_help" /> android:label="@string/title_help" />
<!-- Internal services/content provider (not exported) -->
<service <service
android:name=".service.PassphraseCacheService" android:name=".service.PassphraseCacheService"
android:exported="false" android:exported="false"
@ -363,15 +364,7 @@
android:authorities="org.sufficientlysecure.keychain.provider" android:authorities="org.sufficientlysecure.keychain.provider"
android:exported="false" /> android:exported="false" />
<!-- TODO: authority! Make this API with content provider uris --> <!-- Internal classes of OpenPGP (not exported) -->
<!-- <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) -->
<activity <activity
android:name="org.sufficientlysecure.keychain.service.remote.RemoteServiceActivity" android:name="org.sufficientlysecure.keychain.service.remote.RemoteServiceActivity"
android:exported="false" android:exported="false"
@ -390,7 +383,6 @@
android:exported="false" /> android:exported="false" />
<!-- OpenPGP Remote API --> <!-- OpenPGP Remote API -->
<service <service
android:name="org.sufficientlysecure.keychain.service.remote.OpenPgpService" android:name="org.sufficientlysecure.keychain.service.remote.OpenPgpService"
android:enabled="true" android:enabled="true"
@ -420,6 +412,12 @@
android:name="api_version" android:name="api_version"
android:value="1" /> android:value="1" />
</service> </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> </application>
</manifest> </manifest>

4
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java
View File

@ -422,8 +422,8 @@ public class OpenPgpService extends RemoteService {
OpenPgpSignatureResult sigResult = null; OpenPgpSignatureResult sigResult = null;
if (signature) { if (signature) {
long signatureKeyId = outputBundle // long signatureKeyId = outputBundle
.getLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID); // .getLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID);
String signatureUserId = outputBundle String signatureUserId = outputBundle
.getString(KeychainIntentService.RESULT_SIGNATURE_USER_ID); .getString(KeychainIntentService.RESULT_SIGNATURE_USER_ID);
boolean signatureSuccess = outputBundle boolean signatureSuccess = outputBundle