From a08e362b0bc9c0ba6f25a792a356663624dc9d00 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 24 Nov 2016 21:30:06 +0100
Subject: explictly scan for aztec and qr codes only

---
 src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java')

diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
index fd3e9f421..a354f5a88 100644
--- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
@@ -21,6 +21,7 @@ import com.google.zxing.integration.android.IntentResult;
 import org.whispersystems.libaxolotl.IdentityKey;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -129,7 +130,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
                 if (hasPendingKeyFetches()) {
                     Toast.makeText(this, R.string.please_wait_for_keys_to_be_fetched, Toast.LENGTH_SHORT).show();
                 } else {
-                    new IntentIntegrator(this).initiateScan();
+                    new IntentIntegrator(this).initiateScan(Arrays.asList("AZTEC","QR_CODE"));
                     return true;
                 }
         }
-- 
cgit v1.2.3