diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-11-29 21:39:50 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-11-29 21:39:50 +0100 |
| commit | bdda426ad4223773b5873ee20db22a22dff0e49b (patch) | |
| tree | 0f958c1e14690a9731429ba5f1d801c5c94fb96b /src/main/res | |
| parent | 9671783d5bf7e2b8cf543b03b13fd292c2183614 (diff) | |
allow fingerprint verification via context menu
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/menu/omemo_key_context.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/ids.xml | 5 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/main/res/menu/omemo_key_context.xml b/src/main/res/menu/omemo_key_context.xml index f63a3439b..19f7d75e4 100644 --- a/src/main/res/menu/omemo_key_context.xml +++ b/src/main/res/menu/omemo_key_context.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/verify_scan" + android:title="@string/scan_qr_code" + /> + <item android:id="@+id/purge_omemo_key" android:title="@string/purge_key" /> <item diff --git a/src/main/res/values/ids.xml b/src/main/res/values/ids.xml index 78ccb5596..d1fd477b5 100644 --- a/src/main/res/values/ids.xml +++ b/src/main/res/values/ids.xml @@ -4,6 +4,7 @@ <item name="message_image_view" type="id" /> <item name="message_video_view" type="id" /> <item name="import_text" type="id" /> - <item type="id" name="TAG_ACCOUNT" /> - <item type="id" name="TAG_FINGERPRINT" /> + <item name="TAG_ACCOUNT" type="id" /> + <item name="TAG_FINGERPRINT" type="id" /> + <item name="TAG_FINGERPRINT_STATUS" type="id" /> </resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 01f0dd1c2..7a1110b8f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -722,4 +722,5 @@ <string name="pref_blind_trust_before_verification">Blind Trust Before Verification</string> <string name="pref_blind_trust_before_verification_summary">Automatically trust all new devices from contacts that haven\'t been verified before.</string> <string name="not_trusted">Untrusted</string> + <string name="invalid_barcode">Invalid barcode</string> </resources> |