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

Share with NFC, Qr Code sharing refactored, Receiving NFC is not ready yet

Browse Source
This commit is contained in:
Dominik Schürmann
2013-01-08 12:58:21 +01:00
parent 9758cb673f
commit 6cc7156fbd
18 changed files with 459 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APG/res/layout/main.xml
View File

@@ -58,7 +58,7 @@
style="@style/DashboardButton"
android:drawableTop="@drawable/dashboard_scan_qrcode"
android:onClick="scanQrcodeOnClick"
android:text="@string/dashboard_scan_qrcode" />
android:text="@string/dashboard_import_keys" />
<Button
android:id="@+id/dashboard_help"

14
APG/res/layout/share_nfc_beam.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<net.nightwhistler.htmlspanner.JellyBeanSpanFixTextView
android:id="@+id/nfc_beam_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="" />
</ScrollView>

10
APG/res/menu/nfc_beam.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/menu_settings"
android:icon="@drawable/ic_menu_settings"
android:showAsAction="always|withText"
android:title="@string/menu_BeamPreferences"/>
</menu>

15
APG/res/raw/help_nfc_beam.html Normal file
View File

@@ -0,0 +1,15 @@
<!-- Maintain structure with headings with h2 tags and content with p tags.
This makes it easy to translate the values with transifex!
And don't add newlines before or after p tags because of transifex -->
<html>
<head>
</head>
<body>
<ol>
<li>Go to your partners 'Manage Public Keyrings' and long press on the keyring you want to share.</li>
<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
<li>Tap the card and the content will then load on the other person’s device.</li>
</ol>
</body>
</html>

15
APG/res/raw/nfc_beam_share.html Normal file
View File

@@ -0,0 +1,15 @@
<!-- Maintain structure with headings with h2 tags and content with p tags.
This makes it easy to translate the values with transifex!
And don't add newlines before or after p tags because of transifex -->
<html>
<head>
</head>
<body>
<ol>
<li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li>
<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
<li>Tap the card and the content will then load on the other person’s device.</li>
</ol>
</body>
</html>

14
APG/res/values/strings.xml
View File

@@ -45,10 +45,10 @@
<string name="title_keyServerQuery">Query Key Server</string>
<string name="title_sendKey">Export to Key Server</string>
<string name="title_unknownSignatureKey">Unknown Signature Key</string>
<string name="title_importFromQRCode">Import from QR Code</string>
<string name="title_signKey">Sign Keyring</string>
<string name="title_about">About</string>
<string name="title_help">Help</string>
<string name="title_shareByNfc">Share keyring with NFC</string>
<!-- section_lowerCase: capitalized words, no punctuation -->
<string name="section_userIds">User IDs</string>
@@ -99,12 +99,14 @@
<string name="menu_editKey">Edit Keyring</string>
<string name="menu_search">Search</string>
<string name="menu_help">Help</string>
<string name="menu_keyServer">Key Server</string>
<string name="menu_keyServer">Query Key Server</string>
<string name="menu_updateKey">Update from Server</string>
<string name="menu_exportKeyToServer">Export To Server</string>
<string name="menu_share">Share public keyring with QR Code</string>
<string name="menu_shareQrCode">Share with QR Code</string>
<string name="menu_shareNfc">Share with NFC</string>
<string name="menu_scanQRCode">Scan QR Code</string>
<string name="menu_signKey">Sign Key</string>
<string name="menu_BeamPreferences">Beam Settings</string>
<!-- label_lowerCase: capitalized words, no punctuation -->
<string name="label_sign">Sign</string>
@@ -262,6 +264,8 @@
<string name="error_savingKeys">error saving some key(s)</string>
<string name="error_couldNotExtractPrivateKey">could not extract private key</string>
<string name="error_onlyFilesAreSupported">Direct binary data without actual file in filesystem is not supported. This is only supported by ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
<string name="error_jellyBeanNeeded">You need Android 4.1 alias Jelly Bean to use Androids NFC Beam feature!</string>
<string name="error_nfcNeeded">NFC is not available on your device!</string>
<!-- progress_lowerCase: lowercase, phrases, usually ending in '…' -->
<string name="progress_done">done.</string>
@@ -329,10 +333,11 @@
<string name="dashboard_encrypt">Encrypt</string>
<string name="dashboard_decrypt">Decrypt</string>
<string name="dashboard_help">Help</string>
<string name="dashboard_scan_qrcode">Scan QRCode</string>
<string name="dashboard_import_keys">Import Keys</string>
<!-- Help -->
<string name="help_tab_start">Start</string>
<string name="help_tab_nfc_beam">NFC Beam</string>
<string name="help_tab_changelog">Changelog</string>
<string name="help_tab_about">About</string>
<string name="help_about_version">Version:</string>
@@ -340,7 +345,6 @@
<!-- Import from QR Code -->
<string name="import_from_qr_code_import">Import keyring (only locally)</string>
<string name="import_from_qr_code_import_sign_and_upload">Import, Sign, and upload keyring</string>
<string name="import_from_qr_code_scan_again">Scan QR Code again</string>
<string name="import_from_qr_code_finish">Finish</string>
<!-- Intent labels -->