Skip to content

Commit

Permalink
Merge pull request #3732 from Navid200/Navid_2024_10_20
Browse files Browse the repository at this point in the history
Cleanup
  • Loading branch information
jamorham authored Oct 29, 2024
2 parents 49c3780 + 1fe29ab commit 83f3d00
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void closeActivity(View myview) {

public void saveLogs(View myview) {
if (saveLogsToStorage(log_data)) {
UserError.Log.e(TAG, "Saved log file to /Downloads/xDrip-export/xDrip-log.txt");
UserError.Log.e(TAG, "Saved log file to /Download/xDrip-export/xDrip-log.txt");
} else {
UserError.Log.e(TAG, "Could not write log file");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public QrCodeFromFile setDesiredBarcodeFormats(Collection<String> desiredBarcode
}

public final void initiateFileScan() {
UserError.Log.e(TAG, "Navid_ initiate scan");

// TODO Replace startActivityForResult with Androidx Activity Result APIs
this.activity.startActivityForResult(this.createFileScanIntent(), Constants.ZXING_FILE_REQ_CODE);
Expand All @@ -53,12 +52,10 @@ private static List<String> list(String... values) {
}

public void scanFile() { // Copied (and slightly modified) from AndroidBarcode.scan()
UserError.Log.e(TAG, "Navid_ scanFile ");
actuallyStartScanFile();
}

private void actuallyStartScanFile() {
UserError.Log.e(TAG, "Navid_ actuallyScan ");
new QrCodeFromFile(activity)
.setDesiredBarcodeFormats(list("QR_CODE", "CODE_128"))
.initiateFileScan();
Expand Down

0 comments on commit 83f3d00

Please sign in to comment.