mobile: disable template when pin note to notifications

.github/workflows/android.publish.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Use specific Java version for the builds
         uses: joschi/setup-jdk@v2
         with:
-          java-version: "17"
+          java-version: "11"
           architecture: "x64"
 
       - name: Install node modules

apps/desktop/README.md

@@ -40,35 +40,12 @@ Once you are inside the `./notesnook` directory, run the preparation step:
 npm install
 ```
 
-Now you can finally start the desktop app for development:
+Now you can finally start the desktop app:
 
 ```bash
 npm run start:desktop
 ```
 
-To run the app in release mode:
-
-```bash
-npm run staging -- --rebuild
-```
-
-This will compile and run the app in production mode but it won't generate any packages. To create the final packages, you'll have to run the following commands:
-
-```bash
-npm run release -- --rebuild
-
-# For macOS
-npx electron-builder --mac dmg --arm64 --x64 -publish never
-
-# For Linux (AppImage)
-npx electron-builder --linux AppImage:x64 AppImage:arm64 -publish never
-
-# For Windows
-npx electron-builder --win --publish never
-```
-
-Feel free to play around with the `electron-builder` command to get the packages you need. `npx electron-builder --help` is a great resource to learn different commands & platforms supported by `electron-builder`.
-
 ## Developer guide
 
 ### The tech stack

apps/desktop/app-update.yml

@@ -1,4 +1,3 @@
 owner: streetwriters
 repo: notesnook
 provider: github
-updaterCacheDirName: Notesnook

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.0.17",
+  "version": "3.0.4",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/index.js",
@@ -11,12 +11,14 @@
   "repository": "https://github.com/streetwriters/notesnook",
   "license": "GPL-3.0-or-later",
   "dependencies": {
+    "@notesnook/crypto": "file:../../packages/crypto",
     "@trpc/client": "10.38.3",
     "@trpc/server": "10.38.3",
     "better-sqlite3-multiple-ciphers": "^9.5.0",
     "electron-trpc": "0.5.2",
-    "electron-updater": "^6.2.1",
+    "electron-updater": "6.1.4",
     "icojs": "^0.17.1",
+    "sodium-native": "^4.1.1",
     "typed-emitter": "^2.1.0",
     "yargs": "^17.6.2",
     "zod": "^3.21.4"
@@ -27,8 +29,7 @@
     "chokidar": "^3.5.3",
     "electron": "^29.3.1",
     "electron-builder": "^24.13.3",
-    "esbuild": "^0.23.0",
-    "kysely": "^0.27.3",
+    "esbuild": "^0.20.0",
     "node-gyp-build": "^4.8.0",
     "prebuildify": "^6.0.1",
     "tree-kill": "^1.2.2",

apps/desktop/scripts/build.mjs

@@ -46,11 +46,11 @@ if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
 // temporary until there's support for prebuilt binaries for linux ARM
 if (os.platform() === "linux") await patchBetterSQLite3();
 
-// if (os.platform() === "win32")
-//   await exec(
-//     `npx prebuildify --arch=arm64 --strip -t electron@${packageJson.devDependencies.electron}`,
-//     path.join(__dirname, "..", "node_modules", "sodium-native")
-//   );
+if (os.platform() === "win32")
+  await exec(
+    `npx prebuildify --arch=arm64 --strip -t electron@${packageJson.devDependencies.electron}`,
+    path.join(__dirname, "..", "node_modules", "sodium-native")
+  );
 
 await fs.cp(path.join(webAppPath, "build"), "build", {
   recursive: true,

apps/desktop/src/api/os-integration.ts

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { initTRPC } from "@trpc/server";
 import { z } from "zod";
-import { app, dialog, nativeTheme, Notification, shell } from "electron";
+import { dialog, nativeTheme, Notification, shell } from "electron";
 import { AutoLaunch } from "../utils/autolaunch";
 import { config, DesktopIntegration } from "../utils/config";
 import { bringToFront } from "../utils/bring-to-front";
@@ -152,10 +152,6 @@ export const osIntegrationRouter = t.router({
     await rm(input);
   }),
 
-  restart: t.procedure.query(() => {
-    app.relaunch();
-    app.exit();
-  }),
   showNotification: t.procedure
     .input(NotificationOptions)
     .query(({ input }) => {
@@ -195,10 +191,7 @@ export const osIntegrationRouter = t.router({
       ({ input: { theme, windowControlsIconColor, backgroundColor } }) => {
         if (windowControlsIconColor) {
           config.windowControlsIconColor = windowControlsIconColor;
-          if (
-            process.platform === "win32" &&
-            !config.desktopSettings.nativeTitlebar
-          )
+          if (process.platform === "win32")
             globalThis.window?.setTitleBarOverlay({
               symbolColor: windowControlsIconColor
             });

apps/desktop/src/api/sqlite-kysely.ts

@@ -1,143 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import type { Database, Statement } from "better-sqlite3-multiple-ciphers";
-import type { QueryResult } from "kysely";
-
-type SQLiteCompatibleType =
-  | number
-  | string
-  | Uint8Array
-  | Array<number>
-  | bigint
-  | null;
-
-export class SQLite {
-  sqlite?: Database;
-  initialized = false;
-  preparedStatements: Map<string, Statement<unknown[]>> = new Map();
-  retryCounter: Record<string, number> = {};
-  constructor() {
-    console.log("new sqlite worker");
-  }
-
-  async open(filePath: string) {
-    if (this.sqlite) {
-      console.error("Database is already initialized");
-      return;
-    }
-
-    this.sqlite = require("better-sqlite3-multiple-ciphers")(
-      filePath
-    ).unsafeMode(true);
-  }
-
-  /**
-   * Wrapper function for preparing SQL statements with caching
-   * to avoid unnecessary computations.
-   */
-  async prepare(sql: string): Promise<Statement | undefined> {
-    if (!this.sqlite) throw new Error("Database is not initialized.");
-    try {
-      const cached = this.preparedStatements.get(sql);
-      if (cached !== undefined) return cached;
-
-      const prepared = this.sqlite.prepare(sql);
-      if (!prepared) return;
-
-      this.preparedStatements.set(sql, prepared);
-
-      // reset retry count on success
-      this.retryCounter[sql] = 0;
-      return prepared;
-    } catch (ex) {
-      console.error(ex);
-
-      // statement prepare process can be flaky so retry at least 5 times
-      // before giving up.
-      if (this.retryCounter[sql] < 5) {
-        this.retryCounter[sql] = (this.retryCounter[sql] || 0) + 1;
-        console.warn("Failed to prepare statement. Retrying:", sql);
-        return this.prepare(sql);
-      } else this.retryCounter[sql] = 0;
-
-      if (ex instanceof Error) ex.message += ` (query: ${sql})`;
-      throw ex;
-    }
-  }
-
-  async exec<R>(
-    sql: string,
-    parameters: SQLiteCompatibleType[] = []
-  ): Promise<QueryResult<R>> {
-    const prepared = await this.prepare(sql);
-    if (!prepared) return { rows: [] };
-    try {
-      if (prepared.reader) {
-        return {
-          rows: prepared.all(parameters) as R[]
-        };
-      } else {
-        const { changes, lastInsertRowid } = prepared.run(parameters);
-        const numAffectedRows =
-          changes !== undefined && changes !== null && !isNaN(changes)
-            ? BigInt(changes)
-            : undefined;
-        return {
-          numAffectedRows,
-          insertId:
-            lastInsertRowid !== undefined && lastInsertRowid !== null
-              ? typeof lastInsertRowid === "bigint"
-                ? lastInsertRowid
-                : BigInt(lastInsertRowid)
-              : undefined,
-          rows: [] as R[]
-        };
-      }
-    } catch (e) {
-      if (e instanceof Error) e.message += ` (query: ${sql})`;
-      throw e;
-    }
-  }
-
-  async run<R>(
-    sql: string,
-    parameters?: SQLiteCompatibleType[]
-  ): Promise<QueryResult<R>> {
-    if (!this.sqlite) throw new Error("No database is not opened.");
-    return await this.exec(sql, parameters);
-  }
-
-  async close() {
-    if (!this.sqlite) return;
-
-    this.preparedStatements.clear();
-    this.sqlite.close();
-    this.sqlite = undefined;
-  }
-
-  async delete(filePath: string) {
-    await this.close();
-    await require("fs/promises").rm(filePath, {
-      force: true,
-      maxRetries: 5,
-      retryDelay: 500
-    });
-  }
-}

apps/desktop/src/api/updater.ts

@@ -29,37 +29,19 @@ type Progress = { percent: number };
 
 const t = initTRPC.create();
 let cancellationToken: CancellationToken | undefined = undefined;
-let downloadTimeout: NodeJS.Timeout | undefined = undefined;
 
 export const updaterRouter = t.router({
   autoUpdates: t.procedure.query(() => config.automaticUpdates),
   install: t.procedure.query(() => autoUpdater.quitAndInstall()),
   download: t.procedure.query(async () => {
     if (cancellationToken) return;
-    clearTimeout(downloadTimeout);
-    await new Promise<string[]>((resolve, reject) => {
-      downloadTimeout = setTimeout(async () => {
-        cancellationToken = new CancellationToken();
-        autoUpdater.isUpdaterActive();
-        await autoUpdater
-          .downloadUpdate(cancellationToken)
-          .then(resolve)
-          .catch(reject)
-          .finally(() => (cancellationToken = undefined));
-      }, 1000);
-    });
+    cancellationToken = new CancellationToken();
+    await autoUpdater
+      .downloadUpdate(cancellationToken)
+      .finally(() => (cancellationToken = undefined));
   }),
   check: t.procedure.query(async () => {
-    if (cancellationToken) return;
-    clearTimeout(downloadTimeout);
-    await new Promise<void>((resolve) => {
-      downloadTimeout = setTimeout(async () => {
-        await autoUpdater
-          .checkForUpdates()
-          .catch(console.error)
-          .finally(resolve);
-      }, 1000);
-    });
+    await autoUpdater.checkForUpdates().catch(console.error);
   }),
 
   toggleAutoUpdates: t.procedure
@@ -79,18 +61,7 @@ export const updaterRouter = t.router({
     "update-not-available"
   ),
   onAvailable: createSubscription<"update-available", UpdateInfo>(
-    "update-available",
-    () => {
-      if (!config.automaticUpdates) return false;
-      autoUpdater.emit("download-progress", {
-        bytesPerSecond: 0,
-        delta: 0,
-        percent: 0,
-        total: 100,
-        transferred: 0
-      });
-      return true;
-    }
+    "update-available"
   ),
   onError: createSubscription("error")
 });
@@ -98,11 +69,10 @@ export const updaterRouter = t.router({
 function createSubscription<
   TName extends keyof AppUpdaterEvents,
   TReturnType = Parameters<AppUpdaterEvents[TName]>[0]
->(eventName: TName, handler?: (args: TReturnType) => boolean) {
+>(eventName: TName) {
   return t.procedure.subscription(() => {
     return observable<TReturnType>((emit) => {
       const listener: AppUpdaterEvents[TName] = (...args: any[]) => {
-        if (handler?.(args[0])) return;
         emit.next(args[0]);
       };
       autoUpdater.removeAllListeners(eventName);

apps/desktop/src/index.ts

@@ -21,4 +21,3 @@ export * from "./constants";
 export type { AppRouter } from "./api";
 export { type UpdateInfo } from "builder-util-runtime";
 export { type DesktopIntegration } from "./utils/config";
-export { SQLite } from "./api/sqlite-kysely.js";

apps/desktop/src/main.ts

@@ -84,27 +84,22 @@ async function createWindow() {
       format: process.platform === "win32" ? "ico" : "png"
     }),
 
-    ...(config.desktopSettings.nativeTitlebar
-      ? {}
-      : {
-          titleBarStyle: "hidden",
-          frame: process.platform === "win32" || process.platform === "darwin",
-          titleBarOverlay: {
-            height: 37,
-            color: "#00000000",
-            symbolColor: config.windowControlsIconColor
-          },
-          trafficLightPosition: {
-            x: 16,
-            y: 12
-          }
-        }),
+    titleBarStyle: "hidden",
+    frame: process.platform === "win32" || process.platform === "darwin",
+    titleBarOverlay: {
+      height: 37,
+      color: "#00000000",
+      symbolColor: config.windowControlsIconColor
+    },
+    trafficLightPosition: {
+      x: 16,
+      y: 12
+    },
 
     webPreferences: {
       zoomFactor: config.zoomFactor,
       nodeIntegration: true,
       contextIsolation: false,
-      nodeIntegrationInWorker: true,
       spellcheck: config.isSpellCheckerEnabled,
       preload: __dirname + "/preload.js"
     }

apps/desktop/src/preload.ts

@@ -20,14 +20,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { ELECTRON_TRPC_CHANNEL } from "electron-trpc/main";
 import { type RendererGlobalElectronTRPC } from "electron-trpc/src/types";
-// import type { NNCrypto } from "@notesnook/crypto";
+import type { NNCrypto } from "@notesnook/crypto";
 import { ipcRenderer } from "electron";
 import { platform } from "os";
+import sqlite3, { Database } from "better-sqlite3-multiple-ciphers";
 
 declare global {
   var os: () => "mas" | ReturnType<typeof platform>;
   var electronTRPC: RendererGlobalElectronTRPC;
-  // var NativeNNCrypto: (new () => NNCrypto) | undefined;
+  var NativeNNCrypto: (new () => NNCrypto) | undefined;
+  var createSQLite3Database: (filename: string) => Database;
 }
 
 process.once("loaded", async () => {
@@ -40,5 +42,6 @@ process.once("loaded", async () => {
   globalThis.electronTRPC = electronTRPC;
 });
 
-// globalThis.NativeNNCrypto = require("@notesnook/crypto").NNCrypto;
+globalThis.NativeNNCrypto = require("@notesnook/crypto").NNCrypto;
+globalThis.createSQLite3Database = (filename) => sqlite3(filename);
 globalThis.os = () => (MAC_APP_STORE ? "mas" : platform());

apps/desktop/src/utils/autoupdater.ts

@@ -35,7 +35,6 @@ async function configureAutoUpdater() {
   autoUpdater.allowDowngrade = false;
   autoUpdater.allowPrerelease = false;
   autoUpdater.autoInstallOnAppQuit = true;
-  autoUpdater.disableWebInstaller = true;
 }
 
 export { configureAutoUpdater };

apps/desktop/src/utils/config.ts

@@ -25,8 +25,7 @@ export const DesktopIntegration = z.object({
   autoStart: z.boolean().optional(),
   startMinimized: z.boolean().optional(),
   minimizeToSystemTray: z.boolean().optional(),
-  closeToSystemTray: z.boolean().optional(),
-  nativeTitlebar: z.boolean().optional()
+  closeToSystemTray: z.boolean().optional()
 });
 
 export type DesktopIntegration = z.infer<typeof DesktopIntegration>;
@@ -36,8 +35,7 @@ export const config = {
     autoStart: false,
     startMinimized: false,
     minimizeToSystemTray: false,
-    closeToSystemTray: false,
-    nativeTitlebar: false
+    closeToSystemTray: false
   },
   privacyMode: false,
   isSpellCheckerEnabled: true,

apps/mobile/.gitignore

@@ -38,7 +38,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 *.hprof
-**/.xcode.env.local
+ios/.xcode.env.local
 # Android/IntelliJ
 #
 rn-build-deps/

apps/mobile/app/app.tsx

@@ -16,13 +16,13 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+import "react-native-gesture-handler";
 import {
   THEME_COMPATIBILITY_VERSION,
   useThemeEngineStore
 } from "@notesnook/theme";
 import React, { useEffect } from "react";
 import { I18nManager, View } from "react-native";
-import "react-native-gesture-handler";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { SafeAreaProvider } from "react-native-safe-area-context";
 import AppLockedOverlay from "./components/app-lock-overlay";
@@ -40,25 +40,30 @@ import { useUserStore } from "./stores/use-user-store";
 I18nManager.allowRTL(false);
 I18nManager.forceRTL(false);
 I18nManager.swapLeftAndRightInRTL(false);
-const { appLockEnabled, appLockMode } = SettingsService.get();
-if (appLockEnabled || appLockMode !== "none") {
-  useUserStore.getState().lockApp(true);
-}
 
 const App = () => {
-  useAppEvents();
-  //@ts-ignore
-  globalThis["IS_MAIN_APP_RUNNING"] = true;
+  const init = useAppEvents();
   useEffect(() => {
-    SettingsService.onFirstLaunch();
+    const { appLockEnabled, appLockMode } = SettingsService.get();
+    if (appLockEnabled || appLockMode !== "none") {
+      useUserStore.getState().lockApp(true);
+    }
+
+    //@ts-ignore
+    globalThis["IS_MAIN_APP_RUNNING"] = true;
+    init();
     setTimeout(async () => {
+      SettingsService.onFirstLaunch();
       await Notifications.get();
       if (SettingsService.get().notifNotes) {
         Notifications.pinQuickNote(true);
       }
       TipManager.init();
     }, 100);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+
   return (
     <View
       style={{

apps/mobile/app/common/analytics/index.js

@@ -0,0 +1,156 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { Platform } from "react-native";
+import { MMKV } from "../database/mmkv";
+import { useSettingStore } from "../../stores/use-setting-store";
+
+const WEBSITE_ID = "3c6890ce-8410-49d5-8831-15fb2eb28a21";
+const baseUrl = "https://analytics.streetwriters.co/api/collect";
+
+const UA =
+  Platform.OS === "ios"
+    ? "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1"
+    : `
+Mozilla/5.0 (Linux; Android 8.0.0; SM-G960F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36`;
+
+/**
+ *
+ * @param {Routes} route
+ * @param {Routes[]} conditions
+ * @returns
+ */
+async function canUpdateAnalytics(route, conditions = []) {
+  if (!useSettingStore?.getState()?.settings?.telemetry) return false;
+  let eventsList = MMKV.getString("notesnookUserEvents");
+
+  if (eventsList) {
+    eventsList = JSON.parse(eventsList);
+  }
+
+  if (eventsList && eventsList[route]) {
+    console.log("analytics: event already sent", route);
+    return false;
+  }
+  if (route !== "/welcome") {
+    for (let cond of conditions) {
+      if (!eventsList || !eventsList[cond]) {
+        console.log("analytics: conditions not met for event", route, cond);
+        return false;
+      }
+    }
+  }
+  console.log("analytics: will send event", route);
+  return true;
+}
+
+async function saveAnalytics(route, value = true) {
+  let eventsList = MMKV.getString("notesnookUserEvents");
+  if (eventsList) {
+    eventsList = JSON.parse(eventsList);
+  } else {
+    eventsList = {};
+  }
+  eventsList[route] = value;
+  MMKV.setString("notesnookUserEvents", JSON.stringify(eventsList));
+}
+
+/**
+ *@typedef {"/welcome" | "/home" | "/signup" | "/first-note" | "/account-created" | "/pro-sheet" | "/pro-plans" | "/iap-native" | "/pro-screen" | "/editor" | "/editor-toolbar" | "/properties" | "/sidemenu"} Routes
+ * @param {Routes} prevRoute
+ * @param {Routes} route
+ * @param {Routes[]} conditions
+ * @param {boolean} once
+ * @returns
+ */
+
+async function pageView(
+  route,
+  prevRoute = "",
+  conditions = ["/welcome"],
+  once = true
+) {
+  if (__DEV__) return;
+  if (!(await canUpdateAnalytics(route, conditions)) && once) return;
+  let body = {
+    payload: {
+      website: WEBSITE_ID,
+      url: `notesnook-${Platform.OS}${prevRoute}${route}`,
+      referrer: `https://notesnook.com/notesnook-${Platform.OS}${prevRoute}`,
+      hostname: `notesnook-${Platform.OS}`,
+      language: "en-US",
+      screen: "1920x1080"
+    },
+    type: "pageview"
+  };
+
+  try {
+    let response = await fetch(baseUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "User-Agent": UA
+      },
+      body: JSON.stringify(body)
+    });
+    console.log("analytics: event sent", route);
+    await saveAnalytics(route);
+    return await response.text();
+  } catch (e) {
+    console.log(e);
+  }
+}
+
+async function sendEvent(type, value, once = true) {
+  if (__DEV__) return;
+  if (!(await canUpdateAnalytics(type)) && once) return;
+  let body = {
+    payload: {
+      website: WEBSITE_ID,
+      url: "/",
+      event_type: type,
+      event_value: value,
+      hostname: "notesnook-android-app",
+      language: "en-US",
+      screen: "1920x1080"
+    },
+    type: "event"
+  };
+
+  try {
+    let response = await fetch(baseUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "User-Agent": UA
+      },
+      body: JSON.stringify(body)
+    });
+    console.log(response.status);
+    return await response.text();
+  } catch (e) {
+    console.log(e);
+  }
+}
+
+export default {
+  sendEvent,
+  pageView,
+  saveAnalytics
+};

apps/mobile/app/common/database/encryption.js

@@ -25,7 +25,6 @@ import { MMKVLoader, ProcessingModes } from "react-native-mmkv-storage";
 import { generateSecureRandom } from "react-native-securerandom";
 import { DatabaseLogger } from ".";
 import { MMKV } from "./mmkv";
-import { ToastManager } from "../../services/event-manager";
 
 // Database key cipher is persisted across different user sessions hence it has
 // it's independent storage which we will never clear. This is only used when application has
@@ -44,8 +43,9 @@ const IOS_KEYCHAIN_ACCESS_GROUP = "group.org.streetwriters.notesnook";
 const IOS_KEYCHAIN_SERVICE_NAME = "org.streetwriters.notesnook";
 const KEYCHAIN_SERVER_DBKEY = "notesnook:db";
 
-const NOTESNOOK_APPLOCK_KEY_SALT = "kBwr1Kre86ebOZ8ThLu2OA";
-const NOTESNOOK_DB_KEY_SALT = "SNuzOcEK3amoqL0WvPeKqw";
+const NOTESNOOK_APPLOCK_KEY_SALT = "3dqclWbOYllfk9kk";
+const NOTESNOOK_DB_KEY_SALT = "2rcgSprDmRvZ1AAa";
+const NOTESNOOK_USER_KEY_SALT = "7qO4qeoM6PbsAJ0Q";
 
 const DB_KEY_CIPHER = "databaseKeyCipher";
 const USER_KEY_CIPHER = "userKeyCipher";
@@ -117,7 +117,9 @@ export async function setAppLockVerificationCipher(appLockPassword) {
       NOTESNOOK_APPLOCK_KEY_SALT
     );
     const encrypted = await encrypt(appLockCredentials, generatePassword());
+
     CipherStorage.setMap(APPLOCK_CIPHER, encrypted);
+
     DatabaseLogger.info("setAppLockVerificationCipher");
   } catch (e) {
     DatabaseLogger.error(e);
@@ -133,8 +135,10 @@ export async function validateAppLockPassword(appLockPassword) {
   try {
     const appLockCipher = CipherStorage.getMap(APPLOCK_CIPHER);
     if (!appLockCipher) return true;
-    const key = await Sodium.deriveKey(appLockPassword, appLockCipher.salt);
-    const decrypted = await decrypt(key, appLockCipher);
+    const decrypted = await decrypt(
+      await Sodium.deriveKey(appLockPassword, NOTESNOOK_APPLOCK_KEY_SALT),
+      appLockCipher
+    );
 
     DatabaseLogger.info(
       `validateAppLockPassword: ${typeof decrypted === "string"}`
@@ -210,7 +214,7 @@ export async function getDatabaseKey(appLockPassword) {
         const userKeyCipher = await encrypt(
           {
             key: DB_KEY,
-            salt: NOTESNOOK_DB_KEY_SALT
+            salt: NOTESNOOK_USER_KEY_SALT
           },
           userKeyCredentials.password
         );
@@ -223,7 +227,6 @@ export async function getDatabaseKey(appLockPassword) {
 
     return DB_KEY;
   } catch (e) {
-    ToastManager.error(e, "Error getting database key");
     console.log(e, "error");
     DatabaseLogger.error(e);
     return null;
@@ -236,7 +239,7 @@ export async function deriveCryptoKey(data) {
     const userKeyCipher = await encrypt(
       {
         key: await getDatabaseKey(),
-        salt: NOTESNOOK_DB_KEY_SALT
+        salt: NOTESNOOK_USER_KEY_SALT
       },
       credentials.key
     );
@@ -261,12 +264,13 @@ export async function getCryptoKey(_name) {
 
     const key = await decrypt(
       {
-        key: await getDatabaseKey(),
-        salt: keyCipher.salt
+        key: await getDatabaseKey()
       },
       keyCipher
     );
 
+    DatabaseLogger.info("User key decrypted: ", !!key);
+
     return key;
   } catch (e) {
     console.log("getCryptoKey", e);

apps/mobile/app/common/database/index.js

@@ -28,7 +28,29 @@ import filesystem from "../filesystem";
 import Storage from "./storage";
 import { RNSqliteDriver } from "./sqlite.kysely";
 import { getDatabaseKey } from "./encryption";
-import SettingsService from "../../services/settings";
+
+database.host(
+  __DEV__
+    ? {
+        API_HOST: "https://api.notesnook.com",
+        AUTH_HOST: "https://auth.streetwriters.co",
+        SSE_HOST: "https://events.streetwriters.co",
+        SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+        ISSUES_HOST: "https://issues.streetwriters.co"
+        // API_HOST: "http://192.168.43.5:5264",
+        // AUTH_HOST: "http://192.168.43.5:8264",
+        // SSE_HOST: "http://192.168.43.5:7264",
+        // SUBSCRIPTIONS_HOST: "http://192.168.43.5:9264",
+        // ISSUES_HOST: "http://192.168.43.5:2624"
+      }
+    : {
+        API_HOST: "https://api.notesnook.com",
+        AUTH_HOST: "https://auth.streetwriters.co",
+        SSE_HOST: "https://events.streetwriters.co",
+        SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+        ISSUES_HOST: "https://issues.streetwriters.co"
+      }
+);
 
 export async function setupDatabase(password) {
   const key = await getDatabaseKey(password);
@@ -37,15 +59,6 @@ export async function setupDatabase(password) {
 
   console.log("Opening database with key:", !!key);
 
-  database.host({
-    API_HOST: "https://api.notesnook.com",
-    AUTH_HOST: "https://auth.streetwriters.co",
-    SSE_HOST: "https://events.streetwriters.co",
-    SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
-    ISSUES_HOST: "https://issues.streetwriters.co",
-    ...(SettingsService.getProperty("serverUrls") || {})
-  });
-
   database.setup({
     storage: Storage,
     eventsource: Platform.OS === "ios" ? EventSource : AndroidEventSource,
@@ -72,10 +85,4 @@ export async function setupDatabase(password) {
 }
 
 export const db = database;
-let DatabaseLogger = dbLogger.scope(Platform.OS);
-
-const setLogger = () => {
-  DatabaseLogger = dbLogger.scope(Platform.OS);
-};
-
-export { DatabaseLogger, setLogger };
+export const DatabaseLogger = dbLogger;

apps/mobile/app/common/database/logger.js

@@ -16,30 +16,14 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
+import { MMKVLoader } from "react-native-mmkv-storage";
 import { initialize } from "@notesnook/core/dist/logger";
-import { SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler } from "kysely";
-import { Platform } from "react-native";
-import { setLogger } from ".";
-import { RNSqliteDriver } from "./sqlite.kysely";
+import { KV } from "./storage";
 
-let loggerLoaded = false;
-const initializeLogger = async () => {
-  if (loggerLoaded) return;
-  await initialize({
-    dialect: (name) => ({
-      createDriver: () => {
-        return new RNSqliteDriver({ async: true, dbName: name });
-      },
-      createAdapter: () => new SqliteAdapter(),
-      createIntrospector: (db) => new SqliteIntrospector(db),
-      createQueryCompiler: () => new SqliteQueryCompiler()
-    }),
-    tempStore: "memory",
-    journalMode: Platform.OS === "ios" ? "DELETE" : "WAL"
-  });
-  setLogger();
-  loggerLoaded = true;
-};
+const LoggerStorage = new MMKVLoader()
+  .withInstanceID("notesnook_logs")
+  .initialize();
 
-export { initializeLogger };
+initialize(new KV(LoggerStorage));
+
+export { LoggerStorage };

apps/mobile/app/common/database/storage.js

@@ -21,15 +21,15 @@ import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import {
   decrypt,
-  decryptMulti,
   deriveCryptoKey,
   encrypt,
-  encryptMulti,
   generateCryptoKey,
   getCryptoKey,
   getRandomBytes,
   hash,
-  removeCryptoKey
+  removeCryptoKey,
+  decryptMulti,
+  encryptMulti
 } from "./encryption";
 import { MMKV } from "./mmkv";
 

apps/mobile/app/common/filesystem/compress.js

@@ -20,6 +20,7 @@ import { Dimensions, Image, Platform } from "react-native";
 import ImageResizer from "@bam.tech/react-native-image-resizer";
 import RNFetchBlob from "react-native-blob-util";
 
+console.log("hello world");
 /**
  * Scale down & compress images to screen width
  * for loading in editor.

apps/mobile/app/common/filesystem/download-attachment.js

@@ -18,20 +18,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import Sodium from "@ammarahmed/react-native-sodium";
-import { getFileNameWithExtension } from "@notesnook/core/dist/utils/filename";
+import {
+  getFileNameWithExtension,
+  isImage,
+  isDocument
+} from "@notesnook/core/dist/utils/filename";
 import React from "react";
 import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
 import * as ScopedStorage from "react-native-scoped-storage";
 import { subscribe, zip } from "react-native-zip-archive";
+import RNFetchBlob from "react-native-blob-util";
 import { ShareComponent } from "../../components/sheets/export-notes/share";
 import { ToastManager, presentSheet } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { IOS_APPGROUPID } from "../../utils/constants";
 import { DatabaseLogger, db } from "../database";
 import Storage from "../database/storage";
-import { createCacheDir, exists } from "./io";
 import { cacheDir, copyFileAsync, releasePermissions } from "./utils";
+import { createCacheDir, exists } from "./io";
+import { IOS_APPGROUPID } from "../../utils/constants";
 
 export const FileDownloadStatus = {
   Success: 1,
@@ -207,11 +211,7 @@ export default async function downloadAttachment(
   try {
     await db
       .fs()
-      .downloadFile(
-        options.groupId || attachment.hash,
-        attachment.hash,
-        attachment.chunkSize
-      );
+      .downloadFile(options.groupId || attachment.hash, attachment.hash);
     if (!(await exists(attachment.hash))) {
       DatabaseLogger.log("Attachment does not exist after download.");
       return;
@@ -259,6 +259,15 @@ export default async function downloadAttachment(
       });
     }
 
+    if (
+      attachment.dateUploaded &&
+      !isImage(attachment.mimeType) &&
+      !isDocument(attachment.mimeType)
+    ) {
+      RNFetchBlob.fs
+        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
+        .catch(console.log);
+    }
     if (Platform.OS === "ios" && !options.cache) {
       fileUri = folder.uri + `/${filename}`;
     }
@@ -278,6 +287,7 @@ export default async function downloadAttachment(
 
     return fileUri;
   } catch (e) {
+    DatabaseLogger.error(e);
     if (attachment.dateUploaded) {
       RNFetchBlob.fs
         .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
@@ -286,7 +296,6 @@ export default async function downloadAttachment(
         .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}_dcache`)
         .catch(console.log);
     }
-    DatabaseLogger.error(e);
     useAttachmentStore.getState().remove(attachment.hash);
     if (options.throwError) {
       throw e;

apps/mobile/app/common/filesystem/download.js

@@ -17,54 +17,31 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import hosts from "@notesnook/core/dist/utils/constants";
 import NetInfo from "@react-native-community/netinfo";
 import RNFetchBlob from "react-native-blob-util";
 import { ToastManager } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
 import { DatabaseLogger, db } from "../database";
+import { cacheDir, fileCheck } from "./utils";
 import { createCacheDir, exists } from "./io";
-import { ABYTES, cacheDir, getUploadedFileSize, parseS3Error } from "./utils";
 
-export async function downloadFile(filename, requestOptions, cancelToken) {
-  if (!requestOptions) {
-    DatabaseLogger.log(
-      `Error downloading file: ${filename}, reason: No requestOptions`
-    );
+export async function downloadFile(filename, data, cancelToken) {
+  if (!data) {
+    DatabaseLogger.log(`Error downloading file: ${filename}, reason: No data`);
     return false;
   }
 
   DatabaseLogger.log(`Downloading ${filename}`);
   await createCacheDir();
-  let { url, headers, chunkSize } = requestOptions;
-  let tempFilePath = `${cacheDir}/${filename}_temp`;
-  let originalFilePath = `${cacheDir}/${filename}`;
+  let { url, headers } = data;
+  let path = `${cacheDir}/${filename}`;
+
   try {
     if (await exists(filename)) {
       DatabaseLogger.log(`File Exists already: ${filename}`);
       return true;
     }
-    const attachment = await db.attachments.attachment(filename);
-    const size = await getUploadedFileSize(filename);
-
-    if (size === -1) {
-      const error = `Uploaded file verification failed. (File hash: ${filename})`;
-      throw new Error(error);
-    }
-
-    if (size === 0) {
-      const error = `File length is 0. Please upload this file again from the attachment manager. (File hash: ${filename})`;
-      await db.attachments.markAsFailed(attachment.id, error);
-      throw new Error(error);
-    }
-
-    const totalChunks = Math.ceil(size / chunkSize);
-    const decryptedLength = size - totalChunks * ABYTES;
-
-    if (attachment && attachment.size !== decryptedLength) {
-      const error = `File length mismatch. Expected ${attachment.size} but got ${decryptedLength} bytes. Please upload this file again from the attachment manager. (File hash: ${filename})`;
-      await db.attachments.markAsFailed(attachment.id, error);
-      throw new Error(error);
-    }
 
     let res = await fetch(url, {
       method: "GET",
@@ -86,51 +63,34 @@ export async function downloadFile(filename, requestOptions, cancelToken) {
       );
       throw new Error("Unable to resolve download url");
     }
-
+    let totalSize = 0;
     DatabaseLogger.log(`Download starting: ${filename}`);
     let request = RNFetchBlob.config({
-      path: tempFilePath,
+      path: path,
       IOSBackgroundTask: true
     })
       .fetch("GET", downloadUrl, null)
-      .progress(async (recieved, total) => {
+      .progress((recieved, total) => {
         useAttachmentStore
           .getState()
           .setProgress(0, total, filename, recieved, "download");
-
+        totalSize = total;
         DatabaseLogger.log(`Downloading: ${filename}, ${recieved}/${total}`);
       });
 
     cancelToken.cancel = () => {
       useAttachmentStore.getState().remove(filename);
       request.cancel();
-      RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
       DatabaseLogger.log(`Download cancelled: ${filename}`);
     };
 
     let response = await request;
-    console.log(response.info().headers);
-
-    const contentType =
-      response.info().headers?.["content-type"] ||
-      response.info().headers?.["Content-Type"];
-
-    if (contentType === "application/xml") {
-      const error = parseS3Error(await response.text());
-      throw new Error(`[${error.Code}] ${error.Message}`);
-    }
-
+    await fileCheck(response, totalSize);
     let status = response.info().status;
     useAttachmentStore.getState().remove(filename);
-    await RNFetchBlob.fs.mv(tempFilePath, originalFilePath);
-
-    if (!(await exists(filename))) {
-      throw new Error("File size mismatch");
-    }
-
     return status >= 200 && status < 300;
   } catch (e) {
-    if (e.message !== "canceled" && !e.message.includes("NoSuchKey")) {
+    if (e.message !== "canceled") {
       ToastManager.show({
         heading: "Error downloading file",
         message: e.message,
@@ -146,8 +106,7 @@ export async function downloadFile(filename, requestOptions, cancelToken) {
     }
 
     useAttachmentStore.getState().remove(filename);
-    RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
-    RNFetchBlob.fs.unlink(originalFilePath).catch(console.log);
+    RNFetchBlob.fs.unlink(path).catch(console.log);
     DatabaseLogger.error(e, {
       url,
       headers
@@ -156,23 +115,37 @@ export async function downloadFile(filename, requestOptions, cancelToken) {
   }
 }
 
+export async function getUploadedFileSize(hash) {
+  try {
+    const url = `${hosts.API_HOST}/s3?name=${hash}`;
+    const token = await db.tokenManager.getAccessToken();
+    const attachmentInfo = await fetch(url, {
+      method: "HEAD",
+      headers: { Authorization: `Bearer ${token}` }
+    });
+    const contentLength = parseInt(
+      attachmentInfo.headers?.get("content-length")
+    );
+    return isNaN(contentLength) ? 0 : contentLength;
+  } catch (e) {
+    DatabaseLogger.error(e);
+    return -1;
+  }
+}
+
 export async function checkAttachment(hash) {
   const internetState = await NetInfo.fetch();
   const isInternetReachable =
     internetState.isConnected && internetState.isInternetReachable;
-  if (!isInternetReachable) return;
+  if (!isInternetReachable) return { success: true };
   const attachment = await db.attachments.attachment(hash);
   if (!attachment) return { failed: "Attachment not found." };
 
   try {
     const size = await getUploadedFileSize(hash);
-    console.log("File Size", size);
     if (size === -1) return { success: true };
 
-    if (size === 0)
-      return {
-        failed: `File length is 0. Please upload this file again from the attachment manager. (File hash: ${hash})`
-      };
+    if (size === 0) return { failed: "File length is 0." };
   } catch (e) {
     return { failed: e?.message };
   }

apps/mobile/app/common/filesystem/index.js

@@ -17,22 +17,17 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { checkAttachment, downloadFile } from "./download";
+import { checkAttachment, downloadFile, getUploadedFileSize } from "./download";
 import {
   clearFileStorage,
   deleteFile,
   exists,
   readEncrypted,
   writeEncryptedBase64,
-  hashBase64,
-  clearCache,
-  deleteCacheFileByName,
-  deleteCacheFileByPath,
-  bulkExists,
-  getCacheSize
+  hashBase64
 } from "./io";
 import { uploadFile } from "./upload";
-import { cancelable, getUploadedFileSize } from "./utils";
+import { cancelable } from "./utils";
 
 export default {
   readEncrypted,
@@ -44,10 +39,5 @@ export default {
   exists,
   clearFileStorage,
   getUploadedFileSize,
-  checkAttachment,
-  clearCache,
-  deleteCacheFileByName,
-  deleteCacheFileByPath,
-  bulkExists,
-  getCacheSize
+  checkAttachment
 };

apps/mobile/app/common/filesystem/io.js

@@ -20,10 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import Sodium from "@ammarahmed/react-native-sodium";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
-import { eSendEvent } from "../../services/event-manager";
 import { IOS_APPGROUPID } from "../../utils/constants";
 import { DatabaseLogger, db } from "../database";
-import { ABYTES, cacheDir, cacheDirOld, getRandomId } from "./utils";
+import { cacheDir, cacheDirOld, getRandomId } from "./utils";
 
 export async function readEncrypted(filename, key, cipherData) {
   await migrateFilesFromCache();
@@ -159,35 +158,7 @@ export async function migrateFilesFromCache() {
   }
 }
 
-export async function clearCache() {
-  await RNFetchBlob.fs.unlink(cacheDir).catch(console.log);
-  await createCacheDir();
-  eSendEvent("cache-cleared");
-}
-
-export async function deleteCacheFileByPath(path) {
-  await RNFetchBlob.fs.unlink(path).catch(console.log);
-}
-
-export async function deleteCacheFileByName(name) {
-  const iosAppGroup =
-    Platform.OS === "ios"
-      ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-      : null;
-  const appGroupPath = `${iosAppGroup}/${name}`;
-  await RNFetchBlob.fs.unlink(appGroupPath).catch(console.log);
-  await RNFetchBlob.fs.unlink(`${cacheDir}/${name}`).catch(console.log);
-}
-
-export async function deleteDCacheFiles() {
-  const files = await RNFetchBlob.fs.ls(cacheDir);
-  for (const file of files) {
-    if (file.includes("_dcache")) {
-      await RNFetchBlob.fs.unlink(file).catch(console.log);
-    }
-  }
-}
-
+const ABYTES = 17;
 export async function exists(filename) {
   let path = `${cacheDir}/${filename}`;
 
@@ -229,29 +200,3 @@ export async function exists(filename) {
   }
   return exists;
 }
-
-export async function bulkExists(files) {
-  const cacheFiles = await RNFetchBlob.fs.ls(cacheDir);
-  let missingFiles = files.filter((file) => !cacheFiles.includes(file));
-
-  if (Platform.OS === "ios") {
-    const iosAppGroup =
-      Platform.OS === "ios"
-        ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
-        : null;
-    const appGroupFiles = await RNFetchBlob.fs.ls(iosAppGroup);
-    missingFiles = missingFiles.filter((file) => !appGroupFiles.includes(file));
-  }
-
-  return missingFiles;
-}
-
-export async function getCacheSize() {
-  const stat = await RNFetchBlob.fs.lstat(`file://` + cacheDir);
-  let total = 0;
-  console.log("Total files", stat.length);
-  stat.forEach((s) => {
-    total += parseInt(s.size);
-  });
-  return total;
-}

apps/mobile/app/common/filesystem/upload.js

@@ -17,30 +17,31 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
-import { ToastManager } from "../../services/event-manager";
 import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { IOS_APPGROUPID } from "../../utils/constants";
 import { DatabaseLogger, db } from "../database";
+import { cacheDir } from "./utils";
+import { isImage, isDocument } from "@notesnook/core/dist/utils/filename";
+import { Platform } from "react-native";
+import { IOS_APPGROUPID } from "../../utils/constants";
 import { createCacheDir } from "./io";
-import { cacheDir, getUploadedFileSize } from "./utils";
+import { getUploadedFileSize } from "./download";
 
-export async function uploadFile(filename, requestOptions, cancelToken) {
-  if (!requestOptions) return false;
-  let { url, headers } = requestOptions;
+export async function uploadFile(filename, data, cancelToken) {
+  if (!data) return false;
+  let { url, headers } = data;
   await createCacheDir();
   DatabaseLogger.info(`Preparing to upload file: ${filename}`);
 
   try {
     const uploadedFileSize = await getUploadedFileSize(filename);
-
     if (uploadedFileSize === -1) {
-      const error = `Uploaded file verification failed. (File hash: ${filename})`;
-      throw new Error(error);
+      DatabaseLogger.log("Upload verification failed.");
+      return false;
     }
 
-    if (uploadedFileSize !== 0) {
+    const isUploaded = uploadedFileSize !== 0;
+    if (isUploaded) {
       DatabaseLogger.log(`File ${filename} is already uploaded.`);
       return true;
     }
@@ -49,15 +50,9 @@ export async function uploadFile(filename, requestOptions, cancelToken) {
       method: "PUT",
       headers
     });
-
-    const uploadUrl = res.ok ? await res.text() : await res.json();
-
-    if (typeof uploadUrl !== "string") {
-      throw new Error(
-        uploadUrl.error || "Unable to resolve attachment upload url."
-      );
-    }
-
+    if (!res.ok) throw new Error(`${res.status}: Unable to resolve upload url`);
+    const uploadUrl = await res.text();
+    if (!uploadUrl) throw new Error("Unable to resolve attachment upload url");
     let uploadFilePath = `${cacheDir}/${filename}`;
 
     const iosAppGroup =
@@ -115,6 +110,9 @@ export async function uploadFile(filename, requestOptions, cancelToken) {
       );
       let attachment = await db.attachments.attachment(filename);
       if (!attachment) return result;
+      if (!isImage(attachment.mimeType) && !isDocument(attachment.mimeType)) {
+        RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
+      }
     } else {
       const fileInfo = await RNFetchBlob.fs.stat(uploadFilePath);
       throw new Error(
@@ -127,10 +125,8 @@ export async function uploadFile(filename, requestOptions, cancelToken) {
     return result;
   } catch (e) {
     useAttachmentStore.getState().remove(filename);
-    ToastManager.error(e, "File upload failed");
-    DatabaseLogger.error(e, "File upload failed", {
-      filename
-    });
+    DatabaseLogger.info(`File upload error: ${filename}, ${e}`);
+    DatabaseLogger.error(e);
     return false;
   }
 }

apps/mobile/app/common/filesystem/utils.js

@@ -17,13 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+import * as ScopedStorage from "react-native-scoped-storage";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
-import * as ScopedStorage from "react-native-scoped-storage";
-import { DatabaseLogger, db } from "../database";
-import hosts from "@notesnook/core/dist/utils/constants";
 
-export const ABYTES = 17;
 export const cacheDirOld = RNFetchBlob.fs.dirs.CacheDir;
 
 export const cacheDir =
@@ -37,36 +34,24 @@ export function getRandomId(prefix) {
     .replace("0.", prefix || "");
 }
 
-/**
- *
- * @param {string | undefined} data
- * @returns
- */
-export function parseS3Error(data) {
-  const xml = typeof data === "string" ? data : null;
+export function extractValueFromXmlTag(code, xml) {
+  if (!xml.includes(code)) return `Unknown ${code}`;
+  return xml.slice(
+    xml.indexOf(`<${code}>`) + code.length + 2,
+    xml.indexOf(`</${code}>`)
+  );
+}
 
-  const error = {
-    Code: "UNKNOWN",
-    Message: xml
-  };
-
-  try {
-    if (!xml) return error;
-    const doc = new DOMParser().parseFromString(xml, "text/xml");
-
-    const ErrorElement = doc.getElementsByTagName("Error")[0];
-    if (!ErrorElement) return error;
-
-    for (const child of ErrorElement.children) {
-      if (
-        child.textContent &&
-        (child.tagName === "Code" || child.tagName === "Message")
-      )
-        error[child.tagName] = child.textContent;
+export async function fileCheck(response, totalSize) {
+  if (totalSize < 1000) {
+    let text = await response.text();
+    if (text.startsWith("<?xml")) {
+      let errorJson = {
+        Code: extractValueFromXmlTag("Code", text),
+        Message: extractValueFromXmlTag("Message", text)
+      };
+      throw new Error(`${errorJson.Code}: ${errorJson.Message}`);
     }
-    return error;
-  } catch (e) {
-    return error;
   }
 }
 
@@ -74,11 +59,12 @@ export function cancelable(operation) {
   const cancelToken = {
     cancel: () => {}
   };
-  return (filename, requestOptions) => {
+  return (filename, { url, headers }) => {
     return {
-      execute: () => operation(filename, requestOptions, cancelToken),
+      execute: () => operation(filename, { url, headers }, cancelToken),
       cancel: async () => {
         await cancelToken.cancel();
+        RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
       }
     };
   };
@@ -105,21 +91,3 @@ export async function releasePermissions(path) {
     }
   }
 }
-
-export async function getUploadedFileSize(hash) {
-  try {
-    const url = `${hosts.API_HOST}/s3?name=${hash}`;
-    const token = await db.tokenManager.getAccessToken();
-    const attachmentInfo = await fetch(url, {
-      method: "HEAD",
-      headers: { Authorization: `Bearer ${token}` }
-    });
-    const contentLength = parseInt(
-      attachmentInfo.headers?.get("content-length")
-    );
-    return isNaN(contentLength) ? 0 : contentLength;
-  } catch (e) {
-    DatabaseLogger.error(e);
-    return -1;
-  }
-}

apps/mobile/app/components/app-lock-overlay/index.tsx

@@ -18,15 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useCallback, useEffect, useRef } from "react";
-import {
-  AppStateStatus,
-  Platform,
-  TextInput,
-  useWindowDimensions,
-  View
-} from "react-native";
+import { AppStateStatus, Platform, TextInput, View } from "react-native";
 //@ts-ignore
 import { useThemeColors } from "@notesnook/theme";
+import { enabled } from "react-native-privacy-snapshot";
 import { DatabaseLogger } from "../../common/database";
 import {
   decrypt,
@@ -39,20 +34,17 @@ import {
 import { MMKV } from "../../common/database/mmkv";
 import { useAppState } from "../../hooks/use-app-state";
 import BiometricService from "../../services/biometrics";
-import { ToastManager } from "../../services/event-manager";
 import SettingsService from "../../services/settings";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { useUserStore } from "../../stores/use-user-store";
 import { NotesnookModule } from "../../utils/notesnook-module";
 import { SIZE } from "../../utils/size";
-import { Toast } from "../toast";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
 import Input from "../ui/input";
 import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 
 const getUser = () => {
   const user = MMKV.getString("user");
@@ -93,7 +85,6 @@ const AppLockedOverlay = () => {
   const appState = useAppState();
   const lastAppState = useRef<AppStateStatus>(appState);
   const biometricUnlockAwaitingUserInput = useRef(false);
-  const { height } = useWindowDimensions();
   const keyboardType = useSettingStore(
     (state) => state.settings.applockKeyboardType
   );
@@ -128,6 +119,7 @@ const AppLockedOverlay = () => {
     );
     if (unlocked) {
       lockApp(false);
+      enabled(false);
       password.current = undefined;
     }
     biometricUnlockAwaitingUserInput.current = false;
@@ -154,13 +146,8 @@ const AppLockedOverlay = () => {
         }
 
         lockApp(false);
+        enabled(false);
         password.current = undefined;
-      } else {
-        ToastManager.show({
-          heading: `Invalid ${keyboardType === "numeric" ? "pin" : "password"}`,
-          type: "error",
-          context: "local"
-        });
       }
     } catch (e) {
       console.error(e);
@@ -168,6 +155,10 @@ const AppLockedOverlay = () => {
   };
 
   useEffect(() => {
+    if (appState === "active") {
+      enabled(false);
+    }
+
     const prevState = lastAppState.current;
     lastAppState.current = appState;
 
@@ -193,28 +184,31 @@ const AppLockedOverlay = () => {
         DatabaseLogger.info("Biometric unlock request");
         onUnlockAppRequested();
       }
+
+      enabled(false);
     } else {
       SettingsService.appEnteredBackground();
+
+      if (
+        SettingsService.get().privacyScreen ||
+        SettingsService.getProperty("appLockEnabled")
+      ) {
+        enabled(true);
+      }
     }
   }, [appState, onUnlockAppRequested, appLocked]);
 
   return appLocked ? (
-    <KeyboardAwareScrollView
+    <View
       style={{
         backgroundColor: colors.primary.background,
         width: "100%",
         height: "100%",
         position: "absolute",
-        zIndex: 999
+        zIndex: 999,
+        justifyContent: "center"
       }}
-      contentContainerStyle={{
-        justifyContent: "center",
-        minHeight: height
-      }}
-      keyboardDismissMode="interactive"
-      keyboardShouldPersistTaps="handled"
     >
-      <Toast context="local" />
       <View
         style={{
           flex: 1,
@@ -327,7 +321,7 @@ const AppLockedOverlay = () => {
           </View>
         </View>
       </View>
-    </KeyboardAwareScrollView>
+    </View>
   ) : null;
 };
 

apps/mobile/app/components/attachments/actions.tsx

@@ -118,14 +118,12 @@ const Actions = ({
         setLoading({
           name: "Run file check"
         });
-        const result = await filesystem.checkAttachment(attachment.hash);
-        if (!result) return;
-
-        if (result.failed) {
-          db.attachments.markAsFailed(attachment.id, result.failed);
-          setFailed(result.failed);
+        const res = await filesystem.checkAttachment(attachment.hash);
+        if (res.failed) {
+          db.attachments.markAsFailed(attachment.id, res.failed);
+          setFailed(res.failed);
           ToastManager.show({
-            heading: "File check failed with error: " + result.failed,
+            heading: "File check failed with error: " + res.failed,
             type: "error",
             context: "local"
           });

apps/mobile/app/components/attachments/index.tsx

@@ -122,11 +122,10 @@ export const AttachmentDialog = ({ note }: { note?: Note }) => {
       const attachment = (await attachments.item(i))?.item;
       if (!attachment) continue;
       const result = await filesystem.checkAttachment(attachment.hash);
-      if (!result) return;
       if (result.failed) {
         await db.attachments.markAsFailed(attachment.hash, result.failed);
       } else {
-        await db.attachments.markAsFailed(attachment.id);
+        await db.attachments.markAsFailed(attachment.id, undefined);
       }
     }
     refresh();
@@ -356,7 +355,6 @@ export const AttachmentDialog = ({ note }: { note?: Note }) => {
 
 AttachmentDialog.present = (note?: Note) => {
   presentSheet({
-    component: () => <AttachmentDialog note={note} />,
-    keyboardHandlerDisabled: true
+    component: () => <AttachmentDialog note={note} />
   });
 };

apps/mobile/app/components/auth/change-password.js

@@ -68,8 +68,7 @@ export const ChangePassword = () => {
     setLoading(true);
     try {
       const result = await BackupService.run(false, "change-password-dialog");
-      if (result.error)
-        throw new Error(`Failed to create backup: ${result.error}`);
+      if (!result) throw new Error("Failed to create backup");
 
       await db.user.clearSessions();
       await db.user.changePassword(oldPassword.current, password.current);

apps/mobile/app/components/auth/login.js

@@ -17,16 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useState } from "react";
 import { TouchableOpacity, View, useWindowDimensions } from "react-native";
 import { SheetManager } from "react-native-actions-sheet";
 import { DDS } from "../../services/device-detection";
 import { eSendEvent } from "../../services/event-manager";
-import Sync from "../../services/sync";
-import { useSettingStore } from "../../stores/use-setting-store";
-import { useUserStore } from "../../stores/use-user-store";
-import { eUserLoggedIn } from "../../utils/events";
+import { useThemeColors } from "@notesnook/theme";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import SheetProvider from "../sheet-provider";
@@ -38,6 +34,11 @@ import Paragraph from "../ui/typography/paragraph";
 import { hideAuth } from "./common";
 import { ForgotPassword } from "./forgot-password";
 import { useLogin } from "./use-login";
+import { useSettingStore } from "../../stores/use-setting-store";
+import { eUserLoggedIn } from "../../utils/events";
+import { useUserStore } from "../../stores/use-user-store";
+import Sync from "../../services/sync";
+import { Notice } from "../ui/notice";
 
 const LoginSteps = {
   emailAuth: 1,
@@ -183,11 +184,7 @@ export const Login = ({ changeMode }) => {
             defaultValue={email.current}
             editable={step === LoginSteps.emailAuth && !loading}
             onSubmit={() => {
-              if (step === LoginSteps.emailAuth) {
-                login();
-              } else {
-                passwordInputRef.current?.focus();
-              }
+              passwordInputRef.current?.focus();
             }}
           />
 
@@ -246,7 +243,6 @@ export const Login = ({ changeMode }) => {
                 width: 250,
                 borderRadius: 100
               }}
-              height={50}
               fontSize={SIZE.md}
               type="accent"
               title={!loading ? "Continue" : null}

apps/mobile/app/components/auth/session-expired.js

@@ -112,10 +112,6 @@ export const SessionExpired = () => {
       if (!res) throw new Error("no token found");
       if (db.tokenManager._isTokenExpired(res))
         throw new Error("token expired");
-
-      const key = await db.user.getEncryptionKey();
-      if (!key) throw new Error("No encryption key found.");
-
       Sync.run("global", false, "full", async (complete) => {
         if (!complete) {
           let user = await db.user.getUser();
@@ -131,6 +127,7 @@ export const SessionExpired = () => {
         setVisible(false);
       });
     } catch (e) {
+      console.log(e);
       let user = await db.user.getUser();
       if (!user) return;
       email.current = user.email;

apps/mobile/app/components/auth/signup.js

@@ -35,7 +35,6 @@ import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { hideAuth } from "./common";
 import { useSettingStore } from "../../stores/use-setting-store";
-import SettingsService from "../../services/settings";
 
 export const Signup = ({ changeMode, trial }) => {
   const { colors } = useThemeColors();
@@ -78,7 +77,6 @@ export const Signup = ({ changeMode, trial }) => {
       clearMessage();
       setEmailVerifyMessage();
       hideAuth();
-      SettingsService.setProperty("encryptedBackup", true);
       await sleep(300);
       if (trial) {
         PremiumService.sheet(null, null, true);

apps/mobile/app/components/auth/two-factor.js

@@ -37,7 +37,6 @@ import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { useCallback } from "react";
-import { ScrollView } from "react-native-actions-sheet";
 
 const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
   const { colors } = useThemeColors();
@@ -144,10 +143,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
   }, [currentMethod.method, mfaInfo.token, seconds, sending, start]);
 
   return (
-    <ScrollView
-      keyboardShouldPersistTaps="handled"
-      keyboardDismissMode="interactive"
-    >
+    <View>
       <View
         style={{
           alignItems: "center",
@@ -218,7 +214,6 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
                 code.current = value;
                 //onNext();
               }}
-              onSubmitEditing={onNext}
               caretHidden
               inputStyle={{
                 fontSize: SIZE.lg,
@@ -230,7 +225,6 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
               keyboardType={
                 currentMethod.method === "recoveryCode" ? "default" : "numeric"
               }
-              enablesReturnKeyAutomatically
               containerStyle={{
                 height: 60,
                 borderWidth: 0,
@@ -303,7 +297,7 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
           </>
         )}
       </View>
-    </ScrollView>
+    </View>
   );
 };
 

apps/mobile/app/components/auth/use-login.js

@@ -83,7 +83,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
                   setLoading(false);
                   setTimeout(() => {
                     passwordInputRef.current?.focus();
-                  }, 500);
+                  }, 1);
                   callback && callback(true);
                 }
                 callback && callback(false);

apps/mobile/app/components/dialog-provider/index.js

@@ -23,7 +23,6 @@ import { AnnouncementDialog } from "../announcements";
 import AuthModal from "../auth/auth-modal";
 import { SessionExpired } from "../auth/session-expired";
 import { Dialog } from "../dialog";
-import { AppLockPassword } from "../dialogs/applock-password";
 import JumpToSectionDialog from "../dialogs/jump-to-section";
 import { LoadingDialog } from "../dialogs/loading";
 import PDFPreview from "../dialogs/pdf-preview";
@@ -36,7 +35,8 @@ import { Expiring } from "../premium/expiring";
 import SheetProvider from "../sheet-provider";
 import RateAppSheet from "../sheets/rate-app";
 import RecoveryKeySheet from "../sheets/recovery-key";
-import Progress from "../dialogs/progress";
+import RestoreDataSheet from "../sheets/restore-data";
+import { AppLockPassword } from "../dialogs/applock-password";
 
 const DialogProvider = () => {
   const { colors } = useThemeColors();
@@ -52,6 +52,7 @@ const DialogProvider = () => {
       <RecoveryKeySheet colors={colors} />
       <SheetProvider />
       <SheetProvider context="sync_progress" />
+      <RestoreDataSheet />
       <ResultDialog />
       <VaultDialog colors={colors} />
       <RateAppSheet />
@@ -61,7 +62,6 @@ const DialogProvider = () => {
       <SessionExpired />
       <PDFPreview />
       <JumpToSectionDialog />
-      <Progress />
     </>
   );
 };

apps/mobile/app/components/dialog/dialog-container.tsx

@@ -32,29 +32,21 @@ const DialogContainer = ({
 }: ViewProps & {
   width?: any;
   height?: any;
-  noBorder?: boolean;
 }) => {
   const { colors } = useThemeColors();
 
   return (
     <View
       {...restProps}
-      style={[
-        style,
-        {
-          width: width || DDS.isTab ? 500 : "85%",
-          maxHeight: height || 450,
-          borderRadius: 10,
-          backgroundColor: colors.primary.background,
-          paddingTop: 12
-        },
-        restProps?.noBorder
-          ? {}
-          : {
-              ...getElevationStyle(5),
-              ...getContainerBorder(colors.secondary.background, 0.8, 0.05)
-            }
-      ]}
+      style={{
+        ...getElevationStyle(5),
+        width: width || DDS.isTab ? 500 : "85%",
+        maxHeight: height || 450,
+        borderRadius: 10,
+        backgroundColor: colors.primary.background,
+        paddingTop: 12,
+        ...getContainerBorder(colors.secondary.background, 0.8, 0.05)
+      }}
     />
   );
 };

apps/mobile/app/components/dialog/functions.ts

@@ -25,7 +25,7 @@ type DialogInfo = {
   paragraph?: string;
   positiveText?: string;
   negativeText?: string;
-  positivePress?: (...args: any[]) => void;
+  positivePress?: (value: any) => void;
   onClose?: () => void;
   positiveType?:
     | "transparent"
@@ -44,16 +44,6 @@ type DialogInfo = {
   // eslint-disable-next-line @typescript-eslint/ban-types
   context: "global" | "local" | (string & {});
   secureTextEntry?: boolean;
-  keyboardType?: string;
-  check?: {
-    info: string;
-    type?: string;
-    defaultValue?: boolean;
-  };
-  notice: {
-    text: string;
-    type: "alert" | "information";
-  };
 };
 
 export function presentDialog(data: Partial<DialogInfo>): void {

apps/mobile/app/components/dialog/index.js

@@ -37,7 +37,6 @@ import DialogHeader from "./dialog-header";
 import { useCallback } from "react";
 import { Button } from "../ui/button";
 import { getContainerBorder } from "../../utils/colors";
-import { Notice } from "../ui/notice";
 
 export const Dialog = ({ context = "global" }) => {
   const { colors } = useThemeColors();
@@ -63,8 +62,7 @@ export const Dialog = ({ context = "global" }) => {
     disableBackdropClosing: false,
     check: {
       info: "Check",
-      type: "transparent",
-      defaultValue: false
+      type: "transparent"
     }
   });
 
@@ -88,7 +86,7 @@ export const Dialog = ({ context = "global" }) => {
       if (!data.context) data.context = "global";
       if (data.context !== context) return;
       setDialogInfo(data);
-      setChecked(data.check?.defaultValue);
+      setChecked(false);
       values.current.inputValue = data.defaultValue;
       setVisible(true);
     },
@@ -176,25 +174,11 @@ export const Dialog = ({ context = "global" }) => {
               onSubmit={onPressPositive}
               returnKeyLabel="Done"
               returnKeyType="done"
-              keyboardType={dialogInfo.keyboardType || "default"}
               placeholder={dialogInfo.inputPlaceholder}
             />
           </View>
         ) : null}
 
-        {dialogInfo?.notice ? (
-          <View
-            style={{
-              paddingHorizontal: 12
-            }}
-          >
-            <Notice
-              type={dialogInfo.notice.type || "information"}
-              text={dialogInfo.notice.text}
-            />
-          </View>
-        ) : null}
-
         {dialogInfo.check ? (
           <>
             <Button
@@ -213,7 +197,7 @@ export const Dialog = ({ context = "global" }) => {
               iconSize={20}
               width="100%"
               title={dialogInfo.check.info}
-              type={checked ? dialogInfo.check.type || "plain" : "plain"}
+              type={checked ? dialogInfo.check.type || "selected" : "plain"}
             />
           </>
         ) : null}

apps/mobile/app/components/dialogs/applock-password/index.tsx

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
 import { TextInput, View } from "react-native";
-import { db } from "../../../common/database";
 import {
   clearAppLockVerificationCipher,
   setAppLockVerificationCipher,
@@ -45,7 +44,6 @@ import BaseDialog from "../../dialog/base-dialog";
 import DialogButtons from "../../dialog/dialog-buttons";
 import DialogHeader from "../../dialog/dialog-header";
 import { Toast } from "../../toast";
-import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
 import Input from "../../ui/input";
 import Seperator from "../../ui/seperator";
@@ -68,7 +66,6 @@ export const AppLockPassword = () => {
     confirmPassword?: string;
   }>({});
   const [secureTextEntry, setSecureTextEntry] = useState(true);
-  const [accountPass, setAccountPass] = useState(false);
 
   useEffect(() => {
     const subs = [
@@ -76,7 +73,6 @@ export const AppLockPassword = () => {
         eOpenAppLockPasswordDialog,
         (mode: "create" | "change" | "remove") => {
           setMode(mode);
-          setAccountPass(false);
           setVisible(true);
         }
       ),
@@ -130,9 +126,7 @@ export const AppLockPassword = () => {
             mode === "change"
               ? `Change app lock ${keyboardType}`
               : mode === "remove"
-              ? `Enter ${
-                  accountPass ? "account password" : `app lock ${keyboardType}`
-                } to remove ${keyboardType}`
+              ? `Remove app lock ${keyboardType}`
               : `Set up a custom app lock ${keyboardType} to unlock the app`
           }
           icon="shield"
@@ -175,39 +169,33 @@ export const AppLockPassword = () => {
               confirmPasswordInputRef.current?.focus();
             }}
             defaultValue={values.current.password}
-            keyboardType={
-              keyboardType === "pin" && !accountPass ? "number-pad" : "default"
-            }
+            keyboardType={keyboardType === "pin" ? "number-pad" : "default"}
             autoComplete="password"
             returnKeyLabel={mode !== "remove" ? "Next" : "Remove"}
             returnKeyType={mode !== "remove" ? "next" : "done"}
             secureTextEntry={secureTextEntry}
             buttonLeft={
-              accountPass ? null : (
-                <IconButton
-                  name={keyboardType === "password" ? "numeric" : "keyboard"}
-                  onPress={() => {
-                    setKeyboardType(
-                      keyboardType === "password" ? "pin" : "password"
-                    );
-                    setSecureTextEntry(false);
-                    setImmediate(() => {
-                      setSecureTextEntry(true);
-                    });
-                  }}
-                  style={{
-                    width: 25,
-                    height: 25,
-                    marginRight: 5
-                  }}
-                  size={SIZE.lg}
-                />
-              )
+              <IconButton
+                name={keyboardType === "password" ? "numeric" : "keyboard"}
+                onPress={() => {
+                  setKeyboardType(
+                    keyboardType === "password" ? "pin" : "password"
+                  );
+                  setSecureTextEntry(false);
+                  setImmediate(() => {
+                    setSecureTextEntry(true);
+                  });
+                }}
+                style={{
+                  width: 25,
+                  height: 25,
+                  marginRight: 5
+                }}
+                size={SIZE.lg}
+              />
             }
             placeholder={
-              accountPass
-                ? "Account password"
-                : mode === "change"
+              mode === "change"
                 ? `New ${keyboardType}`
                 : `${keyboardType === "pin" ? "Pin" : "Password"}`
             }
@@ -234,36 +222,6 @@ export const AppLockPassword = () => {
               placeholder={`Confirm ${keyboardType}`}
             />
           ) : null}
-
-          {mode === "remove" ? (
-            <>
-              <Button
-                icon={
-                  accountPass ? "checkbox-marked" : "checkbox-blank-outline"
-                }
-                onPress={() => {
-                  setSecureTextEntry(false);
-                  setAccountPass(!accountPass);
-                  setTimeout(() => {
-                    setSecureTextEntry(true);
-                  });
-                }}
-                iconSize={SIZE.lg}
-                type="plain"
-                iconColor={
-                  accountPass ? colors.primary.accent : colors.primary.icon
-                }
-                title="Use account password instead"
-                style={{
-                  width: "100%",
-                  alignSelf: "flex-start",
-                  justifyContent: "flex-start",
-                  paddingHorizontal: 0,
-                  height: 30
-                }}
-              />
-            </>
-          ) : null}
         </View>
 
         <DialogButtons
@@ -291,8 +249,7 @@ export const AppLockPassword = () => {
                 );
                 return;
               }
-              const password = values.current.password;
-              setAppLockVerificationCipher(password);
+              await setAppLockVerificationCipher(values.current.password);
               SettingsService.setProperty("appLockHasPasswordSecurity", true);
             } else if (mode === "change") {
               if (
@@ -320,6 +277,7 @@ export const AppLockPassword = () => {
                 );
                 return;
               }
+
               const isCurrentPasswordCorrect = await validateAppLockPassword(
                 values.current.currentPassword
               );
@@ -335,10 +293,8 @@ export const AppLockPassword = () => {
                 return;
               }
 
-              const password = values.current.password;
-              await clearAppLockVerificationCipher();
               SettingsService.setProperty("appLockHasPasswordSecurity", true);
-              await setAppLockVerificationCipher(password);
+              await setAppLockVerificationCipher(values.current.password);
             } else if (mode === "remove") {
               if (!values.current.password) {
                 ToastManager.error(
@@ -349,18 +305,14 @@ export const AppLockPassword = () => {
                 return;
               }
 
-              const isCurrentPasswordCorrect = accountPass
-                ? await db.user.verifyPassword(values.current.password)
-                : await validateAppLockPassword(values.current.password);
+              const isCurrentPasswordCorrect = await validateAppLockPassword(
+                values.current.password
+              );
 
               if (!isCurrentPasswordCorrect) {
                 ToastManager.error(
                   new Error(
-                    accountPass
-                      ? "Account password incorrect"
-                      : `${
-                          keyboardType === "pin" ? "Pin" : "Password"
-                        } incorrect`
+                    `${keyboardType === "pin" ? "Pin" : "Password"} incorrect`
                   ),
                   undefined,
                   "local"
@@ -390,9 +342,7 @@ export const AppLockPassword = () => {
 
             close();
           }}
-          positiveTitle={
-            mode === "remove" ? "Remove" : mode === "change" ? "Change" : "Save"
-          }
+          positiveTitle="Save"
           negativeTitle="Cancel"
           positiveType="transparent"
           loading={false}

apps/mobile/app/components/dialogs/pdf-preview/index.js

@@ -44,7 +44,6 @@ import { ProgressBarComponent } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
 import { sleep } from "../../../utils/time";
 import { MMKV } from "../../../common/database/mmkv";
-import { deleteCacheFileByPath } from "../../../common/filesystem/io";
 
 const WIN_WIDTH = Dimensions.get("window").width;
 const WIN_HEIGHT = Dimensions.get("window").height;
@@ -125,7 +124,6 @@ const PDFPreview = () => {
   );
 
   const close = () => {
-    deleteCacheFileByPath(pdfSource);
     setPDFSource(null);
     setVisible(false);
     setPassword("");

apps/mobile/app/components/dialogs/progress/index.tsx

@@ -1,198 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { useThemeColors } from "@notesnook/theme";
-import React, { useEffect } from "react";
-import { View } from "react-native";
-import { eSendEvent, eSubscribeEvent } from "../../../services/event-manager";
-import { SIZE } from "../../../utils/size";
-import { Dialog } from "../../dialog";
-import BaseDialog from "../../dialog/base-dialog";
-import DialogContainer from "../../dialog/dialog-container";
-import { Button } from "../../ui/button";
-import { ProgressBarComponent } from "../../ui/svg/lazy";
-import Heading from "../../ui/typography/heading";
-import Paragraph from "../../ui/typography/paragraph";
-
-export type ProgressOptions = {
-  progress?: string;
-  cancelCallback?: () => void;
-  title?: string;
-  paragraph?: string;
-  fillBackground?: boolean;
-  canHideProgress?: boolean;
-};
-
-export const PROGRESS_EVENTS = {
-  start: "startProgress",
-  end: "endProgress",
-  update: "updateProgress"
-};
-
-export default function Progress() {
-  const { colors } = useThemeColors();
-  const [progress, setProgress] = React.useState<string | undefined>();
-  const [visible, setVisible] = React.useState(false);
-  const cancelCallback = React.useRef<() => void>();
-  const [data, setData] = React.useState<{
-    title?: string;
-    paragraph?: string;
-    fillBackground?: boolean;
-    canHideProgress?: boolean;
-  }>();
-
-  useEffect(() => {
-    const events = [
-      eSubscribeEvent(PROGRESS_EVENTS.start, (options: ProgressOptions) => {
-        setProgress(options.progress);
-        cancelCallback.current = options.cancelCallback;
-        console.log("options", options.fillBackground);
-        setData({
-          title: options.title,
-          paragraph: options.paragraph,
-          fillBackground: options.fillBackground,
-          canHideProgress: options.canHideProgress
-        });
-        setVisible(true);
-      }),
-      eSubscribeEvent(PROGRESS_EVENTS.end, () => {
-        setProgress(undefined);
-        setVisible(false);
-        setData(undefined);
-        cancelCallback.current?.();
-        cancelCallback.current = undefined;
-      }),
-      eSubscribeEvent(PROGRESS_EVENTS.update, (options: ProgressOptions) => {
-        setProgress(options.progress);
-        if (options.cancelCallback) {
-          cancelCallback.current = options.cancelCallback;
-        }
-
-        const data: ProgressOptions = {};
-        if (options.title) data.title = options.title;
-        if (options.paragraph) data.paragraph = options.paragraph;
-        if (options.fillBackground)
-          data.fillBackground = options.fillBackground;
-
-        setData((current) => {
-          return {
-            ...current,
-            ...data
-          };
-        });
-      })
-    ];
-    return () => {
-      events.forEach((event) => event?.unsubscribe());
-      cancelCallback.current = undefined;
-    };
-  }, []);
-
-  return !visible ? null : (
-    <BaseDialog
-      background={data?.fillBackground ? colors.primary.background : undefined}
-      visible
-    >
-      <DialogContainer
-        style={{
-          paddingHorizontal: 12,
-          paddingBottom: 10
-        }}
-        noBorder={data?.fillBackground ? true : false}
-      >
-        <Dialog context="local" />
-        <View
-          style={{
-            justifyContent: "center",
-            alignItems: "center",
-            paddingHorizontal: 12,
-            gap: 10,
-            paddingBottom: 20
-          }}
-        >
-          <Heading
-            style={{
-              textAlign: "center"
-            }}
-            color={colors.primary.paragraph}
-            size={SIZE.lg}
-          >
-            {data?.title}
-          </Heading>
-          <Paragraph
-            style={{
-              textAlign: "center"
-            }}
-            color={colors.secondary.paragraph}
-          >
-            {progress ? progress : data?.paragraph}
-          </Paragraph>
-
-          <View
-            style={{
-              flexDirection: "row",
-              width: 100,
-              paddingVertical: 12
-            }}
-          >
-            <ProgressBarComponent
-              height={5}
-              width={100}
-              animated={true}
-              useNativeDriver
-              indeterminate
-              indeterminateAnimationDuration={2000}
-              unfilledColor={colors.secondary.background}
-              color={colors.primary.accent}
-              borderWidth={0}
-            />
-          </View>
-
-          {data?.canHideProgress ? null : (
-            <Button
-              title={cancelCallback.current ? "Cancel" : "Hide"}
-              type="secondaryAccented"
-              onPress={() => {
-                if (cancelCallback.current) {
-                  cancelCallback.current?.();
-                }
-                setVisible(false);
-                setProgress(undefined);
-                setData(undefined);
-              }}
-              width="100%"
-            />
-          )}
-        </View>
-      </DialogContainer>
-    </BaseDialog>
-  );
-}
-
-export function startProgress(options: ProgressOptions) {
-  eSendEvent(PROGRESS_EVENTS.start, options);
-}
-
-export function endProgress() {
-  eSendEvent(PROGRESS_EVENTS.end);
-}
-
-export function updateProgress(options: ProgressOptions) {
-  eSendEvent(PROGRESS_EVENTS.update, options);
-}

apps/mobile/app/components/exception-handler/index.tsx

@@ -23,7 +23,10 @@ import { SafeAreaProvider, SafeAreaView } from "react-native-safe-area-context";
 import { Dialog } from "../dialog";
 import { Issue } from "../sheets/github/issue";
 
-const error = (stack: string, component: string) => `
+const error = (
+  stack: string,
+  component: string
+) => `Please let us know what happened. What steps we can take to reproduce the issue here.
 
 _______________________________
 Stacktrace: In ${component}::${stack}`;
@@ -36,9 +39,9 @@ class ExceptionHandler extends React.Component<{
     error: Error | null;
     hasError: boolean;
   } = {
-    hasError: false,
-    error: null
-  };
+      hasError: false,
+      error: null
+    };
   static getDerivedStateFromError(error: Error) {
     return { hasError: true, error: error };
   }

apps/mobile/app/components/intro/index.js

@@ -43,6 +43,9 @@ import { eSendEvent } from "../../services/event-manager";
 
 const Intro = ({ navigation }) => {
   const { colors } = useThemeColors();
+  const isTelemetryEnabled = useSettingStore(
+    (state) => state.settings.telemetry
+  );
   const { width, height } = useWindowDimensions();
   const deviceMode = useSettingStore((state) => state.deviceMode);
   const insets = useGlobalSafeAreaInsets();
@@ -214,6 +217,44 @@ const Intro = ({ navigation }) => {
           type="accent"
           title="Get started"
         />
+
+        <TouchableOpacity
+          activeOpacity={1}
+          style={{
+            flexDirection: "row",
+            alignSelf: "center",
+            width: "90%",
+            marginBottom: 12,
+            paddingHorizontal: 12,
+            justifyContent: "center",
+            padding: 12,
+            maxWidth: 500
+          }}
+          onPress={() => {
+            SettingsService.set({ telemetry: !isTelemetryEnabled });
+          }}
+        >
+          <Icon
+            size={SIZE.md}
+            name={
+              isTelemetryEnabled ? "checkbox-marked" : "checkbox-blank-outline"
+            }
+            color={
+              isTelemetryEnabled ? colors.primary.accent : colors.primary.icon
+            }
+          />
+
+          <Paragraph
+            style={{
+              flexShrink: 1,
+              marginLeft: 6
+            }}
+            size={SIZE.xs}
+          >
+            Help improve Notesnook by sending completely anonymized{" "}
+            <Heading size={SIZE.xs}>private analytics and bug reports.</Heading>
+          </Paragraph>
+        </TouchableOpacity>
       </View>
     </ScrollView>
   );

apps/mobile/app/components/list/card.tsx

@@ -49,8 +49,7 @@ export const Card = ({ color }: { color?: string }) => {
           flexDirection: "row",
           alignItems: "center",
           justifyContent: "space-between",
-          paddingHorizontal: 0,
-          width: "100%"
+          paddingHorizontal: 0
         }}
       >
         <View
@@ -92,6 +91,7 @@ export const Card = ({ color }: { color?: string }) => {
           <View
             style={{
               marginLeft: 10,
+              flexShrink: 1,
               marginRight: 10
             }}
           >

apps/mobile/app/components/note-history/preview.js

@@ -21,10 +21,10 @@ import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useState } from "react";
 import { View } from "react-native";
 import { db } from "../../common/database";
-import { ReadonlyEditor } from "../../screens/editor/readonly-editor";
+import Editor from "../../screens/editor";
 import { useTabStore } from "../../screens/editor/tiptap/use-tab-store";
 import { editorController } from "../../screens/editor/tiptap/utils";
-import { ToastManager, eSendEvent } from "../../services/event-manager";
+import { eSendEvent, ToastManager } from "../../services/event-manager";
 import Navigation from "../../services/navigation";
 import { useSelectionStore } from "../../stores/use-selection-store";
 import { useTrashStore } from "../../stores/use-trash-store";
@@ -34,7 +34,7 @@ import DialogHeader from "../dialog/dialog-header";
 import { presentDialog } from "../dialog/functions";
 import { Button } from "../ui/button";
 import Paragraph from "../ui/typography/paragraph";
-import { diff } from "diffblazer";
+import { ReadonlyEditor } from "../../screens/editor/readonly-editor";
 
 /**
  *
@@ -121,21 +121,12 @@ export default function NotePreview({ session, content, note }) {
           <ReadonlyEditor
             editorId="historyPreview"
             onLoad={async (loadContent) => {
-              try {
-                if (content.data) {
-                  const _note = note || (await db.notes.note(session?.noteId));
-                  const currentContent = await db.content.get(_note.contentId);
-                  loadContent({
-                    data: diff(currentContent.data, content.data),
-                    id: _note.id
-                  });
-                }
-              } catch (e) {
-                ToastManager.error(
-                  e,
-                  "Failed to load history preview",
-                  "local"
-                );
+              if (content.data) {
+                const _note = note || (await db.notes.note(session?.noteId));
+                loadContent({
+                  data: content.data,
+                  id: _note.id
+                });
               }
             }}
           />

apps/mobile/app/components/premium/component.js

@@ -167,7 +167,7 @@ export const Component = ({ close, promo }) => {
           >
             (
             {Platform.OS === "android"
-              ? pricing.product?.subscriptionOfferDetails[0]?.pricingPhases
+              ? pricing.product?.subscriptionOfferDetails[0].pricingPhases
                   .pricingPhaseList?.[0].formattedPrice
               : pricing.product?.localizedPrice}{" "}
             / mo)

apps/mobile/app/components/premium/pricing-item.tsx

@@ -85,7 +85,7 @@ export const PricingItem = ({
           >
             {Platform.OS === "android"
               ? (product.data as RNIap.SubscriptionAndroid | undefined)
-                  ?.subscriptionOfferDetails?.[0]?.pricingPhases
+                  ?.subscriptionOfferDetails[0].pricingPhases
                   .pricingPhaseList?.[0]?.formattedPrice
               : (product.data as RNIap.SubscriptionIOS | undefined)
                   ?.localizedPrice}

apps/mobile/app/components/premium/pricing-plans.tsx

@@ -393,7 +393,7 @@ export const PricingPlans = ({
                 >
                   {Platform.OS === "android"
                     ? (product.data as RNIap.SubscriptionAndroid)
-                        ?.subscriptionOfferDetails[0]?.pricingPhases
+                        ?.subscriptionOfferDetails[0].pricingPhases
                         .pricingPhaseList?.[0]?.formattedPrice
                     : (product.data as RNIap.SubscriptionIOS)
                         ?.introductoryPrice ||

apps/mobile/app/components/sheets/github/issue.js

@@ -18,33 +18,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Debug } from "@notesnook/core/dist/api/debug";
-import { getModel, getBrand, getSystemVersion } from "react-native-device-info";
 import { useThemeColors } from "@notesnook/theme";
+import Clipboard from "@react-native-clipboard/clipboard";
 import React, { useRef, useState } from "react";
 import { Linking, Platform, Text, TextInput, View } from "react-native";
 import { getVersion } from "react-native-device-info";
 import { useStoredRef } from "../../../hooks/use-stored-ref";
-import { ToastManager } from "../../../services/event-manager";
+import { ToastManager, eSendEvent } from "../../../services/event-manager";
 import PremiumService from "../../../services/premium";
 import { useUserStore } from "../../../stores/use-user-store";
+import { eCloseSheet } from "../../../utils/events";
 import { openLinkInBrowser } from "../../../utils/functions";
 import { SIZE } from "../../../utils/size";
+import { sleep } from "../../../utils/time";
 import DialogHeader from "../../dialog/dialog-header";
+import { presentDialog } from "../../dialog/functions";
 import { Button } from "../../ui/button";
 import Seperator from "../../ui/seperator";
-import Heading from "../../ui/typography/heading";
 import Paragraph from "../../ui/typography/paragraph";
 
 export const Issue = ({ defaultTitle, defaultBody, issueTitle }) => {
   const { colors } = useThemeColors();
-  const body = useStoredRef("issueBody");
+
+  const body = useStoredRef("issueBody", defaultBody);
   const title = useStoredRef("issueTitle", defaultTitle);
-  const [done, setDone] = useState(false);
+
   const user = useUserStore((state) => state.user);
   const [loading, setLoading] = useState(false);
   const bodyRef = useRef();
   const initialLayout = useRef(false);
-  const issueUrl = useRef();
 
   const onPress = async () => {
     if (loading) return;
@@ -54,24 +56,57 @@ export const Issue = ({ defaultTitle, defaultBody, issueTitle }) => {
 
     try {
       setLoading(true);
-      issueUrl.current = await Debug.report({
+      let issue_url = await Debug.report({
         title: title.current,
         body:
           body.current +
-          `\n${defaultBody || ""}` +
           `\n_______________
 **Device information:**
 App version: ${getVersion()}
 Platform: ${Platform.OS}
-Device: ${getBrand() || ""}-${getModel() || ""}-${getSystemVersion() || ""}
+Model: ${Platform.constants.Brand || ""}-${Platform.constants.Model || ""}-${
+            Platform.constants.Version || ""
+          }
 Pro: ${PremiumService.get()}
 Logged in: ${user ? "yes" : "no"}`,
         userId: user?.id
       });
       setLoading(false);
+      eSendEvent(eCloseSheet);
       body.reset();
       title.reset();
-      setDone(true);
+      await sleep(300);
+      presentDialog({
+        title: "Issue reported",
+        paragraph: (
+          <Text>
+            You can track your issue at{" "}
+            <Text
+              style={{
+                textDecorationLine: "underline",
+                color: colors.primary.accent
+              }}
+              onPress={() => {
+                Linking.openURL(issue_url);
+              }}
+            >
+              {issue_url}.
+            </Text>{" "}
+            Please note that we will respond to your issue on the given link. We
+            recommend that you save it.
+          </Text>
+        ),
+        positiveText: "Copy link",
+        positivePress: () => {
+          Clipboard.setString(issue_url);
+          ToastManager.show({
+            heading: "Issue url copied!",
+            type: "success",
+            context: "global"
+          });
+        },
+        negativeText: "Close"
+      });
     } catch (e) {
       setLoading(false);
       ToastManager.show({
@@ -89,177 +124,125 @@ Logged in: ${user ? "yes" : "no"}`,
         width: "100%"
       }}
     >
-      {done ? (
-        <>
-          <View
-            style={{
-              height: 250,
-              justifyContent: "center",
-              alignItems: "center",
-              gap: 10
-            }}
-          >
-            <Heading>Issue submitted</Heading>
-            <Paragraph
-              style={{
-                textAlign: "center"
-              }}
-              selectable={true}
-            >
-              You can track your issue at{" "}
-              <Paragraph
-                style={{
-                  textDecorationLine: "underline",
-                  color: colors.primary.accent
-                }}
-                onPress={() => {
-                  Linking.openURL(issueUrl.current);
-                }}
-              >
-                {issueUrl.current}
-              </Paragraph>
-              . Please note that we will respond to your issue on the given
-              link. We recommend that you save it.
-            </Paragraph>
+      <DialogHeader
+        title={issueTitle || "Report issue"}
+        paragraph={
+          issueTitle
+            ? "We are sorry, it seems that the app crashed due to an error. You can submit a bug report below so we can fix this asap."
+            : "Let us know if you have faced any issue/bug while using Notesnook."
+        }
+      />
 
-            <Button
-              title="Open issue"
-              onPress={() => {
-                Linking.openURL(issueUrl.current);
-              }}
-              type="accent"
-              width="100%"
-            />
-          </View>
-        </>
-      ) : (
-        <>
-          <DialogHeader
-            title={issueTitle || "Report issue"}
-            paragraph={
-              issueTitle
-                ? "We are sorry, it seems that the app crashed due to an error. You can submit a bug report below so we can fix this asap."
-                : "Let us know if you have faced any issue/bug while using Notesnook."
-            }
-          />
+      <Seperator half />
 
-          <Seperator half />
-
-          <TextInput
-            placeholder="Title"
-            onChangeText={(v) => (title.current = v)}
-            defaultValue={title.current}
-            style={{
-              borderWidth: 1,
-              borderColor: colors.primary.border,
-              borderRadius: 5,
-              padding: 12,
-              fontFamily: "OpenSans-Regular",
-              marginBottom: 10,
-              fontSize: SIZE.md,
-              color: colors.primary.heading
-            }}
-            placeholderTextColor={colors.primary.placeholder}
-          />
-
-          <TextInput
-            ref={bodyRef}
-            multiline
-            placeholder={`Tell us more about the issue you are facing. 
+      <TextInput
+        placeholder="Title"
+        onChangeText={(v) => (title.current = v)}
+        defaultValue={title.current}
+        style={{
+          borderWidth: 1,
+          borderColor: colors.primary.border,
+          borderRadius: 5,
+          padding: 12,
+          fontFamily: "OpenSans-Regular",
+          marginBottom: 10,
+          fontSize: SIZE.md,
+          color: colors.primary.heading
+        }}
+        placeholderTextColor={colors.primary.placeholder}
+      />
 
+      <TextInput
+        ref={bodyRef}
+        placeholder={`Tell us more about the issue you are facing.
+        
 For example:
-- What were you trying to do in the app?
-- What did you expect to happen?
-- Steps to reproduce the issue 
+- Steps to reproduce the issue
 - Things you have tried etc.`}
-            numberOfLines={5}
-            textAlignVertical="top"
-            onChangeText={(v) => (body.current = v)}
-            onLayout={() => {
-              if (initialLayout.current) return;
-              initialLayout.current = true;
-              if (body.current) {
-                bodyRef.current?.setNativeProps({
-                  text: body.current,
-                  selection: {
-                    start: 0,
-                    end: 0
-                  }
-                });
+        multiline
+        numberOfLines={5}
+        textAlignVertical="top"
+        onChangeText={(v) => (body.current = v)}
+        onLayout={() => {
+          if (initialLayout.current) return;
+          initialLayout.current = true;
+          if (body.current) {
+            bodyRef.current?.setNativeProps({
+              text: body.current,
+              selection: {
+                start: 0,
+                end: 0
               }
-            }}
-            style={{
-              borderWidth: 1,
-              borderColor: colors.primary.border,
-              borderRadius: 5,
-              padding: 12,
-              fontFamily: "OpenSans-Regular",
-              maxHeight: 200,
-              fontSize: SIZE.sm,
-              marginBottom: 2.5,
-              color: colors.primary.paragraph
-            }}
-            placeholderTextColor={colors.primary.placeholder}
-          />
-          <Paragraph
-            size={SIZE.xs}
-            color={colors.secondary.paragraph}
-          >{`App version: ${getVersion()} Platform: ${
-            Platform.OS
-          } Model: ${getBrand()}-${getModel()}-${getSystemVersion()}`}</Paragraph>
+            });
+          }
+        }}
+        style={{
+          borderWidth: 1,
+          borderColor: colors.primary.border,
+          borderRadius: 5,
+          padding: 12,
+          fontFamily: "OpenSans-Regular",
+          maxHeight: 200,
+          fontSize: SIZE.sm,
+          marginBottom: 2.5,
+          color: colors.primary.paragraph
+        }}
+        placeholderTextColor={colors.primary.placeholder}
+      />
+      <Paragraph
+        size={SIZE.xs}
+        color={colors.secondary.paragraph}
+      >{`App version: ${getVersion()} Platform: ${Platform.OS} Model: ${
+        Platform.constants.Brand
+      }-${Platform.constants.Model}-${Platform.constants.Version}`}</Paragraph>
 
-          <Seperator />
-          <Button
-            onPress={onPress}
-            title={loading ? null : "Submit"}
-            loading={loading}
-            width="100%"
-            type="accent"
-          />
+      <Seperator />
+      <Button
+        onPress={onPress}
+        title={loading ? null : "Submit"}
+        loading={loading}
+        width="100%"
+        type="accent"
+      />
 
-          <Paragraph
-            color={colors.secondary.paragraph}
-            size={SIZE.xs}
-            style={{
-              marginTop: 10,
-              textAlign: "center"
-            }}
-          >
-            The information above will be publically available at{" "}
-            <Text
-              onPress={() => {
-                Linking.openURL("https://github.com/streetwriters/notesnook");
-              }}
-              style={{
-                textDecorationLine: "underline",
-                color: colors.primary.accent
-              }}
-            >
-              github.com/streetwriters/notesnook.
-            </Text>{" "}
-            If you want to ask something in general or need some assistance, we
-            would suggest that you{" "}
-            <Text
-              style={{
-                textDecorationLine: "underline",
-                color: colors.primary.accent
-              }}
-              onPress={async () => {
-                try {
-                  await openLinkInBrowser(
-                    "https://discord.gg/zQBK97EE22",
-                    colors
-                  );
-                } catch (e) {
-                  console.error(e);
-                }
-              }}
-            >
-              join our community on Discord.
-            </Text>
-          </Paragraph>
-        </>
-      )}
+      <Paragraph
+        color={colors.secondary.paragraph}
+        size={SIZE.xs}
+        style={{
+          marginTop: 10,
+          textAlign: "center"
+        }}
+      >
+        The information above will be publically available at{" "}
+        <Text
+          onPress={() => {
+            Linking.openURL("https://github.com/streetwriters/notesnook");
+          }}
+          style={{
+            textDecorationLine: "underline",
+            color: colors.primary.accent
+          }}
+        >
+          github.com/streetwriters/notesnook.
+        </Text>{" "}
+        If you want to ask something in general or need some assistance, we
+        would suggest that you{" "}
+        <Text
+          style={{
+            textDecorationLine: "underline",
+            color: colors.primary.accent
+          }}
+          onPress={async () => {
+            try {
+              await openLinkInBrowser("https://discord.gg/zQBK97EE22", colors);
+            } catch (e) {
+              console.error(e);
+            }
+          }}
+        >
+          join our community on Discord.
+        </Text>
+      </Paragraph>
     </View>
   );
 };

apps/mobile/app/components/sheets/migrate/index.tsx

@@ -42,7 +42,10 @@ import { ProgressBarComponent } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
 import { Issue } from "../github/issue";
 
-export const makeError = (stack: string, component: string) => `
+export const makeError = (
+  stack: string,
+  component: string
+) => `Please let us know what happened. What steps we can take to reproduce the issue here.
 
 _______________________________
 Stacktrace: In ${component}::${stack}`;
@@ -95,9 +98,9 @@ export default function Migrate() {
       await sleep(1);
       const { error, report } = await BackupService.run(false, "local");
       if (error) {
-        ToastManager.error(error as Error, "Backup failed");
+        ToastManager.error(error, "Backup failed");
         if (report) {
-          reportError(error as Error);
+          reportError(error);
         }
         setLoading(false);
         return;

apps/mobile/app/components/sheets/restore-data/index.js

@@ -0,0 +1,600 @@
+/*
+This file is part of the Notesnook project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import { getFormattedDate } from "@notesnook/common";
+import { EVENTS } from "@notesnook/core/dist/common";
+import { useThemeColors } from "@notesnook/theme";
+import React, { useCallback, useEffect, useRef, useState } from "react";
+import { ActivityIndicator, Platform, View } from "react-native";
+import { FlatList } from "react-native-actions-sheet";
+import RNFetchBlob from "react-native-blob-util";
+import DocumentPicker from "react-native-document-picker";
+import * as ScopedStorage from "react-native-scoped-storage";
+import { unzip } from "react-native-zip-archive";
+import { db } from "../../../common/database";
+import storage from "../../../common/database/storage";
+import { cacheDir, copyFileAsync } from "../../../common/filesystem/utils";
+import {
+  ToastManager,
+  eSubscribeEvent,
+  eUnSubscribeEvent
+} from "../../../services/event-manager";
+import Navigation from "../../../services/navigation";
+import SettingsService from "../../../services/settings";
+import { refreshAllStores } from "../../../stores/create-db-collection-store";
+import { eCloseRestoreDialog, eOpenRestoreDialog } from "../../../utils/events";
+import { SIZE } from "../../../utils/size";
+import { Dialog } from "../../dialog";
+import DialogHeader from "../../dialog/dialog-header";
+import { presentDialog } from "../../dialog/functions";
+import { Toast } from "../../toast";
+import { Button } from "../../ui/button";
+import Seperator from "../../ui/seperator";
+import SheetWrapper from "../../ui/sheet";
+import Paragraph from "../../ui/typography/paragraph";
+import { useUserStore } from "../../../stores/use-user-store";
+
+const RestoreDataSheet = () => {
+  const [visible, setVisible] = useState(false);
+  const [restoring, setRestoring] = useState(false);
+  const sheet = useRef();
+  useEffect(() => {
+    const open = async () => {
+      setVisible(true);
+      setTimeout(() => {
+        sheet.current?.show();
+      }, 1);
+    };
+    eSubscribeEvent(eOpenRestoreDialog, open);
+    eSubscribeEvent(eCloseRestoreDialog, close);
+    return () => {
+      eUnSubscribeEvent(eOpenRestoreDialog, open);
+      eUnSubscribeEvent(eCloseRestoreDialog, close);
+    };
+  }, [close]);
+
+  const close = useCallback(() => {
+    if (restoring) {
+      showIsWorking();
+      return;
+    }
+    sheet.current?.hide();
+    setTimeout(() => {
+      setVisible(false);
+    }, 150);
+  }, [restoring]);
+
+  const showIsWorking = () => {
+    ToastManager.show({
+      heading: "Restoring Backup",
+      message: "Your backup data is being restored. please wait.",
+      type: "error",
+      context: "local"
+    });
+  };
+
+  return !visible ? null : (
+    <SheetWrapper
+      fwdRef={sheet}
+      gestureEnabled={!restoring}
+      closeOnTouchBackdrop={!restoring}
+      onClose={() => {
+        setVisible(false);
+        close();
+      }}
+    >
+      <RestoreDataComponent
+        close={close}
+        restoring={restoring}
+        setRestoring={setRestoring}
+        actionSheetRef={sheet}
+      />
+      <Toast context="local" />
+    </SheetWrapper>
+  );
+};
+
+export default RestoreDataSheet;
+
+const RestoreDataComponent = ({ close, setRestoring, restoring }) => {
+  const { colors } = useThemeColors();
+  const [files, setFiles] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [backupDirectoryAndroid, setBackupDirectoryAndroid] = useState(false);
+  const [progress, setProgress] = useState();
+  useEffect(() => {
+    const subscription = db.eventManager.subscribe(
+      EVENTS.migrationProgress,
+      (progress) => {
+        setProgress(progress);
+      }
+    );
+    return () => {
+      subscription?.unsubscribe();
+    };
+  }, []);
+
+  useEffect(() => {
+    setTimeout(() => {
+      checkBackups();
+    }, 1000);
+  }, []);
+
+  const restore = async (item) => {
+    if (restoring) {
+      return;
+    }
+
+    try {
+      const file = Platform.OS === "ios" ? item.path : item.uri;
+      console.log(file);
+      if (file.endsWith(".nnbackupz")) {
+        setRestoring(true);
+
+        if (Platform.OS === "android") {
+          const cacheFile = `file://${RNFetchBlob.fs.dirs.CacheDir}/backup.zip`;
+          if (await RNFetchBlob.fs.exists(cacheFile)) {
+            await RNFetchBlob.fs.unlink(cacheFile);
+          }
+          await RNFetchBlob.fs.createFile(cacheFile, "", "utf8");
+          console.log("copying");
+          await copyFileAsync(file, cacheFile);
+          console.log("copied");
+          await restoreFromZip(cacheFile);
+        } else {
+          await restoreFromZip(file, false);
+        }
+      } else if (file.endsWith(".nnbackup")) {
+        let backup;
+        if (Platform.OS === "android") {
+          backup = await ScopedStorage.readFile(file, "utf8");
+        } else {
+          backup = await RNFetchBlob.fs.readFile(file, "utf8");
+        }
+        await restoreFromNNBackup(JSON.parse(backup));
+      }
+    } catch (e) {
+      console.log("error", e);
+      setRestoring(false);
+      backupError(e);
+    }
+  };
+
+  const withPassword = () => {
+    return new Promise((resolve) => {
+      let resolved = false;
+      presentDialog({
+        context: "local",
+        title: "Encrypted backup",
+        input: true,
+        inputPlaceholder: "Password",
+        paragraph: "Please enter password of this backup file",
+        positiveText: "Restore",
+        secureTextEntry: true,
+        onClose: () => {
+          if (resolved) return;
+          resolve(undefined);
+        },
+        negativeText: "Cancel",
+        positivePress: async (password, isEncryptionKey) => {
+          resolve({
+            value: password,
+            isEncryptionKey
+          });
+          resolved = true;
+          return true;
+        },
+        check: {
+          info: "Use encryption key",
+          type: "transparent"
+        }
+      });
+    });
+  };
+
+  const checkBackups = async () => {
+    try {
+      let files = [];
+      if (Platform.OS === "android") {
+        let backupDirectory = SettingsService.get().backupDirectoryAndroid;
+        if (backupDirectory) {
+          setBackupDirectoryAndroid(backupDirectory);
+          files = await ScopedStorage.listFiles(backupDirectory.uri);
+        } else {
+          setLoading(false);
+          return;
+        }
+      } else {
+        let path = await storage.checkAndCreateDir("/backups/");
+        files = await RNFetchBlob.fs.lstat(path);
+      }
+      files = files
+        .filter((file) => {
+          const name = Platform.OS === "android" ? file.name : file.filename;
+          return name.endsWith(".nnbackup") || name.endsWith(".nnbackupz");
+        })
+        .sort(function (a, b) {
+          let timeA = a.lastModified;
+          let timeB = b.lastModified;
+          return timeB - timeA;
+        });
+      setFiles(files);
+      setLoading(false);
+    } catch (e) {
+      console.log(e);
+      setLoading(false);
+    }
+  };
+
+  const restoreBackup = async (backup, password, key) => {
+    await db.transaction(async () => {
+      await db.backup.import(backup, password, key);
+    });
+    await db.initCollections();
+    refreshAllStores();
+    ToastManager.show({
+      heading: "Backup restored successfully.",
+      type: "success",
+      context: "global"
+    });
+    Navigation.queueRoutesForUpdate();
+    return true;
+  };
+
+  const backupError = (e) => {
+    console.log(e.stack);
+    ToastManager.show({
+      heading: "Restore failed",
+      message:
+        e.message ||
+        "The selected backup data file is invalid. You must select a *.nnbackup file to restore.",
+      type: "error",
+      context: "local"
+    });
+  };
+
+  /**
+   *
+   * @param {string} file
+   */
+  async function restoreFromZip(file, remove) {
+    try {
+      const zipOutputFolder = `${cacheDir}/backup_extracted`;
+      if (await RNFetchBlob.fs.exists(zipOutputFolder)) {
+        await RNFetchBlob.fs.unlink(zipOutputFolder);
+        await RNFetchBlob.fs.mkdir(zipOutputFolder);
+      }
+      await unzip(file, zipOutputFolder);
+      console.log("Unzipped files successfully to", zipOutputFolder);
+
+      const backupFiles = await RNFetchBlob.fs.ls(zipOutputFolder);
+
+      // if (backupFiles.findIndex((file) => file === ".nnbackup") === -1) {
+      //   throw new Error("Backup file is invalid");
+      // }
+
+      await db.transaction(async () => {
+        let password;
+        let key;
+        console.log(
+          `Found ${backupFiles?.length} files to restore from backup`
+        );
+        for (const path of backupFiles) {
+          if (path === ".nnbackup") continue;
+          const filePath = `${zipOutputFolder}/${path}`;
+          const data = await RNFetchBlob.fs.readFile(filePath, "utf8");
+          const parsed = JSON.parse(data);
+
+          if (parsed.encrypted && !password) {
+            console.log("Backup is encrypted...", "requesting password");
+            const { value, isEncryptionKey } = await withPassword();
+
+            if (isEncryptionKey) {
+              key = value;
+            } else {
+              password = value;
+            }
+            if (!password && !key) throw new Error("Failed to decrypt backup");
+          }
+          await db.backup.import(parsed, password, key);
+          console.log("Imported", path);
+        }
+      });
+      // Remove files from cache
+      RNFetchBlob.fs.unlink(zipOutputFolder).catch(console.log);
+      if (remove) {
+        RNFetchBlob.fs.unlink(file).catch(console.log);
+      }
+
+      refreshAllStores();
+      Navigation.queueRoutesForUpdate();
+      setRestoring(false);
+      close();
+      ToastManager.show({
+        heading: "Backup restored successfully.",
+        type: "success",
+        context: "global"
+      });
+    } catch (e) {
+      backupError(e);
+      setRestoring(false);
+    }
+  }
+
+  /**
+   *
+   * @param {string} file
+   */
+  async function restoreFromNNBackup(backup) {
+    try {
+      if (backup.data.iv && backup.data.salt) {
+        const { value, isEncryptionKey } = await withPassword();
+
+        let key;
+        let password;
+        if (isEncryptionKey) {
+          key = value;
+        } else {
+          password = value;
+        }
+
+        if (key || password) {
+          try {
+            await restoreBackup(backup, password, key);
+            close();
+            setRestoring(false);
+          } catch (e) {
+            setRestoring(false);
+            backupError(e);
+          }
+        } else {
+          setRestoring(false);
+        }
+      } else {
+        await restoreBackup(backup);
+        setRestoring(false);
+        close();
+      }
+    } catch (e) {
+      setRestoring(false);
+      backupError(e);
+    }
+  }
+
+  const button = {
+    title: "Restore from files",
+    onPress: async () => {
+      if (restoring) {
+        return;
+      }
+      try {
+        useUserStore.setState({
+          disableAppLockRequests: true
+        });
+        console.log("disabled...");
+        const file = await DocumentPicker.pickSingle({
+          copyTo: "cachesDirectory"
+        });
+
+        setTimeout(() => {
+          useUserStore.setState({
+            disableAppLockRequests: false
+          });
+        }, 1000);
+
+        if (file.name.endsWith(".nnbackupz")) {
+          setRestoring(true);
+          await restoreFromZip(file.fileCopyUri, true);
+        } else if (file.name.endsWith(".nnbackup")) {
+          RNFetchBlob.fs.unlink(file.fileCopyUri).catch(console.log);
+          setRestoring(true);
+          const data = await fetch(file.uri);
+          await restoreFromNNBackup(await data.json());
+        }
+      } catch (e) {
+        console.log("error", e.stack);
+        setTimeout(() => {
+          useUserStore.setState({
+            disableAppLockRequests: false
+          });
+        }, 1000);
+        setRestoring(false);
+        backupError(e);
+      }
+    }
+  };
+
+  const renderItem = ({ item, index }) => (
+    <View
+      style={{
+        minHeight: 50,
+        justifyContent: "space-between",
+        alignItems: "center",
+        width: "100%",
+        borderRadius: 0,
+        flexDirection: "row",
+        borderBottomWidth: 0.5,
+        borderBottomColor: colors.primary.border
+      }}
+    >
+      <View
+        style={{
+          maxWidth: "75%"
+        }}
+      >
+        <Paragraph size={SIZE.sm} style={{ width: "100%", maxWidth: "100%" }}>
+          {getFormattedDate(item?.lastModified * 1)}
+        </Paragraph>
+        <Paragraph size={SIZE.xs}>
+          {(item.filename || item.name).replace(".nnbackup", "")}
+        </Paragraph>
+      </View>
+      <Button
+        title="Restore"
+        height={30}
+        type="accent"
+        style={{
+          borderRadius: 100,
+          paddingHorizontal: 12
+        }}
+        fontSize={SIZE.sm - 1}
+        onPress={() => restore(item, index)}
+      />
+    </View>
+  );
+
+  return (
+    <>
+      <View>
+        <Dialog context="local" />
+        <View
+          style={{
+            flexDirection: "row",
+            justifyContent: "space-between",
+            paddingHorizontal: 8,
+            paddingRight: 8,
+            alignItems: "center",
+            paddingTop: restoring ? 8 : 0
+          }}
+        >
+          <DialogHeader
+            title="Backups"
+            paragraph={`All the backups are stored in ${
+              Platform.OS === "ios"
+                ? "File Manager/Notesnook/Backups"
+                : "selected backups folder."
+            }`}
+            button={button}
+          />
+        </View>
+        <Seperator half />
+        <FlatList
+          ListEmptyComponent={
+            !restoring ? (
+              loading ? (
+                <View
+                  style={{
+                    justifyContent: "center",
+                    alignItems: "center",
+                    height: 100
+                  }}
+                >
+                  <ActivityIndicator
+                    color={colors.primary.accent}
+                    size={SIZE.lg}
+                  />
+                </View>
+              ) : (
+                <View
+                  style={{
+                    justifyContent: "center",
+                    alignItems: "center",
+                    height: 100
+                  }}
+                >
+                  {Platform.OS === "android" && !backupDirectoryAndroid ? (
+                    <>
+                      <Button
+                        title="Select backups folder"
+                        icon="folder"
+                        onPress={async () => {
+                          let folder = await ScopedStorage.openDocumentTree(
+                            true
+                          );
+                          let subfolder;
+                          if (folder.name !== "Notesnook backups") {
+                            subfolder = await ScopedStorage.createDirectory(
+                              folder.uri,
+                              "Notesnook backups"
+                            );
+                          } else {
+                            subfolder = folder;
+                          }
+                          SettingsService.set({
+                            backupDirectoryAndroid: subfolder
+                          });
+                          setBackupDirectoryAndroid(subfolder);
+                          setLoading(true);
+                          checkBackups();
+                        }}
+                        style={{
+                          marginTop: 10,
+                          paddingHorizontal: 12
+                        }}
+                        height={30}
+                        width={null}
+                      />
+
+                      <Paragraph
+                        style={{
+                          textAlign: "center",
+                          marginTop: 5
+                        }}
+                        size={SIZE.xs}
+                        textBreakStrategy="balanced"
+                        color={colors.secondary.paragraph}
+                      >
+                        Select the folder that includes your backup files to
+                        list them here.
+                      </Paragraph>
+                    </>
+                  ) : (
+                    <Paragraph color={colors.secondary.paragraph}>
+                      No backups found
+                    </Paragraph>
+                  )}
+                </View>
+              )
+            ) : (
+              <View
+                style={{
+                  justifyContent: "center",
+                  alignItems: "center",
+                  height: 200
+                }}
+              >
+                <ActivityIndicator color={colors.primary.accent} />
+                <Paragraph color={colors.secondary.paragraph}>
+                  Restoring {progress ? progress?.collection : null}
+                  {progress ? `(${progress.current}/${progress.total}) ` : null}
+                  ...Please wait.
+                </Paragraph>
+              </View>
+            )
+          }
+          keyExtractor={(item) => item.name || item.filename}
+          style={{
+            paddingHorizontal: 12
+          }}
+          data={restoring || loading ? [] : files}
+          renderItem={renderItem}
+          ListFooterComponent={
+            restoring || loading || files.length === 0 ? null : (
+              <View
+                style={{
+                  height: 200
+                }}
+              />
+            )
+          }
+        />
+      </View>
+    </>
+  );
+};

apps/mobile/app/components/ui/button/index.tsx

@@ -25,8 +25,7 @@ import {
   DimensionValue,
   TextStyle,
   View,
-  ViewStyle,
-  useWindowDimensions
+  ViewStyle
 } from "react-native";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { useUserStore } from "../../../stores/use-user-store";
@@ -93,9 +92,6 @@ export const Button = ({
   });
   const textColor = buttonType?.text ? buttonType.text : text;
 
-  const { fontScale } = useWindowDimensions();
-  const growFactor = 1 + (fontScale - 1) / 10;
-
   const Component = bold ? Heading : Paragraph;
 
   return (
@@ -112,7 +108,7 @@ export const Button = ({
           NativeTooltip.show(event, tooltipText, NativeTooltip.POSITIONS.TOP);
         }
       }}
-      disabled={loading || restProps.disabled}
+      disabled={loading}
       type={type}
       accentColor={accentColor}
       accentText={accentText}
@@ -121,18 +117,14 @@ export const Button = ({
       customOpacity={buttonType?.opacity}
       customAlpha={buttonType?.alpha}
       style={{
-        height: typeof height === "number" ? height * growFactor : height,
-        width:
-          typeof width === "number"
-            ? width * growFactor
-            : (width as DimensionValue) || undefined,
+        height: height,
+        width: (width as DimensionValue) || undefined,
         paddingHorizontal: 12,
         borderRadius: 5,
         alignSelf: "center",
         justifyContent: "center",
         alignItems: "center",
         flexDirection: "row",
-        opacity: restProps?.disabled ? 0.5 : 1,
         ...(style as ViewStyle)
       }}
     >

apps/mobile/app/components/ui/input/index.tsx

@@ -41,7 +41,6 @@ import { SIZE } from "../../../utils/size";
 import { IconButton } from "../icon-button";
 import Paragraph from "../typography/paragraph";
 import phone from "phone";
-import isURL from "validator/lib/isURL";
 
 interface InputProps extends TextInputProps {
   fwdRef?: RefObject<TextInput>;
@@ -50,8 +49,7 @@ interface InputProps extends TextInputProps {
     | "email"
     | "confirmPassword"
     | "username"
-    | "phonenumber"
-    | "url";
+    | "phonenumber";
   loading?: boolean;
   onSubmit?: (
     event: NativeSyntheticEvent<TextInputSubmitEditingEventData>
@@ -153,9 +151,6 @@ const Input = ({
       case "confirmPassword":
         isError = customValidator && value === customValidator();
         break;
-      case "url":
-        isError = isURL(value);
-        break;
       case "phonenumber": {
         const result = phone(value, {
           strictDetection: true,

apps/mobile/app/components/ui/pressable/index.tsx

@@ -21,12 +21,11 @@ import { VariantsWithStaticColors, useThemeColors } from "@notesnook/theme";
 import React, { RefObject, useCallback } from "react";
 import {
   ColorValue,
-  PressableStateCallbackType,
   Pressable as RNPressable,
   PressableProps as RNPressableProps,
+  PressableStateCallbackType,
   View,
-  ViewStyle,
-  useWindowDimensions
+  ViewStyle
 } from "react-native";
 import {
   RGB_Linear_Shade,
@@ -257,8 +256,6 @@ export const Pressable = ({
     ? 1
     : colorOpacity;
   const alpha = customAlpha ? customAlpha : isDark ? 0.03 : -0.03;
-  const { fontScale } = useWindowDimensions();
-  const growFactor = 1 + (fontScale - 1) / 8;
 
   const getStyle = useCallback(
     ({ pressed }: PressableStateCallbackType): ViewStyle | ViewStyle[] => [
@@ -279,13 +276,7 @@ export const Pressable = ({
           : borderColor || "transparent",
         borderWidth: borderWidth
       },
-      style,
-      {
-        height:
-          typeof style.height === "number"
-            ? style.height * growFactor
-            : style.height
-      }
+      style
     ],
     [
       alpha,
@@ -297,8 +288,7 @@ export const Pressable = ({
       borderSelectedColor,
       borderColor,
       borderWidth,
-      style,
-      growFactor
+      style
     ]
   );
 

apps/mobile/app/hooks/use-app-events.tsx

@@ -26,7 +26,10 @@ import {
 } from "@notesnook/core/dist/common";
 import { EventManagerSubscription } from "@notesnook/core/dist/utils/event-manager";
 import notifee from "@notifee/react-native";
-import NetInfo, { NetInfoSubscription } from "@react-native-community/netinfo";
+import NetInfo, {
+  NetInfoState,
+  NetInfoSubscription
+} from "@react-native-community/netinfo";
 import React, { useCallback, useEffect, useRef } from "react";
 import {
   AppState,
@@ -44,7 +47,6 @@ import { checkVersion } from "react-native-check-version";
 import Config from "react-native-config";
 import * as RNIap from "react-native-iap";
 import { DatabaseLogger, db, setupDatabase } from "../common/database";
-import { initializeLogger } from "../common/database/logger";
 import { MMKV } from "../common/database/mmkv";
 import Migrate from "../components/sheets/migrate";
 import NewFeature from "../components/sheets/new-feature";
@@ -278,109 +280,8 @@ const onSubscriptionError = async (error: RNIap.PurchaseError) => {
 
 const SodiumEventEmitter = new NativeEventEmitter(NativeModules.Sodium);
 
-const doAppLoadActions = async () => {
-  if (SettingsService.get().sessionExpired) {
-    eSendEvent(eLoginSessionExpired);
-    return;
-  }
-  notifee.setBadgeCount(0);
-
-  if (!(await db.user.getUser())) {
-    setLoginMessage();
-    return;
-  }
-
-  await useMessageStore.getState().setAnnouncement();
-  if (NewFeature.present()) return;
-  if (await checkAppUpdateAvailable()) return;
-  if (await checkForRateAppRequest()) return;
-  if (await PremiumService.getRemainingTrialDaysStatus()) return;
-  if (SettingsService.get().introCompleted) {
-    useMessageStore.subscribe((state) => {
-      const dialogs = state.dialogs;
-      if (dialogs.length > 0) {
-        eSendEvent(eOpenAnnouncementDialog, dialogs[0]);
-      }
-    });
-  }
-};
-
-const checkAppUpdateAvailable = async () => {
-  if (__DEV__ || Config.isTesting === "true" || Config.FDROID_BUILD || BETA)
-    return;
-  try {
-    const version =
-      Config.GITHUB_RELEASE === "true"
-        ? await getGithubVersion()
-        : await checkVersion();
-    if (!version || !version?.needsUpdate) return false;
-
-    setUpdateAvailableMessage(version);
-    return true;
-  } catch (e) {
-    return false;
-  }
-};
-
-const checkForRateAppRequest = async () => {
-  const rateApp = SettingsService.get().rateApp as number;
-  if (
-    rateApp &&
-    rateApp < Date.now() &&
-    !useMessageStore.getState().message?.visible
-  ) {
-    setRateAppMessage();
-    return false;
-  }
-  return false;
-};
-
-const IsDatabaseMigrationRequired = () => {
-  if (!db.migrations.required() || useUserStore.getState().appLocked)
-    return false;
-
-  presentSheet({
-    component: <Migrate />,
-    onClose: () => {
-      if (!db.migrations.required()) {
-        initializeDatabase();
-      }
-    },
-    disableClosing: true
-  });
-  return true;
-};
-
-const initializeDatabase = async (password?: string) => {
-  if (useUserStore.getState().appLocked) return;
-  if (!db.isInitialized) {
-    RNBootSplash.hide({ fade: true });
-    DatabaseLogger.info("Initializing database");
-    try {
-      await setupDatabase(password);
-      await db.init();
-      Sync.run();
-    } catch (e) {
-      DatabaseLogger.error(e as Error);
-      ToastManager.error(e as Error, "Error initializing database", "global");
-    }
-  }
-
-  if (IsDatabaseMigrationRequired()) return;
-
-  if (db.isInitialized) {
-    Notifications.setupReminders(true);
-    if (SettingsService.get().notifNotes) {
-      Notifications.pinQuickNote(false);
-    }
-    useSettingStore.getState().setAppLoading(false);
-    DatabaseLogger.info("Database initialized");
-  }
-  Walkthrough.init();
-};
-
 export const useAppEvents = () => {
-  const isAppLoading = useSettingStore((state) => state.isAppLoading);
+  const loading = useSettingStore((state) => state.isAppLoading);
   const [setLastSynced, setUser, appLocked, syncing] = useUserStore((state) => [
     state.setLastSynced,
     state.setUser,
@@ -389,15 +290,18 @@ export const useAppEvents = () => {
   ]);
 
   const syncedOnLaunch = useRef(false);
+
   const refValues = useRef<
     Partial<{
       subsriptionSuccessListener: EmitterSubscription;
       subsriptionErrorListener: EmitterSubscription;
+      isUserReady: boolean;
       prevState: AppStateStatus;
+      showingDialog: boolean;
       removeInternetStateListener: NetInfoSubscription;
+      isReconnecting: boolean;
       initialUrl: string;
       backupDidWait: boolean;
-      isConnectingSSE: boolean;
     }>
   >({});
 
@@ -408,7 +312,7 @@ export const useAppEvents = () => {
   }, [setLastSynced]);
 
   useEffect(() => {
-    if (isAppLoading) return;
+    if (loading) return;
 
     let subscriptions: EventManagerSubscription[] = [];
     const eventManager = db.eventManager;
@@ -423,7 +327,7 @@ export const useAppEvents = () => {
     return () => {
       subscriptions.forEach((sub) => sub?.unsubscribe?.());
     };
-  }, [isAppLoading, onSyncComplete]);
+  }, [loading, onSyncComplete]);
 
   const subscribeToPurchaseListeners = useCallback(async () => {
     if (Platform.OS === "android") {
@@ -460,31 +364,14 @@ export const useAppEvents = () => {
     const user = await db.user.getUser();
     if (PremiumService.get() && user) {
       if (
-        SettingsService.get().backupDirectoryAndroid ||
-        Platform.OS !== "android"
+        await BackupService.checkBackupRequired(SettingsService.get().reminder)
       ) {
-        const partialBackup = await BackupService.checkBackupRequired(
-          SettingsService.get().reminder,
-          "lastBackupDate"
-        );
-        const fullBackup = await BackupService.checkBackupRequired(
-          SettingsService.get().fullBackupReminder,
-          "lastFullBackupDate"
-        );
-
-        await sleep(2000);
-
-        if (partialBackup) {
-          await BackupService.run();
-        }
-
-        if (fullBackup) {
-          await BackupService.run(true, undefined, "full");
-        }
-      }
-
-      if (SettingsService.getProperty("offlineMode")) {
-        db.attachments.cacheAttachments().catch(console.log);
+        if (
+          !SettingsService.get().backupDirectoryAndroid &&
+          Platform.OS === "android"
+        )
+          return;
+        sleep(2000).then(() => BackupService.run());
       }
     }
   }, []);
@@ -545,6 +432,7 @@ export const useAppEvents = () => {
         setRecoveryKeyMessage();
       }
       if (!user?.isEmailConfirmed) setEmailVerifyMessage();
+      refValues.current.isUserReady = true;
 
       syncedOnLaunch.current = true;
       if (!isLogin) {
@@ -618,19 +506,18 @@ export const useAppEvents = () => {
   }, [onSyncComplete, onUserUpdated]);
 
   useEffect(() => {
-    const onInternetStateChanged = async () => {
+    const onInternetStateChanged = async (state: NetInfoState) => {
       if (!syncedOnLaunch.current) return;
-      Sync.run("global", false, "full");
-      reconnectSSE();
+      reconnectSSE(state);
     };
 
     const onAppStateChanged = async (state: AppStateStatus) => {
       if (state === "active") {
         notifee.setBadgeCount(0);
         updateStatusBarColor();
+
         checkAutoBackup();
-        Sync.run("global", false, "full");
-        reconnectSSE();
+        await reconnectSSE();
         await checkForShareExtensionLaunchedInBackground();
         MMKV.removeItem("appState");
         let user = await db.user.getUser();
@@ -685,7 +572,7 @@ export const useAppEvents = () => {
       });
     }
     let sub: NativeEventSubscription;
-    if (!isAppLoading && !appLocked) {
+    if (!loading && !appLocked) {
       setTimeout(() => {
         sub = AppState.addEventListener("change", onAppStateChanged);
         if (
@@ -707,7 +594,7 @@ export const useAppEvents = () => {
       sub?.remove();
       unsubscribePurchaseListeners();
     };
-  }, [isAppLoading, appLocked, checkAutoBackup]);
+  }, [loading, appLocked, checkAutoBackup]);
 
   useEffect(() => {
     if (!appLocked && !syncing && refValues.current.backupDidWait) {
@@ -716,35 +603,167 @@ export const useAppEvents = () => {
     }
   }, [appLocked, syncing, checkAutoBackup]);
 
-  async function reconnectSSE() {
+  async function reconnectSSE(connection?: NetInfoState) {
+    if (refValues.current?.isReconnecting || !refValues.current?.isUserReady)
+      return;
+
+    if (useSettingStore.getState().appDidEnterBackgroundForAction) {
+      useSettingStore.getState().setAppDidEnterBackgroundForAction(false);
+      console.log("AppDidEnterForegroundAfterAction");
+      return;
+    }
+
+    if (SettingsService.get().sessionExpired) {
+      refValues.current.isReconnecting = false;
+      return;
+    }
+
+    refValues.current.isReconnecting = true;
+    let connectionState = connection;
     try {
-      if (refValues.current?.isConnectingSSE) return;
-      refValues.current.isConnectingSSE = true;
-      await db.connectSSE();
-      refValues.current.isConnectingSSE = false;
+      if (!connectionState) {
+        connectionState = await NetInfo.fetch();
+      }
+
+      const user = await db.user.getUser();
+      if (
+        user &&
+        connectionState.isConnected &&
+        connectionState.isInternetReachable
+      ) {
+        await db.connectSSE();
+      } else {
+        useUserStore.getState().setSyncing(false);
+        await db.syncer.stop();
+      }
+      refValues.current.isReconnecting = false;
     } catch (e) {
-      refValues.current.isConnectingSSE = false;
-      DatabaseLogger.error(e as Error);
+      refValues.current.isReconnecting = false;
     }
   }
 
   useEffect(() => {
-    if (!isAppLoading) {
+    if (!loading) {
       onUserUpdated();
       doAppLoadActions();
     }
-  }, [isAppLoading, onUserUpdated]);
+  }, [loading, onUserUpdated]);
+
+  const initializeDatabase = useCallback(async (password?: string) => {
+    const IsDatabaseMigrationRequired = () => {
+      if (!db.migrations.required() || useUserStore.getState().appLocked)
+        return false;
+
+      presentSheet({
+        component: <Migrate />,
+        onClose: () => {
+          if (!db.migrations.required()) {
+            initializeDatabase();
+          }
+        },
+        disableClosing: true
+      });
+      return true;
+    };
+
+    if (useUserStore.getState().appLocked) return;
+    if (!db.isInitialized) {
+      RNBootSplash.hide({ fade: true });
+      DatabaseLogger.info("Initializing database");
+      try {
+        await setupDatabase(password);
+        await db.init();
+      } catch (e) {
+        DatabaseLogger.error(e as Error);
+        ToastManager.error(e as Error, "Error initializing database", "global");
+      }
+    }
+
+    if (IsDatabaseMigrationRequired()) return;
+
+    if (db.isInitialized) {
+      Notifications.setupReminders(true);
+      if (SettingsService.get().notifNotes) {
+        Notifications.pinQuickNote(false);
+      }
+      useSettingStore.getState().setAppLoading(false);
+      DatabaseLogger.info("Database initialized");
+    }
+    Walkthrough.init();
+  }, []);
 
   useEffect(() => {
-    if (!appLocked && isAppLoading) {
-      initializeLogger()
-        .catch((e) => {
-          console.log(e);
-        })
-        .finally(() => {
-          //@ts-ignore
+    let sub: () => void;
+    if (appLocked) {
+      const sub = useUserStore.subscribe((state) => {
+        if (!state.appLocked && useSettingStore.getState().isAppLoading) {
+          console.log("DB initialized");
           initializeDatabase();
-        });
+          sub();
+        }
+      });
     }
-  }, [appLocked, isAppLoading]);
+    return () => {
+      sub?.();
+    };
+  }, [appLocked, initializeDatabase]);
+
+  return initializeDatabase;
+};
+
+const doAppLoadActions = async () => {
+  if (SettingsService.get().sessionExpired) {
+    eSendEvent(eLoginSessionExpired);
+    return;
+  }
+  notifee.setBadgeCount(0);
+
+  if (!(await db.user.getUser())) {
+    setLoginMessage();
+    return;
+  }
+
+  await useMessageStore.getState().setAnnouncement();
+  if (NewFeature.present()) return;
+  if (await checkAppUpdateAvailable()) return;
+  if (await checkForRateAppRequest()) return;
+  if (await PremiumService.getRemainingTrialDaysStatus()) return;
+  if (SettingsService.get().introCompleted) {
+    useMessageStore.subscribe((state) => {
+      const dialogs = state.dialogs;
+      if (dialogs.length > 0) {
+        eSendEvent(eOpenAnnouncementDialog, dialogs[0]);
+      }
+    });
+  }
+};
+
+const checkAppUpdateAvailable = async () => {
+  if (__DEV__ || Config.isTesting === "true" || Config.FDROID_BUILD || BETA)
+    return;
+  try {
+    const version =
+      Config.GITHUB_RELEASE === "true"
+        ? await getGithubVersion()
+        : await checkVersion();
+    if (!version || !version?.needsUpdate) return false;
+
+    setUpdateAvailableMessage(version);
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
+
+const checkForRateAppRequest = async () => {
+  const rateApp = SettingsService.get().rateApp as number;
+  if (
+    rateApp &&
+    rateApp < Date.now() &&
+    !useMessageStore.getState().message?.visible
+  ) {
+    setRateAppMessage();
+    return false;
+  }
+  return false;
 };

apps/mobile/app/hooks/use-pricing.ts

@@ -22,14 +22,20 @@ import { Platform } from "react-native";
 import { Subscription } from "react-native-iap";
 import PremiumService from "../services/premium";
 import { db } from "../common/database";
-import { Product } from "@notesnook/core/dist/api/pricing";
 
-const skuInfos: { [name: string]: Product | undefined } = {};
+type PurchaseInfo = {
+  country: string;
+  countryCode: string;
+  sku: string;
+  discount: number;
+};
+
+const skuInfos: { [name: string]: PurchaseInfo | undefined } = {};
 
 export const usePricing = (period: "monthly" | "yearly") => {
   const [current, setCurrent] = useState<{
     period: string;
-    info?: Product;
+    info?: PurchaseInfo;
     product?: Subscription;
   }>();
 
@@ -48,7 +54,6 @@ export const usePricing = (period: "monthly" | "yearly") => {
           period
         ));
       skuInfos[period] = skuInfo;
-
       const products = (await PremiumService.getProducts()) as Subscription[];
       let product = products.find((p) => p.productId === skuInfo?.sku);
       if (!product)

apps/mobile/app/navigation/tabs-holder.js

@@ -62,6 +62,7 @@ import {
 } from "../services/event-manager";
 import { useSettingStore } from "../stores/use-setting-store";
 import {
+  eClearEditor,
   eCloseFullscreenEditor,
   eOnEnterEditor,
   eOnExitEditor,
@@ -285,10 +286,9 @@ const _TabsHolder = () => {
           break;
         case "mobile":
           if (
-            (state &&
-              !state?.movedAway &&
-              useTabStore.getState().getCurrentNoteId()) ||
-            editorState().movedAway === false
+            state &&
+            !state?.movedAway &&
+            useTabStore.getState().getCurrentNoteId()
           ) {
             tabBarRef.current?.goToIndex(2, false);
           } else {

apps/mobile/app/package.json

@@ -16,7 +16,7 @@
     "html-to-text": "9.0.5",
     "phone": "^3.1.14",
     "qclone": "^1.2.0",
-    "react-native-actions-sheet": "0.9.7",
+    "react-native-actions-sheet": "0.9.3",
     "react-native-check-version": "https://github.com/flexible-agency/react-native-check-version",
     "react-native-drax": "^0.10.2",
     "react-native-image-zoom-viewer": "^3.0.1",

apps/mobile/app/screens/editor/readonly-editor.tsx

@@ -75,16 +75,14 @@ export function ReadonlyEditor(props: {
     if (editorMessage.type === EventTypes.readonlyEditorLoaded) {
       console.log("Readonly editor loaded.");
       props.onLoad?.((content: { data: string; id: string }) => {
-        setTimeout(() => {
-          noteId.current = content.id;
-          editorRef.current?.postMessage(
-            JSON.stringify({
-              type: "native:html",
-              value: content.data
-            })
-          );
-          setLoading(false);
-        }, 300);
+        noteId.current = content.id;
+        editorRef.current?.postMessage(
+          JSON.stringify({
+            type: "native:html",
+            value: content.data
+          })
+        );
+        setLoading(false);
       });
     } else if (editorMessage.type === EventTypes.getAttachmentData) {
       const attachment = (editorMessage.value as any).attachment as Attachment;

apps/mobile/app/screens/editor/tiptap/picker.ts

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import Sodium from "@ammarahmed/react-native-sodium";
 import { isImage } from "@notesnook/core/dist/utils/filename";
-import { basename } from "pathe";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import DocumentPicker, {
@@ -42,6 +41,7 @@ import { FILE_SIZE_LIMIT, IMAGE_SIZE_LIMIT } from "../../../utils/constants";
 import { eCloseSheet } from "../../../utils/events";
 import { useTabStore } from "./use-tab-store";
 import { editorController, editorState } from "./utils";
+import { basename } from "pathe";
 
 const showEncryptionSheet = (file: DocumentPickerResponse) => {
   presentSheet({
@@ -123,13 +123,13 @@ const file = async (fileOptions: PickerOptions) => {
         file.name,
         fileOptions
       ))
-    ) {
-      throw new Error("Failed to attach file");
-    }
+    )
+      return;
     if (Platform.OS === "ios") await RNFetchBlob.fs.unlink(uri);
 
+    if (!fileOptions.tabId) return;
     if (
-      fileOptions.tabId !== undefined &&
+      fileOptions.tabId &&
       fileOptions.noteId &&
       useTabStore.getState().getNoteIdForTab(fileOptions.tabId) ===
         fileOptions.noteId
@@ -158,16 +158,16 @@ const file = async (fileOptions: PickerOptions) => {
           fileOptions.tabId
         );
       }
-    } else {
-      throw new Error("Failed to attach file, no tabId is set");
     }
 
-    eSendEvent(eCloseSheet);
+    setTimeout(() => {
+      eSendEvent(eCloseSheet);
+    }, 1000);
   } catch (e) {
     eSendEvent(eCloseSheet);
     ToastManager.show({
-      heading: "Failed to attach file",
-      message: (e as Error).message,
+      heading: (e as Error).message,
+      message: "You need internet access to attach a file",
       type: "error",
       context: "global"
     });
@@ -185,8 +185,7 @@ const camera = async (options: PickerOptions) => {
       cropping: false,
       multiple: true,
       maxFiles: 10,
-      writeTempFile: true,
-      compressImageQuality: 1
+      writeTempFile: true
     })
       .then((response) => {
         handleImageResponse(
@@ -203,6 +202,7 @@ const camera = async (options: PickerOptions) => {
       type: "error",
       context: "global"
     });
+    console.log("attachment error:", e);
   }
 };
 
@@ -215,8 +215,7 @@ const gallery = async (options: PickerOptions) => {
       mediaType: "photo",
       maxFiles: 10,
       cropping: false,
-      multiple: true,
-      compressImageQuality: 1
+      multiple: true
     })
       .then((response) =>
         handleImageResponse(
@@ -267,6 +266,7 @@ const handleImageResponse = async (
   response: Image[],
   options: PickerOptions
 ) => {
+  console.log(response, "result-file-picker");
   const result = await AttachImage.present(response, options.context);
   if (!result) return;
   const compress = result.compress;
@@ -302,15 +302,10 @@ const handleImageResponse = async (
       type: "url"
     });
 
-    let fileName = image.sourceURL
+    const fileName = image.sourceURL
       ? basename(image.sourceURL)
       : image.filename || "image";
 
-    fileName =
-      image.mime === "image/jpeg"
-        ? fileName.replace(/HEIC|HEIF/, "jpeg")
-        : fileName;
-
     console.log("attaching image...", fileName);
 
     console.log("attaching file...");

apps/mobile/app/screens/editor/tiptap/use-editor.ts

@@ -351,18 +351,9 @@ export const useEditor = (
             if (!unlocked)
               throw new Error("Could not save note, vault is locked");
           }
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          if (typeof noteData.title === "string") {
-            await db.notes.add({
-              title: noteData.title,
-              id: noteData.id
-            });
-          }
-
           noteData.contentId = note?.contentId;
-          if (data) {
-            await db.vault?.save(noteData as any);
-          }
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          await db.vault?.save(noteData as any);
           clearTimeout(saveTimer);
         }
 
@@ -569,7 +560,7 @@ export const useEditor = (
           return;
         }
 
-        lastContentChangeTime.current[item.id] = 0;
+        lastContentChangeTime.current[item.id] = item.dateEdited;
         currentLoadingNoteId.current = item.id;
         currentNotes.current[item.id] = item;
 
@@ -660,9 +651,9 @@ export const useEditor = (
           lock.current = true;
 
           // Handle this case where note was locked on another device and synced.
-          const locked = note
-            ? await db.vaults.itemExists(note as ItemReference)
-            : false;
+          const locked = await db.vaults.itemExists(
+            currentNotes.current[noteId] as ItemReference
+          );
 
           if (note) {
             if (!locked && tab?.noteLocked) {
@@ -705,13 +696,14 @@ export const useEditor = (
               );
             }
 
+            console.log("readonly state changed...", note.readonly);
             useTabStore.getState().updateTab(tabId, {
               readonly: note.readonly
             });
           }
 
           if (data.type === "tiptap" && note && !isLocal) {
-            if (lastContentChangeTime.current[noteId] >= data.dateModified) {
+            if (lastContentChangeTime.current[noteId] >= data.dateEdited) {
               return;
             }
 
@@ -736,7 +728,7 @@ export const useEditor = (
               }
             } else {
               const _nextContent = data.data;
-              if (_nextContent === currentContents.current[note.id]?.data) {
+              if (_nextContent === currentContents.current?.data) {
                 return;
               }
               lastContentChangeTime.current[note.id] = note.dateEdited;

apps/mobile/app/screens/settings/components.tsx

@@ -32,12 +32,9 @@ import {
   TimeFormatPicker,
   TrashIntervalPicker,
   BackupReminderPicker,
-  ApplockTimerPicker,
-  BackupWithAttachmentsReminderPicker
+  ApplockTimerPicker
 } from "./picker/pickers";
 import ThemeSelector from "./theme-selector";
-import { RestoreBackup } from "./restore-backup";
-import { ServersConfiguration } from "./server-config";
 
 export const components: { [name: string]: ReactElement } = {
   colorpicker: <AccentColorPicker />,
@@ -54,8 +51,5 @@ export const components: { [name: string]: ReactElement } = {
   "date-format-selector": <DateFormatPicker />,
   "time-format-selector": <TimeFormatPicker />,
   "theme-selector": <ThemeSelector />,
-  "applock-timer": <ApplockTimerPicker />,
-  autobackupsattachments: <BackupWithAttachmentsReminderPicker />,
-  backuprestore: <RestoreBackup />,
-  "server-config": <ServersConfiguration />
+  "applock-timer": <ApplockTimerPicker />
 };

apps/mobile/app/screens/settings/debug.tsx

@@ -122,8 +122,7 @@ export default function DebugLogs() {
       colors.primary.paragraph,
       colors.error.paragraph,
       colors.static.black,
-      colors.static.orange,
-      colors.primary.border
+      colors.static.orange
     ]
   );
 

apps/mobile/app/screens/settings/functions.js

@@ -90,26 +90,13 @@ export async function verifyUserWithApplock() {
         positiveText: "Verify",
         secureTextEntry: true,
         negativeText: "Cancel",
-        keyboardType: keyboardType,
         positivePress: async (value) => {
           try {
             const verified = await validateAppLockPassword(value);
-            if (!verified) {
-              ToastManager.show({
-                heading: `Invalid ${
-                  keyboardType === "numeric" ? "pin" : "password"
-                }`,
-                type: "error",
-                context: "local"
-              });
-              return false;
-            }
             resolve(verified);
           } catch (e) {
             resolve(false);
-            return false;
           }
-          return true;
         }
       });
     } else {

apps/mobile/app/screens/settings/home.tsx

@@ -18,22 +18,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { NativeStackScreenProps } from "@react-navigation/native-stack";
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { View } from "react-native";
 import Animated, { FadeInDown } from "react-native-reanimated";
 import DelayLayout from "../../components/delay-layout";
-import { Header } from "../../components/header";
+import BaseDialog from "../../components/dialog/base-dialog";
+import { ProgressBarComponent } from "../../components/ui/svg/lazy";
+import Heading from "../../components/ui/typography/heading";
+import Paragraph from "../../components/ui/typography/paragraph";
 import { useNavigationFocus } from "../../hooks/use-navigation-focus";
+import {
+  eSubscribeEvent,
+  eUnSubscribeEvent
+} from "../../services/event-manager";
 import useNavigationStore from "../../stores/use-navigation-store";
+import { useThemeColors } from "@notesnook/theme";
+import { SIZE } from "../../utils/size";
 import { SectionGroup } from "./section-group";
 import { settingsGroups } from "./settings-data";
 import { RouteParams, SettingSection } from "./types";
 import SettingsUserSection from "./user-section";
+import { Header } from "../../components/header";
 const keyExtractor = (item: SettingSection) => item.id;
 
 const Home = ({
   navigation
 }: NativeStackScreenProps<RouteParams, "SettingsHome">) => {
+  const { colors } = useThemeColors();
+  const [loading, setLoading] = useState(false);
+
   useNavigationFocus(navigation, {
     onFocus: () => {
       useNavigationStore.getState().setFocusedRouteId("Settings");
@@ -49,6 +62,16 @@ const Home = ({
       <SectionGroup item={item} />
     );
 
+  useEffect(() => {
+    function settingsLoading(state: boolean) {
+      setLoading(state || true);
+    }
+    eSubscribeEvent("settings-loading", settingsLoading);
+    return () => {
+      eUnSubscribeEvent("settings-loading", settingsLoading);
+    };
+  }, []);
+
   return (
     <>
       <Header
@@ -58,6 +81,57 @@ const Home = ({
         id="Settings"
       />
       <DelayLayout delay={300} type="settings">
+        {loading && (
+          //@ts-ignore // Migrate to typescript required.
+          <BaseDialog animated={false} bounce={false} visible={true}>
+            <View
+              style={{
+                width: "100%",
+                height: "100%",
+                backgroundColor: colors.primary.background,
+                justifyContent: "center",
+                alignItems: "center"
+              }}
+            >
+              <View
+                style={{
+                  width: "100%",
+                  height: "100%",
+                  backgroundColor: colors.primary.background,
+                  justifyContent: "center",
+                  alignItems: "center"
+                }}
+              >
+                <Heading color={colors.primary.paragraph} size={SIZE.lg}>
+                  Logging out
+                </Heading>
+                <Paragraph color={colors.secondary.paragraph}>
+                  Please wait while we log out and clear app data.
+                </Paragraph>
+                <View
+                  style={{
+                    flexDirection: "row",
+                    width: 100,
+                    marginTop: 15
+                  }}
+                >
+                  <ProgressBarComponent
+                    height={5}
+                    width={100}
+                    animated={true}
+                    useNativeDriver
+                    indeterminate
+                    indeterminateAnimationDuration={2000}
+                    unfilledColor={colors.secondary.background}
+                    color={colors.primary.accent}
+                    borderWidth={0}
+                  />
+                </View>
+              </View>
+            </View>
+          </BaseDialog>
+        )}
+
         <Animated.FlatList
           entering={FadeInDown}
           data={settingsGroups}

apps/mobile/app/screens/settings/picker/pickers.jsx

@@ -121,8 +121,8 @@ export const BackupReminderPicker = createSettingsPicker({
     SettingsService.set({ reminder: item });
   },
   formatValue: (item) => {
-    return item === "useroff" || item === "off" || item === "never"
-      ? "Off"
+    return item === "useroff"
+      ? "Never"
       : item.slice(0, 1).toUpperCase() + item.slice(1);
   },
   getItemKey: (item) => item,
@@ -140,31 +140,6 @@ export const BackupReminderPicker = createSettingsPicker({
   }
 });
 
-export const BackupWithAttachmentsReminderPicker = createSettingsPicker({
-  getValue: () => useSettingStore.getState().settings.fullBackupReminder,
-  updateValue: (item) => {
-    SettingsService.set({ fullBackupReminder: item });
-  },
-  formatValue: (item) => {
-    return item === "useroff" || item === "off" || item === "never"
-      ? "Off"
-      : item.slice(0, 1).toUpperCase() + item.slice(1);
-  },
-  getItemKey: (item) => item,
-  options: ["never", "weekly", "monthly"],
-  compareValue: (current, item) => current === item,
-  premium: true,
-  requiresVerification: () => {
-    return (
-      !useSettingStore.getState().settings.encryptedBackup &&
-      useUserStore.getState().user
-    );
-  },
-  onCheckOptionIsPremium: (item) => {
-    return item !== "never";
-  }
-});
-
 export const ApplockTimerPicker = createSettingsPicker({
   getValue: () => useSettingStore.getState().settings.appLockTimer,
   updateValue: (item) => {

apps/mobile/app/screens/settings/restore-backup/index.tsx

@@ -1,558 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { formatBytes, getFormattedDate } from "@notesnook/common";
-import { LegacyBackupFile } from "@notesnook/core";
-import { useThemeColors } from "@notesnook/theme";
-import React, { useEffect, useState } from "react";
-import { ActivityIndicator, FlatList, Platform, View } from "react-native";
-import RNFetchBlob, { ReactNativeBlobUtilStat } from "react-native-blob-util";
-import DocumentPicker from "react-native-document-picker";
-import * as ScopedStorage from "react-native-scoped-storage";
-import { unzip } from "react-native-zip-archive";
-import { DatabaseLogger, db } from "../../../common/database";
-import storage from "../../../common/database/storage";
-import { deleteCacheFileByName } from "../../../common/filesystem/io";
-import { cacheDir, copyFileAsync } from "../../../common/filesystem/utils";
-import { presentDialog } from "../../../components/dialog/functions";
-import {
-  endProgress,
-  startProgress,
-  updateProgress
-} from "../../../components/dialogs/progress";
-import { Button } from "../../../components/ui/button";
-import Heading from "../../../components/ui/typography/heading";
-import Paragraph from "../../../components/ui/typography/paragraph";
-import { SectionItem } from "../../../screens/settings/section-item";
-import { ToastManager } from "../../../services/event-manager";
-import Navigation from "../../../services/navigation";
-import SettingsService from "../../../services/settings";
-import { refreshAllStores } from "../../../stores/create-db-collection-store";
-import { useUserStore } from "../../../stores/use-user-store";
-import { SIZE } from "../../../utils/size";
-
-type PasswordOrKey = { password?: string; encryptionKey?: string };
-
-const withPassword = () => {
-  return new Promise<PasswordOrKey>((resolve) => {
-    let resolved = false;
-    presentDialog({
-      context: "local",
-      title: "Encrypted backup",
-      input: true,
-      inputPlaceholder: "Password",
-      paragraph: "Please enter password of this backup file",
-      positiveText: "Restore",
-      secureTextEntry: true,
-      onClose: () => {
-        if (resolved) return;
-        resolve({});
-      },
-      negativeText: "Cancel",
-      positivePress: async (password, isEncryptionKey) => {
-        resolve({
-          encryptionKey: isEncryptionKey ? password : undefined,
-          password: isEncryptionKey ? undefined : password
-        });
-        resolved = true;
-        return true;
-      },
-      check: {
-        info: "Use encryption key",
-        type: "transparent"
-      }
-    });
-  });
-};
-
-const restoreBackup = async (options: {
-  uri: string;
-  deleteFile?: boolean;
-}) => {
-  try {
-    const isLegacyBackup = options.uri.endsWith(".nnbackup");
-
-    startProgress({
-      title: "Restoring backup",
-      paragraph: "Preparing to restore backup file...",
-      canHideProgress: false
-    });
-
-    let filePath = options.uri;
-    let deleteBackupFile = options.deleteFile;
-
-    if (!isLegacyBackup) {
-      if (Platform.OS === "android") {
-        updateProgress({
-          progress: `Copying backup file to cache...`
-        });
-        const cacheFile = `file://${RNFetchBlob.fs.dirs.CacheDir}/backup.zip`;
-        if (await RNFetchBlob.fs.exists(cacheFile)) {
-          await RNFetchBlob.fs.unlink(cacheFile);
-        }
-
-        await RNFetchBlob.fs.createFile(cacheFile, "", "utf8");
-        if (filePath.startsWith("content://")) {
-          await copyFileAsync(filePath, cacheFile);
-        } else {
-          await RNFetchBlob.fs.cp(filePath, cacheFile);
-        }
-        filePath = cacheFile;
-        deleteBackupFile = true;
-      }
-
-      const zipOutputFolder = `${cacheDir}/backup_extracted`;
-      if (await RNFetchBlob.fs.exists(zipOutputFolder)) {
-        await RNFetchBlob.fs.unlink(zipOutputFolder);
-        await RNFetchBlob.fs.mkdir(zipOutputFolder);
-      }
-      updateProgress({
-        progress: `Extracting files from backup...`
-      });
-      await unzip(filePath, zipOutputFolder);
-
-      const extractedBackupFiles = await RNFetchBlob.fs.ls(zipOutputFolder);
-
-      const extractedAttachments = extractedBackupFiles.includes("attachments")
-        ? await RNFetchBlob.fs.ls(`${zipOutputFolder}/attachments`)
-        : [];
-
-      const attachmentsKeyPath: any = extractedAttachments?.find(
-        (path) => path === ".attachments_key"
-      );
-      const attachmentsKey = attachmentsKeyPath
-        ? await JSON.parse(
-            await RNFetchBlob.fs.readFile(
-              `${zipOutputFolder}/attachments/${attachmentsKeyPath}`,
-              "utf8"
-            )
-          )
-        : undefined;
-
-      let count = 0;
-      await db.transaction(async () => {
-        let passwordOrKey: PasswordOrKey;
-        for (const path of extractedBackupFiles) {
-          if (path === ".nnbackup" || path === "attachments") continue;
-
-          updateProgress({
-            progress: `Restoring data (${count++}/${
-              extractedBackupFiles.length
-            })`
-          });
-
-          const filePath = `${zipOutputFolder}/${path}`;
-          const data = await RNFetchBlob.fs.readFile(filePath, "utf8");
-          const backup = JSON.parse(data);
-
-          const isEncryptedBackup = backup.encrypted;
-
-          passwordOrKey = !isEncryptedBackup
-            ? ({} as PasswordOrKey)
-            : await withPassword();
-
-          if (
-            isEncryptedBackup &&
-            !passwordOrKey?.encryptionKey &&
-            !passwordOrKey?.password
-          ) {
-            endProgress();
-            throw new Error("Failed to decrypt backup");
-          }
-
-          await db.backup.import(backup, {
-            ...passwordOrKey,
-            attachmentsKey: attachmentsKey
-          });
-        }
-      });
-
-      await db.initCollections();
-      count = 0;
-      for (const path of extractedAttachments) {
-        if (path === ".attachments_key") continue;
-        updateProgress({
-          progress: `Restoring attachments (${count++}/${
-            extractedAttachments.length
-          })`
-        });
-        const hash = path;
-        const attachment = await db.attachments.attachment(hash as string);
-        if (!attachment) continue;
-
-        console.log("Saving attachment file", hash);
-        await deleteCacheFileByName(hash);
-        await RNFetchBlob.fs.cp(
-          `${zipOutputFolder}/attachments/${hash}`,
-          `${cacheDir}/${hash}`
-        );
-      }
-      updateProgress({
-        progress: `Cleaning up...`
-      });
-      // Remove files from cache
-      RNFetchBlob.fs.unlink(zipOutputFolder).catch(console.log);
-      if (Platform.OS === "android" || deleteBackupFile) {
-        RNFetchBlob.fs.unlink(filePath).catch(console.log);
-      }
-    } else {
-      updateProgress({
-        progress: `Reading backup file...`
-      });
-      const rawData =
-        Platform.OS === "android"
-          ? await ScopedStorage.readFile(filePath, "utf8")
-          : await RNFetchBlob.fs.readFile(filePath, "utf8");
-      const backup: LegacyBackupFile = JSON.parse(rawData) as LegacyBackupFile;
-
-      const isEncryptedBackup =
-        typeof backup.data !== "string" && backup.data.cipher;
-
-      updateProgress({
-        progress: isEncryptedBackup
-          ? `Backup is encrypted, decrypting...`
-          : "Preparing to restore backup file..."
-      });
-
-      const { encryptionKey, password } = isEncryptedBackup
-        ? ({} as PasswordOrKey)
-        : await withPassword();
-
-      if (isEncryptedBackup && !encryptionKey && !password) {
-        endProgress();
-        throw new Error("Failed to decrypt backup");
-      }
-
-      await db.transaction(async () => {
-        updateProgress({
-          progress: "Restoring backup..."
-        });
-        await db.backup.import(backup, {
-          encryptionKey,
-          password
-        });
-      });
-      endProgress();
-    }
-
-    ToastManager.show({
-      heading: "Backup restored successfully",
-      type: "success"
-    });
-
-    await db.initCollections();
-    refreshAllStores();
-    Navigation.queueRoutesForUpdate();
-    endProgress();
-  } catch (e) {
-    endProgress();
-    DatabaseLogger.error(e as Error);
-    ToastManager.error(e as Error, `Failed to restore backup`);
-  }
-};
-
-const BACKUP_FILES_CACHE: (ReactNativeBlobUtilStat | ScopedStorage.FileType)[] =
-  [];
-
-export const RestoreBackup = () => {
-  const { colors } = useThemeColors();
-  const [files, setFiles] =
-    useState<(ReactNativeBlobUtilStat | ScopedStorage.FileType)[]>(
-      BACKUP_FILES_CACHE
-    );
-  const [loading, setLoading] = useState(true);
-  const [backupDirectoryAndroid, setBackupDirectoryAndroid] =
-    useState<ScopedStorage.FileType>();
-
-  useEffect(() => {
-    setTimeout(() => {
-      checkBackups();
-    }, 1000);
-  }, []);
-
-  const checkBackups = async () => {
-    try {
-      let files: (ReactNativeBlobUtilStat | ScopedStorage.FileType)[] = [];
-      if (Platform.OS === "android") {
-        const backupDirectory = SettingsService.get().backupDirectoryAndroid;
-        if (backupDirectory) {
-          setBackupDirectoryAndroid(backupDirectory);
-          files = await ScopedStorage.listFiles(backupDirectory.uri);
-        } else {
-          setLoading(false);
-          return;
-        }
-      } else {
-        const path = await storage.checkAndCreateDir("/backups/");
-        files = await RNFetchBlob.fs.lstat(path);
-      }
-      files = files
-        .filter((file) => {
-          const name =
-            Platform.OS === "android"
-              ? (file as ScopedStorage.FileType).name
-              : (file as ReactNativeBlobUtilStat).filename;
-          return name.endsWith(".nnbackup") || name.endsWith(".nnbackupz");
-        })
-        .sort(function (a, b) {
-          const timeA = a.lastModified;
-          const timeB = b.lastModified;
-          return timeB - timeA;
-        });
-
-      setFiles(files);
-      BACKUP_FILES_CACHE.splice(0, BACKUP_FILES_CACHE.length, ...files);
-    } catch (e) {
-      e;
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const renderItem = React.useCallback(
-    ({
-      item,
-      index
-    }: {
-      item: ReactNativeBlobUtilStat | ScopedStorage.FileType;
-      index: number;
-    }) => <BackupItem item={item} index={index} />,
-    []
-  );
-
-  return (
-    <>
-      <FlatList
-        data={[0]}
-        renderItem={() => {
-          return (
-            <View>
-              <SectionItem
-                item={{
-                  id: "restore-from-files",
-                  name: "Restore from files",
-                  icon: "folder",
-                  modifer: async () => {
-                    useUserStore.setState({
-                      disableAppLockRequests: true
-                    });
-                    const file = await DocumentPicker.pickSingle({
-                      copyTo: "cachesDirectory"
-                    });
-
-                    setTimeout(() => {
-                      useUserStore.setState({
-                        disableAppLockRequests: false
-                      });
-                    }, 1000);
-
-                    restoreBackup({
-                      uri:
-                        Platform.OS === "android"
-                          ? (("file://" + file.fileCopyUri) as string)
-                          : (file.fileCopyUri as string),
-                      deleteFile: true
-                    });
-                  },
-                  description:
-                    "Select a backup file from your device to restore backup"
-                }}
-              />
-
-              {Platform.OS === "android" ? (
-                <SectionItem
-                  item={{
-                    id: "select-backup-folder",
-                    name: "Select folder with backup files",
-                    icon: "folder",
-                    modifer: async () => {
-                      const folder = await ScopedStorage.openDocumentTree(true);
-                      let subfolder;
-                      if (folder.name !== "Notesnook backups") {
-                        subfolder = await ScopedStorage.createDirectory(
-                          folder.uri,
-                          "Notesnook backups"
-                        );
-                      } else {
-                        subfolder = folder;
-                      }
-                      SettingsService.set({
-                        backupDirectoryAndroid: subfolder
-                      });
-                      setBackupDirectoryAndroid(subfolder);
-                      setLoading(true);
-                      checkBackups();
-                    },
-                    description:
-                      "Select folder where Notesnook backup files are stored to view and restore them from the app"
-                  }}
-                />
-              ) : null}
-
-              <FlatList
-                ListHeaderComponent={
-                  <View
-                    style={{
-                      backgroundColor: colors.primary.background,
-                      marginBottom: 10
-                    }}
-                  >
-                    <Heading color={colors.primary.accent} size={SIZE.xs}>
-                      RECENT BACKUPS
-                    </Heading>
-                  </View>
-                }
-                stickyHeaderIndices={[0]}
-                ListEmptyComponent={
-                  loading ? (
-                    <View
-                      style={{
-                        justifyContent: "center",
-                        alignItems: "center",
-                        height: 300,
-                        paddingHorizontal: 50
-                      }}
-                    >
-                      <ActivityIndicator
-                        color={colors.primary.accent}
-                        size={SIZE.lg}
-                      />
-                    </View>
-                  ) : (
-                    <View
-                      style={{
-                        justifyContent: "center",
-                        alignItems: "center",
-                        gap: 12,
-                        height: 300,
-                        paddingHorizontal: 50
-                      }}
-                    >
-                      <Paragraph
-                        style={{
-                          textAlign: "center"
-                        }}
-                        color={colors.secondary.paragraph}
-                      >
-                        No backups were found.{" "}
-                        {!backupDirectoryAndroid
-                          ? `Please select a folder with backup files to view them here.`
-                          : null}
-                      </Paragraph>
-                    </View>
-                  )
-                }
-                windowSize={2}
-                keyExtractor={(item) =>
-                  (item as ScopedStorage.FileType).name ||
-                  (item as ReactNativeBlobUtilStat).filename
-                }
-                style={{
-                  paddingHorizontal: 12
-                }}
-                ListFooterComponent={
-                  <View
-                    style={{
-                      height: 200
-                    }}
-                  />
-                }
-                data={files}
-                renderItem={renderItem}
-              />
-            </View>
-          );
-        }}
-      />
-    </>
-  );
-};
-
-const BackupItem = ({
-  item,
-  index
-}: {
-  item: ReactNativeBlobUtilStat | ScopedStorage.FileType;
-  index: number;
-}) => {
-  const { colors } = useThemeColors();
-
-  const isLegacyBackup =
-    item.path?.endsWith(".nnbackup") ||
-    (item as ScopedStorage.FileType).uri?.endsWith(".nnbackup");
-  const itemName = (
-    (item as ReactNativeBlobUtilStat).filename ||
-    (item as ScopedStorage.FileType).name
-  )
-    .replace(".nnbackupz", "")
-    .replace(".nnbackup", "");
-
-  return (
-    <View
-      style={{
-        justifyContent: "space-between",
-        alignItems: "center",
-        width: "100%",
-        borderRadius: 0,
-        flexDirection: "row",
-        borderBottomWidth: 0.5,
-        borderBottomColor: colors.primary.border,
-        paddingVertical: 12
-      }}
-    >
-      <View>
-        <Paragraph size={SIZE.sm}>{itemName}</Paragraph>
-        <Paragraph
-          size={SIZE.xs}
-          color={colors.secondary.paragraph}
-          style={{ width: "100%", maxWidth: "100%" }}
-        >
-          Created on {getFormattedDate(item?.lastModified, "date-time")}
-          {isLegacyBackup ? "(Legacy backup)" : ""} (
-          {formatBytes((item as ReactNativeBlobUtilStat).size)})
-        </Paragraph>
-      </View>
-      <Button
-        title="Restore"
-        type="secondaryAccented"
-        style={{
-          paddingHorizontal: 12,
-          height: 35
-        }}
-        onPress={() => {
-          presentDialog({
-            title: `Restore ${itemName}`,
-            paragraph: `Are you sure you want to restore this backup?`,
-            positiveText: "Restore",
-            negativeText: "Cancel",
-            positivePress: async () => {
-              console.log("file path", (item as ScopedStorage.FileType).uri);
-              restoreBackup({
-                uri:
-                  Platform.OS === "android"
-                    ? (item as ScopedStorage.FileType).uri
-                    : (item as ReactNativeBlobUtilStat).path
-              });
-            }
-          });
-        }}
-      />
-    </View>
-  );
-};

apps/mobile/app/screens/settings/server-config.tsx

@@ -1,213 +0,0 @@
-/*
-This file is part of the Notesnook project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import { isServerCompatible } from "@notesnook/core";
-import { useThemeColors } from "@notesnook/theme";
-import React, { useState } from "react";
-import { View } from "react-native";
-import { presentDialog } from "../../components/dialog/functions";
-import { Button } from "../../components/ui/button";
-import Input from "../../components/ui/input";
-import { Notice } from "../../components/ui/notice";
-import Paragraph from "../../components/ui/typography/paragraph";
-import SettingsService from "../../services/settings";
-import { HostId, HostIds } from "../../stores/use-setting-store";
-import { useUserStore } from "../../stores/use-user-store";
-import { ToastManager } from "../../services/event-manager";
-
-export const ServerIds = ["notesnook-sync", "auth", "sse"] as const;
-export type ServerId = (typeof ServerIds)[number];
-type Server = {
-  id: ServerId;
-  host: HostId;
-  title: string;
-  example: string;
-  description: string;
-};
-type VersionResponse = {
-  version: number;
-  id: string;
-  instance: string;
-};
-const SERVERS: Server[] = [
-  {
-    id: "notesnook-sync",
-    host: "API_HOST",
-    title: "Sync server",
-    example: "http://localhost:4326",
-    description: "Server used to sync your notes & other data between devices."
-  },
-  {
-    id: "auth",
-    host: "AUTH_HOST",
-    title: "Auth server",
-    example: "http://localhost:5326",
-    description: "Server used for login/sign up and authentication."
-  },
-  {
-    id: "sse",
-    host: "SSE_HOST",
-    title: "Events server",
-    example: "http://localhost:7326",
-    description: "Server used to receive important notifications & events."
-  }
-];
-export function ServersConfiguration() {
-  const { colors } = useThemeColors();
-  const [error, setError] = useState<string>();
-  const [success, setSuccess] = useState<boolean>();
-  const [urls, setUrls] = useState<Partial<Record<HostId, string>>>(
-    SettingsService.getProperty("serverUrls") || {}
-  );
-  const isLoggedIn = useUserStore((state) => !!state.user);
-
-  return (
-    <View
-      style={{
-        paddingHorizontal: 12,
-        gap: 12,
-        marginTop: 12
-      }}
-    >
-      {isLoggedIn ? (
-        <Notice
-          text="You must log out in order to change/reset server URLs."
-          type="alert"
-        />
-      ) : null}
-
-      <View style={{ flexDirection: "column" }}>
-        {SERVERS.map((server) => (
-          <Input
-            key={server.id}
-            editable={!isLoggedIn}
-            placeholder={`${server.id} e.g. ${server.example}`}
-            validationType="url"
-            defaultValue={urls[server.host]}
-            errorMessage="Please enter a valid URL."
-            onChangeText={(value) =>
-              setUrls((s) => {
-                s[server.host] = value;
-                return s;
-              })
-            }
-          />
-        ))}
-
-        {error ? (
-          <Paragraph
-            style={{
-              paddingVertical: 12
-            }}
-            color={colors.error.paragraph}
-          >
-            {error}
-          </Paragraph>
-        ) : null}
-
-        {success === true ? (
-          <Paragraph
-            style={{
-              paddingVertical: 12
-            }}
-            color={colors.success.paragraph}
-          >
-            Connected to all servers sucessfully.
-          </Paragraph>
-        ) : null}
-        <View style={{ marginTop: 1, justifyContent: "flex-end", gap: 12 }}>
-          <Button
-            disabled={isLoggedIn}
-            type="secondary"
-            width="100%"
-            onPress={async () => {
-              try {
-                for (const host of HostIds) {
-                  const url = urls[host];
-                  const server = SERVERS.find((s) => s.host === host)!;
-                  if (!url) throw new Error("All server urls are required.");
-                  const version = await fetch(`${url}/version`)
-                    .then((r) => r.json() as Promise<VersionResponse>)
-                    .catch(() => undefined);
-                  if (!version)
-                    throw new Error(`Could not connect to ${server.title}.`);
-                  if (version.id !== server.id)
-                    throw new Error(
-                      `The URL you have given (${url}) does not point to the ${server.title}.`
-                    );
-                  if (!isServerCompatible(version.version)) {
-                    throw new Error(
-                      `The server version is not compatible with the app.`
-                    );
-                  }
-                }
-                setSuccess(true);
-                setError(undefined);
-              } catch (e) {
-                setError((e as Error).message);
-              }
-            }}
-            title="Test connection"
-          />
-
-          <Button
-            type="accent"
-            disabled={isLoggedIn}
-            width="100%"
-            onPress={async () => {
-              if (!success) {
-                ToastManager.show({
-                  heading: "Test connection before changing server urls"
-                });
-                return;
-              }
-              SettingsService.setProperty(
-                "serverUrls",
-                urls as Record<HostId, string>
-              );
-
-              presentDialog({
-                title: "Server url changed",
-                paragraph: "Restart the app for changes to take effect.",
-                negativeText: "Done"
-              });
-            }}
-            title="Save"
-          />
-
-          <Button
-            disabled={isLoggedIn}
-            type="error"
-            width="100%"
-            title="Reset server urls"
-            onPress={async () => {
-              if (isLoggedIn) return;
-              SettingsService.setProperty("serverUrls", undefined);
-              presentDialog({
-                title: "Server urls reset",
-                paragraph: "Restart the app for changes to take effect.",
-                negativeText: "Done"
-              });
-            }}
-          />
-        </View>
-      </View>
-    </View>
-  );
-}

apps/mobile/app/screens/settings/settings-data.tsx

@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { formatBytes } from "@notesnook/common";
 import notifee from "@notifee/react-native";
 import dayjs from "dayjs";
 import React from "react";
@@ -25,19 +24,12 @@ import { Appearance, Linking, Platform } from "react-native";
 import { getVersion } from "react-native-device-info";
 import * as RNIap from "react-native-iap";
 import { enabled } from "react-native-privacy-snapshot";
-import ScreenGuardModule from "react-native-screenguard";
-import { DatabaseLogger, db } from "../../common/database";
+import { db } from "../../common/database";
 import { MMKV } from "../../common/database/mmkv";
-import filesystem from "../../common/filesystem";
 import { AttachmentDialog } from "../../components/attachments";
 import { ChangePassword } from "../../components/auth/change-password";
 import { presentDialog } from "../../components/dialog/functions";
 import { AppLockPassword } from "../../components/dialogs/applock-password";
-import {
-  endProgress,
-  startProgress,
-  updateProgress
-} from "../../components/dialogs/progress";
 import { ChangeEmail } from "../../components/sheets/change-email";
 import ExportNotesSheet from "../../components/sheets/export-notes";
 import { Issue } from "../../components/sheets/github/issue";
@@ -50,7 +42,6 @@ import BiometricService from "../../services/biometrics";
 import {
   ToastManager,
   eSendEvent,
-  eSubscribeEvent,
   openVault,
   presentSheet
 } from "../../services/event-manager";
@@ -69,7 +60,8 @@ import {
   eCloseSheet,
   eCloseSimpleDialog,
   eOpenLoginDialog,
-  eOpenRecoveryKeyDialog
+  eOpenRecoveryKeyDialog,
+  eOpenRestoreDialog
 } from "../../utils/events";
 import { NotesnookModule } from "../../utils/notesnook-module";
 import { sleep } from "../../utils/time";
@@ -338,144 +330,43 @@ export const settingsGroups: SettingSection[] = [
             },
             description: "Verify your subscription to Notesnook Pro"
           },
-          {
-            id: "clear-cache",
-            name: "Clear cache",
-            icon: "delete",
-            modifer: async () => {
-              presentDialog({
-                title: "Clear cache",
-                paragraph: "Are you sure you want to clear the cache?",
-                positiveText: "Clear",
-                positivePress: async () => {
-                  filesystem.clearCache();
-                  ToastManager.show({
-                    heading: "Cache cleared",
-                    message: "All cached attachments have been removed",
-                    type: "success"
-                  });
-                }
-              });
-            },
-            description(current) {
-              return `Clear all cached attachments. Current cache size: ${
-                current as number
-              }`;
-            },
-            useHook: () => {
-              const [cacheSize, setCacheSize] = React.useState(0);
-              React.useEffect(() => {
-                filesystem.getCacheSize().then(setCacheSize).catch(console.log);
-                const sub = eSubscribeEvent("cache-cleared", () => {
-                  setCacheSize(0);
-                });
-                return () => {
-                  sub?.unsubscribe();
-                };
-              }, []);
-              return formatBytes(cacheSize);
-            }
-          },
-
           {
             id: "logout",
-            name: "Logout",
-            description:
-              "Logging out will clear all data stored on this device.",
+            name: "Log out",
+            description: "Clear all your data and reset the app.",
             icon: "logout",
-            modifer: async () => {
-              const hasUnsyncedChanges = await db.hasUnsyncedChanges();
+            modifer: () => {
               presentDialog({
                 title: "Logout",
-                paragraph:
-                  "Are you sure you want to logout and clear all data stored on this device?",
+                paragraph: "Clear all your data and reset the app.",
                 positiveText: "Logout",
-                check: {
-                  info: "Take a backup before logging out",
-                  defaultValue: true
-                },
-                notice: hasUnsyncedChanges
-                  ? {
-                      text: "You have unsynced notes. Take a backup or sync your notes to avoid losing your critical data.",
-                      type: "alert"
-                    }
-                  : undefined,
-                positivePress: async (_, takeBackup) => {
-                  eSendEvent(eCloseSimpleDialog);
-                  setTimeout(async () => {
-                    try {
-                      startProgress({
-                        fillBackground: true,
-                        title: "Logging out",
-                        canHideProgress: true,
-                        paragraph:
-                          "Please wait while we log out and clear app data."
-                      });
-
-                      Navigation.navigate("Notes");
-
-                      if (takeBackup) {
-                        updateProgress({
-                          progress: "Taking a backup of your notes"
-                        });
-
-                        try {
-                          const result = await BackupService.run(
-                            false,
-                            "local",
-                            "partial"
-                          );
-                          if (result.error) throw result.error as Error;
-                        } catch (e) {
-                          DatabaseLogger.error(e);
-                          const error = e;
-                          const canLogout = await new Promise((resolve) => {
-                            presentDialog({
-                              context: "local",
-                              title: "Backup failed",
-                              paragraph: `${
-                                (error as Error).message
-                              }. Do you want to continue logging out?`,
-                              positiveText: "Continue",
-                              positivePress: () => {
-                                resolve(true);
-                              },
-                              onClose: () => {
-                                resolve(false);
-                              }
-                            });
-                          });
-                          if (!canLogout) {
-                            endProgress();
-                            return;
-                          }
-                        }
-                      }
-
-                      updateProgress({
-                        progress: "Logging out... please wait"
-                      });
-
+                positivePress: async () => {
+                  try {
+                    eSendEvent(eCloseSimpleDialog);
+                    setTimeout(async () => {
+                      eSendEvent("settings-loading", true);
+                      Navigation.popToTop();
                       await db.user?.logout();
                       setLoginMessage();
                       await PremiumService.setPremiumStatus();
                       await BiometricService.resetCredentials();
                       MMKV.clearStore();
                       clearAllStores();
-                      setImmediate(() => {
-                        refreshAllStores();
-                      });
+                      refreshAllStores();
                       Navigation.queueRoutesForUpdate();
                       SettingsService.resetSettings();
                       useUserStore.getState().setUser(null);
                       useUserStore.getState().setSyncing(false);
-                      endProgress();
-                    } catch (e) {
-                      DatabaseLogger.error(e);
-                      ToastManager.error(e as Error, "Error logging out");
-                      endProgress();
-                    }
-                  }, 300);
+                      Navigation.goBack();
+                      Navigation.popToTop();
+                      setTimeout(() => {
+                        eSendEvent("settings-loading", false);
+                      }, 3000);
+                    }, 300);
+                  } catch (e) {
+                    ToastManager.error(e as Error, "Error logging out");
+                    eSendEvent("settings-loading", false);
+                  }
                 }
               });
             }
@@ -501,18 +392,12 @@ export const settingsGroups: SettingSection[] = [
                   try {
                     const verified = await db.user?.verifyPassword(value);
                     if (verified) {
-                      setTimeout(async () => {
-                        startProgress({
-                          title: "Deleting account",
-                          paragraph: "Please wait while we delete your account"
-                        });
-                        Navigation.navigate("Notes");
-                        await db.user?.deleteUser(value);
-                        await BiometricService.resetCredentials();
-                        SettingsService.set({
-                          introCompleted: true
-                        });
-                      }, 300);
+                      eSendEvent("settings-loading", true);
+                      await db.user?.deleteUser(value);
+                      await BiometricService.resetCredentials();
+                      SettingsService.set({
+                        introCompleted: true
+                      });
                     } else {
                       ToastManager.show({
                         heading: "Incorrect password",
@@ -523,9 +408,9 @@ export const settingsGroups: SettingSection[] = [
                       });
                     }
 
-                    endProgress();
+                    eSendEvent("settings-loading", false);
                   } catch (e) {
-                    endProgress();
+                    eSendEvent("settings-loading", false);
                     console.log(e);
                     ToastManager.error(
                       e as Error,
@@ -546,25 +431,6 @@ export const settingsGroups: SettingSection[] = [
         type: "screen",
         icon: "autorenew",
         sections: [
-          {
-            id: "offline-mode",
-            name: "Full offline mode",
-            description: "Download everything including attachments on sync",
-            type: "switch",
-            property: "offlineMode",
-            modifer: () => {
-              const current = SettingsService.get().offlineMode;
-              if (current) {
-                SettingsService.setProperty("offlineMode", false);
-                db.fs().cancel("offline-mode");
-                return;
-              }
-              PremiumService.verify(() => {
-                SettingsService.setProperty("offlineMode", true);
-                db.attachments.cacheAttachments().catch(console.log);
-              });
-            }
-          },
           {
             id: "auto-sync",
             name: "Disable auto sync",
@@ -606,7 +472,7 @@ export const settingsGroups: SettingSection[] = [
           {
             id: "pull-sync",
             name: "Force pull changes",
-            description: `Use this if changes from other devices are not appearing on this device. This will overwrite the data on this device with the latest data from the server.\n\nThis must only be used for troubleshooting. Using it regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at support@streetwriters.co.`,
+            description: `Use this if some changes are not appearing on this device from other devices. This will pull everything from the server and overwrite with whatever is one this device.\n\nThese must only be used for troubleshooting. Using them regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at support@streetwriters.co.`,
             modifer: () => {
               presentDialog({
                 title: "Force Pull changes",
@@ -628,7 +494,7 @@ export const settingsGroups: SettingSection[] = [
           {
             id: "push-sync",
             name: "Force push changes",
-            description: `Use this if changes made on this device are not appearing on other devices. This will overwrite the data on the server with the data from this device.\n\nThis must only be used for troubleshooting. Using it regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at support@streetwriters.co.`,
+            description: `Use this if some changes are not appearing on this device from other devices. This will pull everything from the server and overwrite with whatever is one this device.`,
             modifer: () => {
               presentDialog({
                 title: "Force Push changes",
@@ -820,14 +686,6 @@ export const settingsGroups: SettingSection[] = [
             type: "switch"
           }
         ]
-      },
-      {
-        id: "servers",
-        type: "screen",
-        name: "Servers",
-        description: "Configure server URLs for Notesnook",
-        icon: "server",
-        component: "server-config"
       }
     ]
   },
@@ -835,6 +693,15 @@ export const settingsGroups: SettingSection[] = [
     id: "privacy-security",
     name: "Privacy and security",
     sections: [
+      {
+        id: "temeltery",
+        type: "switch",
+        name: "Telemetry",
+        icon: "radar",
+        description:
+          "Contribute towards a better Notesnook. All tracking information is anonymous.",
+        property: "telemetry"
+      },
       {
         id: "marketing-emails",
         type: "switch",
@@ -981,18 +848,9 @@ export const settingsGroups: SettingSection[] = [
           "Hide app contents when you switch to other apps. This will also disable screenshot taking in the app.",
         modifer: () => {
           const settings = SettingsService.get();
-          if (Platform.OS === "ios") {
-            enabled(!settings.privacyScreen);
-            if (settings.privacyScreen) {
-              ScreenGuardModule.unregister();
-            } else {
-              ScreenGuardModule.register({
-                backgroundColor: "#000000"
-              });
-            }
-          } else {
-            NotesnookModule.setSecureMode(!settings.privacyScreen);
-          }
+          Platform.OS === "android"
+            ? NotesnookModule.setSecureMode(!settings.privacyScreen)
+            : enabled(true);
 
           SettingsService.set({ privacyScreen: !settings.privacyScreen });
         },
@@ -1013,9 +871,6 @@ export const settingsGroups: SettingSection[] = [
             type: "switch",
             property: "appLockEnabled",
             onChange: () => {
-              SettingsService.set({
-                privacyScreen: true
-              });
               SettingsService.setPrivacyScreen(SettingsService.get());
             },
             onVerify: async () => {
@@ -1118,7 +973,7 @@ export const settingsGroups: SettingSection[] = [
                 SettingsService.getProperty("applockKeyboardType") === "numeric"
                   ? "pin"
                   : "password"
-              }, app lock will be disabled if no other security method is enabled.`,
+              }, app lock will fallback to using account password to unlock the app`,
             hidden: () => {
               return !SettingsService.getProperty("appLockHasPasswordSecurity");
             },
@@ -1171,8 +1026,7 @@ export const settingsGroups: SettingSection[] = [
           {
             id: "backup-now",
             name: "Backup now",
-            description:
-              "Take a partial backup of your data that does not include attachments",
+            description: "Create a backup of your data",
             modifer: async () => {
               const user = useUserStore.getState().user;
               if (!user || SettingsService.getProperty("encryptedBackup")) {
@@ -1183,41 +1037,14 @@ export const settingsGroups: SettingSection[] = [
               verifyUser(null, () => BackupService.run(true));
             }
           },
-          {
-            id: "backup-now",
-            name: "Backup now with attachments",
-            hidden: () => !useUserStore.getState().user,
-            description: "Take a full backup of your data with all attachments",
-            modifer: async () => {
-              const user = useUserStore.getState().user;
-              if (!user || SettingsService.getProperty("encryptedBackup")) {
-                await BackupService.run(true, undefined, "full");
-                return;
-              }
-
-              verifyUser(null, () =>
-                BackupService.run(true, undefined, "full")
-              );
-            }
-          },
           {
             id: "auto-backups",
             type: "component",
             name: "Automatic backups",
             description:
-              "Set the interval to create a partial backup (without attachments) automatically.",
+              "Backup your data once every week or daily automatically.",
             component: "autobackups"
           },
-          {
-            id: "auto-backups-with-attachments",
-            type: "component",
-            hidden: () => !useUserStore.getState().user,
-            name: "Automatic backups with attachments",
-            description: `Set the interval to create a backup (with attachments) automatically.
-
-NOTE: Creating a backup with attachments can take a while, and also fail completely. The app will try to resume/restart the backup in case of interruptions.`,
-            component: "autobackupsattachments"
-          },
           {
             id: "select-backup-dir",
             name: "Select backup directory",
@@ -1309,8 +1136,9 @@ NOTE: Creating a backup with attachments can take a while, and also fail complet
         id: "restore-backup",
         name: "Restore backup",
         description: "Restore backup from phone storage.",
-        type: "screen",
-        component: "backuprestore"
+        modifer: () => {
+          eSendEvent(eOpenRestoreDialog);
+        }
       },
       {
         id: "export-notes",
@@ -1490,9 +1318,9 @@ NOTE: Creating a backup with attachments can take a while, and also fail complet
         }
       },
       {
-        id: "join-mastodon",
+        id: "join-mastodom",
         name: "Follow us on Mastodon",
-        description: "We are on mastodon",
+        description: "We are on mastodom",
         icon: "mastodon",
         modifer: () => {
           Linking.openURL("https://fosstodon.org/@notesnook").catch(

apps/mobile/app/screens/settings/subscription.js

@@ -90,7 +90,7 @@ export const Subscription = () => {
 
   function getPrice() {
     return Platform.OS === "android"
-      ? monthlyPlan?.product?.subscriptionOfferDetails[0]?.pricingPhases
+      ? monthlyPlan?.product?.subscriptionOfferDetails[0].pricingPhases
           .pricingPhaseList?.[0]?.formattedPrice
       : monthlyPlan?.product?.localizedPrice;
   }

apps/mobile/app/services/background-sync.ts

@@ -16,15 +16,14 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import BackgroundFetch from "@ammarahmed/react-native-background-fetch";
-import { AppRegistry, AppState, Platform } from "react-native";
+import { Platform } from "react-native";
 import {
   beginBackgroundTask,
   endBackgroundTask
 } from "react-native-begin-background-task";
+import BackgroundFetch from "@ammarahmed/react-native-background-fetch";
 import { DatabaseLogger, db, setupDatabase } from "../common/database";
-import { deleteDCacheFiles } from "../common/filesystem/io";
-import { useUserStore } from "../stores/use-user-store";
+import { AppState, AppRegistry } from "react-native";
 import Notifications from "./notifications";
 import SettingsService from "./settings";
 
@@ -115,19 +114,15 @@ async function onBackgroundSyncStarted() {
       await db.init();
     }
     const user = await db.user?.getUser();
-    if (user && !useUserStore.getState().syncing) {
-      useUserStore.getState().setSyncing(true);
+    if (user) {
       await db.sync({
         type: "full",
         force: false
       });
-      useUserStore.getState().setSyncing(false);
     }
     await Notifications.setupReminders();
-    deleteDCacheFiles();
     DatabaseLogger.info("BACKGROUND SYNC COMPLETE");
   } catch (e) {
-    useUserStore.getState().setSyncing(false);
     DatabaseLogger.error(e as Error);
     console.log("BACKGROUND SYNC ERROR", (e as Error).message);
   }
@@ -137,17 +132,16 @@ const onBoot = async () => {
   try {
     if (!SettingsService.getProperty("backgroundSync")) {
       DatabaseLogger.info("BACKGROUND SYNC ON BOOT DISABLED");
-
       return;
     }
 
     DatabaseLogger.info("BOOT TASK STARTED");
     if (!db.isInitialized) {
-      await setupDatabase();
       await db.init();
     }
 
     await Notifications.setupReminders();
+    SettingsService.init();
     if (SettingsService.get().notifNotes) {
       Notifications.pinQuickNote(false);
     }

apps/mobile/app/services/backup.js

@@ -17,8 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { sanitizeFilename } from "@notesnook/common";
-import { formatDate } from "@notesnook/core/dist/utils/date";
 import { Platform } from "react-native";
 import RNFetchBlob from "react-native-blob-util";
 import FileViewer from "react-native-file-viewer";
@@ -27,14 +25,8 @@ import Share from "react-native-share";
 import { zip } from "react-native-zip-archive";
 import { DatabaseLogger, db } from "../common/database";
 import storage from "../common/database/storage";
-import filesystem from "../common/filesystem";
 import { cacheDir, copyFileAsync } from "../common/filesystem/utils";
 import { presentDialog } from "../components/dialog/functions";
-import {
-  endProgress,
-  startProgress,
-  updateProgress
-} from "../components/dialogs/progress";
 import { eCloseSheet } from "../utils/events";
 import { sleep } from "../utils/time";
 import { ToastManager, eSendEvent, presentSheet } from "./event-manager";
@@ -45,14 +37,14 @@ const MS_WEEK = MS_DAY * 7;
 const MONTH = MS_DAY * 30;
 
 async function getDirectoryAndroid() {
-  const folder = await ScopedStorage.openDocumentTree(true);
+  let folder = await ScopedStorage.openDocumentTree(true);
   if (!folder) return null;
   let subfolder;
   if (!folder.name.includes("Notesnook backups")) {
-    const files = await ScopedStorage.listFiles(folder.uri);
-    for (const file of files) {
-      if (file.type === "directory" && file.name === "Notesnook backups") {
-        subfolder = file;
+    let folderFiles = await ScopedStorage.listFiles(folder.uri);
+    for (let f of folderFiles) {
+      if (f.type === "directory" && f.name === "Notesnook backups") {
+        subfolder = f;
       }
     }
     if (!subfolder) {
@@ -75,10 +67,10 @@ async function checkBackupDirExists(reset = false, context = "global") {
   let dir = SettingsService.get().backupDirectoryAndroid;
   if (reset) dir = null;
   if (dir) {
-    const allDirs = await ScopedStorage.getPersistedUriPermissions();
+    let allDirs = await ScopedStorage.getPersistedUriPermissions();
     let exists = allDirs.findIndex((d) => {
-      return d === dir?.uri || dir?.uri.includes(d);
-    }) as number | boolean;
+      return d === dir.uri || dir.uri.includes(d);
+    });
     exists = exists !== -1;
     dir = exists ? dir : null;
   }
@@ -108,7 +100,7 @@ async function checkBackupDirExists(reset = false, context = "global") {
   return dir;
 }
 
-async function presentBackupCompleteSheet(backupFilePath: string) {
+async function presentBackupCompleteSheet(backupFilePath) {
   presentSheet({
     title: "Backup complete",
     icon: "cloud-upload",
@@ -131,7 +123,7 @@ async function presentBackupCompleteSheet(backupFilePath: string) {
               showOpenWithDialog: true,
               showAppsSuggestions: true,
               shareFile: true
-            } as any).catch(console.log);
+            }).catch(console.log);
           }
         },
         actionText: "Share"
@@ -150,10 +142,10 @@ async function presentBackupCompleteSheet(backupFilePath: string) {
   });
 }
 
-async function updateNextBackupTime(type: "full" | "partial") {
+async function updateNextBackupTime() {
   SettingsService.set({
     nextBackupRequestTime: Date.now() + 86400000 * 3,
-    [type === "full" ? "lastFullBackupDate" : "lastBackupDate"]: Date.now()
+    lastBackupDate: Date.now()
   });
 }
 /**
@@ -161,124 +153,78 @@ async function updateNextBackupTime(type: "full" | "partial") {
  * @param {string=} context
  * @returns {Promise<{path?: string, error?: Error, report?: boolean}}>
  */
-async function run(
-  progress = false,
-  context?: string,
-  backupType: "full" | "partial" = "partial"
-) {
-  console.log("Creating backup:", backupType, progress, context);
-
-  const androidBackupDirectory = (await checkBackupDirExists(
-    false,
-    context
-  )) as ScopedStorage.FileType;
-
+async function run(progress = false, context) {
+  let androidBackupDirectory = await checkBackupDirExists(false, context);
   if (!androidBackupDirectory)
     return {
       error: new Error("Backup directory not selected"),
       report: false
     };
 
-  let path;
-
-  if (Platform.OS === "ios") {
-    path = await storage.checkAndCreateDir("/backups");
-  }
-
-  const backupFileName = sanitizeFilename(
-    `${formatDate(Date.now(), {
-      type: "date-time",
-      dateFormat: "YYYY-MM-DD",
-      timeFormat: "24-hour"
-    })}-${new Date().getSeconds()}${backupType === "full" ? "-full" : ""}`,
-    { replacement: "-" }
-  );
-
   if (progress) {
-    startProgress({
-      title: `Creating ${backupType === "full" ? "a full " : ""}backup`,
-      paragraph: `Please wait while we create a backup of your data. This may take a few minutes.`,
-      progress: undefined
+    presentSheet({
+      title: "Backing up your data",
+      paragraph:
+        "All your backups are stored in 'Phone Storage/Notesnook/backups/' folder",
+      progress: true
     });
   }
 
-  const zipSourceFolder = `${cacheDir}/backup_temp`;
+  let path;
+  let backupFilePath;
+  let backupFileName = "notesnook_backup_" + Date.now();
+
+  if (Platform.OS === "ios") {
+    path = await storage.checkAndCreateDir("/backups/");
+  }
+
+  const zipSourceFolder = `${cacheDir}/${backupFileName}`;
   const zipOutputFile =
     Platform.OS === "ios"
       ? `${path}/${backupFileName}.nnbackupz`
       : `${cacheDir}/${backupFileName}.nnbackupz`;
 
-  await RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-  await RNFetchBlob.fs.mkdir(zipSourceFolder);
+  try {
+    if (await RNFetchBlob.fs.exists(zipSourceFolder))
+      await RNFetchBlob.fs.unlink(zipSourceFolder);
+  } catch (e) {}
 
-  const attachmentsDir = zipSourceFolder + "/attachments";
-  if (backupType === "full") {
-    await RNFetchBlob.fs.mkdir(attachmentsDir);
-  }
+  await RNFetchBlob.fs.mkdir(zipSourceFolder);
 
   try {
     const user = await db.user.getUser();
-    for await (const file of db.backup.export({
-      type: "mobile",
-      encrypt: SettingsService.get().encryptedBackup && !!user,
-      mode: backupType
-    })) {
-      if (file.type === "file") {
-        updateProgress({
-          progress: `Writing backup chunk of size... ${file?.data?.length}`
-        });
-        await RNFetchBlob.fs.writeFile(
-          `${zipSourceFolder}/${file.path}`,
-          file.data,
-          "utf8"
-        );
-      } else if (file.type === "attachment") {
-        updateProgress({
-          progress: `Saving attachments in backup... ${file.hash}`
-        });
-        if (await filesystem.exists(file.hash)) {
-          await RNFetchBlob.fs.cp(
-            `${cacheDir}/${file.hash}`,
-            `${attachmentsDir}/${file.hash}`
-          );
-        }
-      }
+    for await (const file of db.backup.export(
+      "mobile",
+      SettingsService.get().encryptedBackup && user
+    )) {
+      console.log("Writing backup chunk of size...", file?.data?.length);
+      await RNFetchBlob.fs.writeFile(
+        `${zipSourceFolder}/${file.path}`,
+        file.data,
+        "utf8"
+      );
     }
 
-    updateProgress({
-      progress: "Creating backup zip file..."
-    });
-
     await zip(zipSourceFolder, zipOutputFile);
 
     if (Platform.OS === "android") {
       // Move the zip to user selected directory.
       const file = await ScopedStorage.createFile(
-        androidBackupDirectory?.uri,
+        androidBackupDirectory.uri,
         `${backupFileName}.nnbackupz`,
         "application/nnbackupz"
       );
       console.log("Copying zip file...");
       await copyFileAsync(`file://${zipOutputFile}`, file.uri);
-
-      console.log("Copied zip file...");
+      console.log("Copyied zip file...");
       path = file.uri;
     } else {
       path = zipOutputFile;
     }
-
     RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-    if (Platform.OS === "android") {
-      RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
-    }
+    updateNextBackupTime();
 
-    updateNextBackupTime(backupType || "partial");
-
-    if (progress) {
-      endProgress();
-    }
-
-    const canShowCompletionStatus =
+    let showBackupCompleteSheet =
       progress && SettingsService.get().showBackupCompleteSheet;
 
     if (context) {
@@ -289,12 +235,15 @@ async function run(
 
     await sleep(300);
 
-    if (canShowCompletionStatus) {
-      presentBackupCompleteSheet(path);
+    if (showBackupCompleteSheet) {
+      presentBackupCompleteSheet(backupFilePath);
+    } else {
+      progress && eSendEvent(eCloseSheet);
     }
 
     ToastManager.show({
       heading: "Backup successful",
+      message: "Your backup is stored in Notesnook folder on your phone.",
       type: "success",
       context: "global"
     });
@@ -303,26 +252,16 @@ async function run(
       path: path
     };
   } catch (e) {
-    ToastManager.error(e as Error, "Backup failed", context || "global");
+    ToastManager.error(e, "Backup failed", context || "global");
 
-    if (
-      (e as Error)?.message?.includes("android.net.Uri") &&
-      androidBackupDirectory
-    ) {
+    if (e?.message?.includes("android.net.Uri") && androidBackupDirectory) {
       SettingsService.setProperty("backupDirectoryAndroid", null);
-      return run(progress, context, backupType);
-    }
-
-    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
-    if (Platform.OS === "android") {
-      RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
+      return run(progress, context);
     }
 
     DatabaseLogger.error(e);
     await sleep(300);
-    if (progress) {
-      endProgress();
-    }
+    progress && eSendEvent(eCloseSheet);
     return {
       error: e,
       report: true
@@ -330,41 +269,34 @@ async function run(
   }
 }
 
-async function checkBackupRequired(
-  type: "daily" | "off" | "useroff" | "weekly" | "monthly" | "never",
-  lastBackupDateType: "lastBackupDate" | "lastFullBackupDate" = "lastBackupDate"
-) {
-  console.log(lastBackupDateType, type);
-  if (type === "off" || type === "useroff" || type === "never" || !type) return;
-  const now = Date.now();
-  const lastBackupDate = SettingsService.getProperty(lastBackupDateType) as
-    | number
-    | "never";
+async function getLastBackupDate() {
+  return SettingsService.get().lastBackupDate;
+}
 
-  if (
-    lastBackupDate === undefined ||
-    lastBackupDate === "never" ||
-    lastBackupDate === 0
-  ) {
+async function checkBackupRequired(type) {
+  if (type === "off" || type === "useroff") return;
+  let now = Date.now();
+  let lastBackupDate = await getLastBackupDate();
+  if (!lastBackupDate || lastBackupDate === "never") {
     return true;
   }
-
+  lastBackupDate = parseInt(lastBackupDate);
   if (type === "daily" && lastBackupDate + MS_DAY < now) {
-    DatabaseLogger.info(`Daily backup started: ${type}`);
+    DatabaseLogger.info("Daily backup started");
     return true;
   } else if (type === "weekly" && lastBackupDate + MS_WEEK < now) {
-    DatabaseLogger.info(`Weekly backup started: ${type}`);
+    DatabaseLogger.info("Weekly backup started");
     return true;
   } else if (type === "monthly" && lastBackupDate + MONTH < now) {
-    DatabaseLogger.info(`Monthly backup started: ${type}`);
+    DatabaseLogger.info("Monthly backup started");
     return true;
   }
   return false;
 }
 
 const checkAndRun = async () => {
-  const settings = SettingsService.get();
-  if (await checkBackupRequired(settings?.reminder)) {
+  let settings = SettingsService.get();
+  if (await checkBackupRequired(settings.reminder)) {
     try {
       await run();
     } catch (e) {

apps/mobile/app/services/exporter.ts

@@ -111,6 +111,52 @@ async function resolveFileFunctions(
   };
 }
 
+async function createZip(
+  totalNotes: number,
+  cacheFolder: string,
+  type: "txt" | "pdf" | "md" | "html" | "md-frontmatter",
+  path: string,
+  callback: (progress?: string) => void
+) {
+  const fileName = `nn-export-${totalNotes}-${type}-${Date.now()}.zip`;
+  const dir = path;
+  try {
+    callback("Creating zip");
+    const zipOutputPath =
+      Platform.OS === "ios"
+        ? join(path, fileName)
+        : join(RNFetchBlob.fs.dirs.CacheDir, fileName);
+    await zip(cacheFolder, zipOutputPath);
+
+    callback("Saving zip file");
+    if (Platform.OS === "android") {
+      const file = await ScopedStorage.createFile(
+        path,
+        fileName,
+        "application/zip"
+      );
+      path = file.uri;
+      await copyFileAsync("file://" + zipOutputPath, path);
+      await RNFetchBlob.fs.unlink(zipOutputPath);
+      callback();
+    } else {
+      path = zipOutputPath;
+    }
+    RNFetchBlob.fs.unlink(cacheFolder);
+  } catch (e) {
+    DatabaseLogger.error(e as Error);
+  }
+
+  return {
+    filePath: path,
+    fileDir: dir,
+    type: "application/zip",
+    name: "zip",
+    fileName: fileName,
+    count: totalNotes
+  };
+}
+
 async function exportNoteToFile(
   item: ExportableNote,
   type: "txt" | "pdf" | "md" | "html" | "md-frontmatter",
@@ -223,8 +269,6 @@ async function exportNote(
   const { mkdir, writeFile, cacheFolder } = fileFuncions;
 
   let currentAttachmentProgress = 0;
-  let hasAttachments = false;
-  let noteItem;
   for await (const item of _exportNote(note, {
     format: type,
     unlockVault: unlockVaultForNoteExport as () => Promise<boolean>
@@ -237,7 +281,6 @@ async function exportNote(
     if (item.type === "note") {
       callback(`Exporting note`);
       try {
-        noteItem = item;
         await exportNoteToFile(item, type, mkdir, writeFile);
       } catch (e) {
         console.log("exportNoteToFile", item.type, e);
@@ -246,7 +289,6 @@ async function exportNote(
       currentAttachmentProgress += 1;
       callback(`Downloading attachments (${currentAttachmentProgress})`);
       try {
-        hasAttachments = true;
         await exportAttachmentToFile(item, mkdir, cacheFolder);
       } catch (e) {
         console.log("exportAttachmentToFile", item.path, e);
@@ -254,90 +296,9 @@ async function exportNote(
     }
   }
 
-  if (!hasAttachments) {
-    return createFile(noteItem as ExportableNote, type, path, cacheFolder);
-  } else {
-    return createZip(1, cacheFolder, type, path, callback);
-  }
+  return createZip(1, cacheFolder, type, path, callback);
 }
 
-async function createZip(
-  totalNotes: number,
-  cacheFolder: string,
-  type: "txt" | "pdf" | "md" | "html" | "md-frontmatter",
-  path: string,
-  callback: (progress?: string) => void
-) {
-  const fileName = `nn-export-${totalNotes}-${type}-${Date.now()}.zip`;
-  const dir = path;
-  try {
-    callback("Creating zip");
-    const zipOutputPath =
-      Platform.OS === "ios"
-        ? join(path, fileName)
-        : join(RNFetchBlob.fs.dirs.CacheDir, fileName);
-    await zip(cacheFolder, zipOutputPath);
-
-    callback("Saving zip file");
-    if (Platform.OS === "android") {
-      const file = await ScopedStorage.createFile(
-        path,
-        fileName,
-        "application/zip"
-      );
-      path = file.uri;
-      await copyFileAsync("file://" + zipOutputPath, path);
-      await RNFetchBlob.fs.unlink(zipOutputPath);
-      callback();
-    } else {
-      path = zipOutputPath;
-    }
-    RNFetchBlob.fs.unlink(cacheFolder);
-  } catch (e) {
-    DatabaseLogger.error(e as Error);
-  }
-
-  return {
-    filePath: path,
-    fileDir: dir,
-    type: "application/zip",
-    name: "zip",
-    fileName: fileName,
-    count: totalNotes
-  };
-}
-
-async function createFile(
-  noteItem: ExportableNote,
-  type: keyof typeof FileMime,
-  path: string,
-  cacheFolder: string
-) {
-  const file = await ScopedStorage.createFile(
-    path,
-    basename(noteItem?.path as string),
-    FileMime[type]
-  );
-  const exportedFile = join(cacheFolder, noteItem?.path as string);
-  await copyFileAsync("file://" + exportedFile, file.uri);
-  return {
-    filePath: file.uri,
-    fileDir: path,
-    type: FileMime[type],
-    name: type,
-    fileName: basename(noteItem?.path as string),
-    count: 1
-  };
-}
-
-const FileMime = {
-  pdf: "application/pdf",
-  txt: "text/plain",
-  md: "text/markdown",
-  html: "text/html",
-  "md-frontmatter": "text/markdown"
-};
-
 const Exporter = {
   exportNote,
   bulkExport

apps/mobile/app/services/message.js

@@ -59,14 +59,14 @@ const recoveryKeyMessage = {
       () => {
         eSendEvent(eOpenRecoveryKeyDialog);
       },
-      false,
+      true,
       async () => {
         SettingsService.set({
           recoveryKeySaved: true
         });
         clearMessage();
       },
-      "Cancel"
+      "I have saved my key already"
     );
   },
   data: {},

apps/mobile/app/services/settings.ts

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { NativeModules, Platform } from "react-native";
+import { Platform } from "react-native";
 import { enabled } from "react-native-privacy-snapshot";
 import { MMKV } from "../common/database/mmkv";
 import {
@@ -29,8 +29,6 @@ import { NotesnookModule } from "../utils/notesnook-module";
 import { scale, updateSize } from "../utils/size";
 import { DatabaseLogger } from "../common/database";
 import { useUserStore } from "../stores/use-user-store";
-import ScreenGuardModule from "react-native-screenguard";
-
 function reset() {
   const settings = get();
   if (settings.reminder !== "off" && settings.reminder !== "useroff") {
@@ -41,15 +39,10 @@ function reset() {
 }
 
 function resetSettings() {
-  const settings: SettingStore["settings"] = {
-    ...defaultSettings,
-    introCompleted: true,
-    serverUrls: get().serverUrls,
-    backupDirectoryAndroid: undefined
-  };
-
-  MMKV.setString("appSettings", JSON.stringify(settings));
-  set(settings);
+  MMKV.setString(
+    "appSettings",
+    JSON.stringify({ ...defaultSettings, introCompleted: true })
+  );
   init();
 }
 
@@ -83,17 +76,6 @@ function migrateAppLock() {
   DatabaseLogger.debug("App lock Migrated");
 }
 
-function migrateSettings(settings: SettingStore["settings"]) {
-  const version = settings.settingsVersion;
-  if (!version) {
-    settings.settingsVersion = 1;
-    settings.privacyScreen = settings.appLockEnabled
-      ? true
-      : settings.privacyScreen;
-    MMKV.setString("appSettings", JSON.stringify(settings));
-  }
-}
-
 function init() {
   scale.fontScale = 1;
   const settingsJson = MMKV.getString("appSettings");
@@ -101,17 +83,14 @@ function init() {
   if (!settingsJson) {
     MMKV.setString("appSettings", JSON.stringify(settings));
   } else {
-    const settingsParsed = JSON.parse(settingsJson);
-    migrateSettings(settingsParsed);
     settings = {
       ...settings,
-      ...settingsParsed
+      ...JSON.parse(settingsJson)
     };
   }
   if (settings.fontScale) {
     scale.fontScale = settings.fontScale;
   }
-
   setTimeout(() => setPrivacyScreen(settings), 1);
   updateSize();
   useSettingStore.getState().setSettings({ ...settings });
@@ -119,23 +98,17 @@ function init() {
 }
 
 function setPrivacyScreen(settings: SettingStore["settings"]) {
-  if (settings.privacyScreen) {
+  if (settings.privacyScreen || settings.appLockEnabled) {
     if (Platform.OS === "android") {
       NotesnookModule.setSecureMode(true);
     } else {
       enabled(true);
-      if (NativeModules.ScreenGuard) {
-        ScreenGuardModule.register({ backgroundColor: "#000000" });
-      }
     }
   } else {
     if (Platform.OS === "android") {
       NotesnookModule.setSecureMode(false);
     } else {
       enabled(false);
-      if (NativeModules.ScreenGuard) {
-        ScreenGuardModule.unregister();
-      }
     }
   }
 }

apps/mobile/app/services/sync.ts

@@ -30,9 +30,7 @@ export const ignoredMessages = [
   "Sync already running",
   "Not allowed to start service intent",
   "WebSocket failed to connect",
-  "Failed to start the HttpConnection before",
-  "Could not connect to the Sync server",
-  "Network request failed"
+  "Failed to start the HttpConnection before"
 ];
 let pendingSync: any = undefined;
 let syncTimer: NodeJS.Timeout;
@@ -63,45 +61,58 @@ const run = async (
 
   clearTimeout(syncTimer);
   syncTimer = setTimeout(async () => {
+    const status = await NetInfo.fetch();
     const userstore = useUserStore.getState();
-    userstore.setSyncing(true);
     const user = await db.user.getUser();
+    if (!status.isInternetReachable) {
+      DatabaseLogger.warn("Internet not reachable");
+    }
 
-    if (!user || SettingsService.get().disableSync) {
-      userstore.setSyncing(false);
+    if (
+      !user ||
+      !status.isInternetReachable ||
+      SettingsService.get().disableSync
+    ) {
       initAfterSync();
       pendingSync = undefined;
       return onCompleted?.(SyncStatus.Failed);
     }
+    userstore.setSyncing(true);
 
-    let error: Error | undefined = undefined;
+    let error = null;
 
     try {
       await BackgroundSync.doInBackground(async () => {
         try {
           await db.sync({
             type: type,
-            force: forced,
-            offlineMode: SettingsService.get().offlineMode
+            force: forced
           });
         } catch (e) {
-          error = e as Error;
+          error = e;
         }
       });
 
-      if (error) throw error;
+      if (error) {
+        throw error;
+      }
     } catch (e) {
-      error = e as Error;
-      DatabaseLogger.error(error, "[Client] Failed to sync");
+      error = e;
       if (
-        !ignoredMessages.find((message) => error?.message?.includes(message)) &&
-        userstore.user
+        !ignoredMessages.find((message) =>
+          (e as Error).message?.includes(message)
+        ) &&
+        userstore.user &&
+        status.isConnected &&
+        status.isInternetReachable
       ) {
-        const status = await NetInfo.fetch();
+        userstore.setSyncing(false, SyncStatus.Failed);
         if (status.isConnected && status.isInternetReachable) {
           ToastManager.error(e as Error, "Sync failed", context);
         }
       }
+
+      DatabaseLogger.error(e, "[Client] Failed to sync");
     } finally {
       initAfterSync();
       userstore.setSyncing(
@@ -109,14 +120,16 @@ const run = async (
         error ? SyncStatus.Failed : SyncStatus.Passed
       );
       onCompleted?.(error ? SyncStatus.Failed : SyncStatus.Passed);
-      if (pendingSync)
-        Sync.run(
-          pendingSync.context,
-          pendingSync.forced,
-          pendingSync.type,
-          pendingSync.onCompleted,
-          pendingSync.lastSyncTime
-        );
+      setImmediate(() => {
+        if (pendingSync)
+          Sync.run(
+            pendingSync.context,
+            pendingSync.forced,
+            pendingSync.type,
+            pendingSync.onCompleted,
+            pendingSync.lastSyncTime
+          );
+      });
     }
   }, 300);
 };

apps/mobile/app/stores/use-setting-store.ts

@@ -25,8 +25,6 @@ import { FileType } from "react-native-scoped-storage";
 import create, { State } from "zustand";
 import { ThemeDark, ThemeLight, ThemeDefinition } from "@notesnook/theme";
 import { Reminder } from "@notesnook/core/dist/types";
-export const HostIds = ["API_HOST", "AUTH_HOST", "SSE_HOST"] as const;
-export type HostId = (typeof HostIds)[number];
 
 export type Settings = {
   showToolbarOnTop?: boolean;
@@ -34,8 +32,7 @@ export type Settings = {
   fontScale?: number;
   forcePortraitOnTablet?: boolean;
   useSystemTheme?: boolean;
-  reminder: "daily" | "off" | "useroff" | "weekly" | "monthly";
-  fullBackupReminder: "never" | "weekly" | "monthly";
+  reminder?: string;
   encryptedBackup?: boolean;
   homepage?: string;
   sort?: string;
@@ -45,6 +42,7 @@ export type Settings = {
   appLockTimer: number;
   appLockEnabled?: boolean;
   appLockMode?: "none" | "background" | "launch";
+  telemetry?: boolean;
   notebooksListMode?: "normal" | "compact";
   notesListMode?: "normal" | "compact";
   devMode?: boolean;
@@ -54,8 +52,8 @@ export type Settings = {
   rateApp?: boolean | number;
   migrated?: boolean;
   introCompleted?: boolean;
-  nextBackupRequestTime?: number;
-  lastBackupDate?: number;
+  nextBackupRequestTime?: number | undefined;
+  lastBackupDate?: number | undefined;
   userEmailConfirmed?: boolean;
   recoveryKeySaved?: boolean;
   backupDirectoryAndroid?: FileType | null;
@@ -83,11 +81,6 @@ export type Settings = {
   biometricsAuthEnabled?: boolean;
   backgroundSync?: boolean;
   applockKeyboardType: "numeric" | "default";
-  settingsVersion?: number;
-  backupType: "full" | "partial";
-  offlineMode?: boolean;
-  lastFullBackupDate?: number;
-  serverUrls?: Record<HostId, string>;
 };
 
 type DimensionsType = {
@@ -133,12 +126,6 @@ export const defaultSettings: SettingStore["settings"] = {
   applockKeyboardType: "numeric",
   appLockTimer: 0,
   showToolbarOnTop: false,
-  disableAutoSync: false,
-  disableRealtimeSync: false,
-  disableSync: false,
-  appLockEnabled: false,
-  backupDirectoryAndroid: null,
-  offlineMode: false,
   showKeyboardOnOpen: false,
   fontScale: 1,
   forcePortraitOnTablet: false,
@@ -151,6 +138,7 @@ export const defaultSettings: SettingStore["settings"] = {
   screenshotMode: true,
   privacyScreen: false,
   appLockMode: "none",
+  telemetry: false,
   notebooksListMode: "normal",
   notesListMode: "normal",
   devMode: false,
@@ -161,7 +149,7 @@ export const defaultSettings: SettingStore["settings"] = {
   migrated: false,
   introCompleted: Config.isTesting ? true : false,
   nextBackupRequestTime: undefined,
-  lastBackupDate: 0,
+  lastBackupDate: undefined,
   userEmailConfirmed: false,
   recoveryKeySaved: false,
   showBackupCompleteSheet: true,
@@ -181,11 +169,7 @@ export const defaultSettings: SettingStore["settings"] = {
   markdownShortcuts: true,
   biometricsAuthEnabled: false,
   appLockHasPasswordSecurity: false,
-  backgroundSync: true,
-  settingsVersion: 0,
-  backupType: "partial",
-  fullBackupReminder: "never",
-  lastFullBackupDate: 0
+  backgroundSync: true
 };
 
 export const useSettingStore = create<SettingStore>((set, get) => ({

apps/mobile/app/stores/use-user-store.ts

@@ -17,7 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Profile, User } from "@notesnook/core";
+import { Profile } from "@notesnook/core";
+import { User } from "@notesnook/core";
 import create, { State } from "zustand";
 
 export enum SyncStatus {
@@ -55,9 +56,7 @@ export const useUserStore = create<UserStore>((set) => ({
     set({ syncing: syncing, lastSyncStatus: status });
   },
   setLastSynced: (lastSynced) => set({ lastSynced: lastSynced }),
-  lockApp: (appLocked) => {
-    set({ appLocked });
-  },
+  lockApp: (appLocked) => set({ appLocked }),
   lastSyncStatus: SyncStatus.Never,
   disableAppLockRequests: false,
   setDisableAppLockRequests: (disableAppLockRequests) => {

apps/mobile/native/Gemfile

@@ -1,7 +1,4 @@
 source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
-# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
-# bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+gem 'cocoapods', '~> 1.12'

apps/mobile/native/android/app/build.gradle

@@ -1,7 +1,5 @@
 apply plugin: "com.android.application"
-apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
-
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
 import com.android.build.OutputFile
@@ -49,6 +47,7 @@ react {
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     hermesFlags = ["-O", "-output-source-map"]
 }
+println(projectDir);
 
 /**
  * Set this to true to create two separate APKs instead of one:
@@ -97,14 +96,10 @@ def getNpmVersion() {
     return jsonPackage["version"]
 }
 
-def isBuildingAAB = gradle.startParameter.getTaskNames().any { it.contains("bundleRelease") }
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     ndkVersion rootProject.ext.ndkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-    compileSdk rootProject.ext.compileSdkVersion
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -116,7 +111,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 3027
+        versionCode 3011
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -168,12 +163,8 @@ android {
       pickFirst 'lib/x86_64/libc++_shared.so'
       pickFirst 'lib/armeabi-v7a/libc++_shared.so'
       pickFirst 'lib/arm64-v8a/libc++_shared.so'
-      jniLibs {
-            useLegacyPackaging isBuildingAAB == false
-    }
   }
 
-    
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
@@ -187,15 +178,9 @@ android {
                        defaultConfig.versionCode * 5 + versionCodes.get(abi)
                     println("Fdroid Version code: ${output.versionCodeOverride} for abi ${versionCodes.get(abi)}");
                 } else {
-                    if (isBuildingAAB) {
-                        output.versionCodeOverride = 4 * 1048576 + defaultConfig.versionCode
-                        println("AAB version code: ${output.versionCodeOverride}");
-                    } else {
-                        output.versionCodeOverride =
+                    println("Version code: ${output.versionCodeOverride} for abi ${versionCodes.get(abi)}");
+                    output.versionCodeOverride =
                         versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
-                        println("Version code: ${output.versionCodeOverride} for abi ${versionCodes.get(abi)}");
-                    }
-                    
                 }
                 
             }
@@ -218,7 +203,13 @@ dependencies {
 
     androidTestImplementation('com.wix:detox:+')
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    
+
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
+    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.squareup.okhttp3', module:'okhttp'
+    }
+
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {

apps/mobile/native/android/app/src/debug/AndroidManifest.xml

@@ -2,9 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
         tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
     </application>
 </manifest>

apps/mobile/native/android/app/src/debug/java/com/streetwriters/notesnook/ReactNativeFlipper.java

@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package com.streetwriters.notesnook;
+
+import android.content.Context;
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.android.utils.FlipperUtils;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
+import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceEventListener;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.network.NetworkingModule;
+import okhttp3.OkHttpClient;
+
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    if (FlipperUtils.shouldEnableFlipper(context)) {
+      final FlipperClient client = AndroidFlipperClient.getInstance(context);
+
+      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
+      client.addPlugin(new DatabasesFlipperPlugin(context));
+      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
+      client.addPlugin(CrashReporterPlugin.getInstance());
+
+      NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
+      NetworkingModule.setCustomClientBuilder(
+          new NetworkingModule.CustomClientBuilder() {
+            @Override
+            public void apply(OkHttpClient.Builder builder) {
+              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
+            }
+          });
+      client.addPlugin(networkFlipperPlugin);
+      client.start();
+
+      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
+      // Hence we run if after all native modules have been initialized
+      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
+      if (reactContext == null) {
+        reactInstanceManager.addReactInstanceEventListener(
+            new ReactInstanceEventListener() {
+              @Override
+              public void onReactContextInitialized(ReactContext reactContext) {
+                reactInstanceManager.removeReactInstanceEventListener(this);
+                reactContext.runOnNativeModulesQueueThread(
+                    new Runnable() {
+                      @Override
+                      public void run() {
+                        client.addPlugin(new FrescoFlipperPlugin());
+                      }
+                    });
+              }
+            });
+      } else {
+        client.addPlugin(new FrescoFlipperPlugin());
+      }
+    }
+  }
+}

apps/mobile/native/android/app/src/main/AndroidManifest.xml

@@ -18,7 +18,6 @@
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" tools:node="remove" />
 
     <queries>
             <intent>

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootRecieverService.java

@@ -3,7 +3,6 @@ package com.streetwriters.notesnook;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.util.Log;
 import android.app.ActivityManager;
 import com.facebook.react.HeadlessJsTaskService;
@@ -20,12 +19,8 @@ public class BootRecieverService extends BroadcastReceiver {
              network connections
              **/
             Intent serviceIntent = new Intent(context, BootTaskService.class);
-              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                  context.startForegroundService(serviceIntent);
-              } else {
-                  context.startService(serviceIntent);
-              }
-              HeadlessJsTaskService.acquireWakeLockNow(context);
+            context.startService(serviceIntent);
+            HeadlessJsTaskService.acquireWakeLockNow(context);
         }
     }
 

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/BootTaskService.java

@@ -1,24 +1,15 @@
 package com.streetwriters.notesnook;
 
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
-
-import androidx.core.app.NotificationCompat;
-
 import com.facebook.react.HeadlessJsTaskService;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.jstasks.HeadlessJsTaskConfig;
 import javax.annotation.Nullable;
 
 public class BootTaskService extends HeadlessJsTaskService {
-    Notification notification;
+
     @Override
   protected @Nullable HeadlessJsTaskConfig getTaskConfig(Intent intent) {
-      Log.d("BootTask", "Task Started");
       return new HeadlessJsTaskConfig(
               "com.streetwriters.notesnook.BOOT_TASK",
               Arguments.createMap(),
@@ -26,31 +17,4 @@ public class BootTaskService extends HeadlessJsTaskService {
               false // optional: defines whether or not the task is allowed in foreground. Default is false
       );
   }
-
-    @Override
-    public void onHeadlessJsTaskFinish(int taskId) {
-        super.onHeadlessJsTaskFinish(taskId);
-        Log.d("BootTask", "Task completed");
-        stopSelf();
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            NotificationChannel channel = new NotificationChannel("com.streetwriters.notesnook",
-                    "Default",
-                    NotificationManager.IMPORTANCE_DEFAULT);
-
-            ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(channel);
-            notification = new NotificationCompat.Builder(this, channel.getId())
-                    .setContentTitle("Sync on boot")
-                    .setContentText("")
-                    .setSmallIcon(R.drawable.ic_stat_name)
-                    .build();
-            startForeground(1, notification);
-        }
-
-        return super.onStartCommand(intent, flags, startId);
-    }
 }

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.java

@@ -0,0 +1,65 @@
+package com.streetwriters.notesnook;
+
+import com.facebook.react.PackageList;
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.soloader.SoLoader;
+
+import java.util.List;
+
+import androidx.multidex.MultiDexApplication;
+
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactNativeHost;
+
+public class MainApplication extends MultiDexApplication implements ReactApplication {
+
+    private final ReactNativeHost mReactNativeHost =
+            new DefaultReactNativeHost(this) {
+                @Override
+                public boolean getUseDeveloperSupport() {
+                    return BuildConfig.DEBUG;
+                }
+
+                @Override
+                protected List<ReactPackage> getPackages() {
+                    @SuppressWarnings("UnnecessaryLocalVariable")
+                    List<ReactPackage> packages = new PackageList(this).getPackages();
+                    packages.add(new NNativeModulePackage());
+                    return packages;
+                }
+
+                @Override
+                protected String getJSMainModuleName() {
+                    return "index";
+                }
+
+                @Override
+                protected boolean isNewArchEnabled() {
+                    return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+                }
+
+                @Override
+                protected Boolean isHermesEnabled() {
+                    return BuildConfig.IS_HERMES_ENABLED;
+                }
+            };
+
+    @Override
+    public ReactNativeHost getReactNativeHost() {
+        return mReactNativeHost;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        SoLoader.init(this, /* native exopackage */ false);
+
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            // If you opted-in for the New Architecture, we load the native entry point for this app.
+            DefaultNewArchitectureEntryPoint.load();
+        }
+        com.streetwriters.notesnook.ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    }
+}

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/MainApplication.kt

@@ -1,44 +0,0 @@
-package com.streetwriters.notesnook
- 
-import android.app.Application
-import com.facebook.react.PackageList
-import com.facebook.react.ReactApplication
-import com.facebook.react.ReactHost
-import com.facebook.react.ReactNativeHost
-import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
-import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
-import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.soloader.SoLoader
- 
-class MainApplication : Application(), ReactApplication {
- 
-  override val reactNativeHost: ReactNativeHost =
-      object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> =
-            PackageList(this).packages.apply {
-              // Packages that cannot be autolinked yet can be added manually here, for example:
-              // add(MyReactNativePackage())
-              add(NNativeModulePackage());
-            }
- 
-        override fun getJSMainModuleName(): String = "index"
- 
-        override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
- 
-        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-      }
- 
-  override val reactHost: ReactHost
-    get() = getDefaultReactHost(applicationContext, reactNativeHost)
- 
-  override fun onCreate() {
-    super.onCreate()
-    SoLoader.init(this, false)
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      load()
-    }
-  }
-}

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java

@@ -1,7 +1,5 @@
 package com.streetwriters.notesnook;
 
-import android.annotation.SuppressLint;
-import android.app.PendingIntent;
 import android.content.Intent;
 import android.os.Build;
 import android.service.quicksettings.Tile;
@@ -11,24 +9,11 @@ import androidx.annotation.RequiresApi;
 
 @RequiresApi(api = Build.VERSION_CODES.N)
 public class NotesnookTileService extends TileService {
-    @SuppressLint("StartActivityAndCollapseDeprecated")
     @Override
     public void onClick() {
         super.onClick();
         Intent intent = new Intent(this.getApplicationContext(), ShareActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startActivityAndCollapse(
-                    PendingIntent.getActivity(
-                            this.getApplicationContext(),
-                            0,
-                            intent,
-                            PendingIntent.FLAG_IMMUTABLE
-                    )
-            );
-        } else {
-            startActivityAndCollapse(intent);
-        }
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivityAndCollapse(intent);
     }
 }

apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/ShareApplication.java

@@ -67,6 +67,7 @@ public class ShareApplication extends MultiDexApplication implements ReactApplic
     @Override
     public void onCreate() {
         super.onCreate();
+        ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
         SoLoader.init(this, /* native exopackage */ false);
     }
 

apps/mobile/native/android/build.gradle

@@ -3,11 +3,11 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 buildscript {
     ext {
-        buildToolsVersion = "34.0.0"
-        minSdkVersion = 23
-        compileSdkVersion = 34
-        targetSdkVersion = 34
-        kotlinVersion = '1.9.22'
+        buildToolsVersion = "33.0.0"
+        minSdkVersion = 21
+        compileSdkVersion = 33
+        targetSdkVersion = 33
+        ext.kotlinVersion = '1.8.0'
         androidXAnnotation = "1.1.0"
         androidXCoreVersion = "1.7.0"
         androidXCore = "1.7.0"
@@ -23,11 +23,10 @@ buildscript {
     dependencies {
          classpath("com.android.tools.build:gradle")
          classpath("com.facebook.react:react-native-gradle-plugin")
-         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
+         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
-apply plugin: "com.facebook.react.rootproject"
 
 allprojects {
     repositories {
@@ -38,10 +37,4 @@ allprojects {
 
         maven { url 'https://www.jitpack.io' }
     }
-
-    // tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    //     kotlinOptions {
-    //         jvmTarget = "11"
-    //     }
-    // }
-}
+}

apps/mobile/native/android/gradle.properties

@@ -24,6 +24,9 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
+# Version of flipper SDK to use with React Native
+FLIPPER_VERSION=0.182.0
+
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64

apps/mobile/native/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

apps/mobile/native/android/gradlew

@@ -83,8 +83,10 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -131,13 +133,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -145,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,15 +197,11 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

apps/mobile/native/android/gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 

apps/mobile/native/android/releasenotes/whatsnew-en-US

@@ -1,6 +1,4 @@
-- Fix crash when launching Notesnook from Notification tiles
-- Fix app crashing on background on boot
-- Fix self-hosted server urls not working
-- Bug fixes and small improvements
+- Added push/pull changes to troubleshoot sync issues in settings
+- Bug fixes and performance improvements
 
 Thank you for using Notesnook!

apps/mobile/native/babel.config.js

@@ -2,7 +2,7 @@ const env = process.env.BABEL_ENV || process.env.NODE_ENV;
 const configs = {
   env: {
     development: {
-      presets: ['module:@react-native/babel-preset'],
+      presets: ['module:metro-react-native-babel-preset'],
       plugins: [
         '@babel/plugin-transform-named-capturing-groups-regex',
         'react-native-reanimated/plugin',
@@ -18,7 +18,7 @@ const configs = {
       ]
     },
     test: {
-      presets: ['module:@react-native/babel-preset'],
+      presets: ['module:metro-react-native-babel-preset'],
       plugins: [
         '@babel/plugin-transform-named-capturing-groups-regex',
         'react-native-reanimated/plugin',
@@ -40,7 +40,7 @@ const configs = {
       
     },
     production: {
-      presets: ['module:@react-native/babel-preset'],
+      presets: ['module:metro-react-native-babel-preset'],
       plugins: [
         'transform-remove-console',
         '@babel/plugin-transform-named-capturing-groups-regex',