luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-14 22:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make the parsing logic of the QR code URI more robust

Browse source
This commit is contained in:
Alexander Bakker 2020-02-19 11:17:16 +01:00
parent cd42b0dc65
commit 2bf3546971
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/beemdevelopment/aegis/otp/GoogleAuthInfo.java
View file

@ -101,7 +101,7 @@ public class GoogleAuthInfo {
default: default:
throw new GoogleAuthInfoException(String.format("unsupported otp type: %s", type)); throw new GoogleAuthInfoException(String.format("unsupported otp type: %s", type));
} }
} catch (OtpInfoException e) { } catch (OtpInfoException | NumberFormatException e) {
throw new GoogleAuthInfoException(e); throw new GoogleAuthInfoException(e);
} }
@ -141,7 +141,7 @@ public class GoogleAuthInfo {
if (digits != null) { if (digits != null) {
info.setDigits(Integer.parseInt(digits)); info.setDigits(Integer.parseInt(digits));
} }
} catch (OtpInfoException e) { } catch (OtpInfoException | NumberFormatException e) {
throw new GoogleAuthInfoException(e); throw new GoogleAuthInfoException(e);
} }

2
app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
View file

@ -108,7 +108,7 @@ public class ScannerActivity extends AegisActivity implements ZXingScannerView.R
public void handleResult(Result rawResult) { public void handleResult(Result rawResult) {
try { try {
// parse google auth uri // parse google auth uri
GoogleAuthInfo info = GoogleAuthInfo.parseUri(rawResult.getText()); GoogleAuthInfo info = GoogleAuthInfo.parseUri(rawResult.getText().trim());
VaultEntry entry = new VaultEntry(info); VaultEntry entry = new VaultEntry(info);
Intent intent = new Intent(); Intent intent = new Intent();