offer verification directly from the trust keys screen

1 files changed, 73 insertions, 0 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
index 893317970..fd3e9f421 100644
--- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
@@ -1,7 +1,12 @@
 package de.pixart.messenger.ui;
 
+import android.app.ActionBar;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -10,6 +15,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
+
 import org.whispersystems.libaxolotl.IdentityKey;
 
 import java.util.ArrayList;
@@ -25,6 +33,7 @@ import de.pixart.messenger.crypto.axolotl.AxolotlService;
 import de.pixart.messenger.crypto.axolotl.FingerprintStatus;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Conversation;
+import de.pixart.messenger.utils.XmppUri;
 import de.pixart.messenger.xmpp.OnKeyStatusUpdated;
 import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
@@ -64,6 +73,8 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
         }
     };
 
+    private XmppUri mPendingFingerprintVerificationUri = null;
+
     @Override
     protected void refreshUiReal() {
         invalidateOptionsMenu();
@@ -101,6 +112,64 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.trust_keys, menu);
+        Toast toast = Toast.makeText(this,R.string.use_camera_icon_to_scan_barcode,Toast.LENGTH_LONG);
+        ActionBar actionBar = getActionBar();
+        toast.setGravity(Gravity.TOP | Gravity.END, 0 ,actionBar == null ? 0 : actionBar.getHeight());
+        toast.show();
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_scan_qr_code:
+                if (hasPendingKeyFetches()) {
+                    Toast.makeText(this, R.string.please_wait_for_keys_to_be_fetched, Toast.LENGTH_SHORT).show();
+                } else {
+                    new IntentIntegrator(this).initiateScan();
+                    return true;
+                }
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
+        if (scanResult != null && scanResult.getFormatName() != null) {
+            String data = scanResult.getContents();
+            XmppUri uri = new XmppUri(data);
+            if (xmppConnectionServiceBound) {
+                processFingerprintVerification(uri);
+                populateView();
+            } else {
+                this.mPendingFingerprintVerificationUri =uri;
+            }
+        }
+    }
+
+    private void processFingerprintVerification(XmppUri uri) {
+        if (mConversation != null
+                && mAccount != null
+                && uri.hasFingerprints()
+                && mAccount.getAxolotlService().getCryptoTargets(mConversation).contains(uri.getJid())) {
+            boolean performedVerification = xmppConnectionService.verifyFingerprints(mAccount.getRoster().getContact(uri.getJid()),uri.getFingerprints());
+            boolean keys = reloadFingerprints();
+            if (performedVerification && !keys && !hasNoOtherTrustedKeys() && !hasPendingKeyFetches()) {
+                Toast.makeText(this,R.string.all_omemo_keys_have_been_verified, Toast.LENGTH_SHORT).show();
+                finishOk();
+            } else if (performedVerification) {
+                Toast.makeText(this,R.string.verified_fingerprints,Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            Log.d(Config.LOGTAG,"xmpp uri was: "+uri.getJid()+" has Fingerprints: "+Boolean.toString(uri.hasFingerprints()));
+            Toast.makeText(this,R.string.barcode_does_not_contain_fingerprints_for_this_conversation,Toast.LENGTH_SHORT).show();
+        }
+    }
+
     private void populateView() {
         setTitle(getString(R.string.trust_omemo_fingerprints));
         ownKeys.removeAllViews();
@@ -215,6 +284,10 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
         if (this.mAccount != null && intent != null) {
             String uuid = intent.getStringExtra("conversation");
             this.mConversation = xmppConnectionService.findConversationByUuid(uuid);
+            if (this.mPendingFingerprintVerificationUri != null) {
+                processFingerprintVerification(this.mPendingFingerprintVerificationUri);
+                this.mPendingFingerprintVerificationUri = null;
+            }
             reloadFingerprints();
             populateView();
         }