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

Make keybase an experimental feature

Browse Source
This commit is contained in:
Dominik Schürmann
2015-08-28 15:18:11 +02:00
parent 905148f586
commit 765ec094c9
12 changed files with 216 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,18 +182,32 @@
android:layout_gravity="fill_vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<FrameLayout
<LinearLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:id="@+id/view_key_fragment"
android:layout_width="match_parent"
android:layout_height="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
-->
<View
android:layout_width="match_parent"
android:layout_height="230dp"
android:orientation="vertical" />
</FrameLayout>
</LinearLayout>
</android.support.v4.widget.FlingNestedScrollView>

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

@@ -1,126 +1,95 @@
<?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="match_parent"
android:orientation="vertical">
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp">
<TextView
android:layout_width="wrap_content"
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorButtonRow"
android:padding="8dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/key_trust_header_text"
android:gravity="center_horizontal" />
android:layout_gravity="center"
card_view:cardBackgroundColor="?attr/colorCardViewBackground"
card_view:cardCornerRadius="4dp"
card_view:cardElevation="2dp"
card_view:cardUseCompatPadding="true">
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
<LinearLayout
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:focusableInTouchMode="true"
android:descendantFocusability="beforeDescendants"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp">
android:orientation="vertical">
<TextView
style="@style/SectionHeader"
style="@style/CardViewHeader"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:text="@string/section_should_you_trust"
android:layout_weight="1" />
android:layout_height="wrap_content"
android:text="@string/section_keybase_proofs" />
<TextView
android:id="@+id/view_key_trust_readout"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="14dp"
android:layout_marginLeft="8dp"
android:layout_weight="1"
style="?android:attr/textAppearanceMedium" />
android:layout_height="wrap_content"
android:background="?attr/colorButtonRow"
android:gravity="center_horizontal"
android:padding="8dp"
android:text="@string/key_trust_header_text"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="14dp"
android:text="@string/section_cloud_evidence"
android:layout_weight="1" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<LinearLayout
android:id="@+id/view_key_trust_search_cloud"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:paddingRight="4dp"
style="?android:attr/borderlessButtonStyle"
android:orientation="horizontal">
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp">
<TextView
android:paddingLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dip"
android:layout_height="match_parent"
android:text="@string/key_trust_start_cloud_search"
android:layout_weight="1"
android:gravity="center_vertical" />
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" />
<ImageView
<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="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_search_cloud"
android:layout_gravity="center_vertical" />
android:layout_height="0dp"
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>
<TextView
android:id="@+id/view_key_trust_cloud_narrative"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="14dp"
android:layout_marginBottom="14dp"
android:layout_marginLeft="8dp"
android:layout_weight="1"
style="?android:attr/textAppearanceMedium" />
<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="0dp"
android:layout_marginTop="16dp"
android:text="@string/section_proof_details"
android:layout_weight="1" />
<TextView
android:id="@+id/view_key_proof_verify_detail"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="14dp"
android:layout_marginLeft="8dp"
android:layout_weight="1"
style="?android:attr/textAppearanceMedium" />
</LinearLayout>
</ScrollView>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>

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

@@ -7,7 +7,7 @@
android:layout_height="wrap_content"
android:paddingLeft="6dip"
android:text="1."
style="?android:attr/textAppearanceMedium" />
style="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/proof_text"
@@ -15,5 +15,5 @@
android:layout_height="wrap_content"
android:paddingLeft="6dip"
android:text="Posts to twitter as Timbray"
style="?android:attr/textAppearanceMedium" />
style="?android:attr/textAppearanceSmall" />
</TableRow>

4
OpenKeychain/src/main/res/layout/view_key_fragment.xml
View File

@@ -3,12 +3,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="230dp"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp">
<!-- paddingBottom is this large to improve the scrolling.
Somehow the content must be large enough to enable scrolling on NestedScrollView -->
<android.support.v7.widget.CardView
android:id="@+id/card_view"

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

@@ -43,9 +43,9 @@
<string name="section_user_ids">"Identities"</string>
<string name="section_yubikey">"YubiKey"</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_cloud_evidence">"Proofs from the Internet"</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>
@@ -197,6 +197,8 @@
<string name="label_experimental_settings_word_confirm_summary">"Allows to compare fingerprints with words instead of hexadecimal representation."</string>
<string name="label_experimental_settings_linked_identities_title">"Linked Identities"</string>
<string name="label_experimental_settings_linked_identities_summary">"Linked Identities"</string>
<string name="label_experimental_settings_keybase_title">"Keybase.io Proofs"</string>
<string name="label_experimental_settings_keybase_summary">"Every time a key is displayed, this will contact keybase.io for key proofs"</string>
<!-- Proxy Preferences -->
<string name="pref_proxy_tor_title">"Enable Tor"</string>
@@ -674,12 +676,6 @@
<string name="user_id_info_invalid_text">"Something is wrong with this identity!"</string>
<!-- Key trust -->
<string name="key_trust_already_verified">"You have already confirmed this key!"</string>
<string name="key_trust_it_is_yours">"This is one of your keys!"</string>
<string name="key_trust_maybe">"This key is neither revoked nor expired.\nYou haven’t confirmed it, but you may choose to trust it."</string>
<string name="key_trust_revoked">"This key has been revoked by its owner. You should not trust it."</string>
<string name="key_trust_expired">"This key has expired. You should not trust it."</string>
<string name="key_trust_old_keys">"It may be OK to use this to decrypt an old message dating from the time when this key was valid."</string>
<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>

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

@@ -18,6 +18,13 @@
android:summary="@string/label_experimental_settings_linked_identities_summary"
android:title="@string/label_experimental_settings_linked_identities_title" />
<SwitchPreference
android:defaultValue="false"
android:key="experimentalEnableKeybase"
android:persistent="false"
android:summary="@string/label_experimental_settings_keybase_summary"
android:title="@string/label_experimental_settings_keybase_title" />
<ListPreference
android:dialogTitle="@string/label_theme"
android:entries="@array/theme_entries"