laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-08-10 08:37:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve validation of legacy multipart qr part numbers

Browse Source
This commit is contained in:
Craig Raw
2026-08-04 11:52:06 +02:00
parent 866e989380
commit 059f1e8850
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lark
+1 -1
Submodule lark updated: 00fdebc715...a246d87cca
src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java
+9 -5
View File
@@ -75,7 +75,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
private QRScanDialog.Result result;
private static final Pattern PART_PATTERN = Pattern.compile("p(\\d+)of(\\d+) (.+)");
private static final Pattern PART_PATTERN = Pattern.compile("p(\\d{1,4})of(\\d{1,4}) (.+)");
private static final int SCAN_PERIOD_MILLIS = 100;
private final ObjectProperty<CaptureDevice> webcamDeviceProperty = new SimpleObjectProperty<>();
@@ -275,15 +275,19 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
int n = Integer.parseInt(partMatcher.group(2));
String payload = partMatcher.group(3);
if(parts == null) {
if(n < 1 || m < 1 || m > n) {
log.warn("Ignoring invalid QR part " + m + " of " + n);
return;
}
//A different number of parts indicates a different sequence, so start over
if(parts == null || parts.size() != n) {
parts = new ArrayList<>(n);
IntStream.range(0, n).forEach(i -> parts.add(null));
}
parts.set(m - 1, payload);
if(n > 0) {
Platform.runLater(() -> percentComplete.setValue((double)parts.stream().filter(Objects::nonNull).count() / n));
}
Platform.runLater(() -> percentComplete.setValue((double)parts.stream().filter(Objects::nonNull).count() / n));
if(parts.stream().filter(Objects::nonNull).count() == n) {
String complete = String.join("", parts);