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

QR Code import works now

Browse Source
This commit is contained in:
Dominik Schürmann
2013-10-06 01:12:30 +02:00
parent 2942d94a29
commit b3d51b8b80
5 changed files with 87 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml
View File

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
android:orientation="vertical" >
<Button
android:id="@+id/import_qrcode_button"
@@ -10,4 +10,16 @@
android:layout_height="wrap_content"
android:text="@string/menu_importFromQrCode" />
<TextView
android:id="@+id/import_qrcode_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ProgressBar
android:id="@+id/import_qrcode_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:progress="0" />
</LinearLayout>

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

@@ -354,7 +354,10 @@
<string name="import_sign_and_upload">Import, Sign, and upload selected keys</string>
<string name="import_finish">Finish</string>
<string name="import_from_clipboard">Import from Clipboard</string>
<string name="import_qr_code_missing">Missing QR Codes: %1$s</string>
<string name="import_qr_code_wrong">QR Code malformed! Please try again!</string>
<string name="import_qr_code_finished">QR Code scanning finished!</string>
<!-- Intent labels -->
<string name="intent_decrypt_file">OpenPGP: Decrypt File</string>
<string name="intent_import_key">OpenPGP: Import Key</string>