diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-11-28 15:11:44 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-11-28 15:11:44 +0100 |
| commit | 84a2fa0041c6d30658ba29b3b5f5db2604c35c90 (patch) | |
| tree | fe9508196323d120b4c57e30831b8636637f1ed8 /src/main/res | |
| parent | bbe01c9a6afd2bf312c1ad38c482c53be743949c (diff) | |
allow fingerprint verification via context menu
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/menu/omemo_key_context.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/ids.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/main/res/menu/omemo_key_context.xml b/src/main/res/menu/omemo_key_context.xml index 2e2fc5da..1e825902 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 7daad46d..142e4d66 100644 --- a/src/main/res/values/ids.xml +++ b/src/main/res/values/ids.xml @@ -2,4 +2,5 @@ <resources> <item type="id" name="TAG_ACCOUNT"/> <item type="id" name="TAG_FINGERPRINT"/> + <item type="id" name="TAG_FINGERPRINT_STATUS"/> </resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index d4dc946f..352180d2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -714,4 +714,5 @@ <string name="pref_blind_trust_before_verification_summary">Automatically trust all new devices of contacts that haven’t been verified before, and prompt for manual confirmation each time a verified contact adds a new device.</string> <string name="blindly_trusted_omemo_keys">Blindly trusted OMEMO keys</string> <string name="not_trusted">Untrusted</string> + <string name="invalid_barcode">Invalid 2D barcode</string> </resources> |