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

token-import: add entrypoint for blank token setup flow

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-09-11 01:42:04 +02:00
parent 19bb4ff83c
commit e0b5d97356
9 changed files with 116 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
OpenKeychain/src/main/res/layout/create_security_token_import_fragment.xml
View File

@@ -50,7 +50,7 @@
android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out"
android:clipChildren="false"
custom:initialView="05">
custom:initialView="06">
<Space
android:layout_width="wrap_content"
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:minHeight="?listPreferredItemHeight"
android:gravity="center_vertical"
android:text="@string/token_status_not_found"
android:text="@string/token_result_not_found"
style="?android:textAppearanceLarge"
/>
@@ -79,7 +79,7 @@
android:drawableStart="@drawable/ic_repeat_grey_24dp"
android:drawablePadding="12dp"
android:textColor="@color/card_view_button"
android:text="@string/token_status_retry"
android:text="@string/token_action_retry"
style="?borderlessButtonStyle"
/>
@@ -91,7 +91,7 @@
android:drawableStart="@drawable/ic_folder_grey_24dp"
android:drawablePadding="12dp"
android:textColor="@color/card_view_button"
android:text="@string/token_status_load_from_file"
android:text="@string/token_action_load_from_file"
style="?borderlessButtonStyle"
/>
@@ -103,7 +103,7 @@
android:drawableStart="@drawable/ic_bomb_24dp"
android:drawablePadding="12dp"
android:textColor="@color/android_red_dark"
android:text="@string/token_status_reset"
android:text="@string/token_action_reset"
style="?borderlessButtonStyle"
/>
@@ -120,7 +120,7 @@
android:layout_height="wrap_content"
android:minHeight="?listPreferredItemHeight"
android:gravity="center_vertical"
android:text="@string/token_status_key_found"
android:text="@string/token_result_key_found"
style="?android:textAppearanceLarge"
/>
@@ -132,7 +132,7 @@
android:drawableStart="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="12dp"
android:textColor="@color/card_view_button"
android:text="@string/token_status_import"
android:text="@string/token_action_import"
style="?borderlessButtonStyle"
/>
@@ -144,7 +144,7 @@
android:drawableStart="@drawable/ic_bomb_24dp"
android:drawablePadding="12dp"
android:textColor="@color/android_red_dark"
android:text="@string/token_status_reset"
android:text="@string/token_action_reset"
style="?borderlessButtonStyle"
/>
@@ -161,7 +161,7 @@
android:layout_height="wrap_content"
android:minHeight="?listPreferredItemHeight"
android:gravity="center_vertical"
android:text="@string/token_status_token_ok"
android:text="@string/token_result_token_ok"
style="?android:textAppearanceLarge"
/>
@@ -173,7 +173,7 @@
android:drawableStart="@drawable/ic_vpn_key_grey_24dp"
android:drawablePadding="12dp"
android:textColor="@color/card_view_button"
android:text="@string/token_status_view_key"
android:text="@string/token_action_view_key"
style="?borderlessButtonStyle"
/>
@@ -185,7 +185,7 @@
android:drawableStart="@drawable/ic_bomb_24dp"
android:drawablePadding="12dp"
android:textColor="@color/android_red_dark"
android:text="@string/token_status_reset"
android:text="@string/token_action_reset"
style="?borderlessButtonStyle"
/>
@@ -259,7 +259,7 @@
android:drawableStart="@drawable/ic_bomb_24dp"
android:drawablePadding="12dp"
android:textColor="@color/android_red_dark"
android:text="@string/token_status_reset"
android:text="@string/token_action_reset"
style="?borderlessButtonStyle"
/>
@@ -334,7 +334,37 @@
android:drawableStart="@drawable/ic_bomb_24dp"
android:drawablePadding="12dp"
android:textColor="@color/android_red_dark"
android:text="@string/token_status_reset"
android:text="@string/token_action_reset"
style="?borderlessButtonStyle"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/token_layout_empty">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?listPreferredItemHeight"
android:gravity="center_vertical"
android:text="@string/token_result_empty"
style="?android:textAppearanceLarge"
/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/button_setup"
android:drawableLeft="@drawable/ic_person_add_grey_24dp"
android:drawableStart="@drawable/ic_person_add_grey_24dp"
android:drawableTint="@color/md_black_1000"
android:drawablePadding="12dp"
android:text="@string/token_action_setup"
style="?borderlessButtonStyle"
/>

76
OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
View File

@@ -1,76 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:layout_above="@+id/create_key_buttons">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/first_time_blank_security_token" />
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:background="?attr/colorButtonRow"
android:id="@+id/create_key_buttons">
<TextView
android:id="@+id/create_key_back_button"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:text="@string/btn_back"
android:textAllCaps="true"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
android:drawablePadding="8dp"
android:gravity="left|center_vertical"
android:clickable="true"
style="?android:attr/borderlessButtonStyle" />
<TextView
android:id="@+id/create_key_next_button"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:text="@string/first_time_blank_security_token_yes"
android:textAllCaps="true"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical|right"
android:clickable="true"
style="?android:attr/borderlessButtonStyle" />
</LinearLayout>
</RelativeLayout>

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

@@ -1931,14 +1931,16 @@
<string name="token_reset_confirm_message">This will irrecoverably delete the key stored on this Security Token. You will no longer be able to use this key for decryption! Are you sure?</string>
<string name="token_reset_confirm_ok">Reset</string>
<string name="token_status_title">Gathering information for Security Token…</string>
<string name="token_status_not_found">Key not found!</string>
<string name="token_status_retry">Retry Search</string>
<string name="token_status_load_from_file">Load from File</string>
<string name="token_status_reset">Reset Security Token</string>
<string name="token_status_key_found">Key found!</string>
<string name="token_status_import">Import</string>
<string name="token_status_token_ok">Ready for use!</string>
<string name="token_status_view_key">View Key</string>
<string name="token_result_not_found">Key not found!</string>
<string name="token_result_key_found">Key found!</string>
<string name="token_result_token_ok">Ready for use!</string>
<string name="token_result_empty">Token is empty</string>
<string name="token_action_retry">Retry Search</string>
<string name="token_action_load_from_file">Load from File</string>
<string name="token_action_reset">Reset Security Token</string>
<string name="token_action_import">Import</string>
<string name="token_action_view_key">View Key</string>
<string name="token_action_setup">"Set up with new key"</string>
<string name="token_action_unlock">Unlock using admin pin</string>
<string name="token_unlock_attempts_none">"No unlock attempts left"</string>
<plurals name="token_unlock_attempts">