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

token-import: show unlock option for locked keys

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-09-06 03:53:54 +02:00
parent 768abb3074
commit 4d0a686220
5 changed files with 149 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,8 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:layout_width="match_parent"
@@ -49,7 +50,7 @@
android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out"
android:clipChildren="false"
custom:initialView="01">
custom:initialView="04">
<Space
android:layout_width="wrap_content"
@@ -190,6 +191,80 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/token_layout_locked">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?listPreferredItemHeight"
android:gravity="center_vertical"
android:text="Token is locked!"
style="?android:textAppearanceLarge"
/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dp"
android:id="@+id/button_unlock"
android:background="?selectableItemBackground"
>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
android:layout_centerVertical="true"
android:id="@+id/button_unlock_drawable"
android:src="@drawable/ic_vpn_key_grey_24dp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/button_unlock_drawable"
android:layout_toRightOf="@+id/button_unlock_drawable"
android:id="@+id/button_unlock_title"
android:textColor="@color/card_view_button"
android:textAllCaps="true"
android:textStyle="bold"
android:text="Unlock using admin pin"
android:padding="0dp"
android:minHeight="0dp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/button_unlock_drawable"
android:layout_toRightOf="@+id/button_unlock_drawable"
android:layout_below="@+id/button_unlock_title"
android:id="@+id/button_unlock_subtitle"
tools:text="3 attempts left"
style="?android:textAppearanceSmall"
/>
</RelativeLayout>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/button_reset_token_4"
android:drawableLeft="@drawable/ic_bomb_24dp"
android:drawableStart="@drawable/ic_bomb_24dp"
android:drawablePadding="12dp"
android:textColor="@color/android_red_dark"
android:text="@string/token_status_reset"
style="?borderlessButtonStyle"
/>
</LinearLayout>
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
</LinearLayout>

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

@@ -1918,6 +1918,7 @@
<string name="transfer_error_wifi_text_instructions">"Make sure you are on the same network, then scan again."</string>
<string name="transfer_error_wifi_text_instructions_ssid">"Make sure you are on the &quot;%s&quot; network, then scan again."</string>
<string name="status_check_key">Checking key status…</string>
<string name="status_search_local">Searching in key list…</string>
<string name="status_search_uri">Searching at token Uri…</string>
<string name="status_search_keyserver">Searching on keyservers…</string>
@@ -1937,6 +1938,11 @@
<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_unlock_attempts_none">"No unlock attempts left"</string>
<plurals name="token_unlock_attempts">
<item quantity="one">"1 attempt left"</item>
<item quantity="other">"%d attempts left"</item>
</plurals>
<string name="msg_ret_curi_error_io">"Error reading data!"</string>
<string name="msg_ret_curi_error_no_match">"No matching key found"</string>