aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-11-23 11:01:58 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-11-23 11:01:58 +0100
commit20d3a41b52b8c00a5e803eee4659527d22950b30 (patch)
tree9a60d1ac14cf2b83751bd3ede4b94d5af4213c4e /src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
parent839ef8e14b576e546a13942d72139248873f7fac (diff)
explictly scan for aztec and qr codes only
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
index 55112702..45800854 100644
--- a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
+++ b/src/main/java/eu/siacs/conversations/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;
}
}