diff options
| author | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-02 15:14:06 +0100 |
|---|---|---|
| committer | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-02 15:14:06 +0100 |
| commit | 1988e244ef035da5ddc309c3ad587f967518509e (patch) | |
| tree | 285ce0234b94519aa83e93b6c140e73bd61beeb0 /src/main/res | |
| parent | f58f27a1f74ee37092aa24a1187de32fe7e903ae (diff) | |
some further otr improvements
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/menu/verification_choices.xml | 15 | ||||
| -rw-r--r-- | src/main/res/menu/verify_otr.xml | 9 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
3 files changed, 20 insertions, 6 deletions
diff --git a/src/main/res/menu/verification_choices.xml b/src/main/res/menu/verification_choices.xml new file mode 100644 index 00000000..e833ba79 --- /dev/null +++ b/src/main/res/menu/verification_choices.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/scan_fingerprint" + android:title="@string/scan_qr_code"/> + <item + android:id="@+id/ask_question" + android:title="@string/ask_question"/> + + <item + android:id="@+id/manual_verification" + android:title="@string/manually_verify" /> + +</menu>
\ No newline at end of file diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml index 1d4a11b6..42b66ad5 100644 --- a/src/main/res/menu/verify_otr.xml +++ b/src/main/res/menu/verify_otr.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/manually_verify" - android:orderInCategory="10" - android:showAsAction="never" - android:title="@string/manually_verify" /> + <item + android:id="@+id/action_show_qr_code" + android:title="@string/show_qr_code" + android:showAsAction="never" /> <item android:id="@+id/action_accounts" diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index be548ad4..1d1f609d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -398,5 +398,5 @@ <string name="smp_explain_answer">Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret.</string> <string name="shared_secret_hint_should_not_be_empty">Your hint should not be empty</string> <string name="shared_secret_can_not_be_empty">Your shared secret can not be empty</string> - <string name="manual_verification_explanation">Carefully compare the fingerprints shown below with the fingerprints of your contact.\nYou can use a trusted communication channel like an encrypted e-mail or a telephone call channel to exchange those.</string> + <string name="manual_verification_explanation">Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those.</string> </resources> |