lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-22 04:29:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add more cancel case in scan return

Browse source
This commit is contained in:
jacques 2022-03-11 10:14:28 +01:00
parent 273ae8bdfe
commit 15b7c52b66
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/net/foucry/pilldroid/DrugListActivity.java
View file

@ -296,6 +296,30 @@ public class DrugListActivity extends AppCompatActivity {
super.onResume(); super.onResume();
} }
/** Register the launcher and result handler
* ActivityResultLauncher
*/
private final ActivityResultLauncher<ScanOptions> barcodeLauncher = registerForActivityResult(new ScanContract(),
result -> {
if(result.getContents() == null) {
Intent originalIntent = result.getOriginalIntent();
if (originalIntent == null {
Log.d(TAG, "Cancelled Scan");
Toast.makeText(DrugListActivity.this, "Cancelled", Toast.LENGTH_LONG).show();
} else if (originalIntent.hasExtra(Intents.Scan.MISSING_CAMERA_PERMISSION)) {
Log.d(TAG, "Cancelled scan due missing camera permission");
Toast.makeText(DrugListaActivity.this, "Cancelled due missing camera persmission",
Toast.LENGTH_LONG.show());
} else if (originalIntent.hasExtra(Intents.Scan.TIMEOUT)) {
Log.d(TAG, "Cancelled due timeout");
Toast,makeText(DrugListActivity.this, "Cancelled due timeout", Toast.LENGTH_LONG.show());
}
} else {
Log.d(TAG, "Scanned");
Toast.makeText(DrugListActivity.this, "Scanned: " + result.getContents(),
Toast.LENGTH_LONG).show();
}
});
// Launch scan // Launch scan
public void onButtonClick() { public void onButtonClick() {
@ -306,7 +330,7 @@ public class DrugListActivity extends AppCompatActivity {
options.setCameraId(0); // Use a specific camera of the device options.setCameraId(0); // Use a specific camera of the device
options.setBeepEnabled(true); options.setBeepEnabled(true);
options.setBarcodeImageEnabled(true); options.setBarcodeImageEnabled(true);
//options.setTimeout(3600); options.setTimeout(60);
options.setCaptureActivity(CustomScannerActivity.class); options.setCaptureActivity(CustomScannerActivity.class);
options.setBeepEnabled(true); options.setBeepEnabled(true);
options.addExtra(Intents.Scan.SCAN_TYPE, Intents.Scan.MIXED_SCAN); options.addExtra(Intents.Scan.SCAN_TYPE, Intents.Scan.MIXED_SCAN);