kumi/andOTP
1
0
Fork 0
Code Issues 1 Pull requests 5 Projects Releases Packages Wiki Activity Actions

Move method to be in expected call order

Browse source
This commit is contained in:
Joshua Soberg 2021-01-29 18:23:43 -05:00
parent 1780d24955
commit 44ca3c02c5
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/org/shadowice/flocke/andotp/Tasks/AuthenticationTask.java
View file

@ -49,22 +49,6 @@ public class AuthenticationTask extends AsyncTask<Void, Void, Result> {
} }
} }
@NonNull
private Result confirmAuthentication() {
try {
PBKDF2Credentials credentials = EncryptionHelper.generatePBKDF2Credentials(plainPassword, settings.getSalt(), settings.getIterations());
byte[] passwordArray = Base64.decode(existingAuthCredentials, Base64.URL_SAFE);
if (Arrays.equals(passwordArray, credentials.password)) {
return Result.success(credentials.key);
}
return Result.failure();
} catch (NoSuchAlgorithmException | InvalidKeySpecException | IllegalArgumentException e) {
Log.e("DecodePasswordTask", "Problem decoding password", e);
return Result.failure();
}
}
@NonNull @NonNull
private Result upgradeAuthentication() { private Result upgradeAuthentication() {
String hashedPassword = new String(Hex.encodeHex(DigestUtils.sha256(plainPassword))); String hashedPassword = new String(Hex.encodeHex(DigestUtils.sha256(plainPassword)));
@ -85,6 +69,22 @@ public class AuthenticationTask extends AsyncTask<Void, Void, Result> {
return Result.success(key); return Result.success(key);
} }
@NonNull
private Result confirmAuthentication() {
try {
PBKDF2Credentials credentials = EncryptionHelper.generatePBKDF2Credentials(plainPassword, settings.getSalt(), settings.getIterations());
byte[] passwordArray = Base64.decode(existingAuthCredentials, Base64.URL_SAFE);
if (Arrays.equals(passwordArray, credentials.password)) {
return Result.success(credentials.key);
}
return Result.failure();
} catch (NoSuchAlgorithmException | InvalidKeySpecException | IllegalArgumentException e) {
Log.e("DecodePasswordTask", "Problem decoding password", e);
return Result.failure();
}
}
@Override @Override
protected void onPostExecute(Result result) { protected void onPostExecute(Result result) {
callback.onComplete(result); callback.onComplete(result);