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

Do not use ImportKeysListFragment for Security Token import, fixes #1959. Also introduces radio button to import key information from file

Browse Source
This commit is contained in:
Dominik Schürmann
2016-12-04 22:58:41 +01:00
parent 553f90f145
commit dd69621408
3 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/res/layout/create_security_token_import_reset_fragment.xml
View File

@@ -82,6 +82,13 @@
android:layout_marginTop="16dp"
android:text="@string/security_token_import_radio" />
<RadioButton
android:id="@+id/token_decision_file"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/security_token_file_radio" />
<RadioButton
android:id="@+id/token_decision_reset"
android:layout_width="match_parent"
@@ -117,6 +124,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/android_red_dark"
android:visibility="gone" />
</FrameLayout>
</RelativeLayout>

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

@@ -1576,9 +1576,10 @@
<string name="security_token_status_unbound">"Security Token matches, can be bound to key"</string>
<string name="security_token_status_partly">"Security Token matches, partly bound to key"</string>
<string name="security_token_create">"Hold Security Token against the back of your device."</string>
<string name="security_token_reset_or_import">"This Security Token already contains a key. You can import the key using the cloud or reset the Security Token."</string>
<string name="security_token_reset_or_import">"This Security Token already contains a key. To use it, we need additional key information. These information can be searched on a keyserver or imported from a file."</string>
<string name="btn_reset">"Reset"</string>
<string name="security_token_import_radio">"Import key"</string>
<string name="security_token_import_radio">"Search key information on keyserver"</string>
<string name="security_token_file_radio">"Import key information from file"</string>
<string name="security_token_reset_radio">"Reset Security Token"</string>
<string name="security_token_reset_warning">"Resetting the Security Token completely destroys the keys on it. Afterwards, you will not be able to decrypt messages/files encrypted with this key!"</string>
<string name="snack_security_token_other">Different key stored on Security Token!</string>