Skip to content

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

Merge branch 'master' into beta

Ammar Ahmedfa03ec5ebe60
diff --cc apps/mobile/app/screens/settings/settings-data.tsx
index 72b61daf2,8c9b51509..073e9a78e
--- a/apps/mobile/app/screens/settings/settings-data.tsx
+++ b/apps/mobile/app/screens/settings/settings-data.tsx
@@@ -31,9 -31,10 +31,9 @@@ import dayjs from "dayjs"
import React from "react";
import { Appearance, Linking, Platform } from "react-native";
import { getVersion } from "react-native-device-info";
+ import { TextInput } from "react-native-gesture-handler";
import * as RNIap from "react-native-iap";
- import ScreenGuardModule from "react-native-screenguard";
import { DatabaseLogger, db } from "../../common/database";
-import { MMKV } from "../../common/database/mmkv";
import filesystem from "../../common/filesystem";
import { presentDialog } from "../../components/dialog/functions";
import { AppLockPassword } from "../../components/dialogs/applock-password";
@@@ -74,12 -82,6 +81,8 @@@ import { verifyUser, verifyUserWithAppl
import { logoutUser } from "./logout";
import { SettingSection } from "./types";
import { getTimeLeft } from "./user-section";
- import { EDITOR_LINE_HEIGHT } from "../../utils/constants";
+import { MMKV } from "../../common/database/mmkv";
- import { resetTabStore } from "../editor/tiptap/use-tab-store";
- import { clearAllStores } from "../../stores";
- import { refreshAllStores } from "../../stores/create-db-collection-store";
+import { useSettingStore } from "../../stores/use-setting-store";
export const settingsGroups: SettingSection[] = [
{
diff --cc apps/mobile/fonts/MaterialCommunityIcons.ttf
index a0d7a210a,23909c714..7bfc48b13
Binary files differ
diff --cc packages/intl/locale/en.po
index ee1ec8446,b8a10442e..fa6ab07e2
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@@ -975,7 -936,11 +976,11 @@@ msgstr "Are you sure you want to clear
msgid "Are you sure you want to clear trash?"
msgstr "Are you sure you want to clear trash?"
-#: src/strings.ts:2666
++#: src/strings.ts:2734
+ msgid "Are you sure you want to delete this attachment?"
+ msgstr "Are you sure you want to delete this attachment?"
+
-#: src/strings.ts:1542
+#: src/strings.ts:1544
msgid "Are you sure you want to logout and clear all data stored on THIS DEVICE?"
msgstr "Are you sure you want to logout and clear all data stored on THIS DEVICE?"
@@@ -1032,7 -993,11 +1037,11 @@@ msgstr "attachment
msgid "Attachment"
msgstr "Attachment"
-#: src/strings.ts:2667
++#: src/strings.ts:2735
+ msgid "Attachment deleted"
+ msgstr "Attachment deleted"
+
-#: src/strings.ts:2458
+#: src/strings.ts:2460
msgid "Attachment manager"
msgstr "Attachment manager"
@@@ -1830,7 -1779,11 +1839,11 @@@ msgstr "Confirm new password
msgid "Confirm password"
msgstr "Confirm password"
-#: src/strings.ts:2661
++#: src/strings.ts:2729
+ msgid "Confirm password required"
+ msgstr "Confirm password required"
+
-#: src/strings.ts:1487
+#: src/strings.ts:1489
msgid "Confirm pin"
msgstr "Confirm pin"
@@@ -2040,11 -1969,16 +2053,16 @@@ msgstr "Curate the toolbar that fits yo
msgid "Current note"
msgstr "Current note"
-#: src/strings.ts:1479
-#: src/strings.ts:1485
++#: src/strings.ts:1481
+#: src/strings.ts:1487
msgid "Current password"
msgstr "Current password"
-#: src/strings.ts:2670
++#: src/strings.ts:2738
+ msgid "Current password required"
+ msgstr "Current password required"
+
-#: src/strings.ts:1229
+#: src/strings.ts:1231
msgid "Current path: {path}"
msgstr "Current path: {path}"
@@@ -2222,7 -2156,11 +2240,11 @@@ msgstr "Delete
msgid "Delete account"
msgstr "Delete account"
-#: src/strings.ts:2664
++#: src/strings.ts:2732
+ msgid "Delete attachment"
+ msgstr "Delete attachment"
+
-#: src/strings.ts:1319
+#: src/strings.ts:1321
msgid "Delete collapsed section"
msgstr "Delete collapsed section"
@@@ -3230,7 -3119,11 +3252,11 @@@ msgstr "Getting information
msgid "Getting recovery codes"
msgstr "Getting recovery codes"
-#: src/strings.ts:2663
++#: src/strings.ts:2731
+ msgid "Gift code required"
+ msgstr "Gift code required"
+
-#: src/strings.ts:2172
+#: src/strings.ts:2174
msgid "GNU GENERAL PUBLIC LICENSE Version 3"
msgstr "GNU GENERAL PUBLIC LICENSE Version 3"
@@@ -3937,6 -3790,10 +3963,10 @@@ msgstr "Login failed
msgid "Login required"
msgstr "Login required"
-#: src/strings.ts:2671
++#: src/strings.ts:2739
+ msgid "Login required to restore attachments"
+ msgstr "Login required to restore attachments"
+
#: src/strings.ts:779
msgid "Login successful"
msgstr "Login successful"
@@@ -4187,7 -4044,11 +4217,11 @@@ msgstr "Multi-layer encryption to most
msgid "Name"
msgstr "Name"
-#: src/strings.ts:2669
++#: src/strings.ts:2737
+ msgid "Name is required."
+ msgstr "Name is required."
+
-#: src/strings.ts:1688
+#: src/strings.ts:1690
msgid "Native high-performance encryption"
msgstr "Native high-performance encryption"
@@@ -4568,11 -4417,7 +4602,7 @@@ msgstr "Okay
msgid "Old - new"
msgstr "Old - new"
- #: src/strings.ts:1481
- msgid "Old password"
- msgstr "Old password"
-
-#: src/strings.ts:1835
+#: src/strings.ts:1837
msgid "Older version"
msgstr "Older version"
@@@ -4725,6 -4570,10 +4755,10 @@@ msgstr "Password not entered
msgid "Password protection"
msgstr "Password protection"
-#: src/strings.ts:2660
++#: src/strings.ts:2728
+ msgid "Password required"
+ msgstr "Password required"
+
#: src/strings.ts:809
msgid "Password updated"
msgstr "Password updated"
@@@ -4831,11 -4680,8 +4865,12 @@@ msgstr "Please download a backup of you
msgid "Please enable automatic backups to avoid losing important data."
msgstr "Please enable automatic backups to avoid losing important data."
-#: src/strings.ts:1512
-#: src/strings.ts:2662
+#: src/strings.ts:2674
+msgid "Please enter a key name"
+msgstr "Please enter a key name"
+
+#: src/strings.ts:1514
++#: src/strings.ts:2730
msgid "Please enter a valid email address"
msgstr "Please enter a valid email address"
@@@ -4899,6 -4741,10 +4934,10 @@@ msgstr "Please fill all the fields to c
msgid "Please grant notifications permission to add new reminders."
msgstr "Please grant notifications permission to add new reminders."
-#: src/strings.ts:2677
++#: src/strings.ts:2745
+ msgid "Please login to download attachments."
+ msgstr "Please login to download attachments."
+
#: src/strings.ts:873
msgid "Please make sure you have saved the recovery key. Tap one more time to confirm."
msgstr "Please make sure you have saved the recovery key. Tap one more time to confirm."
@@@ -6856,7 -6678,11 +6895,11 @@@ msgstr "Title
msgid "Title format"
msgstr "Title format"
-#: src/strings.ts:2668
++#: src/strings.ts:2736
+ msgid "Title is required"
+ msgstr "Title is required"
+
-#: src/strings.ts:1188
+#: src/strings.ts:1190
msgid "To use app lock, you must enable biometrics such as Fingerprint lock or Face ID on your phone."
msgstr "To use app lock, you must enable biometrics such as Fingerprint lock or Face ID on your phone."
@@@ -7681,6 -7499,16 +7724,16 @@@ msgstr "You have unsynced notes. Take
msgid "You must log out in order to change/reset server URLs."
msgstr "You must log out in order to change/reset server URLs."
-#: src/strings.ts:2673
++#: src/strings.ts:2741
+ msgid ""
+ "You need to login to restore attachments from a backup file. [Read more](https://help.notesnook.com/faqs/login-to-restore-attachments-in-backup).\n"
+ " \n"
+ "Continue without attachments?"
+ msgstr ""
+ "You need to login to restore attachments from a backup file. [Read more](https://help.notesnook.com/faqs/login-to-restore-attachments-in-backup).\n"
+ " \n"
+ "Continue without attachments?"
+
#: src/strings.ts:836
msgid "You simply cannot get any better of a note taking app than @notesnook. The UI is clean and slick, it is feature rich, encrypted, reasonably priced (esp. for students & educators) & open source"
msgstr "You simply cannot get any better of a note taking app than @notesnook. The UI is clean and slick, it is feature rich, encrypted, reasonably priced (esp. for students & educators) & open source"
diff --cc packages/intl/locale/pseudo-LOCALE.po
index 2a0cc525e,718e2c9d3..c790396bf
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@@ -971,11 -932,15 +972,15 @@@ msgstr "
msgid "Are you sure you want to clear all logs from {key}?"
msgstr ""
-#: src/strings.ts:1324
+#: src/strings.ts:1326
msgid "Are you sure you want to clear trash?"
-msgstr ""
++msgstr "<<<<<<< HEAD"
+
-#: src/strings.ts:2666
++#: src/strings.ts:2734
+ msgid "Are you sure you want to delete this attachment?"
msgstr ""
-#: src/strings.ts:1542
+#: src/strings.ts:1544
msgid "Are you sure you want to logout and clear all data stored on THIS DEVICE?"
msgstr ""
@@@ -1028,11 -989,15 +1033,15 @@@ msgid "attachment
msgstr ""
#: src/strings.ts:300
-#: src/strings.ts:2354
+#: src/strings.ts:2356
msgid "Attachment"
-msgstr ""
++msgstr "<<<<<<< HEAD"
+
-#: src/strings.ts:2667
++#: src/strings.ts:2735
+ msgid "Attachment deleted"
msgstr ""
-#: src/strings.ts:2458
+#: src/strings.ts:2460
msgid "Attachment manager"
msgstr ""
@@@ -1815,15 -1764,19 +1824,19 @@@ msgstr "
msgid "Confirm new password"
msgstr ""
-#: src/strings.ts:1483
+#: src/strings.ts:1485
msgid "Confirm password"
-msgstr ""
++msgstr "<<<<<<< HEAD"
+
-#: src/strings.ts:2661
++#: src/strings.ts:2729
+ msgid "Confirm password required"
msgstr ""
-#: src/strings.ts:1487
+#: src/strings.ts:1489
msgid "Confirm pin"
-msgstr ""
+msgstr "<<<<<<< HEAD"
-#: src/strings.ts:2653
+#: src/strings.ts:2655
msgid "Confirmation email sent"
msgstr ""
@@@ -2025,15 -1954,20 +2038,20 @@@ msgstr "
msgid "Curate the toolbar that fits your needs and matches your personality."
msgstr ""
-#: src/strings.ts:1836
+#: src/strings.ts:1838
msgid "Current note"
--msgstr ""
++msgstr "<<<<<<< HEAD"
-#: src/strings.ts:1479
-#: src/strings.ts:1485
++#: src/strings.ts:1481
+#: src/strings.ts:1487
msgid "Current password"
msgstr ""
-#: src/strings.ts:2670
++#: src/strings.ts:2738
+ msgid "Current password required"
+ msgstr ""
+
-#: src/strings.ts:1229
+#: src/strings.ts:1231
msgid "Current path: {path}"
msgstr ""
@@@ -2207,19 -2141,23 +2225,23 @@@ msgstr "
msgid "Delete"
msgstr ""
-#: src/strings.ts:1076
+#: src/strings.ts:1078
msgid "Delete account"
-msgstr ""
++msgstr "<<<<<<< HEAD"
+
-#: src/strings.ts:2664
++#: src/strings.ts:2732
+ msgid "Delete attachment"
msgstr ""
-#: src/strings.ts:1319
+#: src/strings.ts:1321
msgid "Delete collapsed section"
-msgstr ""
+msgstr "<<<<<<< HEAD"
-#: src/strings.ts:2303
+#: src/strings.ts:2305
msgid "Delete column"
-msgstr ""
+msgstr "<<<<<<< HEAD<<<<<<< HEAD<<<<<<< HEAD"
-#: src/strings.ts:2650
+#: src/strings.ts:2652
msgid "Delete data"
msgstr ""
@@@ -3210,9 -3099,13 +3232,13 @@@ msgstr "
#: src/strings.ts:400
msgid "Getting recovery codes"
- msgstr "<<<<<<< HEAD"
-msgstr ""
++msgstr "<<<<<<< HEAD<<<<<<< HEAD"
+
-#: src/strings.ts:2663
++#: src/strings.ts:2731
+ msgid "Gift code required"
+ msgstr ""
-#: src/strings.ts:2172
+#: src/strings.ts:2174
msgid "GNU GENERAL PUBLIC LICENSE Version 3"
msgstr ""
@@@ -3917,6 -3770,10 +3943,10 @@@ msgstr "
msgid "Login required"
msgstr ""
-#: src/strings.ts:2671
++#: src/strings.ts:2739
+ msgid "Login required to restore attachments"
+ msgstr ""
+
#: src/strings.ts:779
msgid "Login successful"
msgstr ""
@@@ -4165,13 -4022,17 +4195,17 @@@ msgstr "
#: src/strings.ts:887
msgid "Name"
-msgstr ""
++msgstr "<<<<<<< HEAD"
+
-#: src/strings.ts:2669
++#: src/strings.ts:2737
+ msgid "Name is required."
msgstr ""
-#: src/strings.ts:1688
+#: src/strings.ts:1690
msgid "Native high-performance encryption"
-msgstr ""
+msgstr "<<<<<<< HEAD<<<<<<< HEAD"
-#: src/strings.ts:2453
+#: src/strings.ts:2455
msgid "Navigate"
msgstr ""
@@@ -4540,13 -4389,9 +4574,9 @@@ msgstr "
#: src/strings.ts:641
msgid "Old - new"
- msgstr ""
-
- #: src/strings.ts:1481
- msgid "Old password"
--msgstr ""
++msgstr "<<<<<<< HEAD"
-#: src/strings.ts:1835
+#: src/strings.ts:1837
msgid "Older version"
msgstr ""
@@@ -4699,15 -4544,19 +4729,19 @@@ msgstr "
msgid "Password protection"
msgstr ""
-#: src/strings.ts:2660
++#: src/strings.ts:2728
+ msgid "Password required"
+ msgstr ""
+
#: src/strings.ts:809
msgid "Password updated"
-msgstr ""
+msgstr "<<<<<<< HEAD"
-#: src/strings.ts:2091
+#: src/strings.ts:2093
msgid "Password/pin"
-msgstr ""
+msgstr "<<<<<<< HEAD<<<<<<< HEAD"
-#: src/strings.ts:2259
+#: src/strings.ts:2261
msgid "Paste"
msgstr ""
@@@ -4801,15 -4650,12 +4835,16 @@@ msgstr "
msgid "Please download a backup of your data as your account will be cleared before recovery."
msgstr ""
-#: src/strings.ts:2007
+#: src/strings.ts:2009
msgid "Please enable automatic backups to avoid losing important data."
-msgstr ""
+msgstr "<<<<<<< HEAD"
-#: src/strings.ts:1512
-#: src/strings.ts:2662
+#: src/strings.ts:2674
+msgid "Please enter a key name"
- msgstr ""
++msgstr "<<<<<<< HEAD"
+
+#: src/strings.ts:1514
++#: src/strings.ts:2730
msgid "Please enter a valid email address"
msgstr ""
@@@ -4873,6 -4715,10 +4908,10 @@@ msgstr "
msgid "Please grant notifications permission to add new reminders."
msgstr ""
-#: src/strings.ts:2677
++#: src/strings.ts:2745
+ msgid "Please login to download attachments."
+ msgstr ""
+
#: src/strings.ts:873
msgid "Please make sure you have saved the recovery key. Tap one more time to confirm."
msgstr ""
@@@ -6811,11 -6633,15 +6850,15 @@@ msgstr "
msgid "Title"
msgstr ""
-#: src/strings.ts:1157
+#: src/strings.ts:1159
msgid "Title format"
-msgstr ""
++msgstr "<<<<<<< HEAD"
+
-#: src/strings.ts:2668
++#: src/strings.ts:2736
+ msgid "Title is required"
msgstr ""
-#: src/strings.ts:1188
+#: src/strings.ts:1190
msgid "To use app lock, you must enable biometrics such as Fingerprint lock or Face ID on your phone."
msgstr ""
@@@ -7623,6 -7441,13 +7666,13 @@@ msgstr "
msgid "You must log out in order to change/reset server URLs."
msgstr ""
-#: src/strings.ts:2673
++#: src/strings.ts:2741
+ msgid ""
+ "You need to login to restore attachments from a backup file. [Read more](https://help.notesnook.com/faqs/login-to-restore-attachments-in-backup).\n"
+ " \n"
+ "Continue without attachments?"
+ msgstr ""
+
#: src/strings.ts:836
msgid "You simply cannot get any better of a note taking app than @notesnook. The UI is clean and slick, it is feature rich, encrypted, reasonably priced (esp. for students & educators) & open source"
msgstr ""
@@@ -7820,15 -7645,15 +7870,15 @@@ msgstr "
msgid "Your subscription has ended"
msgstr ""
-#: src/strings.ts:1036
+#: src/strings.ts:1038
msgid "Your subscription renews on {date}"
-msgstr ""
+msgstr "<<<<<<< HEAD"
-#: src/strings.ts:2053
+#: src/strings.ts:2055
msgid "Your support request has been forwarded"
--msgstr ""
++msgstr "<<<<<<< HEAD"
-#: src/strings.ts:2062
+#: src/strings.ts:2064
msgid "Your support request has been forwarded to our support team. We will get back to you via email as soon as possible. If you don't receive an email from us within 24-48 hours, please send us an email directly at [email protected]."
msgstr ""
diff --cc packages/intl/src/strings.ts
index f4f3ed915,e318c1a76..fc5602bb5
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@@ -2723,6 -2657,22 +2723,24 @@@ Use this if changes from other devices
featureNotAvailable: () => t`This feature is not available on this plan.`,
valueMustBeBetween: (min: number, max: number) =>
t`Value must be between ${min} and ${max}`,
+ pgpPrivateKeyProtected: () =>
- t`Private key is passphrase-protected. Please provide the decrypted key or a key without a passphrase.`
++ t`Private key is passphrase-protected. Please provide the decrypted key or a key without a passphrase.`,
+ passwordRequired: () => t`Password required`,
+ confirmPasswordRequired: () => t`Confirm password required`,
+ enterAValidEmailAddress: () => t`Please enter a valid email address`,
+ giftCodeRequired: () => t`Gift code required`,
+ deleteAttachment: () => t`Delete attachment`,
+ deleteAttachmentConfirm: () =>
+ t`Are you sure you want to delete this attachment?`,
+ attachmentDeleted: () => t`Attachment deleted`,
+ titleIsRequired: () => t`Title is required`,
+ nameIsRequired: () => t`Name is required.`,
+ currentPasswordRequired: () => t`Current password required`,
+ loginToRestoreAttachments: () => t`Login required to restore attachments`,
+ loginToRestoreAttachmentsDesc: () =>
+ t`You need to login to restore attachments from a backup file. [Read more](https://help.notesnook.com/faqs/login-to-restore-attachments-in-backup).
+
+ Continue without attachments?`,
+ pleaseLoginToDownloadAttachments: () =>
+ t`Please login to download attachments.`
};