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

Fix decrypt by searching for secret key based on keyId not masterKeyId, new ApgService for RPC

Browse Source
This commit is contained in:
Dominik
2012-11-14 16:02:11 +01:00
parent 8aac7ea7be
commit d61e00ae6c
40 changed files with 2201 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
org_apg/AndroidManifest.xml
View File

@@ -336,7 +336,21 @@
android:label="@string/title_help" />
<service android:name=".service.PassphraseCacheService" />
<service android:name=".service.ApgService" />
<service android:name=".service.ApgIntentService" />
<service
android:name=".service.ApgService"
android:enabled="true"
android:exported="true"
android:permission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS"
android:process=":remote" >
<intent-filter>
<action android:name="org.thialfihar.android.apg.service.IApgService" />
</intent-filter>
<meta-data
android:name="api_version"
android:value="3" />
</service>
<provider
android:name=".provider.ApgProvider"
@@ -344,31 +358,34 @@
android:readPermission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" />
<!-- DEPRECATED: -->
<!-- <provider -->
<!-- android:name=".deprecated.DataProvider" -->
<!-- android:authorities="org.thialfihar.android.apg.provider" -->
<!-- android:readPermission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" /> -->
<!-- <provider -->
<!-- android:name=".deprecated.DataProvider" -->
<!-- android:authorities="org.thialfihar.android.apg.provider" -->
<!-- android:readPermission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" /> -->
<!-- TODO: need to be moved into new service model -->
<!-- <service -->
<!-- android:name=".deprecated.ApgService2" -->
<!-- android:enabled="true" -->
<!-- android:exported="true" -->
<!-- android:permission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" -->
<!-- android:process=":remote" > -->
<!-- <intent-filter> -->
<!-- <action android:name="org.thialfihar.android.apg.service.IApgService2" /> -->
<!-- </intent-filter> -->
<!-- <service -->
<!-- android:name=".deprecated.ApgService2" -->
<!-- android:enabled="true" -->
<!-- android:exported="true" -->
<!-- android:permission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" -->
<!-- android:process=":remote" > -->
<!-- <intent-filter> -->
<!-- <action android:name="org.thialfihar.android.apg.service.IApgService2" /> -->
<!-- </intent-filter> -->
<!-- <meta-data -->
<!-- android:name="api_version" -->
<!-- android:value="2" /> -->
<!-- </service> -->
<!-- <provider -->
<!-- android:name=".deprecated.ApgServiceBlobProvider" -->
<!-- android:authorities="org.thialfihar.android.apg.provider.apgserviceblobprovider" -->
<!-- android:permission="org.thialfihar.android.apg.permission.STORE_BLOBS" /> -->
<!-- <meta-data -->
<!-- android:name="api_version" -->
<!-- android:value="2" /> -->
<!-- </service> -->
<!-- <provider -->
<!-- android:name=".deprecated.ApgServiceBlobProvider" -->
<!-- android:authorities="org.thialfihar.android.apg.provider.apgserviceblobprovider" -->
<!-- android:permission="org.thialfihar.android.apg.permission.STORE_BLOBS" /> -->
</application>
</manifest>