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

share fingerprint with qr code

Browse Source
This commit is contained in:
Dominik Schürmann
2014-01-19 01:15:25 +01:00
parent 88aa439ea7
commit a966d1afa1
6 changed files with 79 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenPGP-Keychain/res/layout/share_qr_code_dialog.xml
View File

@@ -9,7 +9,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/share_qr_code_dialog_start"
android:textAppearance="@android:style/TextAppearance.Medium" />
<ImageView

4
OpenPGP-Keychain/res/menu/key_view.xml
View File

@@ -11,6 +11,10 @@
android:id="@+id/menu_key_view_share_default"
android:showAsAction="never"
android:title="@string/menu_share"/>
<item
android:id="@+id/menu_key_view_share_qr_code_fingerprint"
android:showAsAction="never"
android:title="@string/menu_share_qr_code_fingerprint"/>
<item
android:id="@+id/menu_key_view_share_qr_code"
android:showAsAction="never"

7
OpenPGP-Keychain/res/values/strings.xml
View File

@@ -43,7 +43,7 @@
<string name="section_signing_key">Your Key used for Signing</string>
<string name="section_upload_key">Upload Key</string>
<string name="section_key_server">Key Server</string>
<!-- button -->
<string name="btn_sign_to_clipboard">Sign (Clipboard)</string>
<string name="btn_encrypt_to_clipboard">Encrypt to Clipboard</string>
@@ -85,7 +85,8 @@
<string name="menu_update_key">Update from key server</string>
<string name="menu_export_key_to_server">Upload to key server</string>
<string name="menu_share">Share with…</string>
<string name="menu_share_qr_code">Share with QR Code</string>
<string name="menu_share_qr_code">Share with QR Code (whole key)</string>
<string name="menu_share_qr_code_fingerprint">Share with QR Code (fingerprint)</string>
<string name="menu_share_nfc">Share with NFC</string>
<string name="menu_copy_to_clipboard">Copy to clipboard</string>
<string name="menu_sign_key">Sign key</string>
@@ -353,7 +354,9 @@
<string name="api_error_wrong_signature">Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app\'s registration in OpenPGP Keychain and then register the app again.</string>
<!-- Share -->
<string name="share_qr_code_dialog_title">Share with QR Code</string>
<string name="share_qr_code_dialog_start">Go through all QR Codes using \'Next\', and scan them one by one.</string>
<string name="share_qr_code_dialog_fingerprint_text">Fingerprint:</string>
<string name="share_qr_code_dialog_progress">QR Code with ID %1$d of %2$d</string>
<string name="share_nfc_dialog">Share with NFC</string>