Skip to content

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

mobile: add vault lock timer settings

Ammar Ahmed1f7a64a42d51
diff --git a/apps/mobile/app/screens/settings/components.tsx b/apps/mobile/app/screens/settings/components.tsx
index ce752a963..4413648bf 100644
--- a/apps/mobile/app/screens/settings/components.tsx
+++ b/apps/mobile/app/screens/settings/components.tsx
@@ -39,7 +39,8 @@ import {
ImageCompressionPicker,
SidebarTabPicker,
TimeFormatPicker,
- TrashIntervalPicker
+ TrashIntervalPicker,
+ VaultLockTimerPicker
} from "./picker/pickers";
import { RestoreBackup } from "./restore-backup";
import { ServersConfiguration } from "./server-config";
@@ -66,6 +67,7 @@ export const components: { [name: string]: ReactElement } = {
"image-compression-picker": <ImageCompressionPicker />,
"theme-selector": <ThemeSelector />,
"applock-timer": <ApplockTimerPicker />,
+ "vault-lock-timer": <VaultLockTimerPicker />,
autobackupsattachments: <BackupWithAttachmentsReminderPicker />,
backuprestore: <RestoreBackup />,
"server-config": <ServersConfiguration />,
diff --git a/apps/mobile/app/screens/settings/picker/pickers.tsx b/apps/mobile/app/screens/settings/picker/pickers.tsx
index 602f9973b..e5a103cd3 100644
--- a/apps/mobile/app/screens/settings/picker/pickers.tsx
+++ b/apps/mobile/app/screens/settings/picker/pickers.tsx
@@ -137,8 +137,8 @@ export const TrashIntervalPicker = createSettingsPicker({
return item === -1
? strings.never()
: item === 1
- ? strings.reminderRecurringMode.day()
- : strings.days(item);
+ ? strings.reminderRecurringMode.day()
+ : strings.days(item);
},
getItemKey: (item) => item.toString(),
options: [-1, 1, 7, 30, 365] as TrashCleanupInterval[],
@@ -294,10 +294,10 @@ export const ApplockTimerPicker = createSettingsPicker({
return item === -1
? strings.never()
: item === 0 || item === undefined
- ? strings.immediately()
- : item === 1
- ? strings.minutes(1)
- : strings.minutes(item);
+ ? strings.immediately()
+ : item === 1
+ ? strings.minutes(1)
+ : strings.minutes(item);
},
getItemKey: (item) => item.toString(),
options: [-1, 0, 1, 5, 15, 30],
@@ -309,6 +309,37 @@ export const ApplockTimerPicker = createSettingsPicker({
isOptionAvailable: async () => true
});
+export const VaultLockTimerPicker = createSettingsPicker({
+ getValue: () => useSettingStore.getState().vaultLockAfter,
+ updateValue: async (item) => {
+ await db.settings.setVaultLockAfter(item);
+ useSettingStore.setState({
+ vaultLockAfter: item
+ });
+ },
+ formatValue: (item) => {
+ return item === -1
+ ? strings.never()
+ : item < 1000 * 60 * 60
+ ? strings.minutes(item / (1000 * 60))
+ : strings.hours(item / (1000 * 60 * 60));
+ },
+ getItemKey: (item) => item.toString(),
+ options: [
+ 1000 * 60 * 1,
+ 1000 * 60 * 5,
+ 1000 * 60 * 10,
+ 1000 * 60 * 15,
+ 1000 * 60 * 30,
+ 1000 * 60 * 45,
+ 1000 * 60 * 60,
+ -1
+ ],
+ compareValue: (current, item) => current === item,
+ isFeatureAvailable: async () => true,
+ isOptionAvailable: async () => true
+});
+
export const ImageCompressionPicker = createSettingsPicker({
getValue: () => useSettingStore.getState().settings.imageCompression,
updateValue: async (item) => {
diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsx
index 89fbe9731..7ac735a75 100644
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@ -1041,6 +1041,16 @@ export const settingsGroups: SettingSection[] = [
});
}
},
+ {
+ id: "lock-vault-after",
+ type: "component",
+ useHook: useVaultStatus,
+ name: strings.lockVaultAfter(),
+ description: strings.lockVaultAfterDesc(),
+ hidden: (current) => !(current as VaultStatusType)?.exists,
+ component: "vault-lock-timer",
+ icon: "clock-outline"
+ },
{
id: "change-vault-password",
useHook: useVaultStatus,
diff --git a/apps/mobile/app/stores/use-setting-store.ts b/apps/mobile/app/stores/use-setting-store.ts
index c3ba7af62..8702fae52 100644
--- a/apps/mobile/app/stores/use-setting-store.ts
+++ b/apps/mobile/app/stores/use-setting-store.ts
@@ -140,6 +140,7 @@ export interface SettingStore {
dateFormat: string;
dayFormat: DayFormat;
weekFormat: WeekFormat;
+ vaultLockAfter: number;
dbPassword?: string;
isOldAppLock: () => boolean;
initialUrl: string | null;
@@ -234,6 +235,7 @@ export const useSettingStore = create<SettingStore>((set, get) => ({
dateFormat: "DD-MM-YYYY",
dayFormat: "short",
weekFormat: "Sun",
+ vaultLockAfter: 1000 * 60 * 30,
setAppDidEnterBackgroundForAction: (value: boolean) => {
set({
appDidEnterBackgroundForAction: value
@@ -257,6 +259,7 @@ export const useSettingStore = create<SettingStore>((set, get) => ({
timeFormat: db.settings.getTimeFormat(),
dateFormat: db.settings?.getTimeFormat(),
weekFormat: db.settings.getWeekFormat(),
+ vaultLockAfter: db.settings.getVaultLockAfter(),
inboxEnabled: await db.user.hasInboxKeys()
});
},
diff --git a/apps/mobile/fonts/MaterialCommunityIcons.ttf b/apps/mobile/fonts/MaterialCommunityIcons.ttf
index b3dda3db1..0ac83a101 100644
Binary files a/apps/mobile/fonts/MaterialCommunityIcons.ttf and b/apps/mobile/fonts/MaterialCommunityIcons.ttf differ
diff --git a/apps/mobile/scripts/optimize-fonts.mjs b/apps/mobile/scripts/optimize-fonts.mjs
index 5bf951bdb..2660c6532 100644
--- a/apps/mobile/scripts/optimize-fonts.mjs
+++ b/apps/mobile/scripts/optimize-fonts.mjs
@@ -126,7 +126,8 @@ const EXTRA_ICON_NAMES = [
"cancel",
"inbox",
"identifier",
- "image-area"
+ "image-area",
+ "clock-outline"
];
const __filename = fileURLToPath(import.meta.url);