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

Merge pull request #649 from mar-v-in/automatic-contact-discovery

Browse Source 
Automatic contact discovery and more
This commit is contained in:
Dominik Schürmann
2014-06-06 22:57:51 +02:00
parent d2430fe0e3 5601f1b76f
commit a0f43febbb
22 changed files with 639 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -520,5 +520,7 @@
<string name="can_sign_not">cannot sign</string>
<string name="error_encoding">Encoding error</string>
<string name="error_no_encrypt_subkey">No encryption subkey available!</string>
<string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.\nFor more information, see Help.</string>
<string name="contact_show_key">Show key (%s)</string>
</resources>

6
OpenKeychain/src/main/res/xml/account_desc.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
android:accountType="org.sufficientlysecure.keychain"
android:icon="@drawable/icon"
android:label="@string/app_name"/>

5
OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
<ContactsDataKind android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"
android:detailColumn="data1"/>
</ContactsSource>

6
OpenKeychain/src/main/res/xml/sync_adapter_desc.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="com.android.contacts"
android:accountType="org.sufficientlysecure.keychain"
android:supportsUploading="false"
android:userVisible="true"/>