mobile: set default widget size

.github/workflows/android.publish.yml

@@ -4,7 +4,7 @@ on: workflow_dispatch
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 40
     env:
       CMAKE_C_COMPILER_LAUNCHER: ccache

.github/workflows/ios.publish.yml

@@ -89,13 +89,13 @@ jobs:
       - name: CCache Stats After Build
         run: ccache -sv
 
-      # - name: "Upload app to TestFlight"
-      #   uses: apple-actions/upload-testflight-build@v1
-      #   with:
-      #     app-path: Notesnook.ipa
-      #     issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
-      #     api-key-id: ${{ secrets.API_KEY_ID }}
-      #     api-private-key: ${{ secrets.API_KEY }}
+      - name: "Upload app to TestFlight"
+        uses: apple-actions/upload-testflight-build@v1
+        with:
+          app-path: Notesnook.ipa
+          issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
+          api-key-id: ${{ secrets.API_KEY_ID }}
+          api-private-key: ${{ secrets.API_KEY }}
 
       - name: Upload Notesnook.ipa to Github
         uses: actions/upload-artifact@v4

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.0.24",
+  "version": "3.0.23",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",
@@ -33,10 +33,10 @@
     "electron-trpc": "0.6.1",
     "electron-updater": "^6.3.4",
     "icojs": "^0.19.4",
-    "sqlite-better-trigram": "0.0.2",
+    "sqlite-better-trigram": "^0.0.2",
     "typed-emitter": "^2.1.0",
     "yargs": "^17.7.2",
-    "zod": "3.23.8"
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@streetwriters/kysely": "^0.27.4",
@@ -45,15 +45,15 @@
     "chokidar": "^4.0.1",
     "electron": "^31.7.4",
     "electron-builder": "^25.1.8",
-    "esbuild": "0.21.5",
-    "vitest": "2.1.8",
+    "esbuild": "^0.24.0",
     "node-abi": "^3.68.0",
     "node-gyp-build": "^4.8.2",
     "playwright": "^1.48.2",
     "prebuildify": "^6.0.1",
-    "slugify": "1.6.6",
+    "slugify": "^1.6.6",
     "tree-kill": "^1.2.2",
-    "undici": "^6.19.8"
+    "undici": "^6.19.8",
+    "vitest": "^2.1.5"
   },
   "optionalDependencies": {
     "dmg-license": "^1.0.11"
@@ -262,4 +262,4 @@
       }
     ]
   }
-}
+}

apps/desktop/scripts/build.mjs

@@ -36,7 +36,7 @@ await fs.rm("./build/", { force: true, recursive: true });
 
 if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
   await exec(
-    "npx nx build:desktop @notesnook/web",
+    "yarn nx build:desktop @notesnook/web",
     path.join(__dirname, "..", "..", "..")
   );
 }
@@ -58,13 +58,11 @@ if (args.variant === "mas") {
 await exec(`yarn run build`);
 
 if (args.run) {
-  await exec(`yarn electron-builder --dir --${process.arch}`);
+  await exec(`yarn electron-builder --dir --x64`);
   if (process.platform === "win32") {
     await exec(`.\\output\\win-unpacked\\Notesnook.exe`);
   } else if (process.platform === "darwin") {
-    if (process.arch === "arm64")
-      await exec(`./output/mac-arm64/Notesnook.app/Contents/MacOS/Notesnook`);
-    else await exec(`./output/mac/Notesnook.app/Contents/MacOS/Notesnook`);
+    await exec(`./output/mac/Notesnook.app/Contents/MacOS/Notesnook`);
   } else {
     await exec(`./output/linux-unpacked/Notesnook`);
   }

apps/desktop/scripts/dev.mjs

@@ -70,8 +70,8 @@ async function onChange(first) {
 
   if (first) {
     await spawnAndWaitUntil(
-      ["npm", "run", "start:desktop"],
-      path.join(__dirname, "..", "..", "web"),
+      ["yarn", "nx", "start:desktop", "@notesnook/web"],
+      path.join(__dirname, "..", "..", ".."),
       (data) => data.includes("Network: use --host to expose")
     );
   }

apps/mobile/app/app.tsx

@@ -32,14 +32,12 @@ import { withErrorBoundry } from "./components/exception-handler";
 import GlobalSafeAreaProvider from "./components/globalsafearea";
 import { useAppEvents } from "./hooks/use-app-events";
 import { ApplicationHolder } from "./navigation";
-import { NotePreviewConfigure } from "./screens/note-preview-configure";
 import { themeTrpcClient } from "./screens/settings/theme-selector";
 import Notifications from "./services/notifications";
 import SettingsService from "./services/settings";
 import { TipManager } from "./services/tip-manager";
 import { useThemeStore } from "./stores/use-theme-store";
 import { useUserStore } from "./stores/use-user-store";
-import { IntentService } from "./services/intent";
 
 I18nManager.allowRTL(false);
 I18nManager.forceRTL(false);
@@ -49,8 +47,7 @@ if (appLockEnabled || appLockMode !== "none") {
   useUserStore.getState().lockApp(true);
 }
 
-IntentService.onLaunch();
-const App = (props: { configureMode: "note-preview" }) => {
+const App = () => {
   useAppEvents();
   //@ts-ignore
   globalThis["IS_MAIN_APP_RUNNING"] = true;
@@ -64,7 +61,6 @@ const App = (props: { configureMode: "note-preview" }) => {
       TipManager.init();
     }, 100);
   }, []);
-
   return (
     <View
       style={{
@@ -94,11 +90,7 @@ const App = (props: { configureMode: "note-preview" }) => {
           width: "100%"
         }}
       >
-        {props.configureMode === "note-preview" ? (
-          <NotePreviewConfigure />
-        ) : (
-          <ApplicationHolder />
-        )}
+        <ApplicationHolder />
       </GestureHandlerRootView>
       <AppLockedOverlay />
     </View>
@@ -111,8 +103,8 @@ let currTheme =
     : SettingsService.getProperty("lighTheme");
 useThemeEngineStore.getState().setTheme(currTheme);
 
-export const withTheme = (Element: (props: any) => JSX.Element) => {
-  return function AppWithThemeProvider(props: any) {
+export const withTheme = (Element: () => JSX.Element) => {
+  return function AppWithThemeProvider() {
     const [colorScheme, darkTheme, lightTheme] = useThemeStore((state) => [
       state.colorScheme,
       state.darkTheme,
@@ -131,14 +123,13 @@ export const withTheme = (Element: (props: any) => JSX.Element) => {
           })
           .then((theme) => {
             if (theme) {
+              console.log(theme.version, "theme updated");
               theme.colorScheme === "dark"
                 ? useThemeStore.getState().setDarkTheme(theme)
                 : useThemeStore.getState().setLightTheme(theme);
             }
           })
-          .catch(() => {
-            /* empty */
-          });
+          .catch(console.log);
       }, 1000);
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -153,7 +144,7 @@ export const withTheme = (Element: (props: any) => JSX.Element) => {
 
     return (
       <I18nProvider i18n={i18n}>
-        <Element {...props} />
+        <Element />
       </I18nProvider>
     );
   };

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

@@ -126,6 +126,7 @@ export async function setAppLockVerificationCipher(appLockPassword: string) {
     DatabaseLogger.info("setAppLockVerificationCipher");
   } catch (e) {
     DatabaseLogger.error(e);
+    console.log(e);
   }
 }
 
@@ -158,77 +159,79 @@ export function clearDatabaseKey() {
 
 export async function getDatabaseKey(appLockPassword?: string) {
   if (DB_KEY) return DB_KEY;
-  if (appLockPassword) {
-    const databaseKeyCipher: Cipher = CipherStorage.getMap("databaseKeyCipher");
-    const databaseKey = await decrypt(
-      {
-        password: appLockPassword
-      },
-      databaseKeyCipher
-    );
-    DatabaseLogger.info("Getting database key from cipher");
-    DB_KEY = databaseKey;
-  }
+  try {
+    if (appLockPassword) {
+      const databaseKeyCipher: Cipher =
+        CipherStorage.getMap("databaseKeyCipher");
+      const databaseKey = await decrypt(
+        {
+          password: appLockPassword
+        },
+        databaseKeyCipher
+      );
+      DatabaseLogger.info("Getting database key from cipher");
+      DB_KEY = databaseKey;
+    }
 
-  if (!DB_KEY) {
-    const hasKey = await Keychain.hasInternetCredentials(KEYCHAIN_SERVER_DBKEY);
-    if (hasKey) {
-      const credentials = await Keychain.getInternetCredentials(
+    if (!DB_KEY) {
+      const hasKey = await Keychain.hasInternetCredentials(
         KEYCHAIN_SERVER_DBKEY
       );
+      if (hasKey) {
+        const credentials = await Keychain.getInternetCredentials(
+          KEYCHAIN_SERVER_DBKEY
+        );
 
-      DatabaseLogger.info("Getting database key from Keychain");
-      DB_KEY = (credentials as Keychain.UserCredentials).password;
+        DatabaseLogger.info("Getting database key from Keychain");
+        DB_KEY = (credentials as Keychain.UserCredentials).password;
+      }
     }
-  }
 
-  if (!DB_KEY) {
-    DatabaseLogger.info("Generating new database key");
-    const password = generatePassword();
-    const derivedDatabaseKey = await Sodium.deriveKey(
-      password,
-      NOTESNOOK_DB_KEY_SALT
-    );
+    if (!DB_KEY) {
+      DatabaseLogger.info("Generating new database key");
+      const password = generatePassword();
+      const derivedDatabaseKey = await Sodium.deriveKey(
+        password,
+        NOTESNOOK_DB_KEY_SALT
+      );
 
-    DB_KEY = derivedDatabaseKey.key as string;
+      DB_KEY = derivedDatabaseKey.key as string;
 
-    await Keychain.setInternetCredentials(
-      KEYCHAIN_SERVER_DBKEY,
-      "notesnook",
-      DB_KEY,
-      KEYSTORE_CONFIG
-    );
-  }
-
-  if (await Keychain.hasInternetCredentials("notesnook")) {
-    const userKeyCredentials = await Keychain.getInternetCredentials(
-      "notesnook"
-    );
-
-    if (userKeyCredentials) {
-      const userKeyCipher: Cipher = (await encrypt(
-        {
-          key: DB_KEY,
-          salt: NOTESNOOK_DB_KEY_SALT
-        },
-        userKeyCredentials.password
-      )) as Cipher;
-      // Store encrypted user key in MMKV
-      MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
-      await Keychain.resetInternetCredentials("notesnook");
+      await Keychain.setInternetCredentials(
+        KEYCHAIN_SERVER_DBKEY,
+        "notesnook",
+        DB_KEY,
+        KEYSTORE_CONFIG
+      );
     }
-    DatabaseLogger.info("Migrated user credentials to cipher storage");
-  }
 
-  if (!DB_KEY) {
-    throw new Error(
-      `Failed to get database key, ${await Keychain.hasInternetCredentials(
-        KEYCHAIN_SERVER_DBKEY
-      )}`
-    );
-  }
+    if (await Keychain.hasInternetCredentials("notesnook")) {
+      const userKeyCredentials = await Keychain.getInternetCredentials(
+        "notesnook"
+      );
 
-  return DB_KEY;
+      if (userKeyCredentials) {
+        const userKeyCipher: Cipher = (await encrypt(
+          {
+            key: DB_KEY,
+            salt: NOTESNOOK_DB_KEY_SALT
+          },
+          userKeyCredentials.password
+        )) as Cipher;
+        // Store encrypted user key in MMKV
+        MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
+        await Keychain.resetInternetCredentials("notesnook");
+      }
+      DatabaseLogger.info("Migrated user credentials to cipher storage");
+    }
+
+    return DB_KEY;
+  } catch (e) {
+    ToastManager.error(e as Error, "Error getting database key");
+    console.log(e, "error");
+    DatabaseLogger.error(e);
+    return null;
+  }
 }
 
 export async function deriveCryptoKeyFallback(data: SerializedKey) {
@@ -309,6 +312,7 @@ export async function getCryptoKey() {
 
     return key;
   } catch (e) {
+    console.log("getCryptoKey", e);
     DatabaseLogger.error(e);
   }
 }

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

@@ -39,6 +39,8 @@ export async function setupDatabase(password?: string) {
   const key = await getDatabaseKey(password);
   if (!key) throw new Error(strings.databaseSetupFailed());
 
+  console.log("Opening database with key:", !!key);
+
   database.host({
     API_HOST: "https://api.notesnook.com",
     AUTH_HOST: "https://auth.streetwriters.co",

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

@@ -27,9 +27,13 @@ import RNFetchBlob from "react-native-blob-util";
  */
 export async function compressToBase64(path, type) {
   const { width: screenWidth, scale } = Dimensions.get("window");
-
+  console.log("COMPRESSING TO BASE64...");
   return new Promise((resolve) => {
+    console.log(path, "image path...");
+
     Image.getSize(path, async (width) => {
+      console.log("image width", width);
+
       const response = await ImageResizer.createResizedImage(
         path,
         screenWidth * scale,
@@ -51,12 +55,10 @@ export async function compressToBase64(path, type) {
           : response.uri,
         "base64"
       );
-      RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(() => {
-        /* empty */
-      });
-      RNFetchBlob.fs.unlink(response.uri.replace("file://", "")).catch(() => {
-        /* empty */
-      });
+      RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(console.log);
+      RNFetchBlob.fs
+        .unlink(response.uri.replace("file://", ""))
+        .catch(console.log);
 
       resolve(base64);
     });
@@ -78,8 +80,6 @@ export async function compressToFile(path, type) {
       onlyScaleDown: true
     }
   );
-  RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(() => {
-    /* empty */
-  });
+  RNFetchBlob.fs.unlink(path.replace("file://", "")).catch(console.log);
   return response.uri;
 }

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

@@ -83,9 +83,7 @@ export async function downloadAttachments(attachmentIds: string[]) {
 
   const isCancelled = () => {
     if (useAttachmentStore.getState().downloading?.[groupId]?.canceled) {
-      RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
-        /* empty */
-      });
+      RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
       useAttachmentStore.getState().setDownloading({
         groupId,
         current: 0,
@@ -190,13 +188,9 @@ export async function downloadAttachments(attachmentIds: string[]) {
     ToastManager.error(e as Error, "Error zipping attachments");
   }
   // Remove source & zip file from cache.
-  RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
-    /* empty */
-  });
+  RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
   if (Platform.OS === "android") {
-    RNFetchBlob.fs.unlink(zipOutputFile).catch(() => {
-      /* empty */
-    });
+    RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
   }
 }
 
@@ -327,14 +321,10 @@ export default async function downloadAttachment(
     if (attachment.dateUploaded) {
       RNFetchBlob.fs
         .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
-        .catch(() => {
-          /* empty */
-        });
+        .catch(console.log);
       RNFetchBlob.fs
         .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}_dcache`)
-        .catch(() => {
-          /* empty */
-        });
+        .catch(console.log);
     }
 
     useAttachmentStore.getState().setDownloading({

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

@@ -123,9 +123,7 @@ export async function downloadFile(
     cancelToken.cancel = async (reason) => {
       useAttachmentStore.getState().remove(filename);
       request.cancel();
-      RNFetchBlob.fs.unlink(tempFilePath).catch(() => {
-        /* empty */
-      });
+      RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
       DatabaseLogger.log(`Download cancelled: ${reason} ${filename}`);
     };
 
@@ -144,9 +142,7 @@ export async function downloadFile(
     useAttachmentStore.getState().remove(filename);
 
     if (await exists(originalFilePath)) {
-      await RNFetchBlob.fs.unlink(originalFilePath).catch(() => {
-        /* empty */
-      });
+      await RNFetchBlob.fs.unlink(originalFilePath).catch(console.log);
     }
 
     await RNFetchBlob.fs.mv(tempFilePath, originalFilePath);
@@ -173,12 +169,8 @@ export async function downloadFile(
     }
 
     useAttachmentStore.getState().remove(filename);
-    RNFetchBlob.fs.unlink(tempFilePath).catch(() => {
-      /* empty */
-    });
-    RNFetchBlob.fs.unlink(originalFilePath).catch(() => {
-      /* empty */
-    });
+    RNFetchBlob.fs.unlink(tempFilePath).catch(console.log);
+    RNFetchBlob.fs.unlink(originalFilePath).catch(console.log);
     DatabaseLogger.error(e, "Download failed: ", {
       url
     });
@@ -196,7 +188,7 @@ export async function checkAttachment(hash: string) {
 
   try {
     const size = await getUploadedFileSize(hash);
-
+    console.log("File Size", size);
     if (size === -1) return { success: true };
 
     if (size === 0)

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

@@ -60,9 +60,7 @@ export async function readEncrypted<TOutputFormat extends DataFormat>(
 
     return output as Output<TOutputFormat>;
   } catch (e) {
-    RNFetchBlob.fs.unlink(path).catch(() => {
-      /* empty */
-    });
+    RNFetchBlob.fs.unlink(path).catch(console.log);
     DatabaseLogger.error(e);
   }
 }
@@ -92,9 +90,8 @@ export async function writeEncryptedBase64(
     type: "url"
   });
 
-  RNFetchBlob.fs.unlink(filepath).catch(() => {
-    /* empty */
-  });
+  RNFetchBlob.fs.unlink(filepath).catch(console.log);
+  console.log("encrypted file output: ", output);
 
   return {
     ...output,
@@ -109,9 +106,7 @@ export async function deleteFile(
   await createCacheDir();
   const localFilePath = cacheDir + `/${filename}`;
   if (!requestOptions) {
-    RNFetchBlob.fs.unlink(localFilePath).catch(() => {
-      /* empty */
-    });
+    RNFetchBlob.fs.unlink(localFilePath).catch(console.log);
     return true;
   }
 
@@ -122,9 +117,7 @@ export async function deleteFile(
     const status = response.info().status;
     const ok = status >= 200 && status < 300;
     if (ok) {
-      RNFetchBlob.fs.unlink(localFilePath).catch(() => {
-        /* empty */
-      });
+      RNFetchBlob.fs.unlink(localFilePath).catch(console.log);
     }
     return ok;
   } catch (e) {
@@ -141,14 +134,10 @@ export async function clearFileStorage() {
     const oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
 
     for (const file of files) {
-      await RNFetchBlob.fs.unlink(cacheDir + `/${file}`).catch(() => {
-        /* empty */
-      });
+      await RNFetchBlob.fs.unlink(cacheDir + `/${file}`).catch(console.log);
     }
     for (const file of oldCache) {
-      await RNFetchBlob.fs.unlink(cacheDirOld + `/${file}`).catch(() => {
-        /* empty */
-      });
+      await RNFetchBlob.fs.unlink(cacheDirOld + `/${file}`).catch(console.log);
     }
   } catch (e) {
     DatabaseLogger.error(e, "clearFileStorage");
@@ -172,19 +161,20 @@ export async function migrateFilesFromCache() {
     const migratedFilesPath = cacheDir + "/.migrated_1";
     const migrated = await RNFetchBlob.fs.exists(migratedFilesPath);
     if (migrated) {
+      console.log("Files migrated already");
       return;
     }
 
     const files = await RNFetchBlob.fs.ls(cacheDir);
+    console.log("Files to migrate:", files.join(","));
 
     const oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
     for (const file of oldCache) {
       if (file.startsWith("org.") || file.startsWith("com.")) continue;
       RNFetchBlob.fs
         .mv(cacheDirOld + `/${file}`, cacheDir + `/${file}`)
-        .catch(() => {
-          /* empty */
-        });
+        .catch(console.log);
+      console.log("Moved", file);
     }
     await RNFetchBlob.fs.createFile(migratedFilesPath, "1", "utf8");
   } catch (e) {
@@ -193,17 +183,13 @@ export async function migrateFilesFromCache() {
 }
 
 export async function clearCache() {
-  await RNFetchBlob.fs.unlink(cacheDir).catch(() => {
-    /* empty */
-  });
+  await RNFetchBlob.fs.unlink(cacheDir).catch(console.log);
   await createCacheDir();
   eSendEvent("cache-cleared");
 }
 
 export async function deleteCacheFileByPath(path: string) {
-  await RNFetchBlob.fs.unlink(path).catch(() => {
-    /* empty */
-  });
+  await RNFetchBlob.fs.unlink(path).catch(console.log);
 }
 
 export async function deleteCacheFileByName(name: string) {
@@ -212,21 +198,15 @@ export async function deleteCacheFileByName(name: string) {
       ? await (RNFetchBlob.fs as any).pathForAppGroup(IOS_APPGROUPID)
       : null;
   const appGroupPath = `${iosAppGroup}/${name}`;
-  await RNFetchBlob.fs.unlink(appGroupPath).catch(() => {
-    /* empty */
-  });
-  await RNFetchBlob.fs.unlink(`${cacheDir}/${name}`).catch(() => {
-    /* empty */
-  });
+  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") || file.startsWith("NN_")) {
-      await RNFetchBlob.fs.unlink(file).catch(() => {
-        /* empty */
-      });
+    if (file.includes("_dcache")) {
+      await RNFetchBlob.fs.unlink(file).catch(console.log);
     }
   }
 }
@@ -265,9 +245,7 @@ export async function exists(filename: string) {
       );
       RNFetchBlob.fs
         .unlink(existsInAppGroup ? appGroupPath : path)
-        .catch(() => {
-          /* empty */
-        });
+        .catch(console.log);
       return false;
     }
 
@@ -303,7 +281,7 @@ export async function getCacheSize() {
   await createCacheDir();
   const stat = await RNFetchBlob.fs.lstat(`file://` + cacheDir);
   let total = 0;
-
+  console.log("Total files", stat.length);
   stat.forEach((file) => {
     total += parseInt(file.size as unknown as string);
   });

apps/mobile/app/common/logger/index.ts

@@ -17,7 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-function info(context: string, ...logs: unknown[]) {}
+function info(context: string, ...logs: unknown[]) {
+  console.log(`${new Date().toLocaleDateString()}::info::${context}:`, ...logs);
+}
 
 function error(context: string, ...logs: unknown[]) {
   console.log(

apps/mobile/app/components/announcements/cta.js

@@ -41,9 +41,7 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
       await sleep(500);
     }
     if (item.type === "link") {
-      Linking.openURL(item.data).catch(() => {
-        /* empty */
-      });
+      Linking.openURL(item.data).catch(console.log);
     } else if (item.type === "promo") {
       presentSheet({
         component: (

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

@@ -528,9 +528,7 @@ export const AttachmentDialog = ({
                         setAttachments(results);
                         setLoading(false);
                       })
-                      .catch(() => {
-                        /* empty */
-                      });
+                      .catch(console.log);
                   }}
                 />
               )

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

@@ -88,6 +88,7 @@ export const ChangePassword = () => {
       await sleep(300);
       eSendEvent(eOpenRecoveryKeyDialog);
     } catch (e) {
+      console.log(e.stack);
       setLoading(false);
       ToastManager.show({
         heading: strings.passwordChangeFailed(),

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

@@ -70,7 +70,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
       switch (step) {
         case LoginSteps.emailAuth: {
           const mfaInfo = await db.user.authenticateEmail(email.current);
-
+          console.log("email auth", mfaInfo);
           if (mfaInfo) {
             TwoFactorVerification.present(
               async (mfa, callback) => {

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

@@ -75,9 +75,9 @@ const BaseDialog = ({
   background
 }: BaseDialogProps) => {
   const floating = useIsFloatingKeyboard();
+  const appState = useAppState();
   const lockEvents = useRef(false);
   const [internalVisible, setIntervalVisible] = useState(true);
-  const locked = useUserStore((state) => state.appLocked);
 
   useEffect(() => {
     return () => {
@@ -86,20 +86,26 @@ const BaseDialog = ({
   }, []);
 
   useEffect(() => {
-    if (locked) {
-      setIntervalVisible(false);
-      lockEvents.current = true;
-      const unsub = useUserStore.subscribe((state) => {
-        if (!state.appLocked) {
-          setIntervalVisible(true);
-          unsub();
-          setTimeout(() => {
-            lockEvents.current = false;
+    if (useUserStore.getState().disableAppLockRequests) return;
+
+    if (SettingsService.canLockAppInBackground()) {
+      if (appState === "background") {
+        setIntervalVisible(false);
+        if (useUserStore.getState().appLocked) {
+          lockEvents.current = true;
+          const unsub = useUserStore.subscribe((state) => {
+            if (!state.appLocked) {
+              setIntervalVisible(true);
+              unsub();
+              setTimeout(() => {
+                lockEvents.current = false;
+              });
+            }
           });
         }
-      });
+      }
     }
-  }, [locked]);
+  }, [appState]);
 
   const Wrapper = useSafeArea ? SafeAreaView : View;
 

apps/mobile/app/components/dialogs/attach-image-dialog/index.tsx

@@ -180,7 +180,7 @@ AttachImage.present = (response: ImageType[], context?: string) => {
           close={close}
           onAttach={(result) => {
             resolved = true;
-
+            console.log("closing");
             resolve(result);
             close?.();
           }}

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

@@ -307,7 +307,9 @@ const PDFPreview = () => {
                     password={password}
                     maxScale={6}
                     onError={onError}
-                    onPressLink={(uri) => {}}
+                    onPressLink={(uri) => {
+                      console.log(`Link pressed: ${uri}`);
+                    }}
                     style={{
                       flex: 1,
                       width: width,

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

@@ -62,7 +62,7 @@ export default function Progress() {
       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,

apps/mobile/app/components/dialogs/vault/index.js

@@ -336,7 +336,7 @@ export class VaultDialog extends Component {
             );
           });
         }
-
+        console.log("VAULT UPDATED EVENT");
         eSendEvent("vaultUpdated");
         this.setState({
           loading: false
@@ -406,6 +406,7 @@ export class VaultDialog extends Component {
     } else {
       await db.vault.add(this.state.note.id);
 
+      console.log("update note event...");
       eSendEvent(eUpdateNoteInEditor, this.state.note, true);
 
       this.close();
@@ -542,6 +543,7 @@ export class VaultDialog extends Component {
         this.close();
       })
       .catch((e) => {
+        console.log("Error", e);
         this._takeErrorAction(e);
       });
   }

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

@@ -78,10 +78,10 @@ class ExceptionHandler extends React.Component<{
 }
 
 export const withErrorBoundry = (Element: React.ElementType, name: string) => {
-  return function ErrorBoundary(props: any) {
+  return function ErrorBoundary() {
     return (
       <ExceptionHandler component={name}>
-        <Element {...props} />
+        <Element />
       </ExceptionHandler>
     );
   };

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

@@ -54,7 +54,7 @@ export const Header = ({
   onSearch
 }: {
   onLeftMenuButtonPress?: () => void;
-  renderedInRoute?: RouteName;
+  renderedInRoute: RouteName;
   id?: string;
   title: string;
   headerRightButtons?: HeaderRightButton[];

apps/mobile/app/components/header/right-menus.tsx

@@ -41,7 +41,7 @@ export const RightMenus = ({
   onSearch
 }: {
   headerRightButtons?: HeaderRightButton[];
-  renderedInRoute?: RouteName;
+  renderedInRoute: RouteName;
   id?: string;
   onPressDefaultRightButton?: () => void;
   search?: boolean;

apps/mobile/app/components/header/title.tsx

@@ -41,7 +41,7 @@ export const Title = ({
   isHiddenOnRender?: boolean;
   accentColor?: string;
   isBeta?: boolean;
-  renderedInRoute?: string;
+  renderedInRoute: string;
   id?: string;
 }) => {
   const { colors } = useThemeColors();

apps/mobile/app/components/image-preview/index.tsx

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import Sodium from "@ammarahmed/react-native-sodium";
-import { DataURL, getFileNameWithExtension } from "@notesnook/core";
+import { DataURL } from "@notesnook/core";
 import type { ImageAttributes } from "@notesnook/editor";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
@@ -34,11 +34,6 @@ import {
 import BaseDialog from "../dialog/base-dialog";
 import { IconButton } from "../ui/icon-button";
 import { ProgressBarComponent } from "../ui/svg/lazy";
-import RNFetchBlob from "react-native-blob-util";
-import Share from "react-native-share";
-import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
-import { useSettingStore } from "../../stores/use-setting-store";
-
 const ImagePreview = () => {
   const { colors } = useThemeColors("dialog");
 
@@ -46,8 +41,6 @@ const ImagePreview = () => {
   const [image, setImage] = useState<string>();
   const [loading, setLoading] = useState(false);
   const imageRef = useRef<ImageAttributes>();
-  const insets = useGlobalSafeAreaInsets();
-  const [showHeader, setShowHeader] = useState(true);
 
   useEffect(() => {
     eSubscribeEvent("ImagePreview", open);
@@ -80,86 +73,16 @@ const ImagePreview = () => {
         silent: true,
         cache: true
       });
-
-      if (!uri) {
-        setLoading(false);
-        return;
-      }
-      const attachment = await db.attachments.attachment(hash);
-      const path = `${cacheDir}/${
-        "NN_" + (await getFileNameWithExtension(hash, attachment?.mimeType))
-      }`;
-      await RNFetchBlob.fs.mv(`${cacheDir}/${uri}`, path).catch(() => {
-        /* empty */
-      });
+      const path = `${cacheDir}/${uri}`;
       setImage("file://" + path);
       setLoading(false);
     }, 100);
   };
 
-  const close = React.useCallback(() => {
-    image &&
-      RNFetchBlob.fs.unlink(image.replace("file://", "")).catch(() => {
-        /* empty */
-      });
+  const close = () => {
     setImage(undefined);
     setVisible(false);
-  }, [image]);
-
-  const renderHeader = React.useCallback(
-    () => (
-      <View
-        style={{
-          paddingTop: insets.top,
-          backgroundColor: "rgba(0,0,0,0.3)",
-          position: "absolute",
-          zIndex: 999,
-          display: showHeader ? "flex" : "none"
-        }}
-      >
-        <View
-          style={{
-            flexDirection: "row",
-            width: "100%",
-            justifyContent: "flex-end",
-            alignItems: "center",
-            height: 50,
-            paddingHorizontal: 12,
-            gap: 10
-          }}
-        >
-          <IconButton
-            name="share"
-            color="white"
-            style={{
-              borderWidth: 0
-            }}
-            onPress={async () => {
-              useSettingStore
-                .getState()
-                .setAppDidEnterBackgroundForAction(true);
-              await Share.open({
-                url: image
-              }).catch(() => {
-                /* empty */
-              });
-              useSettingStore
-                .getState()
-                .setAppDidEnterBackgroundForAction(false);
-            }}
-          />
-          <IconButton
-            name="close"
-            color="white"
-            onPress={() => {
-              close();
-            }}
-          />
-        </View>
-      </View>
-    ),
-    [close, image, insets.top, showHeader]
-  );
+  };
 
   return (
     visible && (
@@ -167,7 +90,6 @@ const ImagePreview = () => {
         background="black"
         animation="slide"
         visible={true}
-        useSafeArea={false}
         onRequestClose={close}
         transparent
       >
@@ -208,25 +130,43 @@ const ImagePreview = () => {
               />
             </View>
           ) : (
-            <>
-              <ImageViewer
-                enableImageZoom={true}
-                renderIndicator={() => <></>}
-                enableSwipeDown
-                useNativeDriver
-                onSwipeDown={close}
-                saveToLocalByLongPress={false}
-                onClick={() => {
-                  setShowHeader(!showHeader);
-                }}
-                renderHeader={renderHeader}
-                imageUrls={[
-                  {
-                    url: image as string
-                  }
-                ]}
-              />
-            </>
+            <ImageViewer
+              enableImageZoom={true}
+              renderIndicator={() => <></>}
+              enableSwipeDown
+              useNativeDriver
+              onSwipeDown={close}
+              saveToLocalByLongPress={false}
+              renderHeader={() => (
+                <View
+                  style={{
+                    flexDirection: "row",
+                    width: "100%",
+                    justifyContent: "flex-end",
+                    alignItems: "center",
+                    height: 50,
+                    paddingHorizontal: 24,
+                    position: "absolute",
+                    zIndex: 999,
+                    backgroundColor: "rgba(0,0,0,0.3)",
+                    marginTop: Platform.OS === "android" ? 30 : 0
+                  }}
+                >
+                  <IconButton
+                    name="close"
+                    color="white"
+                    onPress={() => {
+                      close();
+                    }}
+                  />
+                </View>
+              )}
+              imageUrls={[
+                {
+                  url: image as string
+                }
+              ]}
+            />
           )}
         </View>
       </BaseDialog>

apps/mobile/app/components/list/list-item.wrapper.tsx

@@ -153,7 +153,9 @@ export function ListItemWrapper(props: ListItemWrapperProps) {
           },
           items?.cacheItem(index) ? 100 : 0
         );
-      } catch (e) {}
+      } catch (e) {
+        console.log("Error", e);
+      }
     })();
   }, [index, items, refreshItem]);
 

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

@@ -119,6 +119,7 @@ export const PricingPlans = ({
       setLoading(false);
     } catch (e) {
       setLoading(false);
+      console.log("error getting sku", e);
     }
   }, [promo?.promoCode]);
 
@@ -170,6 +171,7 @@ export const PricingPlans = ({
       });
       return true;
     } catch (e) {
+      console.log("PROMOCODE ERROR:", code, e);
       return false;
     }
   };
@@ -229,6 +231,7 @@ export const PricingPlans = ({
       });
     } catch (e) {
       setBuying(false);
+      console.log(e);
     }
   };
 

apps/mobile/app/components/sheets/add-notebook/index.tsx

@@ -100,6 +100,7 @@ export const AddNotebookSheet = ({
     eSendEvent(eOnNotebookUpdated, parent);
     if (notebook) {
       setImmediate(() => {
+        console.log(parent, notebook.id);
         eSendEvent(eOnNotebookUpdated, notebook.id);
       });
     }

apps/mobile/app/components/sheets/add-to/notebook-item.tsx

@@ -90,12 +90,13 @@ export const NotebookItem = ({
       for (const key in keys) {
         nextState[key] = !state.initialState[key] ? undefined : "deselected";
       }
-
+      console.log("Single item selection");
       state.setSelection({
         [item.id]: "selected",
         ...nextState
       });
     } else {
+      console.log("Multi item selection");
       state.markAs(item, "selected");
     }
   };

apps/mobile/app/components/sheets/export-notes/index.tsx

@@ -333,17 +333,13 @@ const ExportNotesSheet = ({
                     if (Platform.OS === "ios") {
                       Share.open({
                         url: result?.fileDir + result.fileName
-                      }).catch(() => {
-                        /* empty */
-                      });
+                      }).catch(console.log);
                     } else {
                       FileViewer.open(result.filePath, {
                         showOpenWithDialog: true,
                         showAppsSuggestions: true,
                         shareFile: true
-                      } as any).catch(() => {
-                        /* empty */
-                      });
+                      } as any).catch(console.log);
                     }
                   }}
                 />

apps/mobile/app/components/sheets/export-notes/share.jsx

@@ -62,9 +62,7 @@ export const ShareComponent = ({ uri, name, padding }) => {
             showOpenWithDialog: true,
             showAppsSuggestions: true,
             shareFile: true
-          }).catch(() => {
-            /* empty */
-          });
+          }).catch(console.log);
         }}
       />
     </View>

apps/mobile/app/components/sheets/manage-tags/index.tsx

@@ -113,9 +113,11 @@ const ManageTagsSheet = (props: {
         .sorted()
         .then((items) => {
           setTags(items);
+          console.log("searched tags");
         });
     } else {
       db.tags.all.sorted(db.settings.getGroupOptions("tags")).then((items) => {
+        console.log("items loaded tags", items.placeholders.length);
         setTags(items);
       });
     }

apps/mobile/app/components/sheets/recovery-key/index.jsx

@@ -191,17 +191,13 @@ class RecoveryKeySheet extends React.Component {
         Share.open({
           url: path,
           failOnCancel: false
-        }).catch(() => {
-          /* empty */
-        });
+        }).catch(console.log);
       } else {
         FileViewer.open(path, {
           showOpenWithDialog: true,
           showAppsSuggestions: true,
           shareFile: true
-        }).catch(() => {
-          /* empty */
-        });
+        }).catch(console.log);
       }
     } catch (e) {
       console.error(e);

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

@@ -273,7 +273,7 @@ const ListNoteItem = ({
     listType,
     noteInternalLinks.length
   ]);
-
+  console.log(noteInternalLinks);
   const renderBlock = React.useCallback(
     (block: ContentBlock) => (
       <ListBlockItem
@@ -419,6 +419,7 @@ export const ReferencesList = ({ item, close }: ReferencesListProps) => {
         id={index}
         items={items}
         onSelect={(note, blockId) => {
+          console.log(note.id, blockId);
           eSendEvent(eOnLoadNote, {
             item: note,
             blockId: blockId

apps/mobile/app/components/sheets/sort/index.js

@@ -38,7 +38,7 @@ const Sort = ({ type, screen }) => {
   );
   const updateGroupOptions = async (_groupOptions) => {
     const groupType = screen === "Notes" ? "home" : type + "s";
-
+    console.log("updateGroupOptions for group", groupType, "in", screen);
     await db.settings.setGroupOptions(groupType, _groupOptions);
     setGroupOptions(_groupOptions);
     setTimeout(() => {

apps/mobile/app/components/sheets/update/index.js

@@ -215,9 +215,7 @@ export const Update = ({ version: appVersion, fwdRef }) => {
               marginTop: 10
             }}
             onPress={() => {
-              Linking.openURL(GITHUB_PAGE_URL).catch(() => {
-                /* empty */
-              });
+              Linking.openURL(GITHUB_PAGE_URL).catch(console.log);
             }}
           >
             {strings.readReleaseNotes()}

apps/mobile/app/components/ui/sheet/index.js

@@ -59,9 +59,8 @@ const SheetWrapper = ({
   const smallTablet = deviceMode === "smallTablet";
   const dimensions = useSettingStore((state) => state.dimensions);
   const insets = useGlobalSafeAreaInsets();
+  const appState = useAppState();
   const lockEvents = useRef(false);
-  const locked = useUserStore((state) => state.appLocked);
-
   let width = dimensions.width > 600 ? 600 : 500;
 
   const style = React.useMemo(() => {
@@ -100,21 +99,24 @@ const SheetWrapper = ({
   };
 
   useEffect(() => {
-    if (locked) {
-      const ref = fwdRef || localRef;
-      ref?.current?.hide();
-      if (useUserStore.getState().appLocked) {
-        lockEvents.current = true;
-        const unsub = useUserStore.subscribe((state) => {
-          if (!state.appLocked) {
-            ref?.current?.show();
-            unsub();
-            lockEvents.current = false;
-          }
-        });
+    if (useUserStore.getState().disableAppLockRequests) return;
+    if (SettingsService.canLockAppInBackground()) {
+      if (appState === "background") {
+        const ref = fwdRef || localRef;
+        ref?.current?.hide();
+        if (useUserStore.getState().appLocked) {
+          lockEvents.current = true;
+          const unsub = useUserStore.subscribe((state) => {
+            if (!state.appLocked) {
+              ref?.current?.show();
+              unsub();
+              lockEvents.current = false;
+            }
+          });
+        }
       }
     }
-  }, [locked, fwdRef]);
+  }, [appState, fwdRef]);
 
   return (
     <ScopedThemeProvider value="sheet">

apps/mobile/app/components/walkthroughs/walkthroughs.tsx

@@ -315,9 +315,7 @@ const trialstarted: { id: string; steps: TStep[] } = {
       actionButton: {
         text: strings.joinDiscord(),
         action: () => {
-          Linking.openURL("https://discord.gg/zQBK97EE22").catch(() => {
-            /* empty */
-          });
+          Linking.openURL("https://discord.gg/zQBK97EE22").catch(console.log);
         }
       }
     }
@@ -368,9 +366,7 @@ const Support = () => {
           width: "90%"
         }}
         onPress={() => {
-          Linking.openURL("https://discord.gg/zQBK97EE22").catch(() => {
-            /* empty */
-          });
+          Linking.openURL("https://discord.gg/zQBK97EE22").catch(console.log);
         }}
         icon="discord"
         type="secondary"
@@ -384,9 +380,7 @@ const Support = () => {
           width: "90%"
         }}
         onPress={() => {
-          Linking.openURL("https://t.me/notesnook").catch(() => {
-            /* empty */
-          });
+          Linking.openURL("https://t.me/notesnook").catch(console.log);
         }}
         icon="telegram"
         type="secondary"

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

@@ -66,7 +66,6 @@ import {
   eSubscribeEvent,
   presentSheet
 } from "../services/event-manager";
-import { IntentService } from "../services/intent";
 import {
   clearMessage,
   setEmailVerifyMessage,
@@ -149,6 +148,7 @@ const onUploadedAttachmentProgress = (data: any) => {
 };
 
 const onUserSessionExpired = async () => {
+  console.log("LOGGED OUT USER....");
   SettingsService.set({
     sessionExpired: true
   });
@@ -254,7 +254,9 @@ async function checkForShareExtensionLaunchedInBackground() {
       if (note) setTimeout(() => eSendEvent("loadingNote", note), 1);
       MMKV.removeItem("shareExtensionOpened");
     }
-  } catch (e) {}
+  } catch (e) {
+    console.log(e);
+  }
 }
 
 async function saveEditorState() {
@@ -500,9 +502,7 @@ export const useAppEvents = () => {
       }
 
       if (SettingsService.getProperty("offlineMode")) {
-        db.attachments.cacheAttachments().catch(() => {
-          /* empty */
-        });
+        db.attachments.cacheAttachments().catch(console.log);
       }
     }
   }, []);
@@ -550,6 +550,7 @@ export const useAppEvents = () => {
           });
         }
       } catch (e) {
+        console.log(e);
         ToastManager.error(e as Error, "Error updating user", "global");
       }
 
@@ -644,7 +645,6 @@ export const useAppEvents = () => {
 
     const emitterSubscriptions = [
       Linking.addEventListener("url", onAppOpenedFromURL),
-
       SodiumEventEmitter.addListener(
         "onSodiumProgress",
         onFileEncryptionProgress
@@ -695,10 +695,6 @@ export const useAppEvents = () => {
           // Reset the editor if the app has been in background for more than 10 minutes.
           eSendEvent(eEditorReset);
         }
-
-        setTimeout(async () => {
-          IntentService.onAppStateChanged();
-        }, 100);
       } else {
         await saveEditorState();
         if (
@@ -783,7 +779,9 @@ export const useAppEvents = () => {
   useEffect(() => {
     if (!appLocked && isAppLoading) {
       initializeLogger()
-        .catch((e) => {})
+        .catch((e) => {
+          console.log(e);
+        })
         .finally(() => {
           //@ts-ignore
           initializeDatabase();

apps/mobile/app/hooks/use-db-item.ts

@@ -196,6 +196,7 @@ export const useTotalNotes = (type: "notebook" | "tag" | "color") => {
           }
           setTotalNotesById(totalNotesById);
         });
+      console.log("useTotalNotes.getTotalNotes");
     },
     [type]
   );

apps/mobile/app/hooks/use-group-options.ts

@@ -31,7 +31,7 @@ export function useGroupOptions(type: any) {
     const onUpdate = (groupType: string) => {
       if (groupType !== type) return;
       const options = db.settings?.getGroupOptions(type) as any;
-
+      console.log("useGroupOptions.onUpdate", type, options);
       if (
         groupOptions?.groupBy !== options.groupBy ||
         groupOptions?.sortBy !== options.sortBy ||

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

@@ -74,8 +74,10 @@ export const useNotebook = (
     };
 
     const onUpdate = (type: string) => {
+      console.log("event", type);
       if (type !== "notebooks") return;
       onRequestUpdate();
+      console.log("useNotebook.onUpdate", item?.id, Date.now());
     };
 
     eSubscribeEvent(eGroupOptionsUpdated, onUpdate);

apps/mobile/app/navigation/navigation-stack.js

@@ -45,9 +45,6 @@ import { useSelectionStore } from "../stores/use-selection-store";
 import { useSettingStore } from "../stores/use-setting-store";
 import { rootNavigatorRef } from "../utils/global-refs";
 import { strings } from "@notesnook/intl";
-import { IntentService } from "../services/intent";
-import ReminderSheet from "../components/sheets/reminder";
-import { db } from "../common/database";
 
 const NativeStack = createNativeStackNavigator();
 const IntroStack = createNativeStackNavigator();
@@ -79,24 +76,12 @@ const _Tabs = () => {
   const introCompleted = useSettingStore(
     (state) => state.settings.introCompleted
   );
-
   const height = useSettingStore((state) => state.dimensions.height);
   const insets = useGlobalSafeAreaInsets();
   const screenHeight = height - (50 + insets.top + insets.bottom);
   React.useEffect(() => {
-    setTimeout(async () => {
+    setTimeout(() => {
       useNavigationStore.getState().update(homepage);
-      const intent = IntentService.getLaunchIntent();
-      if (intent && intent["com.streetwriters.notesnook.OpenReminderId"]) {
-        const reminder = await db.reminders.reminder(
-          intent["com.streetwriters.notesnook.OpenReminderId"]
-        );
-        if (reminder) {
-          ReminderSheet.present(reminder);
-        }
-      } else if (intent["com.streetwriters.notesnook.NewReminder"]) {
-        ReminderSheet.present();
-      }
     }, 1000);
   }, [homepage]);
 

apps/mobile/app/package.json

@@ -9,13 +9,13 @@
     "@streetwriters/showdown": "^3.0.1-alpha.2",
     "absolutify": "^0.1.0",
     "buffer": "^6.0.3",
+    "dayjs": "^1.10.4",
     "deprecated-react-native-prop-types": "^4.1.0",
     "entities": "^3.0.1",
     "fflate": "^0.7.3",
     "html-to-text": "9.0.5",
     "phone": "^3.1.14",
     "qclone": "^1.2.0",
-    "dayjs": "^1.11.13",
     "react-native-actions-sheet": "0.9.7",
     "react-native-drax": "^0.10.2",
     "react-native-image-zoom-viewer": "^3.0.1",
@@ -36,8 +36,8 @@
     "@streetwriters/kysely": "^0.27.4",
     "pathe": "1.1.2",
     "react-native-format-currency": "0.0.5",
-    "@lingui/core": "5.1.2",
-    "@lingui/react": "5.1.2",
+    "@lingui/react": "4.11.2",
+    "@lingui/core": "4.11.2",
     "react-native-check-version": "^1.3.0",
     "react-native-material-menu": "^2.0.0"
   },

apps/mobile/app/screens/editor/index.tsx

@@ -229,7 +229,7 @@ const useLockedNoteHandler = () => {
     const unlockWithBiometrics = async () => {
       try {
         if (!tabRef.current?.noteLocked || !tabRef.current) return;
-
+        console.log("Trying to unlock with biometrics...");
         const credentials = await BiometricService.getCredentials(
           "Unlock note",
           "Unlock note to open it in editor."
@@ -305,6 +305,7 @@ const useLockedNoteHandler = () => {
           locked: false
         });
       } catch (e) {
+        console.log(e);
         ToastManager.show({
           heading: strings.passwordIncorrect(),
           type: "error"
@@ -323,6 +324,7 @@ const useLockedNoteHandler = () => {
           unlockWithBiometrics();
         }, 150);
       } else {
+        console.log("Biometrics unavailable.", editorState().movedAway);
         if (!editorState().movedAway) {
           setTimeout(() => {
             if (tabRef.current && tabRef.current?.locked) {

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

@@ -74,6 +74,7 @@ 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;
@@ -89,6 +90,7 @@ export function ReadonlyEditor(props: {
     } else if (editorMessage.type === EventTypes.getAttachmentData) {
       const attachment = (editorMessage.value as any).attachment as Attachment;
 
+      console.log("Getting attachment data:", attachment.hash, attachment.type);
       downloadAttachment(attachment.hash, true, {
         base64: attachment.type === "image",
         text: attachment.type === "web-clip",
@@ -113,6 +115,7 @@ export function ReadonlyEditor(props: {
           );
         })
         .catch(() => {
+          console.log("Error downloading attachment data");
           editorRef.current?.postMessage(
             JSON.stringify({
               type: EditorEvents.attachmentData,

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

@@ -43,8 +43,6 @@ import { eCloseSheet } from "../../../utils/events";
 import { useTabStore } from "./use-tab-store";
 import { editorController, editorState } from "./utils";
 import { strings } from "@notesnook/intl";
-import { useUserStore } from "../../../stores/use-user-store";
-import { sleep } from "../../../utils/time";
 
 const showEncryptionSheet = (file: DocumentPickerResponse) => {
   presentSheet({
@@ -196,7 +194,9 @@ const camera = async (options: PickerOptions) => {
           options
         );
       })
-      .catch((e) => {});
+      .catch((e) => {
+        console.log("camera error: ", e);
+      });
   } catch (e) {
     ToastManager.show({
       heading: (e as Error).message,
@@ -224,7 +224,9 @@ const gallery = async (options: PickerOptions) => {
           options
         )
       )
-      .catch((e) => {});
+      .catch((e) => {
+        console.log("gallery error: ", e);
+      });
   } catch (e) {
     useSettingStore.getState().setAppDidEnterBackgroundForAction(false);
     ToastManager.show({
@@ -232,19 +234,13 @@ const gallery = async (options: PickerOptions) => {
       type: "error",
       context: "global"
     });
+    console.log("attachment error:", e);
   }
 };
 
 const pick = async (options: PickerOptions) => {
   if (!PremiumService.get()) {
     const user = await db.user.getUser();
-    if (!user) {
-      ToastManager.show({
-        heading: strings.loginRequired(),
-        type: "error"
-      });
-      return;
-    }
     if (editorState().isFocused) {
       editorState().isFocused = true;
     }
@@ -255,7 +251,6 @@ const pick = async (options: PickerOptions) => {
     }
     return;
   }
-  useUserStore.getState().setDisableAppLockRequests(true);
   if (options?.type.startsWith("image") || options?.type === "camera") {
     if (options.type.startsWith("image")) {
       gallery(options);
@@ -272,7 +267,6 @@ const handleImageResponse = async (
   options: PickerOptions
 ) => {
   const result = await AttachImage.present(response, options.context);
-
   if (!result) return;
   const compress = result.compress;
 
@@ -316,14 +310,18 @@ const handleImageResponse = async (
         ? fileName.replace(/HEIC|HEIF/, "jpeg")
         : fileName;
 
+    console.log("attaching image...", fileName);
+
+    console.log("attaching file...");
     if (!(await attachFile(uri, hash, image.mime, fileName, options))) return;
 
     if (Platform.OS === "ios") await RNFetchBlob.fs.unlink(uri);
-
+    console.log("attaching image to note...");
     if (
       options.tabId !== undefined &&
       useTabStore.getState().getNoteIdForTab(options.tabId) === options.noteId
     ) {
+      console.log("attaching image to note...");
       editorController.current?.commands.insertImage(
         {
           hash: hash,
@@ -390,6 +388,7 @@ export async function attachFile(
       encryptionInfo.mimeType = type;
       encryptionInfo.filename = filename;
       encryptionInfo.alg = "xcha-stream";
+      encryptionInfo.size = encryptionInfo.length;
       encryptionInfo.key = key;
       if (options?.reupload && exists) {
         const attachment = await db.attachments.attachment(hash);
@@ -398,7 +397,6 @@ export async function attachFile(
     } else {
       encryptionInfo = { hash: hash };
     }
-
     await db.attachments.add(encryptionInfo);
     return true;
   } catch (e) {

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

@@ -94,5 +94,4 @@ export type AppState = {
   editing: boolean;
   movedAway: boolean;
   timestamp: number;
-  noteId?: string;
 };

apps/mobile/app/screens/editor/tiptap/use-editor-events.tsx

@@ -268,6 +268,7 @@ export const useEditorEvents = (
   }, [editor, deviceMode, fullscreen]);
 
   const onHardwareBackPress = useCallback(() => {
+    console.log(tabBarRef.current?.page());
     if (tabBarRef.current?.page() === 2) {
       onBackPress();
       return true;
@@ -573,7 +574,7 @@ export const useEditorEvents = (
           //   tabs: (editorMessage.value as any)?.tabs,
           //   currentTab: (editorMessage.value as any)?.currentTab
           // });
-          //
+          // console.log("Tabs updated");
           break;
         }
         case EventTypes.toc:
@@ -596,6 +597,14 @@ export const useEditorEvents = (
           break;
         }
         case EventTypes.tabFocused: {
+          console.log(
+            "Focused tab",
+            editorMessage.tabId,
+            editorMessage.noteId,
+            "Content:",
+            editorMessage.value
+          );
+
           eSendEvent(eEditorTabFocused, editorMessage.tabId);
 
           if (

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

@@ -46,7 +46,6 @@ import {
   eUnSubscribeEvent
 } from "../../../services/event-manager";
 import Navigation from "../../../services/navigation";
-import { NotePreviewWidget } from "../../../services/note-preview-widget";
 import Notifications from "../../../services/notifications";
 import SettingsService from "../../../services/settings";
 import { useSettingStore } from "../../../stores/use-setting-store";
@@ -153,6 +152,7 @@ export const useEditor = (
 
   useEffect(() => {
     const event = eSubscribeEvent(eEditorTabFocused, (tabId) => {
+      console.log("Editot tab focus changed", lastTabFocused.current, tabId);
       if (lastTabFocused.current !== tabId) lock.current = false;
       lastTabFocused.current = tabId as number;
     });
@@ -189,6 +189,7 @@ export const useEditor = (
 
   const reset = useCallback(
     async (tabId: number, resetState = true, resetContent = true) => {
+      console.log("Resetting tab:", tabId);
       const noteId = useTabStore.getState().getNoteIdForTab(tabId);
       if (noteId) {
         currentNotes.current?.id && db.fs().cancel(noteId);
@@ -391,13 +392,6 @@ export const useEditor = (
         }
 
         saveCount.current++;
-
-        clearTimeout(timers.current.onsave);
-        timers.current.onsave = setTimeout(async () => {
-          if (!id || !note) return;
-          NotePreviewWidget.updateNote(id, note);
-        }, 500);
-
         return id;
       } catch (e) {
         console.error(e);
@@ -444,6 +438,7 @@ export const useEditor = (
       presistTab?: boolean;
     }) => {
       if (!event) return;
+      console.log(event.item?.id, event?.item?.title, "loading note...");
 
       if (event.blockId) {
         blockIdRef.current = event.blockId;
@@ -474,7 +469,7 @@ export const useEditor = (
           overlay(false);
           return;
         }
-
+        console.log("LOADING NOTE", event.item.id);
         const item = event.item;
 
         const currentTab = useTabStore
@@ -507,6 +502,7 @@ export const useEditor = (
                 }
               }, 150);
             }
+            console.log("Note already loaded, focusing the tab");
           } else {
             if (event.presistTab) {
               // Open note in new tab.
@@ -517,7 +513,9 @@ export const useEditor = (
                 noteId: event.item.id,
                 previewTab: false
               });
+              console.log("Opening note in new tab");
             } else {
+              console.log("Opening note in preview tab");
               // Otherwise we focus the preview tab or create one to open the note in.
               useTabStore.getState().focusPreviewTab(event.item.id, {
                 readonly: event.item.readonly || readonly,
@@ -535,11 +533,11 @@ export const useEditor = (
         const tabId = event.tabId || useTabStore.getState().currentTab;
         if (lastTabFocused.current !== tabId) {
           // if ((await waitForEvent(eEditorTabFocused, 1000)) !== tabId) {
-          //
+          //   console.log("tab id did not match after focus in 1000ms");
           //   return;
           // }
           currentLoadingNoteId.current = item.id;
-
+          console.log("Waiting for tab to focus");
           return;
         }
 
@@ -557,7 +555,7 @@ export const useEditor = (
           loadingState.current === currentContents.current[item.id]?.data
         ) {
           // If note is already loading, return.
-
+          console.log("Note is already loading...");
           return;
         }
 
@@ -634,6 +632,7 @@ export const useEditor = (
           if (isDeleted(data) || isTrashItem(data)) {
             const tabId = useTabStore.getState().getTabForNote(data.id);
             if (tabId !== undefined) {
+              console.log("Removing tab");
               await commands.clearContent(tabId);
               useTabStore.getState().removeTab(tabId);
             }
@@ -916,34 +915,24 @@ export const useEditor = (
       state.current.ready = true;
     }
 
-    const appState = getAppState();
-    if (appState?.noteId) {
-      const note = await db.notes?.note(appState.noteId);
+    const noteId = useTabStore.getState().getCurrentNoteId();
+    if (!noteId) {
+      loadNote({ newNote: true });
+      if (tabBarRef.current?.page() === 1) {
+        state.current.currentlyEditing = false;
+      }
+    } else if (state.current?.initialLoadCalled) {
+      const note = currentNotes.current[noteId];
       if (note) {
         loadNote({
           item: note
         });
       }
-    } else {
-      const noteId = useTabStore.getState().getCurrentNoteId();
-      if (!noteId) {
-        loadNote({ newNote: true });
-        if (tabBarRef.current?.page() === 1) {
-          state.current.currentlyEditing = false;
-        }
-      } else if (state.current?.initialLoadCalled) {
-        const note = currentNotes.current[noteId];
-        if (note) {
-          loadNote({
-            item: note
-          });
-        }
-      }
-      if (!state.current?.initialLoadCalled) {
-        state.current.initialLoadCalled = true;
-      }
-      overlay(false);
     }
+    if (!state.current?.initialLoadCalled) {
+      state.current.initialLoadCalled = true;
+    }
+    overlay(false);
   }, [
     postMessage,
     theme,

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

@@ -167,7 +167,7 @@ export const useTabStore = create<TabStore>(
           previewTab: true,
           noteId: noteId
         };
-
+        console.log("focus preview", noteId);
         set({
           tabs: tabs
         });
@@ -211,6 +211,7 @@ export const useTabStore = create<TabStore>(
       focusEmptyTab: () => {
         const index = get().tabs.findIndex((t) => !t.noteId);
         if (index === -1) return get().newTab();
+        console.log("focus empty tab", get().tabs[index]);
 
         get().focusTab(get().tabs[index].id);
       },
@@ -224,6 +225,7 @@ export const useTabStore = create<TabStore>(
       },
 
       focusTab: (id: number) => {
+        console.log(history.getHistory(), id);
         history.add(id);
         set({
           currentTab: id

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

@@ -135,6 +135,7 @@ export const waitForEvent = async (
     };
     eSubscribeEvent(type, callback);
     setTimeout(() => {
+      console.log("return..");
       eUnSubscribeEvent(type, callback);
       resolve(false);
     }, waitFor);
@@ -157,9 +158,6 @@ const canRestoreAppState = (appState: AppState) => {
 };
 
 let appState: AppState | undefined;
-export function setAppState(state: AppState) {
-  appState = state;
-}
 export function getAppState() {
   if (appState && canRestoreAppState(appState)) return appState as AppState;
   const json = NotesnookModule.getAppState();

apps/mobile/app/screens/note-preview-configure/index.tsx

@@ -1,169 +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 { Note, VirtualizedGrouping } from "@notesnook/core";
-import { useThemeColors } from "@notesnook/theme";
-import React, { useEffect, useState } from "react";
-import { FlatList, TouchableOpacity, View } from "react-native";
-import { db } from "../../common/database";
-import { Header } from "../../components/header";
-import Input from "../../components/ui/input";
-import Paragraph from "../../components/ui/typography/paragraph";
-import { useDBItem } from "../../hooks/use-db-item";
-import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
-import { useSettingStore } from "../../stores/use-setting-store";
-import { NotesnookModule } from "../../utils/notesnook-module";
-
-const NoteItem = (props: {
-  id: string | number;
-  items?: VirtualizedGrouping<Note>;
-}) => {
-  const { colors } = useThemeColors();
-  const [item] = useDBItem(props.id, "note", props.items);
-
-  return (
-    <TouchableOpacity
-      activeOpacity={0.7}
-      onPress={() => {
-        const widgetId = NotesnookModule.getWidgetId();
-        NotesnookModule.setString(
-          "appPreview",
-          String(widgetId),
-          JSON.stringify(item)
-        );
-        setTimeout(() => {
-          NotesnookModule.saveAndFinish();
-        });
-      }}
-      style={{
-        flexDirection: "column",
-        borderBottomWidth: 1,
-        borderBottomColor: colors.primary.border,
-        justifyContent: "center",
-        paddingVertical: 12,
-        minHeight: 45
-      }}
-    >
-      {!item ? null : (
-        <View
-          style={{
-            flexDirection: "row",
-            paddingHorizontal: 12
-          }}
-        >
-          <View
-            style={{
-              flexDirection: "column"
-            }}
-          >
-            <Paragraph
-              numberOfLines={1}
-              style={{
-                color: colors.primary.paragraph,
-                fontSize: 15
-              }}
-            >
-              {item.title}
-            </Paragraph>
-          </View>
-        </View>
-      )}
-    </TouchableOpacity>
-  );
-};
-
-export const NotePreviewConfigure = () => {
-  const [items, setItems] = useState<VirtualizedGrouping<Note>>();
-  const loading = useSettingStore((state) => state.isAppLoading);
-  const bounceRef = React.useRef<NodeJS.Timeout>();
-  const { colors } = useThemeColors();
-  const insets = useGlobalSafeAreaInsets();
-
-  useEffect(() => {
-    useSettingStore.getState().setDeviceMode("mobile");
-    if (loading) return;
-    db.notes.all.sorted(db.settings.getGroupOptions("notes")).then((notes) => {
-      setItems(notes);
-    });
-  }, [loading]);
-
-  const renderItem = React.useCallback(
-    ({ index }: { item: boolean; index: number }) => {
-      return <NoteItem id={index} items={items} />;
-    },
-    [items]
-  );
-
-  return (
-    <View
-      style={{
-        backgroundColor: colors.primary.background,
-        flex: 1
-      }}
-    >
-      <Header
-        canGoBack
-        title="Select a note"
-        onLeftMenuButtonPress={() => {
-          NotesnookModule.cancelAndFinish();
-        }}
-      />
-
-      <View
-        style={{
-          paddingHorizontal: 12,
-          paddingTop: 6
-        }}
-      >
-        <Input
-          placeholder="Search for notes"
-          containerStyle={{
-            height: 50
-          }}
-          onChangeText={(value) => {
-            bounceRef.current = setTimeout(() => {
-              if (!value) {
-                db.notes.all
-                  .sorted(db.settings.getGroupOptions("notes"))
-                  .then((notes) => {
-                    setItems(notes);
-                  });
-                return;
-              }
-              db.lookup
-                .notes(value)
-                .sorted()
-                .then((notes) => {
-                  setItems(notes);
-                });
-            }, 500);
-          }}
-        />
-
-        <FlatList
-          data={items?.placeholders}
-          keyboardShouldPersistTaps="handled"
-          keyboardDismissMode="interactive"
-          renderItem={renderItem}
-          windowSize={1}
-          ListFooterComponent={<View style={{ height: 200 }} />}
-        />
-      </View>
-    </View>
-  );
-};

apps/mobile/app/screens/notebook/index.tsx

@@ -284,13 +284,14 @@ NotebookScreen.navigate = async (item: Notebook, canGoBack?: boolean) => {
       focusedRouteId == item?.id
     ) {
       // Update the route in place instead
-
+      console.log("Updating existing route in place");
       eSendEvent(eUpdateNotebookRoute, {
         item: item,
         title: item.title,
         canGoBack: canGoBack
       });
     } else {
+      console.log("Pushing new notebook route");
       // Push a new route
       Navigation.push("Notebook", {
         title: item.title,

apps/mobile/app/screens/notes/colored.tsx

@@ -59,6 +59,7 @@ ColoredNotes.navigate = (item: Color, canGoBack: boolean) => {
   const { focusedRouteId } = useNavigationStore.getState();
 
   if (focusedRouteId === item.id) {
+    console.log("ColoredNotes.navigate: route already focused for color");
     return;
   }
 

apps/mobile/app/screens/notes/index.tsx

@@ -171,6 +171,7 @@ const NotesPage = ({
           setLoadingNotes(false);
         })
         .catch((e) => {
+          console.log("Error loading notes", params.current?.title, e, e.stack);
           setLoadingNotes(false);
         });
     }

apps/mobile/app/screens/notes/tagged.tsx

@@ -60,6 +60,7 @@ TaggedNotes.navigate = (item: Tag, canGoBack?: boolean) => {
   const { focusedRouteId } = useNavigationStore.getState();
 
   if (focusedRouteId === item.id) {
+    console.log("TaggedNotes.navigate: route already focused for tag");
     return;
   }
 

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

@@ -160,7 +160,9 @@ export default function DebugLogs() {
           type: "success"
         });
       }
-    } catch (e) {}
+    } catch (e) {
+      console.log(e);
+    }
   }, [currentLog?.logs]);
 
   const copyLogs = React.useCallback(() => {

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

@@ -54,9 +54,7 @@ export const Licenses = () => {
         }}
         onPress={() => {
           if (!item.link) return;
-          Linking.openURL(item.link).catch(() => {
-            /* empty */
-          });
+          Linking.openURL(item.link).catch(console.log);
         }}
       >
         <Heading size={SIZE.sm}>{item.name}</Heading>

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

@@ -33,6 +33,7 @@ import { strings } from "@notesnook/intl";
 export const FontPicker = createSettingsPicker({
   getValue: () => useSettingStore.getState().settings.defaultFontFamily,
   updateValue: (item) => {
+    console.log(item.id);
     SettingsService.set({
       defaultFontFamily: item.id
     });
@@ -74,7 +75,7 @@ export const TrashIntervalPicker = createSettingsPicker({
       ? strings.never()
       : item === 1
       ? strings.reminderRecurringMode.day()
-      : strings.days(item);
+      : item + " " + strings.days();
   },
   getItemKey: (item) => item.toString(),
   options: [-1, 1, 7, 30, 365],

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

@@ -197,6 +197,7 @@ const restoreBackup = async (options: {
         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}`,
@@ -207,13 +208,9 @@ const restoreBackup = async (options: {
         progress: strings.cleaningUp()
       });
       // Remove files from cache
-      RNFetchBlob.fs.unlink(zipOutputFolder).catch(() => {
-        /* empty */
-      });
+      RNFetchBlob.fs.unlink(zipOutputFolder).catch(console.log);
       if (Platform.OS === "android" || deleteBackupFile) {
-        RNFetchBlob.fs.unlink(filePath).catch(() => {
-          /* empty */
-        });
+        RNFetchBlob.fs.unlink(filePath).catch(console.log);
       }
     } else {
       updateProgress({

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

@@ -389,12 +389,7 @@ export const settingsGroups: SettingSection[] = [
             useHook: () => {
               const [cacheSize, setCacheSize] = React.useState(0);
               React.useEffect(() => {
-                filesystem
-                  .getCacheSize()
-                  .then(setCacheSize)
-                  .catch(() => {
-                    /* empty */
-                  });
+                filesystem.getCacheSize().then(setCacheSize).catch(console.log);
                 const sub = eSubscribeEvent("cache-cleared", () => {
                   setCacheSize(0);
                 });
@@ -537,7 +532,7 @@ export const settingsGroups: SettingSection[] = [
                     endProgress();
                   } catch (e) {
                     endProgress();
-
+                    console.log(e);
                     ToastManager.error(
                       e as Error,
                       strings.failedToDeleteAccount(),
@@ -573,9 +568,7 @@ export const settingsGroups: SettingSection[] = [
               }
               PremiumService.verify(() => {
                 SettingsService.setProperty("offlineMode", true);
-                db.attachments.cacheAttachments().catch(() => {
-                  /* empty */
-                });
+                db.attachments.cacheAttachments().catch(console.log);
               });
             }
           },
@@ -1466,9 +1459,7 @@ export const settingsGroups: SettingSection[] = [
         name: strings.joinTelegram(),
         description: strings.joinTelegramDesc(),
         modifer: () => {
-          Linking.openURL("https://t.me/notesnook").catch(() => {
-            /* empty */
-          });
+          Linking.openURL("https://t.me/notesnook").catch(console.log);
         }
       },
       {
@@ -1488,9 +1479,7 @@ export const settingsGroups: SettingSection[] = [
         description: strings.followOnXDesc(),
         icon: "twitter",
         modifer: () => {
-          Linking.openURL("https://twitter.com/notesnook").catch(() => {
-            /* empty */
-          });
+          Linking.openURL("https://twitter.com/notesnook").catch(console.log);
         }
       },
       {
@@ -1498,9 +1487,7 @@ export const settingsGroups: SettingSection[] = [
         name: strings.joinDiscord(),
         icon: "discord",
         modifer: async () => {
-          Linking.openURL("https://discord.gg/zQBK97EE22").catch(() => {
-            /* empty */
-          });
+          Linking.openURL("https://discord.gg/zQBK97EE22").catch(console.log);
         },
         description: strings.joinDiscordDesc()
       }

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

@@ -25,7 +25,6 @@ import {
 import { DatabaseLogger, db, setupDatabase } from "../common/database";
 import { deleteDCacheFiles } from "../common/filesystem/io";
 import { useUserStore } from "../stores/use-user-store";
-import { NotePreviewWidget } from "./note-preview-widget";
 import Notifications from "./notifications";
 import SettingsService from "./settings";
 
@@ -86,6 +85,7 @@ const task = async (event: { taskId: string; timeout: boolean }) => {
   const taskId = event.taskId;
   const isTimeout = event.timeout; // <-- true when your background-time has expired.
   if (isTimeout) {
+    console.log(`BACKGROUND FETCH TIMEOUT: ${taskId}`);
     BackgroundFetch.finish(taskId);
     return;
   }
@@ -112,13 +112,12 @@ async function onBackgroundSyncStarted() {
       useUserStore.getState().setSyncing(false);
     }
     await Notifications.setupReminders();
-
-    NotePreviewWidget.updateNotes();
     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);
   }
 }
 
@@ -143,6 +142,7 @@ const onBoot = async () => {
     DatabaseLogger.info("BOOT TASK COMPLETE");
   } catch (e) {
     DatabaseLogger.error(e as Error);
+    console.log(e);
   }
 };
 

apps/mobile/app/services/backup.ts

@@ -120,17 +120,13 @@ async function presentBackupCompleteSheet(backupFilePath: string) {
             Share.open({
               url: backupFilePath,
               failOnCancel: false
-            }).catch(() => {
-              /* empty */
-            });
+            }).catch(console.log);
           } else {
             FileViewer.open(backupFilePath, {
               showOpenWithDialog: true,
               showAppsSuggestions: true,
               shareFile: true
-            } as any).catch(() => {
-              /* empty */
-            });
+            } as any).catch(console.log);
           }
         },
         actionText: strings.share()
@@ -165,6 +161,8 @@ async function run(
   context?: string,
   backupType: "full" | "partial" = "partial"
 ) {
+  console.log("Creating backup:", backupType, progress, context);
+
   const androidBackupDirectory = (await checkBackupDirExists(
     false,
     context
@@ -205,9 +203,7 @@ async function run(
       ? `${path}/${backupFileName}.nnbackupz`
       : `${cacheDir}/${backupFileName}.nnbackupz`;
 
-  await RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
-    /* empty */
-  });
+  await RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
   await RNFetchBlob.fs.mkdir(zipSourceFolder);
 
   const attachmentsDir = zipSourceFolder + "/attachments";
@@ -257,21 +253,18 @@ async function run(
         `${backupFileName}.nnbackupz`,
         "application/nnbackupz"
       );
-
+      console.log("Copying zip file...");
       await copyFileAsync(`file://${zipOutputFile}`, file.uri);
 
+      console.log("Copied zip file...");
       path = file.uri;
     } else {
       path = zipOutputFile;
     }
 
-    RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
-      /* empty */
-    });
+    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
     if (Platform.OS === "android") {
-      RNFetchBlob.fs.unlink(zipOutputFile).catch(() => {
-        /* empty */
-      });
+      RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
     }
 
     updateNextBackupTime(backupType || "partial");
@@ -315,13 +308,9 @@ async function run(
       return run(progress, context, backupType);
     }
 
-    RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
-      /* empty */
-    });
+    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
     if (Platform.OS === "android") {
-      RNFetchBlob.fs.unlink(zipOutputFile).catch(() => {
-        /* empty */
-      });
+      RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
     }
 
     DatabaseLogger.error(e);
@@ -340,6 +329,7 @@ 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
@@ -372,7 +362,9 @@ const checkAndRun = async () => {
   if (await checkBackupRequired(settings?.reminder)) {
     try {
       await run();
-    } catch (e) {}
+    } catch (e) {
+      console.log(e);
+    }
   }
 };
 

apps/mobile/app/services/event-manager.ts

@@ -123,6 +123,7 @@ export type PresentSheetOptions = {
 };
 
 export function presentSheet(data: Partial<PresentSheetOptions>) {
+  console.log("PRESENTING...");
   eSendEvent(eOpenSheet, data);
 }
 

apps/mobile/app/services/exporter.ts

@@ -85,7 +85,7 @@ async function resolveFileFunctions(
     `/export_${Date.now()}`
   );
 
-  await RNFetchBlob.fs.mkdir(exportCacheFolder).catch((e) => {});
+  await RNFetchBlob.fs.mkdir(exportCacheFolder).catch((e) => console.log(e));
 
   const mkdir = async (dir: string) => {
     const folder = join(exportCacheFolder, dir);
@@ -96,7 +96,7 @@ async function resolveFileFunctions(
 
   const writeFile = async (path: string, result: string) => {
     const cacheFilePath = join(exportCacheFolder, path);
-
+    console.log(cacheFilePath, result.length);
     await RNFetchBlob.fs.writeFile(
       cacheFilePath,
       result,
@@ -194,7 +194,7 @@ async function bulkExport(
       try {
         await exportNoteToFile(item, type, mkdir, writeFile);
       } catch (e) {
-        /* empty */
+        console.log(item.type, e);
       }
     } else if (item.type === "attachment") {
       currentAttachmentProgress += 1;
@@ -202,11 +202,11 @@ async function bulkExport(
       try {
         await exportAttachmentToFile(item, mkdir, cacheFolder);
       } catch (e) {
-        /* empty */
+        console.log(item.path, e);
       }
     }
   }
-
+  console.log(cacheFolder);
   return createZip(totalNotes, cacheFolder, type, path, callback);
 }
 
@@ -240,7 +240,7 @@ async function exportNote(
         noteItem = item;
         await exportNoteToFile(item, type, mkdir, writeFile);
       } catch (e) {
-        /* empty */
+        console.log("exportNoteToFile", item.type, e);
       }
     } else if (item.type === "attachment") {
       currentAttachmentProgress += 1;
@@ -249,12 +249,13 @@ async function exportNote(
         hasAttachments = true;
         await exportAttachmentToFile(item, mkdir, cacheFolder);
       } catch (e) {
-        /* empty */
+        console.log("exportAttachmentToFile", item.path, e);
       }
     }
   }
 
   if (!hasAttachments) {
+    console.log("creating file...");
     return createFile(noteItem as ExportableNote, type, path, cacheFolder);
   } else {
     return createZip(1, cacheFolder, type, path, callback);
@@ -332,10 +333,10 @@ async function createFile(
       filePath = originalPath.replace(`${ext}`, "") + "_" + id + ext;
       id++;
     }
-
+    console.log("path", filePath);
     await RNFetchBlob.fs.mv(exportedFile, filePath);
   }
-
+  console.log("file moved...");
   return {
     filePath: filePath,
     fileDir: path,

apps/mobile/app/services/intent.ts

@@ -1,76 +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 { Platform } from "react-native";
-import { db } from "../common/database";
-import ReminderSheet from "../components/sheets/reminder";
-import { setAppState } from "../screens/editor/tiptap/utils";
-import { eOnLoadNote } from "../utils/events";
-import { tabBarRef } from "../utils/global-refs";
-import { NotesnookModule } from "../utils/notesnook-module";
-import { eSendEvent } from "./event-manager";
-
-const launchIntent = Platform.OS === "ios" ? {} : NotesnookModule.getIntent();
-let used = false;
-let launched = false;
-export const IntentService = {
-  getLaunchIntent() {
-    if (used || Platform.OS === "ios") return null;
-    used = true;
-    return launchIntent;
-  },
-  onLaunch() {
-    if (launched || Platform.OS === "ios") return;
-    launched = true;
-    if (launchIntent["com.streetwriters.notesnook.OpenNoteId"]) {
-      setAppState({
-        movedAway: false,
-        editing: true,
-        timestamp: Date.now(),
-        noteId: launchIntent["com.streetwriters.notesnook.OpenNoteId"]
-      });
-    }
-  },
-  async onAppStateChanged() {
-    if (Platform.OS === "ios") return;
-    try {
-      const intent = NotesnookModule.getIntent();
-
-      if (intent["com.streetwriters.notesnook.OpenNoteId"]) {
-        const note = await db.notes.note(
-          intent["com.streetwriters.notesnook.OpenNoteId"]
-        );
-        if (note) {
-          eSendEvent(eOnLoadNote, {
-            item: note
-          });
-          tabBarRef.current?.goToPage(1, false);
-        }
-      } else if (intent["com.streetwriters.notesnook.OpenReminderId"]) {
-        const reminder = await db.reminders.reminder(
-          intent["com.streetwriters.notesnook.OpenReminderId"]
-        );
-        if (reminder) ReminderSheet.present(reminder);
-      } else if (intent["com.streetwriters.notesnook.NewReminder"]) {
-        ReminderSheet.present();
-      }
-    } catch (e) {
-      /* empty */
-    }
-  }
-};

apps/mobile/app/services/navigation.ts

@@ -122,6 +122,7 @@ function queueRoutesForUpdate(...routesToUpdate: RouteName[]) {
 }
 
 function navigate<T extends RouteName>(screen: T, params?: RouteParams[T]) {
+  console.log(`Navigation.navigate ${screen} route`);
   rootNavigatorRef.current?.navigate(screen as any, params);
 }
 
@@ -130,14 +131,17 @@ function goBack() {
 }
 
 function push<T extends RouteName>(screen: T, params: RouteParams[T]) {
+  console.log(`Navigation.push ${screen} route`);
   rootNavigatorRef.current?.dispatch(StackActions.push(screen as any, params));
 }
 
 function replace<T extends RouteName>(screen: T, params: RouteParams[T]) {
+  console.log(`Navigation.replace ${screen} route`);
   rootNavigatorRef.current?.dispatch(StackActions.replace(screen, params));
 }
 
 function popToTop() {
+  console.log(`Navigation.popToTop`);
   rootNavigatorRef.current?.dispatch(StackActions.popToTop());
 }
 

apps/mobile/app/services/note-preview-widget.ts

@@ -1,45 +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 { Note } from "@notesnook/core";
-import { db } from "../common/database";
-import { NotesnookModule } from "../utils/notesnook-module";
-import { Platform } from "react-native";
-
-let timer: NodeJS.Timeout;
-export const NotePreviewWidget = {
-  updateNotes: () => {
-    if (Platform.OS !== "android") return;
-    clearTimeout(timer);
-    timer = setTimeout(async () => {
-      const noteIds = await NotesnookModule.getWidgetNotes();
-      for (const id of noteIds) {
-        const newNote = await db.notes.note(id);
-        if (!newNote) continue;
-
-        NotesnookModule.updateWidgetNote(id, JSON.stringify(newNote));
-      }
-    }, 500);
-  },
-  updateNote: async (id: string, note: Note) => {
-    if (Platform.OS !== "android") return;
-    if (id && (await NotesnookModule.hasWidgetNote(id))) {
-      NotesnookModule.updateWidgetNote(id, JSON.stringify(note));
-    }
-  }
-};

apps/mobile/app/services/notifications.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 { isReminderActive, Reminder } from "@notesnook/core";
+import { Reminder } from "@notesnook/core";
 import { strings } from "@notesnook/intl";
 import notifee, {
   AndroidStyle,
@@ -51,7 +51,6 @@ import { DDS } from "./device-detection";
 import { eSendEvent } from "./event-manager";
 import Navigation from "./navigation";
 import SettingsService from "./settings";
-import { getFormattedReminderTime } from "@notesnook/common";
 
 let pinned: DisplayedNotification[] = [];
 
@@ -121,7 +120,7 @@ const onEvent = async ({ type, detail }: Event) => {
         await scheduleNotification(reminder);
       }
     }
-    updateRemindersForWidget();
+
     return;
   }
   if (type === EventType.PRESS) {
@@ -142,7 +141,7 @@ const onEvent = async ({ type, detail }: Event) => {
     }
     editorState().movedAway = false;
     const noteId = notification?.id;
-
+    console.log("NOTE ID", noteId);
     loadNote(noteId as string, true);
   }
 
@@ -168,7 +167,6 @@ const onEvent = async ({ type, detail }: Event) => {
         );
         useRelationStore.getState().update();
         useReminderStore.getState().refresh();
-        updateRemindersForWidget();
         break;
       }
       case "REMINDER_DISABLE": {
@@ -186,7 +184,6 @@ const onEvent = async ({ type, detail }: Event) => {
         );
         useRelationStore.getState().update();
         useReminderStore.getState().refresh();
-        updateRemindersForWidget();
         break;
       }
       case strings.unpin(): {
@@ -238,9 +235,11 @@ const onEvent = async ({ type, detail }: Event) => {
           try {
             if (!globalThis["IS_MAIN_APP_RUNNING" as never]) {
               await db.sync({ type: "send", force: false });
+            } else {
+              console.log("main app running, skipping sync");
             }
           } catch (e) {
-            /* empty */
+            console.log(e, (e as Error).stack);
           }
         }
         Navigation.queueRoutesForUpdate();
@@ -250,35 +249,6 @@ const onEvent = async ({ type, detail }: Event) => {
   }
 };
 
-type ReminderWithFormattedTime = Reminder & {
-  formattedTime?: string;
-};
-
-async function updateRemindersForWidget() {
-  if (Platform.OS === "ios") return;
-  const reminders: ReminderWithFormattedTime[] = await db.reminders?.all.items(
-    undefined,
-    {
-      sortBy: "dueDate",
-      sortDirection: "asc"
-    }
-  );
-  const activeReminders = [];
-  if (!reminders) return;
-  for (const reminder of reminders) {
-    if (isReminderActive(reminder)) {
-      reminder.formattedTime = getFormattedReminderTime(reminder);
-      activeReminders.push(reminder);
-    }
-  }
-  NotesnookModule.setString(
-    "appPreview",
-    "remindersList",
-    JSON.stringify(activeReminders)
-  );
-  NotesnookModule.updateReminderWidget();
-}
-
 async function setupIOSCategories() {
   try {
     if (Platform.OS === "ios") {
@@ -318,7 +288,7 @@ async function setupIOSCategories() {
       }
     }
   } catch (e) {
-    /* empty */
+    console.log("ERROR in setupIOSCategories", e);
   }
 }
 
@@ -428,9 +398,8 @@ async function scheduleNotification(
         trigger
       );
     }
-    updateRemindersForWidget();
   } catch (e) {
-    /* empty */
+    console.log("Schedule notification", e);
   }
 }
 
@@ -573,7 +542,7 @@ async function displayNotification({
       }
     });
   } catch (e) {
-    /* empty */
+    console.log(e);
   }
 }
 
@@ -974,7 +943,6 @@ async function setupReminders(checkNeedsScheduling = false) {
       trigger.notification.id &&
       notifee.cancelTriggerNotification(trigger.notification.id as string)
   );
-  updateRemindersForWidget();
 }
 
 async function pinNote(id: string) {
@@ -995,7 +963,7 @@ async function pinNote(id: string) {
       id: note.id
     });
   } catch (e) {
-    /* empty */
+    console.log(e);
   }
 }
 const Events = {
@@ -1020,8 +988,7 @@ const Notifications = {
   getChannelId,
   isNotePinned,
   pinNote,
-  Events,
-  updateRemindersForWidget
+  Events
 };
 
 export default Notifications;

apps/mobile/app/services/premium.js

@@ -76,7 +76,9 @@ async function setPremiumStatus() {
     products = await RNIap.getSubscriptions({
       skus: itemSkus
     });
-  } catch (e) {}
+  } catch (e) {
+    console.log("subscriptions: ", e);
+  }
   if (premiumStatus === 0 && !__DEV__) {
     SettingsService.reset();
   }
@@ -297,6 +299,7 @@ const subscriptions = {
           }
         };
 
+        console.log("Subscription.verify", requestData);
         try {
           let result = await fetch(
             __DEV__
@@ -304,7 +307,7 @@ const subscriptions = {
               : "https://payments.streetwriters.co/apple/verify",
             requestData
           );
-
+          console.log("Subscribed", result);
           let text = await result.text();
 
           if (!result.ok) {
@@ -315,7 +318,9 @@ const subscriptions = {
           } else {
             await subscriptions.clear(subscription);
           }
-        } catch (e) {}
+        } catch (e) {
+          console.log("subscription error", e);
+        }
       }
     }
   },

apps/mobile/app/stores/index.ts

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { db } from "../common/database";
 import Navigation from "../services/navigation";
-import { NotePreviewWidget } from "../services/note-preview-widget";
 import Notifications from "../services/notifications";
 import { useFavoriteStore } from "./use-favorite-store";
 import { useMenuStore } from "./use-menu-store";
@@ -42,8 +41,6 @@ export function initAfterSync() {
   useUserStore.setState({
     profile: db.settings.getProfile()
   });
-
-  NotePreviewWidget.updateNotes();
 }
 
 export async function initialize() {}

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

@@ -80,6 +80,7 @@ export const useMenuStore = create<MenuStore>((set, get) => ({
       JSON.stringify(get().hiddenItems || {}) !==
         JSON.stringify(hiddenItems || {})
     ) {
+      console.log(order, hiddenItems);
       set({
         order: order,
         hiddenItems: hiddenItems

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

@@ -126,6 +126,7 @@ export const useMessageStore = create<MessageStore>((set, get) => ({
         announcements = [];
       }
     } catch (e) {
+      console.log(e);
       set({ announcements: [] });
     } finally {
       const all = await getFiltered(announcements);

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

@@ -106,6 +106,7 @@ const useNavigationStore = create<NavigationStore>((set, get) => ({
     set({
       focusedRouteId: id
     });
+    console.log("CurrentRoute ID", id);
   },
   currentRoute: "Notes",
   canGoBack: false,
@@ -113,6 +114,7 @@ const useNavigationStore = create<NavigationStore>((set, get) => ({
     set({
       currentRoute: currentScreen
     });
+    console.log("CurrentRoute", currentScreen);
   },
   headerRightButtons: [],
   buttonAction: () => null,

apps/mobile/app/utils/note-bundle.js

@@ -48,8 +48,9 @@ export async function attachFile(uri, hash, type, filename, options) {
       encryptionInfo.mimeType = type;
       encryptionInfo.filename = filename;
       encryptionInfo.alg = "xcha-stream";
+      encryptionInfo.size = encryptionInfo.length;
       encryptionInfo.key = key;
-
+      console.log(encryptionInfo);
       if (options?.reupload && exists) await db.attachments.reset(hash);
     } else {
       encryptionInfo = { hash: hash };
@@ -57,12 +58,9 @@ export async function attachFile(uri, hash, type, filename, options) {
     await db.attachments.add(encryptionInfo, options?.id);
     return true;
   } catch (e) {
-    if (Platform.OS === "ios")
-      RNFetchBlob.fs.unlink(uri).catch(() => {
-        /* empty */
-      });
+    if (Platform.OS === "ios") RNFetchBlob.fs.unlink(uri).catch(console.log);
     DatabaseLogger.error(e, "Attach file error");
-
+    console.log("attach file error: ", e);
     return false;
   }
 }
@@ -105,10 +103,12 @@ async function createNotes(bundle) {
     const isJpeg = /(jpeg|jpg)/g.test(file.type);
 
     if ((isPng || isJpeg) && compress) {
+      console.log(uri, "before compressed");
       uri = await compressToFile("file://" + uri, isPng ? "PNG" : "JPEG");
 
       uri = `${uri.replace("file://", "")}`;
     }
+    console.log(uri, "after compressed");
 
     const hash = await Sodium.hashFile({
       uri: uri,

apps/mobile/app/utils/notesnook-module.ts

@@ -25,21 +25,6 @@ interface NotesnookModuleInterface {
   setSecureMode: (enabled: boolean) => void;
   setAppState: (appState: string) => void;
   getAppState: () => string;
-  saveAndFinish: () => void;
-  setString: (storeName: string, key: string, value: string) => void;
-  getString: (storeName: string, key: string) => Promise<string>;
-  removeString: (key: string) => void;
-  cancelAndFinish: () => void;
-  getWidgetId: () => void;
-  getIntent: () => {
-    "com.streetwriters.notesnook.OpenNoteId"?: string;
-    "com.streetwriters.notesnook.OpenReminderId"?: string;
-    "com.streetwriters.notesnook.NewReminder"?: string;
-  };
-  getWidgetNotes: () => Promise<string[]>;
-  hasWidgetNote: (noteId: string) => Promise<boolean>;
-  updateWidgetNote: (noteId: string, data: string) => void;
-  updateReminderWidget: () => void;
 }
 
 export const NotesnookModule: NotesnookModuleInterface = Platform.select({
@@ -48,18 +33,7 @@ export const NotesnookModule: NotesnookModuleInterface = Platform.select({
     setBackgroundColor: () => {},
     setSecureMode: () => {},
     setAppState: () => {},
-    getAppState: () => {},
-    saveAndFinish: () => {},
-    getString: () => {},
-    setString: () => {},
-    removeString: () => {},
-    cancelAndFinish: () => {},
-    getWidgetId: () => {},
-    getIntent: () => {},
-    getWidgetNotes: () => {},
-    hasWidgetNote: () => {},
-    updateWidgetNote: () => {},
-    updateReminderWidget: () => {}
+    getAppState: () => {}
   },
   android: NativeModules.NNativeModule
 });

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

@@ -116,7 +116,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 3037
+        versionCode 3035
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -212,7 +212,6 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.2'
     implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.2'
-    implementation 'com.google.code.gson:gson:2.11.0'
 
     androidTestImplementation('com.wix:detox:+')
     implementation 'androidx.appcompat:appcompat:1.1.0'

apps/mobile/native/android/app/proguard-rules.pro

@@ -57,9 +57,4 @@
 -keep class org.apache.commons.io.** { *; }
 
 # Background fetch
--keep class com.transistorsoft.rnbackgroundfetch.HeadlessTask { *; }
-
-#Gson
--keepattributes Signature
--keep class com.google.gson.reflect.TypeToken { *; }
--keep class * extends com.google.gson.reflect.TypeToken
+-keep class com.transistorsoft.rnbackgroundfetch.HeadlessTask { *; }

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

@@ -60,18 +60,10 @@
         android:theme="@style/BootTheme"
         android:largeHeap="true"
         android:supportsRtl="false"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:replace="android:supportsRtl">
-
-        <receiver android:exported="false" android:label="@string/reminders_title" android:name=".ReminderWidgetProvider">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_reminders_info" />
-        </receiver>
     
-        <receiver android:exported="false" android:label="@string/quick_note" android:name=".NoteWidget">
+        <receiver android:exported="false" android:name=".NoteWidget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -81,27 +73,6 @@
                 android:resource="@xml/new_note_widget_info" />
         </receiver>
 
-        <receiver android:exported="false" android:label="@string/note" android:name=".NotePreviewWidget">
-            <intent-filter>"
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/note_widget_info" />
-        </receiver>
-
-        <activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-            android:label="NotePreviewConfigure"
-            android:launchMode="singleTask"
-            android:exported="true"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustResize" android:name=".NotePreviewConfigureActivity">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
-            </intent-filter>
-        </activity>
-
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
@@ -195,11 +166,6 @@
             </intent-filter>
         </service>
 
-        <service 
-        android:name=".ReminderViewsService"
-        android:exported="true"
-        android:permission="android.permission.BIND_REMOTEVIEWS" />
-
         <provider
         android:name="androidx.core.content.FileProvider"
         android:authorities="${applicationId}.provider"
@@ -227,6 +193,9 @@
            </intent-filter>
       </receiver>
 
+
+        
+
     </application>
 
 </manifest>

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

@@ -3,6 +3,7 @@ package com.streetwriters.notesnook;
 import com.facebook.react.ReactActivity;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.webkit.WebView;
 import com.facebook.react.ReactActivityDelegate;
@@ -11,17 +12,22 @@ import com.facebook.react.defaults.DefaultReactActivityDelegate;
 import com.zoontek.rnbootsplash.RNBootSplash;
 
 public class MainActivity extends ReactActivity {
+
+
   @Override
     protected void onCreate(Bundle savedInstanceState) {
     RNBootSplash.init(this);
     super.onCreate(null);
-    if (BuildConfig.DEBUG) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && BuildConfig.DEBUG) {
       WebView.setWebContentsDebuggingEnabled(true);
     }
 
     try {
       startService(new Intent(getBaseContext(), OnClearFromRecentService.class));
-    } catch (Exception ignored) {}
+    } catch (Exception e) {
+
+    }
+
   }
 
   /**
@@ -43,7 +49,7 @@ public void onNewIntent(Intent intent) {
   setIntent(intent);
 }
 
-@Override
+ @Override
 public void onConfigurationChanged(Configuration newConfig) {
   super.onConfigurationChanged(newConfig);
   getReactInstanceManager().onConfigurationChanged(this, newConfig);
@@ -57,6 +63,7 @@ public void onConfigurationChanged(Configuration newConfig) {
     return "Notesnook";
   }
 
+
   @Override
   public void invokeDefaultOnBackPressed() {
     moveTaskToBack(true);

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

@@ -21,7 +21,6 @@ class MainApplication : Application(), ReactApplication {
               // add(MyReactNativePackage())
               add(NNativeModulePackage());
             }
-
  
         override fun getJSMainModuleName(): String = "index"
  

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

@@ -1,71 +0,0 @@
-package com.streetwriters.notesnook;
-
-import android.app.Activity;
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.RemoteViews;
-
-import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-import com.facebook.react.defaults.DefaultReactActivityDelegate;
-import com.google.gson.Gson;
-import com.streetwriters.notesnook.datatypes.Note;
-
-public class NotePreviewConfigureActivity extends ReactActivity {
-
-    static int appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
-    static NotePreviewConfigureActivity activity;
-
-    /**
-     * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
-     * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
-     * (aka React 18) with two boolean flags.
-     */
-    @Override
-    protected ReactActivityDelegate createReactActivityDelegate() {
-        return new DefaultReactActivityDelegate(
-                this,
-                getMainComponentName(),
-                // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-                DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
-                // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18).
-                DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
-        );
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(null);
-        Intent intent = getIntent();
-        Bundle extras = intent.getExtras();
-        int appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
-        if (extras != null) {
-            appWidgetId = extras.getInt(
-                    AppWidgetManager.EXTRA_APPWIDGET_ID,
-                    AppWidgetManager.INVALID_APPWIDGET_ID);
-            NotePreviewConfigureActivity.appWidgetId = appWidgetId;
-        }
-        Intent resultValue = new Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-        setResult(Activity.RESULT_CANCELED, resultValue);
-        activity = this;
-    }
-
-    public static void saveAndFinish(Context context) {
-        if (NotePreviewConfigureActivity.activity == null || appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) return;
-        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-        NotePreviewWidget.updateAppWidget(context, appWidgetManager, appWidgetId);
-        Intent resultValue = new Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-        NotePreviewConfigureActivity.activity.setResult(RESULT_OK, resultValue);
-        NotePreviewConfigureActivity.activity.finish();
-    }
-
-    @Override
-    protected String getMainComponentName() {
-        return "NotePreviewConfigure";
-    }
-
-}

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

@@ -1,68 +0,0 @@
-package com.streetwriters.notesnook;
-
-import android.app.ActivityOptions;
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.widget.RemoteViews;
-import com.google.gson.Gson;
-import com.streetwriters.notesnook.datatypes.Note;
-
-
-public class NotePreviewWidget extends AppWidgetProvider {
-    static String OpenNoteId = "com.streetwriters.notesnook.OpenNoteId";
-    static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
-                                int appWidgetId) {
-        String data = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE).getString(String.valueOf(appWidgetId), "");
-        if (data.isEmpty()) {
-            return;
-        }
-        Gson gson = new Gson();
-        Note note = gson.fromJson(data, Note.class);
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.note_widget);
-        views.setTextViewText(R.id.widget_title, note.getTitle());
-        views.setTextViewText(R.id.widget_body, note.getHeadline());
-
-        Intent intent = new Intent(context, MainActivity.class);
-        intent.putExtra(OpenNoteId, note.getId());
-        intent.putExtra(RCTNNativeModule.IntentType, "OpenNote");
-        intent.setData(Uri.parse("https://notesnook.com/open_note"));
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
-        views.setOnClickPendingIntent(R.id.open_note, pendingIntent);
-
-        appWidgetManager.updateAppWidget(appWidgetId, views);
-    }
-
-    private static Bundle getActivityOptionsBundle() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
-            return activityOptions.toBundle();
-        } else
-            return null;
-    }
-
-    @Override
-    public void onDeleted(Context context, int[] appWidgetIds) {
-        super.onDeleted(context, appWidgetIds);
-        SharedPreferences.Editor edit = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE).edit();
-        for (int id: appWidgetIds) {
-            edit.remove(String.valueOf(id));
-        }
-        edit.apply();
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        // There may be multiple widgets active, so update all of them
-        for (int appWidgetId : appWidgetIds) {
-            updateAppWidget(context, appWidgetManager, appWidgetId);
-        }
-    }
-}

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

@@ -1,12 +1,10 @@
 package com.streetwriters.notesnook;
 
-import android.app.ActivityOptions;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.widget.RemoteViews;
 
@@ -17,24 +15,14 @@ public class NoteWidget extends AppWidgetProvider {
 
     static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
                                 int appWidgetId) {
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.new_note_widget);
-        setClickIntent(context, views);
-        appWidgetManager.updateAppWidget(appWidgetId, views);
-    }
 
-    static void setClickIntent(Context context, RemoteViews views) {
         Intent intent = new Intent(context, ShareActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
-        views.setOnClickPendingIntent(R.id.new_note, pendingIntent);
-    }
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
-    private static Bundle getActivityOptionsBundle() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
-            return activityOptions.toBundle();
-        } else
-            return null;
+        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.note_widget);
+        views.setOnClickPendingIntent(R.id.widget_button, pendingIntent);
+
+        appWidgetManager.updateAppWidget(appWidgetId, views);
     }
 
     @Override
@@ -45,20 +33,21 @@ public class NoteWidget extends AppWidgetProvider {
 
     private void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle options) {
         int minWidth = options != null ? options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH) : 0;
-        int minHeight = options != null ? options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT) : 0;
+//        int minHeight = options != null ? options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT) : 0;
 
-        int layoutId = (minWidth < 100) ? R.layout.new_note_widget_icon : R.layout.new_note_widget;
+        int layoutId = (minWidth < 100) ? R.layout.note_widget_icon : R.layout.note_widget;
 
         RemoteViews views = new RemoteViews(context.getPackageName(), layoutId);
-        setClickIntent(context, views);
         appWidgetManager.updateAppWidget(appWidgetId, views);
     }
 
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        // There may be multiple widgets active, so update all of them
         for (int appWidgetId : appWidgetIds) {
             updateAppWidget(context, appWidgetManager, appWidgetId);
+            updateAppWidget(context, appWidgetManager, appWidgetId,null);
         }
     }
 }

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

@@ -1,38 +1,22 @@
 package com.streetwriters.notesnook;
 
-import android.app.Activity;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
+
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
-import android.os.Bundle;
 import android.util.Log;
 import android.view.WindowManager;
-import android.widget.RemoteViews;
 
-import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableMap;
-import com.google.gson.Gson;
-import com.streetwriters.notesnook.datatypes.Note;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 
 public class RCTNNativeModule extends ReactContextBaseJavaModule {
-    Intent lastIntent;
+
     ReactContext mContext;
-    static String IntentType = "com.streetwriters.notesnook.IntentType";
 
     public RCTNNativeModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -47,6 +31,7 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setBackgroundColor(final String color) {
+
         try {
            getCurrentActivity().getWindow().getDecorView().setBackgroundColor(Color.parseColor(color));
         } catch (Exception e) {
@@ -63,6 +48,8 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
         }
     }
 
+
+
     @ReactMethod
     public void setSecureMode(final boolean mode) {
         try {
@@ -98,123 +85,6 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
         return appStateValue.isEmpty() ? null : appStateValue;
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public int getWidgetId() {
-        return NotePreviewConfigureActivity.appWidgetId;
-    }
 
-    @ReactMethod
-    public void setString(final String storeName, final String key, final String value) {
-        SharedPreferences details = getReactApplicationContext().getSharedPreferences(storeName, Context.MODE_PRIVATE);
-        SharedPreferences.Editor edit = details.edit();
-        edit.putString(key, value);
-        edit.apply();
-    }
 
-    @ReactMethod
-    public void removeString(final String storeName, final String key) {
-        SharedPreferences details = getReactApplicationContext().getSharedPreferences(storeName, Context.MODE_PRIVATE);
-        SharedPreferences.Editor edit = details.edit();
-        edit.remove(key);
-        edit.apply();
-    }
-
-    @ReactMethod
-    public void getString(final String storeName, final String key, Promise promise) {
-        SharedPreferences details = getReactApplicationContext().getSharedPreferences(storeName, Context.MODE_PRIVATE);
-        String value = details.getString(key, "");
-        promise.resolve(value.isEmpty() ? null : value);
-    }
-
-    @ReactMethod
-    public void saveAndFinish() {
-        NotePreviewConfigureActivity.saveAndFinish(mContext);
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public WritableMap getIntent() {
-        WritableMap map = Arguments.createMap();
-        if (getCurrentActivity() != null) {
-            Intent intent = getCurrentActivity().getIntent();
-            Bundle extras = getCurrentActivity().getIntent().getExtras();
-
-            if (extras != null && intent != lastIntent) {
-                lastIntent = intent;
-                if (Objects.equals(extras.getString(IntentType), "NewReminder")) {
-                    map.putString(ReminderWidgetProvider.NewReminder, extras.getString(ReminderWidgetProvider.NewReminder));
-                } else if (Objects.equals(extras.getString(IntentType), "OpenReminder")) {
-                    map.putString(ReminderViewsService.OpenReminderId, extras.getString(ReminderViewsService.OpenReminderId));
-                } else if (Objects.equals(extras.getString(IntentType), "OpenNote")) {
-                    map.putString(NotePreviewWidget.OpenNoteId, extras.getString(NotePreviewWidget.OpenNoteId));
-                }
-
-            }
-        }
-        return map;
-    }
-
-    @ReactMethod
-    public void cancelAndFinish() {
-        NotePreviewConfigureActivity.activity.setResult(Activity.RESULT_CANCELED);
-        NotePreviewConfigureActivity.activity.finish();
-    }
-
-    @ReactMethod
-    public void getWidgetNotes(Promise promise) {
-        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Map<String, ?> map = pref.getAll();
-        WritableArray arr = Arguments.createArray();
-        for(Map.Entry<String,?> entry : map.entrySet()){
-            if (entry.getKey().equals("remindersList")) continue;
-            String value = (String) entry.getValue();
-            Gson gson = new Gson();
-            Note note = gson.fromJson(value, Note.class);
-            arr.pushString(note.getId());
-        }
-        promise.resolve(arr);
-    }
-
-    @ReactMethod
-    public void hasWidgetNote(final String noteId, Promise promise) {
-        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Map<String, ?> map = pref.getAll();
-        boolean found = false;
-        for(Map.Entry<String,?> entry : map.entrySet()){
-            String value = (String) entry.getValue();
-            if (value.contains(noteId)) {
-                found = true;
-            }
-        }
-        promise.resolve(found);
-    }
-    @ReactMethod
-    public void updateWidgetNote(final String noteId, final String data) {
-        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Map<String, ?> map = pref.getAll();
-        SharedPreferences.Editor edit = pref.edit();
-        ArrayList<String> ids = new ArrayList<>();
-        for(Map.Entry<String,?> entry : map.entrySet()) {
-            String value = (String) entry.getValue();
-            if (value.contains(noteId)) {
-                edit.putString(entry.getKey(), data);
-                ids.add(entry.getKey());
-            }
-        }
-        edit.apply();
-        for (String id: ids) {
-            NotePreviewWidget.updateAppWidget(mContext, AppWidgetManager.getInstance(mContext), Integer.parseInt(id));
-        }
-    }
-
-    @ReactMethod
-    public void updateReminderWidget() {
-        AppWidgetManager wm = AppWidgetManager.getInstance(mContext);
-        int[] ids = wm.getAppWidgetIds(ComponentName.createRelative(mContext.getPackageName(), ReminderWidgetProvider.class.getName()));
-        for (int id: ids) {
-            Log.d("Reminders", "Updating" + id);
-            RemoteViews views = new RemoteViews(mContext.getPackageName(), R.layout.widget_reminders);
-            ReminderWidgetProvider.updateAppWidget(mContext, wm, id, views);
-            wm.notifyAppWidgetViewDataChanged(id, R.id.widget_list_view);
-        }
-    }
 }

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

@@ -1,101 +0,0 @@
-package com.streetwriters.notesnook;
-
-import android.app.ActivityOptions;
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.RemoteViewsService;
-import android.content.Context;
-import android.widget.RemoteViews;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.streetwriters.notesnook.datatypes.Reminder;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ReminderViewsService extends RemoteViewsService {
-    static String OpenReminderId = "com.streetwriters.notesnook.OpenReminderId";
-    @Override
-    public RemoteViewsFactory onGetViewFactory(Intent intent) {
-        return new ReminderRemoteViewsFactory(this.getApplicationContext(), intent);
-    }
-}
-
-class ReminderRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory {
-    private Context context;
-    private List<Reminder> reminders;
-
-    public ReminderRemoteViewsFactory(Context context, Intent intent) {
-        this.context = context;
-    }
-
-    @Override
-    public void onCreate() {
-        // Initialize reminders list
-        reminders = new ArrayList<Reminder>();
-    }
-
-    @Override
-    public void onDataSetChanged() {
-        reminders.clear();
-        SharedPreferences preferences = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Gson gson = new Gson();
-        reminders = gson.fromJson(preferences.getString("remindersList","[]"), new TypeToken<List<Reminder>>(){}.getType());
-    }
-
-    @Override
-    public void onDestroy() {
-        reminders.clear();
-    }
-
-    @Override
-    public int getCount() {
-        return reminders.size();
-    }
-
-    @Override
-    public RemoteViews getViewAt(int position) {
-        Reminder reminder = reminders.get(position);
-
-        boolean useMiniLayout = reminder.getDescription() == null || reminder.getDescription().isEmpty();
-
-        RemoteViews views = new RemoteViews(context.getPackageName(), useMiniLayout ? R.layout.widget_reminder_layout_small :  R.layout.widget_reminder_layout);
-        views.setTextViewText(R.id.reminder_title, reminder.getTitle());
-           if (!useMiniLayout) {
-               views.setTextViewText(R.id.reminder_description, reminder.getDescription());
-           }
-        views.setTextViewText(R.id.reminder_time, reminder.getFormattedTime());
-        final Intent fillInIntent = new Intent();
-        final Bundle extras = new Bundle();
-        extras.putString(ReminderViewsService.OpenReminderId, reminder.getId());
-        fillInIntent.putExtra(RCTNNativeModule.IntentType, "OpenReminder");
-        fillInIntent.putExtras(extras);
-        views.setOnClickFillInIntent(R.id.reminder_item_btn, fillInIntent);
-        return views;
-    }
-
-
-    @Override
-    public RemoteViews getLoadingView() {
-        return null;
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 1;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-}

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

@@ -1,54 +0,0 @@
-package com.streetwriters.notesnook;
-
-import android.app.ActivityOptions;
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.widget.RemoteViews;
-
-public class ReminderWidgetProvider extends AppWidgetProvider {
-    static String NewReminder = "com.streetwriters.notesnook.NewReminder";
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        for (int appWidgetId : appWidgetIds) {
-            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_reminders);
-            updateAppWidget(context, appWidgetManager, appWidgetId, views);
-        }
-    }
-
-
-    private static Bundle getActivityOptionsBundle() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentBackgroundActivityStartMode(ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
-            return activityOptions.toBundle();
-        } else
-            return null;
-    }
-
-    static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId, RemoteViews views) {
-        Intent listview_intent_template = new Intent(context, MainActivity.class);
-        listview_intent_template.setData(Uri.parse("https://notesnook.com/open_reminder"));
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, listview_intent_template, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE, getActivityOptionsBundle());
-        views.setPendingIntentTemplate(R.id.widget_list_view, pendingIntent);
-
-        Intent new_reminder_intent = new Intent(context, MainActivity.class);
-        new_reminder_intent.putExtra(NewReminder, NewReminder);
-        new_reminder_intent.putExtra(RCTNNativeModule.IntentType, "NewReminder");
-        new_reminder_intent.setData(Uri.parse("https://notesnook.com/new_reminder"));
-        PendingIntent pendingIntent2 = PendingIntent.getActivity(context, appWidgetId, new_reminder_intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
-        views.setOnClickPendingIntent(R.id.add_button, pendingIntent2);
-
-        Intent list_remote_adapter_intent = new Intent(context, ReminderViewsService.class);
-        list_remote_adapter_intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-        views.setRemoteAdapter(R.id.widget_list_view, list_remote_adapter_intent);
-        views.setEmptyView(R.id.widget_list_view, R.id.empty_view);
-        appWidgetManager.updateAppWidget(appWidgetId, views);
-    }
-}

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

@@ -1,92 +0,0 @@
-package com.streetwriters.notesnook.datatypes;
-
-import androidx.annotation.Keep;
-
-@Keep
-public class BaseItem {
-    private String id;
-    private String type;
-    private long dateModified;
-    private long dateCreated;
-    private Boolean migrated;
-    private Boolean remote;
-    private Boolean synced;
-    private Boolean deleted;
-    /**
-     * @deprecated only kept here for migration purposes
-     */
-    private Object deleteReason; // Assuming never can be represented as Object
-
-    // Getters and Setters
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public long getDateModified() {
-        return dateModified;
-    }
-
-    public void setDateModified(long dateModified) {
-        this.dateModified = dateModified;
-    }
-
-    public long getDateCreated() {
-        return dateCreated;
-    }
-
-    public void setDateCreated(long dateCreated) {
-        this.dateCreated = dateCreated;
-    }
-
-    public Boolean getMigrated() {
-        return migrated;
-    }
-
-    public void setMigrated(Boolean migrated) {
-        this.migrated = migrated;
-    }
-
-    public Boolean getRemote() {
-        return remote;
-    }
-
-    public void setRemote(Boolean remote) {
-        this.remote = remote;
-    }
-
-    public Boolean getSynced() {
-        return synced;
-    }
-
-    public void setSynced(Boolean synced) {
-        this.synced = synced;
-    }
-
-    public Boolean getDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(Boolean deleted) {
-        this.deleted = deleted;
-    }
-
-    public Object getDeleteReason() {
-        return deleteReason;
-    }
-
-    public void setDeleteReason(Object deleteReason) {
-        this.deleteReason = deleteReason;
-    }
-}

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

@@ -1,125 +0,0 @@
-package com.streetwriters.notesnook.datatypes;
-
-import androidx.annotation.Keep;
-
-@Keep
-public class Note extends BaseItem {
-private String title;
-private String headline;
-private String contentId;
-private Boolean locked;
-private boolean pinned;
-private boolean favorite;
-private boolean localOnly;
-private boolean conflicted;
-private boolean readonly;
-private long dateEdited;
-private Object dateDeleted; // Assuming null can be represented as Object
-private Object itemType; // Assuming null can be represented as Object
-private Object deletedBy; // Assuming null can be represented as Object
-
-// Getters and Setters
-public String getTitle() {
-    return title;
-}
-
-public void setTitle(String title) {
-    this.title = title;
-}
-
-public String getHeadline() {
-    return headline;
-}
-
-public void setHeadline(String headline) {
-    this.headline = headline;
-}
-
-public String getContentId() {
-    return contentId;
-}
-
-public void setContentId(String contentId) {
-    this.contentId = contentId;
-}
-
-public Boolean getLocked() {
-    return locked;
-}
-
-public void setLocked(Boolean locked) {
-    this.locked = locked;
-}
-
-public boolean isPinned() {
-    return pinned;
-}
-
-public void setPinned(boolean pinned) {
-    this.pinned = pinned;
-}
-
-public boolean isFavorite() {
-    return favorite;
-}
-
-public void setFavorite(boolean favorite) {
-    this.favorite = favorite;
-}
-
-public boolean isLocalOnly() {
-    return localOnly;
-}
-
-public void setLocalOnly(boolean localOnly) {
-    this.localOnly = localOnly;
-}
-
-public boolean isConflicted() {
-    return conflicted;
-}
-
-public void setConflicted(boolean conflicted) {
-    this.conflicted = conflicted;
-}
-
-public boolean isReadonly() {
-    return readonly;
-}
-
-public void setReadonly(boolean readonly) {
-    this.readonly = readonly;
-}
-
-public long getDateEdited() {
-    return dateEdited;
-}
-
-public void setDateEdited(long dateEdited) {
-    this.dateEdited = dateEdited;
-}
-
-public Object getDateDeleted() {
-    return dateDeleted;
-}
-
-public void setDateDeleted(Object dateDeleted) {
-    this.dateDeleted = dateDeleted;
-}
-
-public Object getItemType() {
-    return itemType;
-}
-
-public void setItemType(Object itemType) {
-    this.itemType = itemType;
-}
-
-public Object getDeletedBy() {
-    return deletedBy;
-}
-
-public void setDeletedBy(Object deletedBy) {
-    this.deletedBy = deletedBy;
-}
-}

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

@@ -1,138 +0,0 @@
-package com.streetwriters.notesnook.datatypes;
-
-import androidx.annotation.Keep;
-
-import java.util.concurrent.TimeUnit;
-
-@Keep
-public class Reminder extends BaseItem {
-    private String title;
-    private String description;
-    private String formattedTime;
-    private String priority; // "silent", "vibrate", "urgent"
-    private long date;
-    private String mode; // "repeat", "once", "permanent"
-    private String recurringMode; // "week", "month", "day", "year"
-    private int[] selectedDays;
-    private boolean localOnly;
-    private boolean disabled;
-    private long snoozeUntil;
-
-    // Getters and Setters
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getPriority() {
-        return priority;
-    }
-
-    public void setPriority(String priority) {
-        this.priority = priority;
-    }
-
-    public long getDate() {
-        return date;
-    }
-
-    public void setDate(long date) {
-        this.date = date;
-    }
-
-    public String getMode() {
-        return mode;
-    }
-
-    public void setMode(String mode) {
-        this.mode = mode;
-    }
-
-    public String getRecurringMode() {
-        return recurringMode;
-    }
-
-    public void setRecurringMode(String recurringMode) {
-        this.recurringMode = recurringMode;
-    }
-
-    public int[] getSelectedDays() {
-        return selectedDays;
-    }
-
-    public void setSelectedDays(int[] selectedDays) {
-        this.selectedDays = selectedDays;
-    }
-
-    public boolean isLocalOnly() {
-        return localOnly;
-    }
-
-    public void setLocalOnly(boolean localOnly) {
-        this.localOnly = localOnly;
-    }
-
-    public boolean isDisabled() {
-        return disabled;
-    }
-
-    public void setDisabled(boolean disabled) {
-        this.disabled = disabled;
-    }
-
-    public long getSnoozeUntil() {
-        return snoozeUntil;
-    }
-
-    public void setSnoozeUntil(long snoozeUntil) {
-        this.snoozeUntil = snoozeUntil;
-    }
-
-    public String getFormattedTime() {
-        return formattedTime;
-    }
-
-    public void setFormattedTime(String formattedTime) {
-        this.formattedTime = formattedTime;
-    }
-
-    public String formatTime(long timeInMillis) {
-        long currentTime = System.currentTimeMillis();
-        long diff = timeInMillis - currentTime;
-
-        if (diff < TimeUnit.MINUTES.toMillis(1)) {
-            return "in " + (diff / 1000) + " seconds";
-        } else if (diff < TimeUnit.HOURS.toMillis(1)) {
-            long minutes = TimeUnit.MILLISECONDS.toMinutes(diff);
-            return "in " + minutes + " minute" + (minutes > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(1)) {
-            long hours = TimeUnit.MILLISECONDS.toHours(diff);
-            return "in " + hours + " hour" + (hours > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(2)) {
-            return "tomorrow";
-        } else if (diff < TimeUnit.DAYS.toMillis(7)) {
-            long days = TimeUnit.MILLISECONDS.toDays(diff);
-            return "in " + days + " day" + (days > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(30)) {
-            long weeks = TimeUnit.MILLISECONDS.toDays(diff) / 7;
-            return "in " + weeks + " week" + (weeks > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(365)) {
-            long months = TimeUnit.MILLISECONDS.toDays(diff) / 30;
-            return "in " + months + " month" + (months > 1 ? "s" : "");
-        } else {
-            long years = TimeUnit.MILLISECONDS.toDays(diff) / 365;
-            return "in " + years + " year" + (years > 1 ? "s" : "");
-        }
-    }
-}

apps/mobile/native/android/app/src/main/res/layout/new_note_widget.xml

@@ -1,35 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/transparent"
-    android:theme="@style/ThemeOverlay.Notesnook.AppWidgetContainer">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:id="@+id/new_note"
-        android:layout_height="50dp"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:background="@drawable/layout_bg"
-        android:paddingHorizontal="10dp"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:src="@drawable/add_note"
-            android:contentDescription="New note icon" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"
-            android:textColor="@color/text"
-            android:textSize="16sp"
-            android:text="@string/take_a_quick_note" />
-    </LinearLayout>
-
-</RelativeLayout>

apps/mobile/native/android/app/src/main/res/layout/note_widget.xml

@@ -3,38 +3,35 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/transparent"
+    android:padding="@dimen/widget_margin"
     android:theme="@style/ThemeOverlay.Notesnook.AppWidgetContainer">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:id="@+id/open_note"
-        android:layout_height="wrap_content"
+        android:id="@+id/widget_button"
+        android:layout_height="50dp"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
         android:background="@drawable/layout_bg"
         android:paddingHorizontal="10dp"
-        android:paddingVertical="10dp"
         android:elevation="5dp"
-        android:orientation="vertical">
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/add_note"
+            android:contentDescription="New note icon" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="8dp"
-            android:id="@+id/widget_title"
             android:textColor="@color/text"
             android:textSize="16sp"
-            android:textStyle="bold"
-            android:text="Widget unconfigured" />
-        <TextView
-            android:id="@+id/widget_body"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"
-            android:textColor="@color/text"
-            android:textSize="14sp"
-            android:text="Configure this widget to show a note here." />
+            android:text="@string/take_a_quick_note" />
     </LinearLayout>
 
 </RelativeLayout>

apps/mobile/native/android/app/src/main/res/layout/note_widget_icon.xml

@@ -1,7 +1,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:id="@+id/new_note"
     android:background="@drawable/layout_bg"
     android:padding="@dimen/widget_margin">