narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

explictly scan for aztec and qr codes only

Browse source
This commit is contained in:
Daniel Gultsch 2016-11-23 11:01:58 +01:00
parent 839ef8e14b
commit 20d3a41b52
3 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/eu/siacs/conversations/services/BarcodeProvider.java
View file

@ -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);
}
}
}
}

2
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -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();

3
src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
View file

@ -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;
}
}