From 1988e244ef035da5ddc309c3ad587f967518509e Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 2 Jan 2015 15:14:06 +0100 Subject: [PATCH] some further otr improvements --- .../eu/siacs/conversations/crypto/OtrEngine.java | 2 +- .../conversations/ui/ConversationFragment.java | 2 ++ .../siacs/conversations/ui/VerifyOTRActivity.java | 10 ++++++++-- src/main/res/menu/verification_choices.xml | 15 +++++++++++++++ src/main/res/menu/verify_otr.xml | 9 ++++----- src/main/res/values/strings.xml | 2 +- 6 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 src/main/res/menu/verification_choices.xml diff --git a/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java index 64434631c..7f7b350c6 100644 --- a/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java +++ b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java @@ -126,7 +126,7 @@ public class OtrEngine extends OtrCryptoEngineImpl implements OtrEngineHost { @Override public byte[] getLocalFingerprintRaw(SessionID arg0) { try { - return new OtrCryptoEngineImpl().getFingerprintRaw(getPublicKey()); + return getFingerprintRaw(getPublicKey()); } catch (OtrCryptoException e) { return null; } diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index d73af194e..93a4cc7ef 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -374,6 +374,8 @@ public class ConversationFragment extends Fragment { privateMessageWith(message.getCounterpart()); } } + } else { + activity.showQrCode(); } } }); diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java index 8fffbaac4..c33decd89 100644 --- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java @@ -5,12 +5,11 @@ import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; +import android.view.Menu; import android.view.View; import android.widget.Button; import android.widget.EditText; -import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; @@ -411,6 +410,13 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer this.mSmpVerificationArea = (LinearLayout) findViewById(R.id.smp_verification_area); } + @Override + public boolean onCreateOptionsMenu(final Menu menu) { + super.onCreateOptionsMenu(menu); + getMenuInflater().inflate(R.menu.verify_otr, menu); + return true; + } + private void showManuallyVerifyDialog() { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.manually_verify); diff --git a/src/main/res/menu/verification_choices.xml b/src/main/res/menu/verification_choices.xml new file mode 100644 index 000000000..e833ba79d --- /dev/null +++ b/src/main/res/menu/verification_choices.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ 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 1d4a11b6d..42b66ad5b 100644 --- a/src/main/res/menu/verify_otr.xml +++ b/src/main/res/menu/verify_otr.xml @@ -1,11 +1,10 @@ - + 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. Your hint should not be empty Your shared secret can not be empty - 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. + 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.