ResultHandler.java (zxing-zxing-3.4.0) | : | ResultHandler.java (zxing-zxing-3.4.1) | ||
---|---|---|---|---|
skipping to change at line 523 | skipping to change at line 523 | |||
url = url.replaceFirst("%f(?![0-9a-f])", rawResult.getBarcodeFormat().toSt ring()); | url = url.replaceFirst("%f(?![0-9a-f])", rawResult.getBarcodeFormat().toSt ring()); | |||
if (url.contains("%t")) { | if (url.contains("%t")) { | |||
ParsedResult parsedResultAgain = ResultParser.parseResult(rawResult); | ParsedResult parsedResultAgain = ResultParser.parseResult(rawResult); | |||
url = url.replace("%t", parsedResultAgain.getType().toString()); | url = url.replace("%t", parsedResultAgain.getType().toString()); | |||
} | } | |||
} | } | |||
// Replace %s last as it might contain itself %f or %t | // Replace %s last as it might contain itself %f or %t | |||
return url.replace("%s", text); | return url.replace("%s", text); | |||
} | } | |||
@SuppressWarnings("deprecation") | ||||
static String formatPhone(String phoneData) { | static String formatPhone(String phoneData) { | |||
// Just collect the call to a deprecated method in one place | // Just collect the call to a deprecated method in one place | |||
return PhoneNumberUtils.formatNumber(phoneData); | return PhoneNumberUtils.formatNumber(phoneData); | |||
} | } | |||
} | } | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 1 lines changed or added |