Skip to content

[FIX] Handle no attached activity when try biometry #2132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
djorkaeffalexandre wants to merge 2 commits into from
Closed

[FIX] Handle no attached activity when try biometry #2132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb089b1
[FIX] Handle no attached activity when try biometry
djorkaeffalexandre May 18, 2020
fc9fbdd
Merge branch 'develop' into fix.biometry-activity
djorkaeffalexandre May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/containers/Passcode/PasscodeEnter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,13 @@ const PasscodeEnter = ({ theme, hasBiometry, finishProcess }) => {

const biometry = async() => {
if (hasBiometry && status === TYPE.ENTER) {
const result = await biometryAuth();
if (result?.success) {
finishProcess();
try {
const result = await biometryAuth();
if (result?.success) {
finishProcess();
}
} catch {
// Do nothing
}
}
};
Expand Down
14 changes: 7 additions & 7 deletions app/utils/localAuthentication.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@ export const biometryAuth = force => LocalAuthentication.authenticateAsync({
const checkBiometry = async(serverRecord) => {
const serversDB = database.servers;

const result = await biometryAuth(true);
await serversDB.action(async() => {
try {
try {
const result = await biometryAuth(true);
await serversDB.action(async() => {
await serverRecord.update((record) => {
record.biometry = !!result?.success;
});
} catch {
// Do nothing
}
});
});
} catch {
// Do nothing
}
};

export const checkHasPasscode = async({ force = true, serverRecord }) => {
Expand Down