From 20d3a41b52b8c00a5e803eee4659527d22950b30 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 23 Nov 2016 11:01:58 +0100 Subject: explictly scan for aztec and qr codes only --- .../conversations/services/BarcodeProvider.java | 30 +--------------------- .../ui/StartConversationActivity.java | 2 +- .../siacs/conversations/ui/TrustKeysActivity.java | 3 ++- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/services/BarcodeProvider.java b/src/main/java/eu/siacs/conversations/services/BarcodeProvider.java index ccaa65c9..08ceb169 100644 --- a/src/main/java/eu/siacs/conversations/services/BarcodeProvider.java +++ b/src/main/java/eu/siacs/conversations/services/BarcodeProvider.java @@ -185,7 +185,7 @@ public class BarcodeProvider extends ContentProvider implements ServiceConnectio for (int y = 0; y < height; y++) { final int offset = y * width; for (int x = 0; x < width; x++) { - pixels[offset + x] = result.get(x, y) ? Color.BLACK : Color.TRANSPARENT; + pixels[offset + x] = result.get(x, y) ? Color.BLACK : Color.WHITE; } } final Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); @@ -195,32 +195,4 @@ public class BarcodeProvider extends ContentProvider implements ServiceConnectio return null; } } - - static class TransferThread extends Thread { - InputStream in; - OutputStream out; - - TransferThread(InputStream in, OutputStream out) { - this.in = in; - this.out = out; - } - - @Override - public void run() { - byte[] buf = new byte[1024]; - int len; - - try { - while ((len = in.read(buf)) >= 0) { - out.write(buf, 0, len); - } - - in.close(); - out.flush(); - out.close(); - } catch (IOException e) { - Log.e(Config.LOGTAG, "Exception transferring file", e); - } - } - } } diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index c9b5b9cc..c674442f 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -626,7 +626,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU showCreateConferenceDialog(); return true; case R.id.action_scan_qr_code: - new IntentIntegrator(this).initiateScan(); + new IntentIntegrator(this).initiateScan(Arrays.asList("AZTEC","QR_CODE")); return true; case R.id.action_hide_offline: mHideOfflineContacts = !item.isChecked(); 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; } } -- cgit v1.2.3