diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
19 files changed, 37 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..b6e040adb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..b6e040adb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor_off.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor_off.png Binary files differnew file mode 100644 index 000000000..e72d7ca4b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor_off.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..49b475fcb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..49b475fcb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor_off.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor_off.png Binary files differnew file mode 100644 index 000000000..9d6447799 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor_off.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..e76c09f8d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..e76c09f8d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_tor_off.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_tor_off.png Binary files differnew file mode 100644 index 000000000..5b1777c8e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_tor_off.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..5fdedd3b9 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..5fdedd3b9 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_tor_off.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_tor_off.png Binary files differnew file mode 100644 index 000000000..2fb280a1b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_tor_off.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..306b94793 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..306b94793 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_tor_off.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_tor_off.png Binary files differnew file mode 100644 index 000000000..317c86717 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_tor_off.png diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 72406aaab..643f41004 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -51,6 +51,7 @@ <string name="section_passphrase_cache">"Password/PIN Handling"</string> <string name="section_proxy_settings">"Proxy Settings"</string> <string name="section_gui">"Interface"</string> + <string name="section_sync_settings">"Sync Settings"</string> <string name="section_certify">"Confirm"</string> <string name="section_actions">"Actions"</string> <string name="section_share_key">"Key"</string> @@ -175,6 +176,15 @@ <string name="pref_keybase">"keybase.io"</string> <string name="pref_keybase_summary">"Search keys on keybase.io"</string> + <string name="label_sync_settings_keyserver_title">"Automatically update keys"</string> + <string name="label_sync_settings_keyserver_summary_on">"Keys older than a week are updated from the preferred keyserver"</string> + <string name="label_sync_settings_keyserver_summary_off">"Keys not automatically updated"</string> + <string name="label_sync_settings_contacts_title">"Sync Contacts with Keys"</string> + <string name="label_sync_settings_contacts_summary_on">"Keys linked to contacts with matching emails, happens completely offline"</string> + <string name="label_sync_settings_contacts_summary_off">"New keys will not be linked to contacts"</string> + <!-- label shown in Android settings under the OpenKeychain account --> + <string name="keyserver_sync_settings_title">"Automatically update keys"</string> + <!-- Proxy Preferences --> <string name="pref_proxy_tor_title">"Enable Tor"</string> <string name="pref_proxy_tor_summary">"Requires Orbot to be installed"</string> @@ -1304,7 +1314,6 @@ </plurals> <string name="msg_revoke_error_empty">"Nothing to revoke!"</string> - <string name="msg_revoke_error_multi_secret">"Secret keys can only be revoked individually!"</string> <string name="msg_revoke_error_not_found">"Cannot find key to revoke!"</string> <string name="msg_revoke_key">"Revoking key %s"</string> <string name="msg_revoke_key_fail">"Failed revoking key"</string> @@ -1351,6 +1360,12 @@ <string name="passp_cache_notif_clear">"Clear Passwords"</string> <string name="passp_cache_notif_pwd">"Password"</string> + <!-- Keyserver sync --> + <string name="keyserver_sync_orbot_notif_title">"Sync From Cloud requires Orbot"</string> + <string name="keyserver_sync_orbot_notif_msg">"Tap to start orbot"</string> + <string name="keyserver_sync_orbot_notif_start">"Start Orbot"</string> + <string name="keyserver_sync_orbot_notif_ignore">"Direct"</string> + <!-- First Time --> <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string> <string name="first_time_create_key">"Create my key"</string> diff --git a/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml new file mode 100644 index 000000000..3923fae59 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/keyserver_sync_adapter_desc.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" + android:contentAuthority="@string/provider_content_authority" + android:accountType="@string/account_type" + android:supportsUploading="false" + android:userVisible="true" + android:allowParallelSyncs="false" + android:isAlwaysSyncable="true" />
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index b7512b062..606196c1e 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -11,4 +11,7 @@ <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment" android:title="@string/section_proxy_settings" /> + <header + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncSettingsFragment" + android:title="@string/section_sync_settings" /> </preference-headers> diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml new file mode 100644 index 000000000..e870be9ec --- /dev/null +++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml @@ -0,0 +1,10 @@ +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <CheckBoxPreference + android:key="syncKeyserver" + android:persistent="false" + android:title="@string/label_sync_settings_keyserver_title"/> + <CheckBoxPreference + android:key="syncContacts" + android:persistent="false" + android:title="@string/label_sync_settings_contacts_title" /> +</PreferenceScreen> |
