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

ditch keybase

Browse Source
This commit is contained in:
Vincent Breitmoser
2019-11-15 11:47:46 +01:00
parent 5e0a17b966
commit d3e48db520
35 changed files with 41 additions and 1344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -205,11 +205,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:id="@+id/view_key_keybase_fragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!--
placeholder to improve the scrolling.
Somehow the content must be large enough to enable scrolling on NestedScrollView

81
OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml
View File

@@ -1,81 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
card_view:cardBackgroundColor="?attr/colorCardViewBackground"
card_view:cardCornerRadius="4dp"
card_view:cardElevation="2dp"
card_view:cardUseCompatPadding="true">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
style="@style/CardViewHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/section_keybase_proofs" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp">
<TextView
android:id="@+id/view_key_trust_cloud_narrative"
style="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="14dp"
android:layout_marginLeft="8dp"
android:layout_weight="1" />
<TableLayout
android:id="@+id/view_key_proof_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/view_key_proof_verify_header"
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_weight="1"
android:text="@string/section_proof_details" />
<TextView
android:id="@+id/view_key_proof_verify_detail"
style="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="14dp"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>

19
OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="match_parent">
<TextView
android:id="@+id/proof_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dip"
android:text="1."
style="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/proof_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="6dip"
android:text="Posts to twitter as Timbray"
style="?android:attr/textAppearanceSmall" />
</TableRow>

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

@@ -46,12 +46,11 @@
<string name="section_user_ids">"Identities"</string>
<string name="section_security_token">"Security Token"</string>
<string name="section_linked_system_contact">"Linked System Contact"</string>
<string name="section_keybase_proofs">"Keybase.io Proofs"</string>
<string name="section_should_you_trust">"Should you trust this key?"</string>
<string name="section_proof_details">Proof verification</string>
<string name="section_keys">"Subkeys"</string>
<string name="section_cloud_search">"Key Search"</string>
<string name="section_cloud_search_summary">"Keyserver, keybase.io"</string>
<string name="section_cloud_search_summary">"Keyserver"</string>
<string name="section_passphrase_cache">"Passwords and PINs"</string>
<string name="section_passphrase_cache_summary">"Handling"</string>
<string name="section_proxy_settings">"Network Anonymity"</string>
@@ -212,8 +211,6 @@
<string name="pref_keyserver">"OpenPGP keyservers"</string>
<string name="pref_keyserver_summary">"Search keys on selected OpenPGP keyservers (HKP protocol)"</string>
<string name="pref_keybase">"keybase.io"</string>
<string name="pref_keybase_summary">"Search keys on keybase.io"</string>
<string name="pref_facebook">"Facebook"</string>
<string name="pref_facebook_summary">"Search keys on Facebook by username"</string>
<string name="pref_wkd">"Web Key Directory"</string>
@@ -232,8 +229,6 @@
<string name="label_experimental_settings_desc_title">"Warning"</string>
<string name="label_experimental_settings_desc_summary">"These features are not yet finished or results of user experience/security research. Thus, don't rely on their security and please don't report issues you encounter!"</string>
<string name="label_experimental_settings_keybase_title">"Keybase.io proofs"</string>
<string name="label_experimental_settings_keybase_summary">"Contact keybase.io for key proofs and show them every time a key is displayed"</string>
<string name="label_experimental_settings_theme_summary">"(The icons and many screens are not yet adjusted accordingly for the dark theme)"</string>
<string name="label_settings_analytics_title">Allow anonymous usage statistics</string>
@@ -724,7 +719,6 @@
<string name="key_view_tab_share">"Share"</string>
<string name="key_view_tab_keys">"Subkeys"</string>
<string name="key_view_tab_certs">"Certificates"</string>
<string name="key_view_tab_keybase">"Keybase.io"</string>
<string name="user_id_info_revoked_title">"Revoked"</string>
<string name="user_id_info_revoked_text">"This identity has been revoked by the key owner. It is no longer valid."</string>
<string name="user_id_info_certified_title">"Confirmed"</string>
@@ -735,37 +729,6 @@
<!-- Key trust -->
<string name="key_trust_no_cloud_evidence">"No proof from the Internet on this key’s trustworthiness."</string>
<string name="key_trust_start_cloud_search">"Start search"</string>
<string name="key_trust_results_prefix">"Keybase.io offers “proofs” which assert that the owner of this key: "</string>
<!-- keybase proof stuff -->
<string name="keybase_narrative_twitter">"Posts to Twitter as %s"</string>
<string name="keybase_narrative_github">"Is known on GitHub as %s"</string>
<string name="keybase_narrative_dns">"Controls the domain name(s) %s"</string>
<string name="keybase_narrative_web_site">"Can post to the Web site(s) %s"</string>
<string name="keybase_narrative_reddit">"Posts to Reddit as %s"</string>
<string name="keybase_narrative_coinbase">"Is known on Coinbase as %s"</string>
<string name="keybase_narrative_hackernews">"Posts to Hacker News as %s"</string>
<string name="keybase_narrative_unknown">"Unknown proof type %s"</string>
<string name="keybase_proof_failure">"Unfortunately this proof cannot be verified."</string>
<string name="keybase_unknown_proof_failure">"Unrecognized problem with proof checker"</string>
<string name="keybase_problem_fetching_evidence">"Problem with proof"</string>
<string name="keybase_key_mismatch">"Key fingerprint doesn’t match that in proof post"</string>
<string name="keybase_dns_query_failure">"DNS TXT Record retrieval failed"</string>
<string name="keybase_no_prover_found">"No proof checker found for"</string>
<string name="keybase_message_payload_mismatch">"Decrypted proof post does not match expected value"</string>
<string name="keybase_message_fetching_data">"Fetching proof"</string>
<string name="keybase_proof_succeeded">"This proof has been verified!"</string>
<string name="keybase_a_post">"A post"</string>
<string name="keybase_fetched_from">"fetched from"</string>
<string name="keybase_for_the_domain">"for the domain"</string>
<string name="keybase_contained_signature">"contains a message which could only have been created by the owner of this key."</string>
<string name="keybase_twitter_proof">"A tweet"</string>
<string name="keybase_dns_proof">"A DNS TXT record"</string>
<string name="keybase_web_site_proof">"A text file"</string>
<string name="keybase_github_proof">"A gist"</string>
<string name="keybase_reddit_proof">"A JSON file"</string>
<string name="keybase_reddit_attribution">"attributed by Reddit to"</string>
<string name="keybase_verify">"Verify"</string>
<!-- Edit key -->
<string name="edit_key_action_change_passphrase">"Change Password"</string>
@@ -1334,7 +1297,6 @@
<string name="msg_import_fetch_error_not_found">"Key not found!"</string>
<string name="msg_import_fetch_error_keyserver">"Could not retrieve key from keyservers: %s"</string>
<string name="msg_import_fetch_error_keyserver_secret">"Cannot import secret key from keyserver!"</string>
<string name="msg_import_fetch_keybase">"Retrieving from keybase.io: %s"</string>
<string name="msg_import_fetch_facebook">"Retrieving from Facebook: %s"</string>
<string name="msg_import_fetch_keyserver">"Retrieving from keyserver: %s"</string>
<string name="msg_import_fetch_keyserver_ok">"Key retrieval successful"</string>
@@ -1437,15 +1399,6 @@
<string name="msg_download_query_failed">"An error occurred when searching for keys."</string>
<!-- Messages for Keybase Verification operation -->
<string name="msg_keybase_verification">"Attempting keybase verification for %s"</string>
<string name="msg_keybase_error_no_prover">"No proof checker found for %s"</string>
<string name="msg_keybase_error_fetching_evidence">"Problem with fetching proof"</string>
<string name="msg_keybase_error_key_mismatch">"Key fingerprint doesn’t match that in proof post"</string>
<string name="msg_keybase_error_dns_fail">"DNS TXT Record retrieval failed"</string>
<string name="msg_keybase_error_specific">"%s"</string>
<string name="msg_keybase_error_msg_payload_mismatch">"Decrypted proof post does not match expected value"</string>
<!-- Messages for Mime parsing operation -->
<string name="msg_mime_parsing_start">"Parsing the MIME structure"</string>
<string name="msg_mime_parsing_error">"MIME parsing failed"</string>

5
OpenKeychain/src/main/res/xml/cloud_search_preferences.xml
View File

@@ -9,11 +9,6 @@
android:dependency="search_keyserver_pref"
android:key="keyServers"
android:title="@string/label_keyservers" />
<SwitchPreference
android:defaultValue="true"
android:key="search_keybase_pref"
android:summary="@string/pref_keybase_summary"
android:title="@string/pref_keybase" />
<SwitchPreference
android:defaultValue="true"
android:key="search_wkd_pref"

7
OpenKeychain/src/main/res/xml/experimental_preferences.xml
View File

@@ -12,13 +12,6 @@
android:summary="@string/label_settings_analytics_summary"
android:title="@string/label_settings_analytics_title" />
<SwitchPreference
android:defaultValue="false"
android:key="experimentalEnableKeybase"
android:persistent="true"
android:summary="@string/label_experimental_settings_keybase_summary"
android:title="@string/label_experimental_settings_keybase_title" />
<ListPreference
android:defaultValue="light"
android:dialogTitle="@string/label_theme"