Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: fix applock unlocks app on entering any pin

Ammar Ahmedd45a65edea51
diff --git a/apps/mobile/app/components/app-lock-overlay/index.tsx b/apps/mobile/app/components/app-lock-overlay/index.tsx
index 47e184995..a08b2089b 100644
--- a/apps/mobile/app/components/app-lock-overlay/index.tsx
+++ b/apps/mobile/app/components/app-lock-overlay/index.tsx
@@ -45,6 +45,7 @@ import Input from "../ui/input";
import Seperator from "../ui/seperator";
import Heading from "../ui/typography/heading";
import Paragraph from "../ui/typography/paragraph";
+import { ToastManager } from "../../services/event-manager";
const getUser = () => {
const user = MMKV.getString("user");
@@ -131,9 +132,9 @@ const AppLockedOverlay = () => {
if (!password.current) return;
try {
const unlocked = appLockHasPasswordSecurity
- ? validateAppLockPassword(password.current)
+ ? await validateAppLockPassword(password.current)
: await verifyUserPassword(password.current);
-
+ console.log(unlocked);
if (unlocked) {
if (!appLockHasPasswordSecurity) {
await setAppLockVerificationCipher(password.current);
diff --git a/apps/mobile/app/components/dialogs/applock-password/index.tsx b/apps/mobile/app/components/dialogs/applock-password/index.tsx
index 410e7fd18..64eba6949 100644
--- a/apps/mobile/app/components/dialogs/applock-password/index.tsx
+++ b/apps/mobile/app/components/dialogs/applock-password/index.tsx
@@ -314,6 +314,7 @@ export const AppLockPassword = () => {
new Error(
`${keyboardType === "pin" ? "Pin" : "Password"} incorrect`
),
+ undefined,
"local"
);
return;
diff --git a/apps/mobile/app/screens/settings/functions.js b/apps/mobile/app/screens/settings/functions.js
index 36c59db0a..9245f36e1 100644
--- a/apps/mobile/app/screens/settings/functions.js
+++ b/apps/mobile/app/screens/settings/functions.js
@@ -87,7 +87,7 @@ export async function verifyUserWithApplock() {
paragraph: `Please enter your app lock ${
keyboardType === "numeric" ? "pin" : "password"
}`,
- positiveText: "Disable",
+ positiveText: "Verify",
secureTextEntry: true,
negativeText: "Cancel",
positivePress: async (value) => {