aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-03-31 22:09:22 +0200
committerChristian Schneppe <christian@pix-art.de>2018-03-31 22:12:10 +0200
commita7af64cbeb43214351bbf9557e7e78f2dd295f51 (patch)
tree832f8e2212432934c68b094aea1673f5aa88b5f4 /src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
parent6cfb99ae03a5ea8c992db099caa28ab79b0fbfce (diff)
integrate qr code scanner. temporarily break omemo activity scan
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
index 385d0a68f..3499b8f00 100644
--- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
@@ -16,7 +16,6 @@ import android.widget.Toast;
import org.whispersystems.libsignal.IdentityKey;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,7 +32,6 @@ import de.pixart.messenger.entities.Account;
import de.pixart.messenger.entities.Conversation;
import de.pixart.messenger.utils.CryptoHelper;
import de.pixart.messenger.utils.XmppUri;
-import de.pixart.messenger.utils.zxing.IntentIntegrator;
import de.pixart.messenger.xmpp.OnKeyStatusUpdated;
import de.pixart.messenger.xmpp.jid.InvalidJidException;
import de.pixart.messenger.xmpp.jid.Jid;
@@ -130,7 +128,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(Arrays.asList("AZTEC","QR_CODE"));
+ //new IntentIntegrator(this).initiateScan(Arrays.asList("AZTEC","QR_CODE"));
return true;
}
}