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:33:56 +0200
committerChristian Schneppe <christian@pix-art.de>2018-03-31 22:33:56 +0200
commit92a0dc50159674f1b7d17bf70f4ff26893dab627 (patch)
tree0585ee8ee1f915d8462c74f452852fd8ea7cce24 /src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
parentebeb5f04ab10aeeda56597b29a757e657d71d218 (diff)
fixe scan in OmemoActivities
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
index 3499b8f00..751c51f09 100644
--- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
@@ -128,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"));
+ ScanActivity.scan(this);
return true;
}
}