mobile: fix crash when taking camera picture

.commitlintrc.js

@@ -10,12 +10,11 @@ const authors = readFileSync("AUTHORS", "utf-8");
 const isAuthor = authors.includes(`<${authorEmail}>`);
 
 const SCOPES = [
-  // for full list of scopes + details see: https://github.com/streetwriters/notesnook/blob/master/CONTRIBUTING.md#commit-guidelines
+  // for full list of scopes + details see: https://github.com/streetwriters/notesnook-private/blob/master/CONTRIBUTING.md#commit-guidelines
 
   "mobile",
   "web",
   "vericrypt",
-  "monograph",
   "desktop",
   "crypto",
   "editor",
@@ -35,9 +34,7 @@ const SCOPES = [
   "common",
   "global",
   "docs",
-  "themebuilder",
-  "intl",
-  "webclipper"
+  "themebuilder"
 ];
 
 module.exports = {

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,8 @@
 name: Bug Report
 description: Are you facing a bug or a crash in Notesnook?
-type: Bug
+labels: ["Type: Bug", "Status: Pending"]
+assignees:
+  - thecodrr
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
   - name: Notesnook Discord Community
-    url: https://go.notesnook.com/discord
+    url: https://discord.gg/6mHHyncHJE
     about: Reach out to us directly & discuss your issues, suggestions & other feedback!

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest a feature you are missing in Notesnook
-type: Feature
+labels: ["Type: Feature Request", "Status: Pending"]
 body:
   - type: markdown
     attributes:

.github/workflows/android.e2e.yml

@@ -1,100 +0,0 @@
-name: e2e-android
-on: workflow_dispatch
-
-jobs:
-  e2e-android:
-    runs-on: ubuntu-latest
-    env:
-      API_LEVEL: 34
-      ARCH: x86_64
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Enable KVM
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
-      - name: Free Disk Space
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: false
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install node modules
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-version: wrapper
-          cache-read-only: false
-
-      - name: Use specific Java version for the builds
-        uses: joschi/setup-jdk@v2
-        with:
-          java-version: "17"
-          architecture: "x64"
-
-      - name: Install Detox CLI
-        run: npm install detox-cli --global
-
-      - name: Detox build
-        run: |
-          yarn build:android
-          ls apps/mobile/native/android/app/build/outputs/apk
-          ls apps/mobile/native/android/app/build/outputs/apk/release
-
-      - name: Get device name
-        id: device
-        run: |
-          AVD_NAME=$(node -p "require('./apps/mobile/native/.detoxrc.js').devices.emulator.device.avdName")
-          echo "AVD_NAME=$AVD_NAME" >> $GITHUB_OUTPUT
-
-      - name: AVD cache
-        uses: actions/cache@v4
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: ${{ steps.device.outputs.AVD_NAME }}
-
-      - name: create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ env.API_LEVEL }}
-          arch: ${{ env.ARCH }}
-          avd-name: ${{ steps.device.outputs.AVD_NAME }}
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          script: echo "Generated AVD snapshot for caching."
-
-      - name: Detox test
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ env.API_LEVEL }}
-          arch: ${{ env.ARCH }}
-          avd-name: ${{ steps.device.outputs.AVD_NAME }}
-          disable-animations: true
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          force-avd-creation: false
-          script: yarn test:android --headless --record-logs failing --record-videos failing --take-screenshots failing
-
-      - name: Upload artifacts
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: detox-artifacts
-          path: artifacts
-          retention-days: 14

.github/workflows/android.publish.internal.yml

@@ -148,7 +148,7 @@ jobs:
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
 
       - name: Upload sourcemaps
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: sourcemaps
           path: |

.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
@@ -22,7 +22,7 @@ jobs:
       - name: Use specific Java version for the builds
         uses: joschi/setup-jdk@v2
         with:
-          java-version: "17"
+          java-version: "11"
           architecture: "x64"
 
       - name: Install node modules
@@ -148,7 +148,7 @@ jobs:
             apps/mobile/native/android/app/build/outputs/apk/release/notesnook-x86_64.apk
 
       - name: Upload sourcemaps
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: sourcemaps
           path: |

.github/workflows/core.tests.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/desktop.publish.yml

@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -84,26 +84,6 @@ jobs:
           files: ./notesnook_build_v${{ steps.app_metadata.outputs.app_version }}.zip
           prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
 
-      - name: Generate flatpak sources
-        if: inputs.publish-github && inputs.build-linux
-        run: |
-          sudo apt-get install -y flatpak flatpak-builder pipx
-          git clone https://github.com/flatpak/flatpak-builder-tools.git /tmp/flatpak-builder-tools
-          cd /tmp/flatpak-builder-tools/node
-          pipx install .
-          cd -
-          node scripts/generate-sources.mjs
-
-      - name: Upload flatpak sources
-        uses: softprops/action-gh-release@v1
-        if: inputs.publish-github && inputs.build-linux
-        with:
-          draft: true
-          name: Notesnook Desktop v${{ steps.app_metadata.outputs.app_version }}
-          tag_name: v${{ steps.app_metadata.outputs.app_version }}
-          files: ./generated-sources.json
-          prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
-
   build-macos:
     name: Build for macOS
     needs: build
@@ -112,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -156,12 +136,6 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=desktop
 
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
       - name: Install provisioning profile
         run: echo "${{ secrets.MAC_PROVISIONING_PROFILE }}" | base64 --decode > embedded.provisionprofile
         working-directory: ./apps/desktop
@@ -214,7 +188,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -238,12 +212,6 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=desktop
 
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
       - name: Build Electron wrapper
         run: npx nx run release --project @notesnook/desktop
         working-directory: ./apps/desktop
@@ -279,7 +247,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v2
@@ -304,12 +272,6 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=desktop
 
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
       - name: Build
         run: npx nx run release --project @notesnook/desktop
 

.github/workflows/desktop.tests.yml

@@ -1,233 +0,0 @@
-name: Test @notesnook/desktop
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "master"
-    paths:
-      - "app/desktop/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/desktop.tests.yml"
-  pull_request:
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
-
-      - name: Setup environment
-        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
-
-      - name: Generate desktop build
-        run: npx nx build:desktop @notesnook/web
-
-      - name: Archive build artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: build
-          path: apps/web/build/**/*
-
-  test-macos-x64:
-    name: Test macOS x64
-    needs: build
-    runs-on: macos-13
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          yarn electron-builder --mac --dir --x64
-        working-directory: ./apps/desktop
-
-      - name: Run tests x64
-        run: |
-          EXECUTABLE_PATH=output/mac/Notesnook.app/Contents/MacOS/Notesnook npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-macos-x64
-          path: apps/desktop/test-results
-          retention-days: 5
-
-  test-macos:
-    name: Test macOS
-    needs: build
-    runs-on: macos-latest
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          yarn electron-builder --mac --dir --arm64
-        working-directory: ./apps/desktop
-
-      - name: Run tests arm64
-        run: |
-          EXECUTABLE_PATH=output/mac-arm64/Notesnook.app/Contents/MacOS/Notesnook npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-macos
-          path: apps/desktop/test-results
-          retention-days: 5
-
-  test-linux:
-    name: Test for Linux
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          yarn electron-builder --linux --dir --arm64 --x64
-        working-directory: ./apps/desktop
-
-      - name: Run tests
-        run: |
-          EXECUTABLE_PATH=output/linux-unpacked/notesnook xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" -- npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-linux
-          path: apps/desktop/test-results
-          retention-days: 5
-
-  test-windows:
-    name: Test for Windows
-    needs: build
-    runs-on: windows-latest
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Download build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: ./apps/web/build
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Install sqlite-better-trigram for all arch
-        run: |
-          npm i --cpu arm64 sqlite-better-trigram
-          npm i --cpu x64 sqlite-better-trigram
-        working-directory: ./apps/desktop
-
-      - name: Build Electron wrapper
-        run: npx nx run release --project @notesnook/desktop
-        working-directory: ./apps/desktop
-
-      - name: Build app
-        run: |
-          npx cross-env NOTESNOOK_STAGING=true yarn electron-builder --win --dir --arm64 --x64
-        working-directory: ./apps/desktop
-
-      - name: Run tests
-        run: |
-          npx cross-env EXECUTABLE_PATH=output/win-unpacked/Notesnook.exe npm run test
-        working-directory: ./apps/desktop
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results-win
-          path: apps/desktop/test-results
-          retention-days: 5

.github/workflows/editor.tests.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/help.publish.yml

@@ -1,6 +1,6 @@
 name: Publish Notesnook Help
 
-on:
+on: 
   workflow_dispatch:
   push:
     branches:
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable

.github/workflows/ios.publish.yml

@@ -4,7 +4,7 @@ on: workflow_dispatch
 
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-13
     timeout-minutes: 60
 
     steps:
@@ -89,16 +89,16 @@ 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
+        uses: actions/upload-artifact@v2
         with:
           name: Notesnook.zip
           path: |

.github/workflows/monograph.publish.yml

@@ -1,89 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# GitHub recommends pinning actions to a commit SHA.
-# To get a newer version, you will need to update the SHA.
-# You can also reference a tag or branch, but the action may change without warning.
-
-name: Publish @notesnook/monograph
-
-on: workflow_dispatch
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=monograph
-
-      - name: Collect package metadata
-        id: package_metadata
-        working-directory: ./apps/monograph
-        run: |
-          echo ::set-output name=app_version::$(cat package.json | jq -r .version)
-
-      - name: Generate build
-        run: npx nx build @notesnook/monograph
-
-      # Setup Buildx
-      - name: Docker Setup Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          ecr: auto
-          logout: true
-
-      # Pull previous image from docker hub to use it as cache to improve the image build time.
-      - name: docker pull cache image
-        continue-on-error: true
-        run: docker pull streetwriters/monograph:latest
-
-      # Setup QEMU
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v2
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: streetwriters/monograph
-
-      - name: Build and push Docker image
-        id: push
-        uses: docker/build-push-action@v6
-        with:
-          context: apps/monograph
-          file: apps/monograph/Dockerfile
-          push: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
-          tags: streetwriters/monograph:${{ steps.package_metadata.outputs.app_version }},streetwriters/monograph:latest
-          cache-from: streetwriters/monograph:latest
-
-      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v1
-        with:
-          subject-name: index.docker.io/streetwriters/monograph
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true

.github/workflows/theme-builder.publish.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/vericrypt.publish.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/web.benchmarks.yml

@@ -1,44 +0,0 @@
-name: Benchmark @notesnook/web
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "master"
-    paths:
-      - "apps/web/**"
-      # re-run workflow if workflow file changes
-      - ".github/workflows/web.benchmarks.yml"
-  pull_request:
-
-jobs:
-  bench:
-    name: Bench
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Install packages
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=web
-
-      - name: Setup environment
-        run: |
-          echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
-
-      - name: Build
-        run: npm run build:web
-
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium --with-deps
-        working-directory: apps/web
-
-      - name: Run benchmarks
-        id: benchmark
-        run: node __bench__/app.bench.mjs
-        working-directory: apps/web

.github/workflows/web.publish.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/web.tests.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -40,7 +40,7 @@ jobs:
         run: npm run build:test:web
 
       - name: Archive build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: build
           path: apps/web/build/**/*
@@ -53,10 +53,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Download build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: build
           path: ./apps/web/build
@@ -88,7 +88,7 @@ jobs:
         working-directory: apps/web
 
       - name: Upload test results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: test-results-${{ matrix.shard }}

apps/desktop/README.md

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

apps/desktop/__tests__/launch.test.mjs

@@ -1,53 +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 test from "node:test";
-import { launchApp } from "./utils.mjs";
-import assert from "assert";
-import slugify from "slugify";
-import path from "path";
-import { mkdir } from "fs/promises";
-
-test("make sure app loads", async (t) => {
-  const { app, page } = await launchApp();
-  try {
-    await page.waitForSelector("#authForm");
-
-    assert.ok(
-      await page.getByRole("button", { name: "Create account" }).isVisible()
-    );
-
-    await page
-      .getByRole("button", { name: "Skip & go directly to the app" })
-      .click();
-
-    await page.waitForSelector(".ProseMirror");
-  } catch (e) {
-    await mkdir("test-results", { recursive: true });
-    await page.screenshot({
-      path: path.join(
-        "test-results",
-        `${slugify(t.name)}-${process.platform}-${process.arch}-error.png`
-      )
-    });
-    throw e;
-  } finally {
-    await app.close();
-  }
-});

apps/desktop/__tests__/utils.mjs

@@ -1,38 +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 { _electron as electron } from "playwright";
-
-const executablePath = process.env.EXECUTABLE_PATH;
-
-// process.platform === "linux"
-//   ? "output/linux-unpacked/Notesnook"
-//   : process.platform === "darwin"
-//   ? "output/mac/Notesnook.app/Contents/MacOS/Notesnook"
-//   : "output/win-unpacked/Notesnook.exe";
-
-export async function launchApp() {
-  const app = await electron.launch({
-    executablePath
-  });
-
-  const page = await app.firstWindow();
-
-  return { app, page };
-}

apps/desktop/app-update.yml

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

apps/desktop/package.json

@@ -2,58 +2,38 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.0.24",
+  "version": "3.0.2",
   "appAppleId": "1544027013",
   "private": true,
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
-  "sideEffects": false,
-  "exports": {
-    ".": {
-      "require": {
-        "types": "./dist/types/index.d.ts",
-        "default": "./dist/cjs/index.js"
-      },
-      "import": {
-        "types": "./dist/types/index.d.ts",
-        "default": "./dist/esm/index.js"
-      }
-    }
-  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "homepage": "https://notesnook.com/",
   "repository": "https://github.com/streetwriters/notesnook",
   "license": "GPL-3.0-or-later",
   "dependencies": {
-    "@lingui/core": "4.11.4",
-    "@notesnook/intl": "file:../../packages/intl",
-    "@trpc/client": "10.45.2",
-    "@trpc/server": "10.45.2",
-    "better-sqlite3-multiple-ciphers": "11.5.0",
-    "electron-trpc": "0.6.1",
-    "electron-updater": "^6.3.4",
-    "icojs": "^0.19.4",
-    "sqlite-better-trigram": "0.0.2",
+    "@notesnook/crypto": "file:../../packages/crypto",
+    "@trpc/client": "10.38.3",
+    "@trpc/server": "10.38.3",
+    "better-sqlite3-multiple-ciphers": "^9.5.0",
+    "electron-trpc": "0.5.2",
+    "electron-updater": "6.1.4",
+    "icojs": "^0.17.1",
+    "sodium-native": "^4.1.1",
     "typed-emitter": "^2.1.0",
-    "yargs": "^17.7.2",
-    "zod": "3.23.8"
+    "yargs": "^17.6.2",
+    "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@streetwriters/kysely": "^0.27.4",
-    "@types/node": "22.7.0",
-    "@types/yargs": "^17.0.33",
-    "chokidar": "^4.0.1",
-    "electron": "^31.7.4",
-    "electron-builder": "^25.1.8",
-    "esbuild": "0.21.5",
-    "vitest": "2.1.8",
-    "node-abi": "^3.68.0",
-    "node-gyp-build": "^4.8.2",
-    "playwright": "^1.48.2",
+    "@types/node": "18.16.1",
+    "@types/yargs": "^17.0.24",
+    "chokidar": "^3.5.3",
+    "electron": "^29.3.1",
+    "electron-builder": "^24.13.3",
+    "esbuild": "^0.20.0",
+    "node-gyp-build": "^4.8.0",
     "prebuildify": "^6.0.1",
-    "slugify": "1.6.6",
     "tree-kill": "^1.2.2",
-    "undici": "^6.19.8"
+    "undici": "^6.14.1"
   },
   "optionalDependencies": {
     "dmg-license": "^1.0.11"
@@ -62,11 +42,10 @@
     "start": "node scripts/dev.mjs",
     "staging": "node scripts/build.mjs --run",
     "release": "node scripts/build.mjs",
-    "build": "node ../../scripts/build.mjs",
+    "build": "tsc",
     "bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --external:better-sqlite3-multiple-ciphers --external:sodium-native --minify --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true",
     "bundle:mas": "esbuild electron=./src/main.ts ./src/preload.ts --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true",
-    "postinstall": "patch-package",
-    "test": "node --test --test-timeout 30000 --test-force-exit"
+    "postinstall": "patch-package"
   },
   "author": {
     "name": "Streetwriters (Private) Limited",
@@ -95,20 +74,7 @@
       "node_modules/file-uri-to-path",
       "node_modules/bindings",
       "node_modules/node-gyp-build",
-      "node_modules/sqlite-better-trigram",
       "node_modules/sodium-native/prebuilds/${platform}-${arch}",
-      {
-        "from": "node_modules/sqlite-better-trigram-linux-${arch}",
-        "to": "node_modules/sqlite-better-trigram-linux-${arch}"
-      },
-      {
-        "from": "node_modules/sqlite-better-trigram-darwin-${arch}",
-        "to": "node_modules/sqlite-better-trigram-darwin-${arch}"
-      },
-      {
-        "from": "node_modules/sqlite-better-trigram-windows-${arch}",
-        "to": "node_modules/sqlite-better-trigram-windows-${arch}"
-      },
       "node_modules/sodium-native/index.js",
       "node_modules/sodium-native/package.json"
     ],
@@ -181,12 +147,10 @@
           ]
         }
       ],
-      "signtoolOptions": {
-        "signingHashAlgorithms": [
-          "sha256"
-        ],
-        "sign": "./scripts/sign.js"
-      },
+      "signingHashAlgorithms": [
+        "sha256"
+      ],
+      "sign": "./scripts/sign.js",
       "icon": "assets/icons/app.ico"
     },
     "portable": {
@@ -194,8 +158,7 @@
     },
     "nsis": {
       "oneClick": true,
-      "createDesktopShortcut": "always",
-      "deleteAppDataOnUninstall": true
+      "createDesktopShortcut": "always"
     },
     "linux": {
       "target": [
@@ -262,4 +225,4 @@
       }
     ]
   }
-}
+}

apps/desktop/patches/app-builder-lib+24.6.4.patch

@@ -1,8 +1,8 @@
 diff --git a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-index 739a48c..7a7b4af 100644
+index fcb7f54..cb1c7f7 100644
 --- a/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
 +++ b/node_modules/app-builder-lib/out/targets/LinuxTargetHelper.js
-@@ -117,6 +117,7 @@ class LinuxTargetHelper {
+@@ -116,6 +116,7 @@ class LinuxTargetHelper {
              StartupWMClass: appInfo.productName,
              ...extra,
              ...targetSpecificOptions.desktop,
@@ -10,7 +10,7 @@ index 739a48c..7a7b4af 100644
          };
          const description = this.getDescription(targetSpecificOptions);
          if (!(0, builder_util_1.isEmptyOrSpaces)(description)) {
-@@ -160,6 +161,23 @@ class LinuxTargetHelper {
+@@ -159,6 +160,23 @@ class LinuxTargetHelper {
              data += `\n${name}=${desktopMeta[name]}`;
          }
          data += "\n";

apps/desktop/patches/electron-trpc+0.5.2.patch

@@ -0,0 +1,23 @@
+diff --git a/node_modules/electron-trpc/dist/main.mjs b/node_modules/electron-trpc/dist/main.mjs
+index 379cf3b..2644e5d 100644
+--- a/node_modules/electron-trpc/dist/main.mjs
++++ b/node_modules/electron-trpc/dist/main.mjs
+@@ -221,9 +221,16 @@ class G {
+     i(this, c).includes(r) || (i(this, c).push(r), I(this, T, W).call(this, r));
+   }
+   detachWindow(r) {
++    
+     y(this, c, i(this, c).filter((n) => n !== r));
+-    for (const [n, t] of i(this, u).entries())
+-      n.startsWith(`${r.webContents.id}-`) && (t.unsubscribe(), i(this, u).delete(n));
++    for (const [n, t] of i(this, u).entries()) {
++      try {
++        n.startsWith(`${r.webContents.id}-`) && (t.unsubscribe(), i(this, u).delete(n));
++      } catch(e) {
++        console.error(e);
++        // ignore
++      }
++    }
+   }
+ }
+ c = new WeakMap(), u = new WeakMap(), T = new WeakSet(), W = function(r) {

apps/desktop/patches/electron-trpc+0.6.1.patch

@@ -1,39 +0,0 @@
-diff --git a/node_modules/electron-trpc/dist/main.mjs b/node_modules/electron-trpc/dist/main.mjs
-index 07971db..b67a3cf 100644
---- a/node_modules/electron-trpc/dist/main.mjs
-+++ b/node_modules/electron-trpc/dist/main.mjs
-@@ -537,8 +537,15 @@ class be {
-   attachWindow(r) {
-     F(this, w).includes(r) || (y("Attaching window", r.id), F(this, w).push(r), v(this, N, Z).call(this, r));
-   }
--  detachWindow(r) {
--    y("Detaching window", r.id), L(this, w, F(this, w).filter((e) => e !== r)), v(this, R, M).call(this, { webContentsId: r.webContents.id });
-+  detachWindow(r, webContentsId) {
-+    y("Detaching window", r.id);
-+
-+    if (r.isDestroyed() && webContentsId === undefined) {
-+      throw new Error('webContentsId is required when calling detachWindow on a destroyed window');
-+    }
-+
-+    L(this, w, F(this, w).filter((e) => e !== r));
-+    v(this, R, M).call(this, { webContentsId: webContentsId ?? r.webContents.id });
-   }
- }
- w = new WeakMap(), E = new WeakMap(), R = new WeakSet(), M = function({
-@@ -548,6 +555,7 @@ w = new WeakMap(), E = new WeakMap(), R = new WeakSet(), M = function({
-   for (const [i, a] of F(this, E).entries())
-     i.startsWith(`${r}-${e ?? ""}`) && (y("Closing subscription", i), a.unsubscribe(), F(this, E).delete(i));
- }, N = new WeakSet(), Z = function(r) {
-+  const webContentsId = r.webContents.id;
-   r.webContents.on("did-start-navigation", ({ frame: e }) => {
-     y(
-       "Handling webContents `did-start-navigation` event",
-@@ -558,7 +566,7 @@ w = new WeakMap(), E = new WeakMap(), R = new WeakSet(), M = function({
-       frameRoutingId: e.routingId
-     });
-   }), r.webContents.on("destroyed", () => {
--    y("Handling webContents `destroyed` event"), this.detachWindow(r);
-+    y("Handling webContents `destroyed` event"), this.detachWindow(r, webContentsId);
-   });
- };
- const me = ({

apps/desktop/patches/node-gyp-build+4.8.0.patch

@@ -0,0 +1,46 @@
+diff --git a/node_modules/node-gyp-build/bin.js b/node_modules/node-gyp-build/bin.js
+index 3fbcdf0..7ca3ab5 100644
+--- a/node_modules/node-gyp-build/bin.js
++++ b/node_modules/node-gyp-build/bin.js
+@@ -16,7 +16,8 @@ if (!buildFromSource()) {
+ }
+ 
+ function build () {
+-  var args = [os.platform() === 'win32' ? 'node-gyp.cmd' : 'node-gyp', 'rebuild']
++  var win32 = os.platform() === 'win32'
++  var args = [win32 ? 'node-gyp.cmd' : 'node-gyp', 'rebuild']
+ 
+   try {
+     var pkg = require('node-gyp/package.json')
+@@ -27,7 +28,7 @@ function build () {
+     ]
+   } catch (_) {}
+ 
+-  proc.spawn(args[0], args.slice(1), { stdio: 'inherit' }).on('exit', function (code) {
++  proc.spawn(args[0], args.slice(1), { stdio: 'inherit', shell: win32, windowsHide: true }).on('exit', function (code) {
+     if (code || !process.argv[3]) process.exit(code)
+     exec(process.argv[3]).on('exit', function (code) {
+       process.exit(code)
+@@ -45,15 +46,18 @@ function preinstall () {
+ 
+ function exec (cmd) {
+   if (process.platform !== 'win32') {
+-    var shell = os.platform() === 'android' ? 'sh' : '/bin/sh'
+-    return proc.spawn(shell, ['-c', '--', cmd], {
++    var shell = os.platform() === 'android' ? 'sh' : true
++    return proc.spawn(cmd, [], {
++      shell,
+       stdio: 'inherit'
+     })
+   }
+ 
+-  return proc.spawn(process.env.comspec || 'cmd.exe', ['/s', '/c', '"' + cmd + '"'], {
++  return proc.spawn(cmd, [], {
+     windowsVerbatimArguments: true,
+-    stdio: 'inherit'
++    stdio: 'inherit',
++    shell: true,
++    windowsHide: true
+   })
+ }
+ 

apps/desktop/scripts/build.mjs

@@ -18,17 +18,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import path from "path";
-import fs from "fs/promises";
-import { existsSync } from "fs";
+import fs, { readFile, writeFile } from "fs/promises";
+import { existsSync, readFileSync } from "fs";
 import yargs from "yargs-parser";
 import os from "os";
 import * as childProcess from "child_process";
 import { fileURLToPath } from "url";
-import { patchBetterSQLite3 } from "./patch-better-sqlite3.mjs";
 
 const args = yargs(process.argv);
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+const packageJson = JSON.parse(
+  readFileSync(path.join(__dirname, "..", "package.json"), "utf-8")
+);
 
 const webAppPath = path.resolve(path.join(__dirname, "..", "..", "web"));
 
@@ -44,27 +46,31 @@ if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
 // temporary until there's support for prebuilt binaries for linux ARM
 if (os.platform() === "linux") await patchBetterSQLite3();
 
+if (os.platform() === "win32")
+  await exec(
+    `npx prebuildify --arch=arm64 --strip -t electron@${packageJson.devDependencies.electron}`,
+    path.join(__dirname, "..", "node_modules", "sodium-native")
+  );
+
 await fs.cp(path.join(webAppPath, "build"), "build", {
   recursive: true,
   force: true
 });
 
 if (args.variant === "mas") {
-  await exec(`yarn run bundle:mas`);
+  await exec(`npm run bundle:mas`);
 } else {
-  await exec(`yarn run bundle`);
+  await exec(`npm run bundle`);
 }
 
-await exec(`yarn run build`);
+await exec(`npx tsc`);
 
 if (args.run) {
-  await exec(`yarn electron-builder --dir --${process.arch}`);
+  await exec(`npx 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`);
   }
@@ -77,3 +83,21 @@ async function exec(cmd, cwd) {
     cwd: cwd || process.cwd()
   });
 }
+
+async function patchBetterSQLite3() {
+  const jsonPath = path.join(
+    __dirname,
+    "..",
+    "node_modules",
+    "better-sqlite3-multiple-ciphers",
+    "package.json"
+  );
+  const json = JSON.parse(await readFile(jsonPath, "utf-8"));
+
+  json.version = "9.5.1";
+  json.homepage = "https://github.com/thecodrr/better-sqlite3-multiple-ciphers";
+  json.repository.url =
+    "git://github.com/thecodrr/better-sqlite3-multiple-ciphers.git";
+
+  await writeFile(jsonPath, JSON.stringify(json));
+}

apps/desktop/scripts/dev.mjs

@@ -36,8 +36,6 @@ const ENV = {
   FORCE_COLOR: "false",
   COLOR: "0"
 };
-process.chdir(path.join(__dirname, ".."));
-
 await onChange(true);
 
 console.log("Watching...");
@@ -55,13 +53,11 @@ async function onChange(first) {
   if (first) {
     await fs.rm("./build/", { force: true, recursive: true });
 
-    await exec("npm rebuild electron --verbose --foreground-scripts");
-
-    await exec("yarn electron-builder install-app-deps");
+    await exec("npx electron-builder install-app-deps");
   }
 
-  await exec(`yarn run bundle`);
-  await exec(`yarn run build`);
+  await exec(`npm run bundle`);
+  execAsync(`npx`, [`tsc`]);
 
   if (await isBundleSame()) {
     console.log("Bundle is same. Doing nothing.");
@@ -70,8 +66,8 @@ async function onChange(first) {
 
   if (first) {
     await spawnAndWaitUntil(
-      ["npm", "run", "start:desktop"],
-      path.join(__dirname, "..", "..", "web"),
+      ["npx", "nx", "start:desktop", "@notesnook/web"],
+      path.join(__dirname, "..", "..", ".."),
       (data) => data.includes("Network: use --host to expose")
     );
   }
@@ -82,7 +78,7 @@ async function onChange(first) {
   }
 
   execAsync(
-    "yarn",
+    "npx",
     ["electron", path.join("build", "electron.js")],
     true,
     cleanup

apps/desktop/scripts/patch-better-sqlite3.mjs

@@ -1,48 +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 { readFile, writeFile } from "fs/promises";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export async function patchBetterSQLite3() {
-  const jsonPath = path.join(
-    __dirname,
-    "..",
-    "node_modules",
-    "better-sqlite3-multiple-ciphers",
-    "package.json"
-  );
-  const json = JSON.parse(await readFile(jsonPath, "utf-8"));
-
-  json.version = "11.5.1";
-  json.homepage = "https://github.com/thecodrr/better-sqlite3-multiple-ciphers";
-  json.repository.url =
-    "git://github.com/thecodrr/better-sqlite3-multiple-ciphers.git";
-
-  await writeFile(jsonPath, JSON.stringify(json));
-}
-
-if (process.argv[1] === __filename) {
-  console.log("Patching better-sqlite3");
-  patchBetterSQLite3();
-}

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

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

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

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

apps/desktop/src/api/updater.ts

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

apps/desktop/src/index.ts

@@ -17,8 +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/>.
 */
 
-export { PATHS } from "./constants";
+export * from "./constants";
 export type { AppRouter } from "./api";
 export { type UpdateInfo } from "builder-util-runtime";
 export { type DesktopIntegration } from "./utils/config";
-export { SQLite } from "./api/sqlite-kysely.js";

apps/desktop/src/main.ts

@@ -36,20 +36,6 @@ import { bringToFront } from "./utils/bring-to-front";
 import { bridge } from "./api/bridge";
 import { setupDesktopIntegration } from "./utils/desktop-integration";
 import { disableCustomDns, enableCustomDns } from "./utils/custom-dns";
-import { Messages, setI18nGlobal } from "@notesnook/intl";
-import { i18n } from "@lingui/core";
-
-const locale =
-  process.env.NODE_ENV === "development"
-    ? import("@notesnook/intl/locales/$pseudo-LOCALE.json")
-    : import("@notesnook/intl/locales/$en.json");
-locale.then(({ default: locale }) => {
-  i18n.load({
-    en: locale.messages as unknown as Messages
-  });
-  i18n.activate("en");
-});
-setI18nGlobal(i18n);
 
 // only run a single instance
 if (!MAC_APP_STORE && !app.requestSingleInstanceLock()) {
@@ -98,27 +84,22 @@ async function createWindow() {
       format: process.platform === "win32" ? "ico" : "png"
     }),
 
-    ...(config.desktopSettings.nativeTitlebar
-      ? {}
-      : {
-          titleBarStyle: process.platform === "win32" || process.platform === "darwin" ? "hidden" : "default",
-          frame: process.platform === "win32" || process.platform === "darwin",
-          titleBarOverlay: {
-            height: 37,
-            color: "#00000000",
-            symbolColor: config.windowControlsIconColor
-          },
-          trafficLightPosition: {
-            x: 16,
-            y: 12
-          }
-        }),
+    titleBarStyle: "hidden",
+    frame: process.platform === "win32" || process.platform === "darwin",
+    titleBarOverlay: {
+      height: 37,
+      color: "#00000000",
+      symbolColor: config.windowControlsIconColor
+    },
+    trafficLightPosition: {
+      x: 16,
+      y: 12
+    },
 
     webPreferences: {
       zoomFactor: config.zoomFactor,
       nodeIntegration: true,
       contextIsolation: false,
-      nodeIntegrationInWorker: true,
       spellcheck: config.isSpellCheckerEnabled,
       preload: __dirname + "/preload.js"
     }

apps/desktop/src/preload.ts

@@ -19,25 +19,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* eslint-disable no-var */
 
 import { ELECTRON_TRPC_CHANNEL } from "electron-trpc/main";
-// import type { NNCrypto } from "@notesnook/crypto";
+import { type RendererGlobalElectronTRPC } from "electron-trpc/src/types";
+import type { NNCrypto } from "@notesnook/crypto";
 import { ipcRenderer } from "electron";
 import { platform } from "os";
+import sqlite3, { Database } from "better-sqlite3-multiple-ciphers";
 
 declare global {
   var os: () => "mas" | ReturnType<typeof platform>;
-  var electronTRPC: any;
-  // var NativeNNCrypto: (new () => NNCrypto) | undefined;
+  var electronTRPC: RendererGlobalElectronTRPC;
+  var NativeNNCrypto: (new () => NNCrypto) | undefined;
+  var createSQLite3Database: (filename: string) => Database;
 }
 
 process.once("loaded", async () => {
-  const electronTRPC = {
-    sendMessage: (operation: any) =>
+  const electronTRPC: RendererGlobalElectronTRPC = {
+    sendMessage: (operation) =>
       ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
-    onMessage: (callback: any) =>
+    onMessage: (callback) =>
       ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
   };
   globalThis.electronTRPC = electronTRPC;
 });
 
-// globalThis.NativeNNCrypto = require("@notesnook/crypto").NNCrypto;
+globalThis.NativeNNCrypto = require("@notesnook/crypto").NNCrypto;
+globalThis.createSQLite3Database = (filename) => sqlite3(filename);
 globalThis.os = () => (MAC_APP_STORE ? "mas" : platform());

apps/desktop/src/utils/asset-manager.ts

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { NativeImage, nativeImage } from "electron";
 import path from "path";
 import { isDevelopment } from "./index";
-import { ParsedImage, parseICO } from "icojs";
+import { parse, ParsedImage } from "icojs";
 import { getSystemTheme } from "./theme";
 import { readFile } from "fs/promises";
 
@@ -71,7 +71,7 @@ export class AssetManager {
           `${icon}${prefix}.ico`
         );
         const icoBuffer = await readFile(icoPath);
-        const images = await parseICO(icoBuffer, "image/png");
+        const images = await parse(icoBuffer, "image/png");
         ALL_ICONS.push({ id: icon, images, prefix });
       }
     }

apps/desktop/src/utils/autoupdater.ts

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

apps/desktop/src/utils/config.ts

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

apps/desktop/src/utils/menu.ts

@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { strings } from "@notesnook/intl";
 import { Menu, MenuItem, clipboard, shell } from "electron";
 
 function setupMenu() {
@@ -41,7 +40,7 @@ function setupMenu() {
     if (params.misspelledWord) {
       menu.append(
         new MenuItem({
-          label: strings.addToDictionary(),
+          label: "Add to dictionary",
           click: () =>
             globalThis.window?.webContents.session.addWordToSpellCheckerDictionary(
               params.misspelledWord
@@ -60,7 +59,7 @@ function setupMenu() {
     if (params.linkURL.length) {
       menu.append(
         new MenuItem({
-          label: strings.openInBrowser(),
+          label: "Open in browser",
           click: () => shell.openExternal(params.linkURL)
         })
       );
@@ -69,7 +68,7 @@ function setupMenu() {
     if (params.isEditable) {
       menu.append(
         new MenuItem({
-          label: strings.undo(),
+          label: "Undo",
           role: "undo",
           enabled: params.isEditable,
           accelerator: "CommandOrControl+Z"
@@ -78,7 +77,7 @@ function setupMenu() {
 
       menu.append(
         new MenuItem({
-          label: strings.redo(),
+          label: "Redo",
           role: "redo",
           enabled: params.isEditable,
           accelerator: "CommandOrControl+Y"
@@ -95,7 +94,7 @@ function setupMenu() {
     if (params.isEditable)
       menu.append(
         new MenuItem({
-          label: strings.cut(),
+          label: "Cut",
           role: "cut",
           enabled: params.selectionText.length > 0,
           accelerator: "CommandOrControl+X"
@@ -105,7 +104,7 @@ function setupMenu() {
     if (params.linkURL?.length) {
       menu.append(
         new MenuItem({
-          label: strings.copyLink(),
+          label: "Copy link",
           click() {
             clipboard.writeText(params.linkURL);
           }
@@ -114,7 +113,7 @@ function setupMenu() {
 
       menu.append(
         new MenuItem({
-          label: strings.copyLinkText(),
+          label: "Copy link text",
           click() {
             clipboard.writeText(params.linkText);
           }
@@ -125,7 +124,7 @@ function setupMenu() {
     if (params.selectionText.length) {
       menu.append(
         new MenuItem({
-          label: strings.copy(),
+          label: "Copy",
           role: "copy",
           accelerator: "CommandOrControl+C"
         })
@@ -136,7 +135,7 @@ function setupMenu() {
       menu.append(
         new MenuItem({
           id: "copy-image",
-          label: strings.copyImage(),
+          label: "Copy Image",
           click() {
             globalThis.window?.webContents.copyImageAt(params.x, params.y);
           }
@@ -146,7 +145,7 @@ function setupMenu() {
     if (params.isEditable)
       menu.append(
         new MenuItem({
-          label: strings.paste(),
+          label: "Paste",
           role: "pasteAndMatchStyle",
           enabled: clipboard.readText("clipboard").length > 0,
           accelerator: "CommandOrControl+V"

apps/desktop/src/utils/theme.ts

@@ -57,8 +57,7 @@ function getSystemTheme() {
   nativeTheme.themeSource = oldThemeSource;
 
   setTimeout(
-    () =>
-      listeners.forEach((a) => nativeTheme.addListener("updated", () => a())),
+    () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),
     1000
   );
   return currentTheme;
@@ -73,8 +72,7 @@ function changeTheme(theme: Theme) {
   nativeTheme.themeSource = theme;
 
   setTimeout(
-    () =>
-      listeners.forEach((a) => nativeTheme.addListener("updated", () => a())),
+    () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),
     1000
   );
 }

apps/desktop/tsconfig.json

@@ -2,8 +2,7 @@
   "extends": "../../tsconfig",
   "compilerOptions": {
     "outDir": "./dist/",
-    "lib": ["ESNext"],
-    "moduleResolution": "Bundler"
+    "lib": ["ESNext"]
   },
   "include": ["src", "global.d.ts"]
 }

apps/mobile/.gitignore

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

apps/mobile/app/app.tsx

@@ -16,15 +16,13 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { i18n } from "@lingui/core";
-import { I18nProvider } from "@lingui/react";
+import "react-native-gesture-handler";
 import {
   THEME_COMPATIBILITY_VERSION,
   useThemeEngineStore
 } from "@notesnook/theme";
 import React, { useEffect } from "react";
 import { I18nManager, View } from "react-native";
-import "react-native-gesture-handler";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { SafeAreaProvider } from "react-native-safe-area-context";
 import AppLockedOverlay from "./components/app-lock-overlay";
@@ -32,46 +30,45 @@ 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);
 I18nManager.swapLeftAndRightInRTL(false);
-const { appLockEnabled, appLockMode } = SettingsService.get();
-if (appLockEnabled || appLockMode !== "none") {
-  useUserStore.getState().lockApp(true);
-}
 
-IntentService.onLaunch();
-const App = (props: { configureMode: "note-preview" }) => {
-  useAppEvents();
-  //@ts-ignore
-  globalThis["IS_MAIN_APP_RUNNING"] = true;
+const App = () => {
+  const init = useAppEvents();
   useEffect(() => {
-    SettingsService.onFirstLaunch();
+    const { appLockEnabled, appLockMode } = SettingsService.get();
+    if (appLockEnabled || appLockMode !== "none") {
+      useUserStore.getState().lockApp(true);
+    }
+
+    //@ts-ignore
+    globalThis["IS_MAIN_APP_RUNNING"] = true;
+    init();
     setTimeout(async () => {
+      SettingsService.onFirstLaunch();
       await Notifications.get();
       if (SettingsService.get().notifNotes) {
         Notifications.pinQuickNote(true);
       }
       TipManager.init();
     }, 100);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   return (
     <View
       style={{
         height: "100%",
-        width: "100%",
-        justifyContent: "center",
-        alignItems: "center"
+        width: "100%"
       }}
     >
       <View
@@ -94,11 +91,7 @@ const App = (props: { configureMode: "note-preview" }) => {
           width: "100%"
         }}
       >
-        {props.configureMode === "note-preview" ? (
-          <NotePreviewConfigure />
-        ) : (
-          <ApplicationHolder />
-        )}
+        <ApplicationHolder />
       </GestureHandlerRootView>
       <AppLockedOverlay />
     </View>
@@ -111,8 +104,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 +124,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
     }, []);
@@ -151,11 +143,7 @@ export const withTheme = (Element: (props: any) => JSX.Element) => {
       currTheme = nextTheme;
     }
 
-    return (
-      <I18nProvider i18n={i18n}>
-        <Element {...props} />
-      </I18nProvider>
-    );
+    return <Element />;
   };
 };
 

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

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

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

@@ -0,0 +1,389 @@
+/*
+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 Sodium from "@ammarahmed/react-native-sodium";
+import { Platform } from "react-native";
+import "react-native-get-random-values";
+import * as Keychain from "react-native-keychain";
+import { MMKVLoader, ProcessingModes } from "react-native-mmkv-storage";
+import { generateSecureRandom } from "react-native-securerandom";
+import { DatabaseLogger } from ".";
+import { MMKV } from "./mmkv";
+
+// Database key cipher is persisted across different user sessions hence it has
+// it's independent storage which we will never clear. This is only used when application has
+// app lock with password enabled.
+export const CipherStorage = new MMKVLoader()
+  .withInstanceID("cipher_storage")
+  .setProcessingMode(
+    Platform.OS === "ios"
+      ? ProcessingModes.MULTI_PROCESS
+      : ProcessingModes.SINGLE_PROCESS
+  )
+  .disableIndexing()
+  .initialize();
+
+const IOS_KEYCHAIN_ACCESS_GROUP = "group.org.streetwriters.notesnook";
+const IOS_KEYCHAIN_SERVICE_NAME = "org.streetwriters.notesnook";
+const KEYCHAIN_SERVER_DBKEY = "notesnook:db";
+
+const NOTESNOOK_APPLOCK_KEY_SALT = "3dqclWbOYllfk9kk";
+const NOTESNOOK_DB_KEY_SALT = "2rcgSprDmRvZ1AAa";
+const NOTESNOOK_USER_KEY_SALT = "7qO4qeoM6PbsAJ0Q";
+
+const DB_KEY_CIPHER = "databaseKeyCipher";
+const USER_KEY_CIPHER = "userKeyCipher";
+const APPLOCK_CIPHER = "applockCipher";
+
+const KEYSTORE_CONFIG = Platform.select({
+  ios: {
+    accessible: Keychain.ACCESSIBLE.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
+    accessGroup: IOS_KEYCHAIN_ACCESS_GROUP,
+    service: IOS_KEYCHAIN_SERVICE_NAME
+  },
+  android: {}
+});
+
+function generatePassword() {
+  const length = 80;
+  const crypto = window.crypto || window.msCrypto;
+  if (typeof crypto === "undefined") {
+    throw new Error(
+      "Crypto API is not supported. Please upgrade your web browser"
+    );
+  }
+  const charset =
+    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!@#$%^&+_{}[]():<>/?;";
+  const indexes = crypto.getRandomValues(new Uint32Array(length));
+  let secret = "";
+  for (const index of indexes) {
+    secret += charset[index % charset.length];
+  }
+  return secret;
+}
+
+export async function encryptDatabaseKeyWithPassword(appLockPassword) {
+  const key = getDatabaseKey();
+  const appLockCredentials = await Sodium.deriveKey(
+    appLockPassword,
+    NOTESNOOK_APPLOCK_KEY_SALT
+  );
+  const databaseKeyCipher = await encrypt(appLockCredentials, key);
+  MMKV.setMap(DB_KEY_CIPHER, databaseKeyCipher);
+  // We reset the database key from keychain once app lock password is set.
+  await Keychain.resetInternetCredentials(KEYCHAIN_SERVER_DBKEY);
+  return true;
+}
+
+export async function restoreDatabaseKeyToKeyChain(appLockPassword) {
+  const databaseKeyCipher = CipherStorage.getMap(DB_KEY_CIPHER);
+  const databaseKey = await decrypt(
+    {
+      password: appLockPassword
+    },
+    databaseKeyCipher
+  );
+
+  await Keychain.setInternetCredentials(
+    KEYCHAIN_SERVER_DBKEY,
+    "notesnook",
+    databaseKey,
+    KEYSTORE_CONFIG
+  );
+  MMKV.removeItem(DB_KEY_CIPHER);
+  return true;
+}
+
+export async function setAppLockVerificationCipher(appLockPassword) {
+  try {
+    const appLockCredentials = await Sodium.deriveKey(
+      appLockPassword,
+      NOTESNOOK_APPLOCK_KEY_SALT
+    );
+    const encrypted = await encrypt(appLockCredentials, generatePassword());
+
+    CipherStorage.setMap(APPLOCK_CIPHER, encrypted);
+
+    DatabaseLogger.info("setAppLockVerificationCipher");
+  } catch (e) {
+    DatabaseLogger.error(e);
+    console.log(e);
+  }
+}
+
+export async function clearAppLockVerificationCipher() {
+  CipherStorage.removeItem(APPLOCK_CIPHER);
+}
+
+export async function validateAppLockPassword(appLockPassword) {
+  try {
+    const appLockCipher = CipherStorage.getMap(APPLOCK_CIPHER);
+    if (!appLockCipher) return true;
+    const decrypted = await decrypt(
+      await Sodium.deriveKey(appLockPassword, NOTESNOOK_APPLOCK_KEY_SALT),
+      appLockCipher
+    );
+
+    DatabaseLogger.info(
+      `validateAppLockPassword: ${typeof decrypted === "string"}`
+    );
+    return typeof decrypted === "string";
+  } catch (e) {
+    DatabaseLogger.error(e);
+    return false;
+  }
+}
+
+let DB_KEY;
+export function clearDatabaseKey() {
+  DB_KEY = undefined;
+  DatabaseLogger.info("Cleared database key");
+}
+
+export async function getDatabaseKey(appLockPassword) {
+  if (DB_KEY) return DB_KEY;
+  try {
+    if (appLockPassword) {
+      const databaseKeyCipher = 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) {
+        let credentials = await Keychain.getInternetCredentials(
+          KEYCHAIN_SERVER_DBKEY,
+          KEYSTORE_CONFIG
+        );
+
+        DatabaseLogger.info("Getting database key from Keychain");
+        DB_KEY = credentials.password;
+      }
+    }
+
+    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;
+
+      await Keychain.setInternetCredentials(
+        KEYCHAIN_SERVER_DBKEY,
+        "notesnook",
+        DB_KEY,
+        KEYSTORE_CONFIG
+      );
+    }
+
+    if (await Keychain.hasInternetCredentials("notesnook")) {
+      const userKeyCredentials = await Keychain.getInternetCredentials(
+        "notesnook",
+        KEYSTORE_CONFIG
+      );
+
+      if (userKeyCredentials) {
+        const userKeyCipher = await encrypt(
+          {
+            key: DB_KEY,
+            salt: NOTESNOOK_USER_KEY_SALT
+          },
+          userKeyCredentials.password
+        );
+        // 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) {
+    console.log(e, "error");
+    DatabaseLogger.error(e);
+    return null;
+  }
+}
+
+export async function deriveCryptoKey(data) {
+  try {
+    let credentials = await Sodium.deriveKey(data.password, data.salt);
+    const userKeyCipher = await encrypt(
+      {
+        key: await getDatabaseKey(),
+        salt: NOTESNOOK_USER_KEY_SALT
+      },
+      credentials.key
+    );
+    DatabaseLogger.info("User key stored: ", !!userKeyCipher);
+
+    // Store encrypted user key in MMKV
+    MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
+    return credentials.key;
+  } catch (e) {
+    DatabaseLogger.error(e);
+  }
+}
+
+export async function getCryptoKey(_name) {
+  try {
+    const keyCipher = MMKV.getMap(USER_KEY_CIPHER);
+
+    if (!keyCipher) {
+      DatabaseLogger.info("User key cipher is null");
+      return null;
+    }
+
+    const key = await decrypt(
+      {
+        key: await getDatabaseKey()
+      },
+      keyCipher
+    );
+
+    DatabaseLogger.info("User key decrypted: ", !!key);
+
+    return key;
+  } catch (e) {
+    console.log("getCryptoKey", e);
+    DatabaseLogger.error(e);
+  }
+}
+
+export async function removeCryptoKey(_name) {
+  try {
+    MMKV.removeItem(USER_KEY_CIPHER);
+    await Keychain.resetInternetCredentials("notesnook");
+    return true;
+  } catch (e) {
+    DatabaseLogger.error(e);
+  }
+}
+
+export async function getRandomBytes(length) {
+  return await generateSecureRandom(length);
+}
+
+export async function hash(password, email) {
+  let result = await Sodium.hashPassword(password, email);
+  return result;
+}
+
+export async function generateCryptoKey(password, salt) {
+  try {
+    let credentials = await Sodium.deriveKey(password, salt || null);
+    return credentials;
+  } catch (e) {
+    DatabaseLogger.error(e);
+  }
+}
+
+export function getAlgorithm(base64Variant) {
+  return `xcha-argon2i13-${base64Variant}`;
+}
+
+export async function decrypt(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+  let _data = { ...data };
+  _data.output = "plain";
+
+  if (!password.salt) password.salt = data.salt;
+  return await Sodium.decrypt(password, _data);
+}
+
+export async function decryptMulti(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+
+  data = data.map((d) => {
+    d.output = "plain";
+    return d;
+  });
+
+  if (data.length && !password.salt) {
+    password.salt = data[0].salt;
+  }
+
+  return await Sodium.decryptMulti(password, data);
+}
+
+export function parseAlgorithm(alg) {
+  if (!alg) return {};
+  const [enc, kdf, compressed, compressionAlg, base64variant] = alg.split("-");
+  return {
+    encryptionAlgorithm: enc,
+    kdfAlgorithm: kdf,
+    compressionAlgorithm: compressionAlg,
+    isCompress: compressed === "1",
+    base64_variant: base64variant
+  };
+}
+
+export async function encrypt(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+
+  let message = {
+    type: "plain",
+    data: data
+  };
+  let result = await Sodium.encrypt(password, message);
+
+  return {
+    ...result,
+    alg: getAlgorithm(7)
+  };
+}
+
+export async function encryptMulti(password, data) {
+  if (!password.password && !password.key) return undefined;
+  if (password.password && password.password === "" && !password.key)
+    return undefined;
+
+  let results = await Sodium.encryptMulti(
+    password,
+    data.map((item) => ({
+      type: "plain",
+      data: item
+    }))
+  );
+
+  return !results
+    ? []
+    : results.map((result) => ({
+        ...result,
+        alg: getAlgorithm(7)
+      }));
+}

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

@@ -1,473 +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 Sodium, { Cipher, Password } from "@ammarahmed/react-native-sodium";
-import { SerializedKey } from "@notesnook/crypto";
-import { Platform } from "react-native";
-import "react-native-get-random-values";
-import * as Keychain from "react-native-keychain";
-import { MMKVLoader, ProcessingModes } from "react-native-mmkv-storage";
-import { generateSecureRandom } from "react-native-securerandom";
-import { DatabaseLogger } from ".";
-import { ToastManager } from "../../services/event-manager";
-import { MMKV } from "./mmkv";
-
-// Database key cipher is persisted across different user sessions hence it has
-// it's independent storage which we will never clear. This is only used when application has
-// app lock with password enabled.
-export const CipherStorage = new MMKVLoader()
-  .withInstanceID("cipher_storage")
-  .setProcessingMode(
-    Platform.OS === "ios"
-      ? ProcessingModes.MULTI_PROCESS
-      : ProcessingModes.SINGLE_PROCESS
-  )
-  .disableIndexing()
-  .initialize();
-
-const IOS_KEYCHAIN_ACCESS_GROUP = "group.org.streetwriters.notesnook";
-const IOS_KEYCHAIN_SERVICE_NAME = "org.streetwriters.notesnook";
-const KEYCHAIN_SERVER_DBKEY = "notesnook:db";
-
-const NOTESNOOK_APPLOCK_KEY_SALT = "kBwr1Kre86ebOZ8ThLu2OA";
-const NOTESNOOK_DB_KEY_SALT = "SNuzOcEK3amoqL0WvPeKqw";
-
-const DB_KEY_CIPHER = "databaseKeyCipher";
-const USER_KEY_CIPHER = "userKeyCipher";
-const APPLOCK_CIPHER = "applockCipher";
-
-const KEYSTORE_CONFIG = Platform.select({
-  ios: {
-    accessible: Keychain.ACCESSIBLE.WHEN_UNLOCKED_THIS_DEVICE_ONLY,
-    accessGroup: IOS_KEYCHAIN_ACCESS_GROUP,
-    service: IOS_KEYCHAIN_SERVICE_NAME
-  },
-  android: {}
-});
-
-function generatePassword() {
-  const length = 80;
-  //@ts-ignore
-  const crypto = window.crypto || window.msCrypto;
-  if (typeof crypto === "undefined") {
-    throw new Error(
-      "Crypto API is not supported. Please upgrade your web browser"
-    );
-  }
-  const charset =
-    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!@#$%^&+_{}[]():<>/?;";
-  const indexes = crypto.getRandomValues(new Uint32Array(length));
-  let secret = "";
-  for (const index of indexes) {
-    secret += charset[index % charset.length];
-  }
-  return secret;
-}
-
-export async function encryptDatabaseKeyWithPassword(appLockPassword: string) {
-  const key = (await getDatabaseKey()) as string;
-  const appLockCredentials = await Sodium.deriveKey(
-    appLockPassword,
-    NOTESNOOK_APPLOCK_KEY_SALT
-  );
-  const databaseKeyCipher = (await encrypt(appLockCredentials, key)) as Cipher;
-  MMKV.setMap(DB_KEY_CIPHER, databaseKeyCipher);
-  // We reset the database key from keychain once app lock password is set.
-  await Keychain.resetInternetCredentials(KEYCHAIN_SERVER_DBKEY);
-  return true;
-}
-
-export async function restoreDatabaseKeyToKeyChain(appLockPassword: string) {
-  const databaseKeyCipher: Cipher = CipherStorage.getMap(DB_KEY_CIPHER);
-  const databaseKey = (await decrypt(
-    {
-      password: appLockPassword
-    },
-    databaseKeyCipher
-  )) as string;
-
-  await Keychain.setInternetCredentials(
-    KEYCHAIN_SERVER_DBKEY,
-    "notesnook",
-    databaseKey,
-    KEYSTORE_CONFIG
-  );
-  MMKV.removeItem(DB_KEY_CIPHER);
-  return true;
-}
-
-export async function setAppLockVerificationCipher(appLockPassword: string) {
-  try {
-    const appLockCredentials = await Sodium.deriveKey(
-      appLockPassword,
-      NOTESNOOK_APPLOCK_KEY_SALT
-    );
-    const encrypted = (await encrypt(
-      appLockCredentials,
-      generatePassword()
-    )) as Cipher;
-    CipherStorage.setMap(APPLOCK_CIPHER, encrypted);
-    DatabaseLogger.info("setAppLockVerificationCipher");
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function clearAppLockVerificationCipher() {
-  CipherStorage.removeItem(APPLOCK_CIPHER);
-}
-
-export async function validateAppLockPassword(appLockPassword: string) {
-  try {
-    const appLockCipher: Cipher = CipherStorage.getMap(APPLOCK_CIPHER);
-    if (!appLockCipher) return true;
-    const key = await Sodium.deriveKey(appLockPassword, appLockCipher.salt);
-    const decrypted = await decrypt(key, appLockCipher);
-
-    DatabaseLogger.info(
-      `validateAppLockPassword: ${typeof decrypted === "string"}`
-    );
-    return typeof decrypted === "string";
-  } catch (e) {
-    DatabaseLogger.error(e);
-    return false;
-  }
-}
-
-let DB_KEY: string | undefined;
-export function clearDatabaseKey() {
-  DB_KEY = undefined;
-  DatabaseLogger.info("Cleared database key");
-}
-
-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;
-  }
-
-  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;
-    }
-  }
-
-  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;
-
-    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");
-    }
-    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
-      )}`
-    );
-  }
-
-  return DB_KEY;
-}
-
-export async function deriveCryptoKeyFallback(data: SerializedKey) {
-  if (Platform.OS !== "ios") return;
-  try {
-    if (!data.password || !data.salt)
-      throw new Error(
-        "Invalid password and salt provided to deriveCryptoKeyFallback"
-      );
-
-    const credentials = await Sodium.deriveKeyFallback?.(
-      data.password,
-      data.salt
-    );
-
-    if (!credentials) return;
-
-    const userKeyCipher = (await encrypt(
-      {
-        key: (await getDatabaseKey()) as string,
-        salt: NOTESNOOK_DB_KEY_SALT
-      },
-      credentials.key as string
-    )) as Cipher<"base64">;
-    DatabaseLogger.info("User key fallback stored: ", {
-      userKeyCipher: !!userKeyCipher
-    });
-
-    // Store encrypted user key in MMKV
-    MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function deriveCryptoKey(data: SerializedKey) {
-  try {
-    if (!data.password || !data.salt)
-      throw new Error("Invalid password and salt provided to deriveCryptoKey");
-
-    const credentials = (await Sodium.deriveKey(
-      data.password,
-      data.salt
-    )) as Password;
-    const userKeyCipher = (await encrypt(
-      {
-        key: (await getDatabaseKey()) as string,
-        salt: NOTESNOOK_DB_KEY_SALT
-      },
-      credentials.key as string
-    )) as Cipher<"base64">;
-    DatabaseLogger.info("User key stored: ", {
-      userKeyCipher: !!userKeyCipher
-    });
-
-    // Store encrypted user key in MMKV
-    MMKV.setMap(USER_KEY_CIPHER, userKeyCipher);
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function getCryptoKey() {
-  try {
-    const keyCipher: Cipher = MMKV.getMap(USER_KEY_CIPHER);
-    if (!keyCipher) {
-      DatabaseLogger.info("User key cipher is null");
-      return undefined;
-    }
-
-    const key = await decrypt(
-      {
-        key: (await getDatabaseKey()) as string,
-        salt: keyCipher.salt
-      },
-      keyCipher
-    );
-
-    return key;
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function removeCryptoKey() {
-  try {
-    MMKV.removeItem(USER_KEY_CIPHER);
-    await Keychain.resetInternetCredentials("notesnook");
-    return true;
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function getRandomBytes(length: number) {
-  return await generateSecureRandom(length);
-}
-
-export async function hash(
-  password: string,
-  email: string,
-  options?: { usesFallback?: boolean }
-) {
-  DatabaseLogger.log(`Hashing password: fallback: ${options?.usesFallback}`);
-
-  if (options?.usesFallback && Platform.OS !== "ios") {
-    return "";
-  }
-
-  return (
-    options?.usesFallback
-      ? await Sodium.hashPasswordFallback?.(password, email)
-      : await Sodium.hashPassword(password, email)
-  ) as string;
-}
-
-export async function generateCryptoKey(password: string, salt?: string) {
-  return Sodium.deriveKey(password, salt) as Promise<SerializedKey>;
-}
-
-export async function generateCryptoKeyFallback(
-  password: string,
-  salt?: string
-): Promise<SerializedKey> {
-  return Sodium.deriveKeyFallback?.(
-    password,
-    salt as string
-  ) as Promise<SerializedKey>;
-}
-
-export function getAlgorithm(base64Variant: number) {
-  return `xcha-argon2i13-${base64Variant}`;
-}
-
-export async function decrypt(password: SerializedKey, data: Cipher<"base64">) {
-  const _data = { ...data };
-  _data.output = "plain";
-
-  if (!password.salt) password.salt = data.salt;
-
-  if (Platform.OS === "ios" && !password.key && password.password) {
-    const key = await Sodium.deriveKey(password.password, password.salt);
-    try {
-      return await Sodium.decrypt(key, _data);
-    } catch (e) {
-      const fallbackKey = await Sodium.deriveKeyFallback?.(
-        password.password,
-        password.salt
-      );
-      if (Platform.OS === "ios" && fallbackKey) {
-        DatabaseLogger.info("Using fallback key for decryption");
-      }
-      if (fallbackKey) {
-        return await Sodium.decrypt(fallbackKey, _data);
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  return await Sodium.decrypt(password, _data);
-}
-
-export async function decryptMulti(
-  password: Password,
-  data: Cipher<"base64">[]
-) {
-  data = data.map((d) => {
-    d.output = "plain";
-    return d;
-  });
-
-  if (data.length && !password.salt) {
-    password.salt = data[0].salt;
-  }
-
-  if (Platform.OS === "ios" && !password.key && password.password) {
-    const key = await Sodium.deriveKey(password.password, password.salt);
-    try {
-      return await Sodium.decryptMulti(key, data);
-    } catch (e) {
-      const fallbackKey = await Sodium.deriveKeyFallback?.(
-        password.password,
-        password.salt as string
-      );
-      if (Platform.OS === "ios" && fallbackKey) {
-        DatabaseLogger.info("Using fallback key for decryption");
-      }
-      if (fallbackKey) {
-        return await Sodium.decryptMulti(fallbackKey, data);
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  return await Sodium.decryptMulti(password, data);
-}
-
-export function parseAlgorithm(alg: string) {
-  if (!alg) return {};
-  const [enc, kdf, compressed, compressionAlg, base64variant] = alg.split("-");
-  return {
-    encryptionAlgorithm: enc,
-    kdfAlgorithm: kdf,
-    compressionAlgorithm: compressionAlg,
-    isCompress: compressed === "1",
-    base64_variant: base64variant
-  };
-}
-
-export async function encrypt(password: SerializedKey, plainText: string) {
-  const result = await Sodium.encrypt<"base64">(password, {
-    type: "plain",
-    data: plainText
-  });
-
-  return {
-    ...result,
-    alg: getAlgorithm(7)
-  };
-}
-
-export async function encryptMulti(
-  password: SerializedKey,
-  plainText: string[]
-) {
-  const results = await Sodium.encryptMulti<"base64">(
-    password,
-    plainText.map((item) => ({
-      type: "plain",
-      data: item
-    }))
-  );
-
-  return !results
-    ? []
-    : results.map((result) => ({
-        ...result,
-        alg: getAlgorithm(7)
-      }));
-}

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

@@ -16,50 +16,57 @@ 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 "./logger";
 import { database } from "@notesnook/common";
-import { logger as dbLogger, ICompressor } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
-import {
-  SqliteAdapter,
-  SqliteIntrospector,
-  SqliteQueryCompiler
-} from "@streetwriters/kysely";
+import { logger as dbLogger } from "@notesnook/core/dist/logger";
 import { Platform } from "react-native";
 import * as Gzip from "react-native-gzip";
-import SettingsService from "../../services/settings";
 import EventSource from "../../utils/sse/even-source-ios";
 import AndroidEventSource from "../../utils/sse/event-source";
-import { FileStorage } from "../filesystem";
-import { getDatabaseKey } from "./encryption";
-import "./logger";
+import { SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler } from "kysely";
+import filesystem from "../filesystem";
+import Storage from "./storage";
 import { RNSqliteDriver } from "./sqlite.kysely";
-import { Storage } from "./storage";
+import { getDatabaseKey } from "./encryption";
 
-export async function setupDatabase(password?: string) {
+database.host(
+  __DEV__
+    ? {
+        API_HOST: "https://api.notesnook.com",
+        AUTH_HOST: "https://auth.streetwriters.co",
+        SSE_HOST: "https://events.streetwriters.co",
+        SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+        ISSUES_HOST: "https://issues.streetwriters.co"
+        // API_HOST: "http://192.168.43.5:5264",
+        // AUTH_HOST: "http://192.168.43.5:8264",
+        // SSE_HOST: "http://192.168.43.5:7264",
+        // SUBSCRIPTIONS_HOST: "http://192.168.43.5:9264",
+        // ISSUES_HOST: "http://192.168.43.5:2624"
+      }
+    : {
+        API_HOST: "https://api.notesnook.com",
+        AUTH_HOST: "https://auth.streetwriters.co",
+        SSE_HOST: "https://events.streetwriters.co",
+        SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
+        ISSUES_HOST: "https://issues.streetwriters.co"
+      }
+);
+
+export async function setupDatabase(password) {
   const key = await getDatabaseKey(password);
-  if (!key) throw new Error(strings.databaseSetupFailed());
+  if (!key)
+    throw new Error("Database setup failed, could not get database key");
 
-  database.host({
-    API_HOST: "https://api.notesnook.com",
-    AUTH_HOST: "https://auth.streetwriters.co",
-    SSE_HOST: "https://events.streetwriters.co",
-    SUBSCRIPTIONS_HOST: "https://subscriptions.streetwriters.co",
-    ISSUES_HOST: "https://issues.streetwriters.co",
-    MONOGRAPH_HOST: "https://monogr.ph",
-    ...(SettingsService.getProperty("serverUrls") || {})
-  });
+  console.log("Opening database with key:", !!key);
 
   database.setup({
     storage: Storage,
-    eventsource: (Platform.OS === "ios"
-      ? EventSource
-      : AndroidEventSource) as any,
-    fs: FileStorage,
-    compressor: async () =>
-      ({
-        compress: Gzip.deflate,
-        decompress: Gzip.inflate
-      } as ICompressor),
+    eventsource: Platform.OS === "ios" ? EventSource : AndroidEventSource,
+    fs: filesystem,
+    compressor: {
+      compress: Gzip.deflate,
+      decompress: Gzip.inflate
+    },
     batchSize: 100,
     sqliteOptions: {
       dialect: (name) => ({
@@ -78,10 +85,4 @@ export async function setupDatabase(password?: string) {
 }
 
 export const db = database;
-let DatabaseLogger = dbLogger.scope(Platform.OS);
-
-const setLogger = () => {
-  DatabaseLogger = dbLogger.scope(Platform.OS);
-};
-
-export { DatabaseLogger, setLogger };
+export const DatabaseLogger = dbLogger;

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

@@ -16,11 +16,14 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+import { MMKVLoader } from "react-native-mmkv-storage";
+import { initialize } from "@notesnook/core/dist/logger";
+import { KV } from "./storage";
 
-import { LoaderFunctionArgs } from "@remix-run/node";
+const LoggerStorage = new MMKVLoader()
+  .withInstanceID("notesnook_logs")
+  .initialize();
 
-export async function loader({ request }: LoaderFunctionArgs) {
-  const url = new URL(request.url);
-  url.pathname = url.pathname.replace(/.png/, ".jpg");
-  return Response.redirect(url, 308);
-}
+initialize(new KV(LoggerStorage));
+
+export { LoggerStorage };

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

@@ -1,49 +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 { initialize } from "@notesnook/core";
-import {
-  SqliteAdapter,
-  SqliteIntrospector,
-  SqliteQueryCompiler
-} from "@streetwriters/kysely";
-import { Platform } from "react-native";
-import { setLogger } from ".";
-import { RNSqliteDriver } from "./sqlite.kysely";
-
-let loggerLoaded = false;
-const initializeLogger = async () => {
-  if (loggerLoaded) return;
-  await initialize({
-    dialect: (name) => ({
-      createDriver: () => {
-        return new RNSqliteDriver({ async: true, dbName: name });
-      },
-      createAdapter: () => new SqliteAdapter(),
-      createIntrospector: (db) => new SqliteIntrospector(db),
-      createQueryCompiler: () => new SqliteQueryCompiler()
-    }),
-    tempStore: "memory",
-    journalMode: Platform.OS === "ios" ? "DELETE" : "WAL"
-  });
-  setLogger();
-  loggerLoaded = true;
-};
-
-export { initializeLogger };

apps/mobile/app/common/database/sqlite.kysely.ts

@@ -17,16 +17,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import type {
-  DatabaseConnection,
-  Driver,
-  QueryResult
-} from "@streetwriters/kysely";
-import { CompiledQuery } from "@streetwriters/kysely";
+import type { DatabaseConnection, Driver, QueryResult } from "kysely";
+import { CompiledQuery } from "kysely";
 import { QuickSQLiteConnection, open } from "react-native-quick-sqlite";
-import { strings } from "@notesnook/intl";
 
-type Config = { dbName: string; async: boolean; location?: string };
+type Config = { dbName: string; async: boolean; location: string };
 
 export class RNSqliteDriver implements Driver {
   private connection?: DatabaseConnection;
@@ -98,7 +93,7 @@ class RNSqliteConnection implements DatabaseConnection {
   constructor(private readonly db: QuickSQLiteConnection) {}
 
   streamQuery<R>(): AsyncIterableIterator<QueryResult<R>> {
-    throw new Error(strings.streamingNotSupported());
+    throw new Error("wasqlite driver doesn't support streaming");
   }
 
   async executeQuery<R>(

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

@@ -16,52 +16,58 @@ 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 { IStorage } from "@notesnook/core";
-import { MMKVInstance } from "react-native-mmkv-storage";
+
+import { Platform } from "react-native";
+import RNFetchBlob from "react-native-blob-util";
 import {
   decrypt,
-  decryptMulti,
   deriveCryptoKey,
-  deriveCryptoKeyFallback,
   encrypt,
-  encryptMulti,
   generateCryptoKey,
   getCryptoKey,
+  getRandomBytes,
   hash,
-  generateCryptoKeyFallback
+  removeCryptoKey,
+  decryptMulti,
+  encryptMulti
 } from "./encryption";
 import { MMKV } from "./mmkv";
 
 export class KV {
-  storage: MMKVInstance;
-  constructor(storage: MMKVInstance) {
+  /**
+   * @type {typeof MMKV}
+   */
+  storage = null;
+  constructor(storage) {
     this.storage = storage;
   }
-
-  async read<T>(key: string, isArray?: boolean) {
-    if (!key) return undefined;
-    const data = this.storage.getString(key);
-    if (!data) return undefined;
+  async read(key) {
+    if (!key) return null;
+    let data = this.storage.getString(key);
+    if (!data) return null;
     try {
-      return JSON.parse(data) as T;
+      let parse = JSON.parse(data);
+      return parse;
     } catch (e) {
-      return data as T;
+      return data;
     }
   }
 
-  async write<T>(key: string, data: T) {
+  async write(key, data) {
     this.storage.setString(
       key,
       typeof data === "string" ? data : JSON.stringify(data)
     );
+
+    return true;
   }
 
-  async readMulti<T>(keys: string[]) {
+  async readMulti(keys) {
     if (keys.length <= 0) {
       return [];
     } else {
       try {
-        const data = await this.storage.getMultipleItemsAsync<any>(
+        let data = await this.storage.getMultipleItemsAsync(
           keys.slice(),
           "string"
         );
@@ -73,24 +79,24 @@ export class KV {
             obj = value;
           }
           return [key, obj];
-        }) as [string, T][];
+        });
       } catch (e) {
-        return [];
+        console.log(e);
       }
     }
   }
 
-  async remove(key: string) {
-    this.storage.removeItem(key);
+  async remove(key) {
+    return this.storage.removeItem(key);
   }
 
-  async removeMulti(keys: string[]) {
-    if (!keys) return;
-    this.storage.removeItems(keys);
+  async removeMulti(keys) {
+    if (!keys) return true;
+    return this.storage.removeItems(keys);
   }
 
   async clear() {
-    this.storage.clearStore();
+    return this.storage.clearStore();
   }
 
   async getAllKeys() {
@@ -107,46 +113,54 @@ export class KV {
     return keys;
   }
 
-  async writeMulti(items: [string, any][]) {
-    await this.storage.setMultipleItemsAsync(items, "object");
+  async writeMulti(items) {
+    return this.storage.setMultipleItemsAsync(items, "object");
   }
 }
 
 const DefaultStorage = new KV(MMKV);
 
-export const Storage: IStorage = {
-  write<T>(key: string, data: T): Promise<void> {
-    return DefaultStorage.write(key, data);
-  },
-  writeMulti<T>(entries: [string, T][]): Promise<void> {
-    return DefaultStorage.writeMulti(entries);
-  },
-  readMulti<T>(keys: string[]): Promise<[string, T][]> {
-    return DefaultStorage.readMulti(keys);
-  },
-  read<T>(key: string, isArray?: boolean): Promise<T | undefined> {
-    return DefaultStorage.read(key, isArray);
-  },
-  remove(key: string): Promise<void> {
-    return DefaultStorage.remove(key);
-  },
-  removeMulti(keys: string[]): Promise<void> {
-    return DefaultStorage.removeMulti(keys);
-  },
-  clear(): Promise<void> {
-    return DefaultStorage.clear();
-  },
-  getAllKeys(): Promise<string[]> {
-    return DefaultStorage.getAllKeys();
-  },
-  hash,
-  getCryptoKey,
+async function requestPermission() {
+  if (Platform.OS === "ios") return true;
+  return true;
+}
+async function checkAndCreateDir(path) {
+  let dir =
+    Platform.OS === "ios"
+      ? RNFetchBlob.fs.dirs.DocumentDir + path
+      : RNFetchBlob.fs.dirs.SDCardDir + "/Notesnook/" + path;
+
+  try {
+    let exists = await RNFetchBlob.fs.exists(dir);
+    let isDir = await RNFetchBlob.fs.isDir(dir);
+    if (!exists || !isDir) {
+      await RNFetchBlob.fs.mkdir(dir);
+    }
+  } catch (e) {
+    await RNFetchBlob.fs.mkdir(dir);
+  }
+  return dir;
+}
+
+export default {
+  read: (key) => DefaultStorage.read(key),
+  write: (key, value) => DefaultStorage.write(key, value),
+  readMulti: (keys) => DefaultStorage.readMulti(keys),
+  remove: (key) => DefaultStorage.remove(key),
+  clear: () => DefaultStorage.clear(),
+  getAllKeys: () => DefaultStorage.getAllKeys(),
+  writeMulti: (items) => DefaultStorage.writeMulti(items),
+  removeMulti: (keys) => DefaultStorage.removeMulti(keys),
   encrypt,
-  encryptMulti,
   decrypt,
   decryptMulti,
+  getRandomBytes,
+  checkAndCreateDir,
+  requestPermission,
   deriveCryptoKey,
+  getCryptoKey,
+  removeCryptoKey,
+  hash,
   generateCryptoKey,
-  generateCryptoKeyFallback,
-  deriveCryptoKeyFallback
+  encryptMulti
 };

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

@@ -20,6 +20,7 @@ import { Dimensions, Image, Platform } from "react-native";
 import ImageResizer from "@bam.tech/react-native-image-resizer";
 import RNFetchBlob from "react-native-blob-util";
 
+console.log("hello world");
 /**
  * Scale down & compress images to screen width
  * for loading in editor.
@@ -27,9 +28,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 +56,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 +81,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.js

@@ -0,0 +1,304 @@
+/*
+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 Sodium from "@ammarahmed/react-native-sodium";
+import {
+  getFileNameWithExtension,
+  isImage,
+  isDocument
+} from "@notesnook/core/dist/utils/filename";
+import React from "react";
+import { Platform } from "react-native";
+import * as ScopedStorage from "react-native-scoped-storage";
+import { subscribe, zip } from "react-native-zip-archive";
+import RNFetchBlob from "react-native-blob-util";
+import { ShareComponent } from "../../components/sheets/export-notes/share";
+import { ToastManager, presentSheet } from "../../services/event-manager";
+import { useAttachmentStore } from "../../stores/use-attachment-store";
+import { DatabaseLogger, db } from "../database";
+import Storage from "../database/storage";
+import { cacheDir, copyFileAsync, releasePermissions } from "./utils";
+import { createCacheDir, exists } from "./io";
+import { IOS_APPGROUPID } from "../../utils/constants";
+
+export const FileDownloadStatus = {
+  Success: 1,
+  Fail: 0
+};
+
+/**
+ * Download all user's attachments
+ * @returns
+ */
+export async function downloadAllAttachments() {
+  const attachments = await db.attachments.all.ids();
+  return downloadAttachments(attachments);
+}
+
+/**
+ * Downloads provided attachments to a .zip file
+ * on user's device.
+ * @param {string[]} attachments
+ * @param onProgress
+ * @returns
+ */
+export async function downloadAttachments(
+  attachments,
+  onProgress,
+  canceled,
+  groupId
+) {
+  await createCacheDir();
+  if (!attachments || !attachments.length) return;
+  const result = new Map();
+
+  let outputFolder;
+  if (Platform.OS === "android") {
+    // Ask the user to select a directory to store the file
+    let file = await ScopedStorage.openDocumentTree(true);
+    outputFolder = file.uri;
+    if (!outputFolder) return;
+  } else {
+    outputFolder = await Storage.checkAndCreateDir("/downloads/");
+  }
+
+  // Create the folder to zip;
+  const zipSourceFolder = `${cacheDir}/notesnook-attachments`;
+  const zipOutputFile =
+    Platform.OS === "ios"
+      ? `${outputFolder}/notesnook-attachments-${Date.now()}.zip`
+      : `${cacheDir}/notesnook-attachments.zip`;
+  if (await RNFetchBlob.fs.exists(zipSourceFolder)) {
+    await RNFetchBlob.fs.unlink(zipSourceFolder);
+  }
+
+  await RNFetchBlob.fs.mkdir(zipSourceFolder);
+
+  for (let i = 0; i < attachments.length; i++) {
+    let attachment = await db.attachments.attachment(attachments[i]);
+    const hash = attachment.hash;
+    try {
+      if (canceled.current) {
+        RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
+        return;
+      }
+      onProgress?.(
+        i + 1 / attachments.length,
+        `Downloading attachments (${i + 1}/${
+          attachments.length
+        })... Please wait`
+      );
+      // Download to cache
+      let uri = await downloadAttachment(hash, false, {
+        silent: true,
+        cache: true,
+        groupId: groupId
+      });
+      if (canceled.current) {
+        RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
+        return;
+      }
+      if (!uri) throw new Error("Failed to download file");
+      // Move file to the source folder we will zip eventually and rename the file to it's actual name.
+      const filePath = `${zipSourceFolder}/${attachment.filename}`;
+      await RNFetchBlob.fs.mv(`${cacheDir}/${uri}`, filePath);
+      result.set(hash, {
+        filename: attachment.filename,
+        status: FileDownloadStatus.Success,
+        attachment: attachment
+      });
+    } catch (e) {
+      result.set(hash, {
+        filename: attachment.filename,
+        status: FileDownloadStatus.Fail,
+        reason: e
+      });
+      ToastManager.error(e, "Error downloading attachment");
+    }
+  }
+  if (canceled.current) {
+    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
+    return;
+  }
+  if (result?.size) {
+    let sub;
+    try {
+      onProgress?.(0, `Zipping... Please wait`);
+      // If all goes well, zip the notesnook-attachments folder in cache.
+
+      sub = subscribe(({ progress }) => {
+        onProgress(
+          progress,
+          `Saving zip file (${(progress * 100).toFixed(1)}%)... Please wait`
+        );
+      });
+      await zip(zipSourceFolder, zipOutputFile);
+      sub?.remove();
+      onProgress(1, `Saving zip file... Please wait`);
+      if (Platform.OS === "android") {
+        // Move the zip to user selected directory.
+        const file = await ScopedStorage.createFile(
+          outputFolder,
+          `notesnook-attachments-${Date.now()}.zip`,
+          "application/zip"
+        );
+        await copyFileAsync(`file://${zipOutputFile}`, file.uri);
+      }
+
+      onProgress?.(1, `Done`);
+      releasePermissions(outputFolder);
+    } catch (e) {
+      releasePermissions(outputFolder);
+      sub?.remove();
+      ToastManager.error(e, "Error zipping attachments");
+    }
+    // Remove source & zip file from cache.
+    RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);
+    if (Platform.OS === "android") {
+      RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);
+    }
+  }
+
+  return result;
+}
+
+export default async function downloadAttachment(
+  hash,
+  global = true,
+  options = {
+    silent: false,
+    cache: false,
+    throwError: false,
+    groupId: undefined,
+    base64: false,
+    text: false
+  }
+) {
+  await createCacheDir();
+
+  let attachment = await db.attachments.attachment(hash);
+  if (!attachment) {
+    DatabaseLogger.log("Attachment not found");
+    return;
+  }
+
+  let folder = {};
+  if (!options.cache) {
+    if (Platform.OS === "android") {
+      folder = await ScopedStorage.openDocumentTree();
+      if (!folder) return;
+    } else {
+      folder.uri = await Storage.checkAndCreateDir("/downloads/");
+    }
+  }
+
+  try {
+    await db
+      .fs()
+      .downloadFile(options.groupId || attachment.hash, attachment.hash);
+    if (!(await exists(attachment.hash))) {
+      DatabaseLogger.log("Attachment does not exist after download.");
+      return;
+    }
+
+    if (options.base64 || options.text) {
+      DatabaseLogger.log(`Starting to decrypt... hash: ${attachment.hash}`);
+      return await db.attachments.read(
+        attachment.hash,
+        options.base64 ? "base64" : "text"
+      );
+    }
+
+    let filename = getFileNameWithExtension(
+      attachment.filename,
+      attachment.mimeType
+    );
+
+    let key = await db.attachments.decryptKey(attachment.key);
+
+    let info = {
+      iv: attachment.iv,
+      salt: attachment.salt,
+      length: attachment.size,
+      alg: attachment.alg,
+      hash: attachment.hash,
+      hashType: attachment.hashType,
+      mime: attachment.mimeType,
+      fileName: options.cache ? undefined : filename,
+      uri: options.cache ? undefined : folder.uri,
+      chunkSize: attachment.chunkSize,
+      appGroupId: IOS_APPGROUPID
+    };
+    let fileUri = await Sodium.decryptFile(
+      key,
+      info,
+      options.cache ? "cache" : "file"
+    );
+
+    if (!options.silent) {
+      ToastManager.show({
+        heading: "Download successful",
+        message: filename + " downloaded",
+        type: "success"
+      });
+    }
+
+    if (
+      attachment.dateUploaded &&
+      !isImage(attachment.mimeType) &&
+      !isDocument(attachment.mimeType)
+    ) {
+      RNFetchBlob.fs
+        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
+        .catch(console.log);
+    }
+    if (Platform.OS === "ios" && !options.cache) {
+      fileUri = folder.uri + `/${filename}`;
+    }
+    if (!options.silent) {
+      presentSheet({
+        title: "File downloaded",
+        paragraph: `${filename} saved to ${
+          Platform.OS === "android"
+            ? "selected path"
+            : "File Manager/Notesnook/downloads"
+        }`,
+        icon: "download",
+        context: global ? null : attachment.hash,
+        component: <ShareComponent uri={fileUri} name={filename} padding={12} />
+      });
+    }
+
+    return fileUri;
+  } catch (e) {
+    DatabaseLogger.error(e);
+    if (attachment.dateUploaded) {
+      RNFetchBlob.fs
+        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
+        .catch(console.log);
+      RNFetchBlob.fs
+        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}_dcache`)
+        .catch(console.log);
+    }
+    useAttachmentStore.getState().remove(attachment.hash);
+    if (options.throwError) {
+      throw e;
+    }
+  }
+}

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

@@ -1,353 +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 Sodium from "@ammarahmed/react-native-sodium";
-import { getFileNameWithExtension } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
-import React from "react";
-import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
-import * as ScopedStorage from "react-native-scoped-storage";
-import { subscribe, zip } from "react-native-zip-archive";
-import filesystem from ".";
-import { ShareComponent } from "../../components/sheets/export-notes/share";
-import { presentSheet, ToastManager } from "../../services/event-manager";
-import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { IOS_APPGROUPID } from "../../utils/constants";
-import { DatabaseLogger, db } from "../database";
-import { createCacheDir, exists } from "./io";
-import { cacheDir, copyFileAsync, releasePermissions } from "./utils";
-
-export const FileDownloadStatus = {
-  Success: 1,
-  Fail: 0
-};
-
-/**
- * Download all user's attachments
- * @returns
- */
-export async function downloadAllAttachments() {
-  const attachments = await db.attachments.all.ids();
-  return downloadAttachments(attachments);
-}
-
-/**
- * Downloads provided attachments to a .zip file
- * on user's device.
- * @param {string[]} attachmentIds
- * @param onProgress
- * @returns
- */
-export async function downloadAttachments(attachmentIds: string[]) {
-  await createCacheDir();
-  if (!attachmentIds || !attachmentIds.length) return;
-  const groupId = `download-all-${Date.now()}`;
-
-  let outputFolder;
-  if (Platform.OS === "android") {
-    // Ask the user to select a directory to store the file
-    const file = await ScopedStorage.openDocumentTree(true);
-    outputFolder = file.uri;
-    if (!outputFolder) return;
-  } else {
-    outputFolder = await filesystem.checkAndCreateDir("/downloads/");
-  }
-
-  // Create the folder to zip;
-  const zipSourceFolder = `${cacheDir}/notesnook-attachments`;
-  const zipOutputFile =
-    Platform.OS === "ios"
-      ? `${outputFolder}/notesnook-attachments-${Date.now()}.zip`
-      : `${cacheDir}/notesnook-attachments.zip`;
-  if (await RNFetchBlob.fs.exists(zipSourceFolder)) {
-    await RNFetchBlob.fs.unlink(zipSourceFolder);
-  }
-
-  await RNFetchBlob.fs.mkdir(zipSourceFolder);
-
-  const isCancelled = () => {
-    if (useAttachmentStore.getState().downloading?.[groupId]?.canceled) {
-      RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
-        /* empty */
-      });
-      useAttachmentStore.getState().setDownloading({
-        groupId,
-        current: 0,
-        total: 0,
-        success: false,
-        message: strings.network.dowloadCancelled(),
-        canceled: true
-      });
-      return true;
-    }
-  };
-
-  for (let i = 0; i < attachmentIds.length; i++) {
-    if (isCancelled()) return;
-    const attachment = await db.attachments.attachment(attachmentIds[i]);
-    if (!attachment) continue;
-
-    const hash = attachment.hash;
-    try {
-      useAttachmentStore.getState().setDownloading({
-        groupId: groupId,
-        current: i + 1,
-        total: attachmentIds.length,
-        filename: attachment.hash
-      });
-      // Download to cache
-      const uri = await downloadAttachment(hash, false, {
-        silent: true,
-        cache: true,
-        groupId: groupId
-      });
-
-      if (isCancelled()) return;
-
-      if (!uri) throw new Error(strings.failedToDownloadFile());
-      // Move file to the source folder we will zip eventually and rename the file to it's actual name.
-      const filePath = `${zipSourceFolder}/${attachment.filename}`;
-      await RNFetchBlob.fs.mv(`${cacheDir}/${uri}`, filePath);
-    } catch (e) {
-      DatabaseLogger.error(e);
-    }
-  }
-
-  useAttachmentStore.getState().setDownloading({
-    groupId: groupId,
-    current: 0,
-    total: 0,
-    success: true
-  });
-
-  if (isCancelled()) return;
-
-  let sub;
-  try {
-    useAttachmentStore.getState().setDownloading({
-      current: 0,
-      total: 1,
-      message: strings.savingZipFile(),
-      groupId
-    });
-    // If all goes well, zip the notesnook-attachments folder in cache.
-
-    sub = subscribe(({ progress }) => {
-      useAttachmentStore.getState().setDownloading({
-        groupId,
-        current: progress,
-        total: 1,
-        message: strings.savingZipFile((progress * 100).toFixed(1))
-      });
-    });
-    await zip(zipSourceFolder, zipOutputFile);
-    sub?.remove();
-
-    if (Platform.OS === "android") {
-      // Move the zip to user selected directory.
-      const file = await ScopedStorage.createFile(
-        outputFolder,
-        `notesnook-attachments-${Date.now()}.zip`,
-        "application/zip"
-      );
-      await copyFileAsync(`file://${zipOutputFile}`, file.uri);
-    }
-
-    useAttachmentStore.getState().setDownloading({
-      current: 0,
-      total: 0,
-      message: undefined,
-      success: true,
-      groupId
-    });
-    releasePermissions(outputFolder);
-  } catch (e) {
-    useAttachmentStore.getState().setDownloading({
-      current: 0,
-      total: 0,
-      message: undefined,
-      success: false,
-      groupId
-    });
-    releasePermissions(outputFolder);
-    sub?.remove();
-    ToastManager.error(e as Error, "Error zipping attachments");
-  }
-  // Remove source & zip file from cache.
-  RNFetchBlob.fs.unlink(zipSourceFolder).catch(() => {
-    /* empty */
-  });
-  if (Platform.OS === "android") {
-    RNFetchBlob.fs.unlink(zipOutputFile).catch(() => {
-      /* empty */
-    });
-  }
-}
-
-export default async function downloadAttachment(
-  hashOrId: string,
-  global = true,
-  options?: {
-    silent?: boolean;
-    cache?: boolean;
-    throwError?: boolean;
-    groupId?: string;
-    base64?: boolean;
-    text?: boolean;
-  }
-) {
-  await createCacheDir();
-
-  const attachment = await db.attachments.attachment(hashOrId);
-  if (!attachment) {
-    DatabaseLogger.log("Attachment not found", {
-      hash: hashOrId
-    });
-    return;
-  }
-
-  let folder: {
-    uri: string;
-  } | null = null;
-  if (!options?.cache) {
-    if (Platform.OS === "android") {
-      folder = await ScopedStorage.openDocumentTree();
-      if (!folder) return;
-    } else {
-      folder = {
-        uri: await filesystem.checkAndCreateDir("/downloads/")
-      };
-    }
-  }
-
-  try {
-    useAttachmentStore.getState().setDownloading({
-      groupId: options?.groupId || attachment.hash,
-      current: 0,
-      total: 1,
-      filename: attachment.filename
-    });
-
-    await db
-      .fs()
-      .downloadFile(
-        options?.groupId || attachment.hash,
-        attachment.hash,
-        attachment.chunkSize
-      );
-
-    useAttachmentStore.getState().setDownloading({
-      groupId: options?.groupId || attachment.hash,
-      current: 1,
-      total: 1,
-      filename: attachment.filename,
-      success: true
-    });
-
-    if (!(await exists(attachment.hash))) {
-      DatabaseLogger.log("Attachment does not exist after download.");
-      return;
-    }
-
-    if (options?.base64 || options?.text) {
-      DatabaseLogger.log(`Starting to decrypt... hash: ${attachment.hash}`);
-      return await db.attachments.read(
-        attachment.hash,
-        options.base64 ? "base64" : "text"
-      );
-    }
-
-    const filename = await getFileNameWithExtension(
-      attachment.filename,
-      attachment.mimeType
-    );
-
-    const key = await db.attachments.decryptKey(attachment.key);
-
-    if (!key) return;
-
-    const info = {
-      iv: attachment.iv,
-      salt: attachment.salt,
-      length: attachment.size,
-      alg: attachment.alg,
-      hash: attachment.hash,
-      hashType: attachment.hashType,
-      mime: attachment.mimeType,
-      fileName: options?.cache ? undefined : filename,
-      uri: options?.cache ? undefined : folder?.uri,
-      chunkSize: attachment.chunkSize,
-      appGroupId: IOS_APPGROUPID
-    };
-    let fileUri = await Sodium.decryptFile(
-      key,
-      info,
-      options?.cache ? "cache" : "file"
-    );
-
-    if (!options?.silent) {
-      ToastManager.show({
-        heading: strings.network.downloadSuccess(),
-        message: strings.network.fileDownloaded(filename),
-        type: "success"
-      });
-    }
-
-    if (Platform.OS === "ios" && !options?.cache) {
-      fileUri = folder?.uri + `/${filename}`;
-    }
-    if (!options?.silent) {
-      presentSheet({
-        title: strings.network.fileDownloaded(),
-        paragraph: strings.fileSaved(filename, Platform.OS),
-        icon: "download",
-        context: global ? "global" : attachment.hash,
-        component: <ShareComponent uri={fileUri} name={filename} padding={12} />
-      });
-    }
-
-    return fileUri;
-  } catch (e) {
-    if (attachment.dateUploaded) {
-      RNFetchBlob.fs
-        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}`)
-        .catch(() => {
-          /* empty */
-        });
-      RNFetchBlob.fs
-        .unlink(RNFetchBlob.fs.dirs.CacheDir + `/${attachment.hash}_dcache`)
-        .catch(() => {
-          /* empty */
-        });
-    }
-
-    useAttachmentStore.getState().setDownloading({
-      groupId: options?.groupId || attachment.hash,
-      current: 0,
-      total: 0,
-      filename: attachment.filename,
-      success: false
-    });
-    DatabaseLogger.error(e);
-    useAttachmentStore.getState().remove(attachment.hash);
-    if (options?.throwError) {
-      throw e;
-    }
-  }
-}

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

@@ -0,0 +1,153 @@
+/*
+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 hosts from "@notesnook/core/dist/utils/constants";
+import NetInfo from "@react-native-community/netinfo";
+import RNFetchBlob from "react-native-blob-util";
+import { ToastManager } from "../../services/event-manager";
+import { useAttachmentStore } from "../../stores/use-attachment-store";
+import { DatabaseLogger, db } from "../database";
+import { cacheDir, fileCheck } from "./utils";
+import { createCacheDir, exists } from "./io";
+
+export async function downloadFile(filename, data, cancelToken) {
+  if (!data) {
+    DatabaseLogger.log(`Error downloading file: ${filename}, reason: No data`);
+    return false;
+  }
+
+  DatabaseLogger.log(`Downloading ${filename}`);
+  await createCacheDir();
+  let { url, headers } = data;
+  let path = `${cacheDir}/${filename}`;
+
+  try {
+    if (await exists(filename)) {
+      DatabaseLogger.log(`File Exists already: ${filename}`);
+      return true;
+    }
+
+    let res = await fetch(url, {
+      method: "GET",
+      headers
+    });
+
+    if (!res.ok) {
+      DatabaseLogger.log(
+        `Error downloading file: ${filename}, ${res.status}, ${res.statusText}, reason: Unable to resolve download url`
+      );
+      throw new Error(`${res.status}: Unable to resolve download url`);
+    }
+
+    const downloadUrl = await res.text();
+
+    if (!downloadUrl) {
+      DatabaseLogger.log(
+        `Error downloading file: ${filename}, reason: Unable to resolve download url`
+      );
+      throw new Error("Unable to resolve download url");
+    }
+    let totalSize = 0;
+    DatabaseLogger.log(`Download starting: ${filename}`);
+    let request = RNFetchBlob.config({
+      path: path,
+      IOSBackgroundTask: true
+    })
+      .fetch("GET", downloadUrl, null)
+      .progress((recieved, total) => {
+        useAttachmentStore
+          .getState()
+          .setProgress(0, total, filename, recieved, "download");
+        totalSize = total;
+        DatabaseLogger.log(`Downloading: ${filename}, ${recieved}/${total}`);
+      });
+
+    cancelToken.cancel = () => {
+      useAttachmentStore.getState().remove(filename);
+      request.cancel();
+      DatabaseLogger.log(`Download cancelled: ${filename}`);
+    };
+
+    let response = await request;
+    await fileCheck(response, totalSize);
+    let status = response.info().status;
+    useAttachmentStore.getState().remove(filename);
+    return status >= 200 && status < 300;
+  } catch (e) {
+    if (e.message !== "canceled") {
+      ToastManager.show({
+        heading: "Error downloading file",
+        message: e.message,
+        type: "error",
+        context: "global"
+      });
+      ToastManager.show({
+        heading: "Error downloading file",
+        message: e.message,
+        type: "error",
+        context: "local"
+      });
+    }
+
+    useAttachmentStore.getState().remove(filename);
+    RNFetchBlob.fs.unlink(path).catch(console.log);
+    DatabaseLogger.error(e, {
+      url,
+      headers
+    });
+    return false;
+  }
+}
+
+export async function getUploadedFileSize(hash) {
+  try {
+    const url = `${hosts.API_HOST}/s3?name=${hash}`;
+    const token = await db.tokenManager.getAccessToken();
+    const attachmentInfo = await fetch(url, {
+      method: "HEAD",
+      headers: { Authorization: `Bearer ${token}` }
+    });
+    const contentLength = parseInt(
+      attachmentInfo.headers?.get("content-length")
+    );
+    return isNaN(contentLength) ? 0 : contentLength;
+  } catch (e) {
+    DatabaseLogger.error(e);
+    return -1;
+  }
+}
+
+export async function checkAttachment(hash) {
+  const internetState = await NetInfo.fetch();
+  const isInternetReachable =
+    internetState.isConnected && internetState.isInternetReachable;
+  if (!isInternetReachable) return { success: true };
+  const attachment = await db.attachments.attachment(hash);
+  if (!attachment) return { failed: "Attachment not found." };
+
+  try {
+    const size = await getUploadedFileSize(hash);
+    if (size === -1) return { success: true };
+
+    if (size === 0) return { failed: "File length is 0." };
+  } catch (e) {
+    return { failed: e?.message };
+  }
+  return { success: true };
+}

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

@@ -1,210 +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 { RequestOptions } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
-import NetInfo from "@react-native-community/netinfo";
-import RNFetchBlob from "react-native-blob-util";
-import { ToastManager } from "../../services/event-manager";
-import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { DatabaseLogger, db } from "../database";
-import { createCacheDir, exists } from "./io";
-import { ABYTES, cacheDir, getUploadedFileSize, parseS3Error } from "./utils";
-
-export async function downloadFile(
-  filename: string,
-  requestOptions: RequestOptions,
-  cancelToken: {
-    cancel: (reason?: string) => Promise<void>;
-  }
-) {
-  if (!requestOptions) {
-    DatabaseLogger.log(
-      `Error downloading file: ${filename}, reason: No requestOptions`
-    );
-    return false;
-  }
-
-  DatabaseLogger.log(`Downloading ${filename}`);
-  await createCacheDir();
-
-  const { url, headers, chunkSize } = requestOptions;
-  const tempFilePath = `${cacheDir}/${filename}_temp`;
-  const originalFilePath = `${cacheDir}/${filename}`;
-
-  try {
-    if (await exists(filename)) {
-      DatabaseLogger.log(`File Exists already: ${filename}`);
-      return true;
-    }
-
-    const attachment = await db.attachments.attachment(filename);
-    if (!attachment) return false;
-
-    const size = await getUploadedFileSize(filename);
-
-    if (size === -1) {
-      const error = `${strings.fileVerificationFailed()} (File hash: ${filename})`;
-      throw new Error(error);
-    }
-
-    if (size === 0) {
-      const error = `${strings.fileLengthError()} (File hash: ${filename})`;
-      await db.attachments.markAsFailed(attachment.id, error);
-      throw new Error(error);
-    }
-
-    const totalChunks = Math.ceil(size / chunkSize);
-    const decryptedLength = size - totalChunks * ABYTES;
-
-    if (attachment && attachment.size !== decryptedLength) {
-      const error = `${strings.fileLengthMismatch(
-        attachment.size,
-        decryptedLength
-      )} (File hash: ${filename})`;
-      await db.attachments.markAsFailed(attachment.id, error);
-      throw new Error(error);
-    }
-
-    const resolveUrlResponse = await fetch(url, {
-      method: "GET",
-      headers
-    });
-
-    if (!resolveUrlResponse.ok) {
-      DatabaseLogger.log(
-        `Error downloading file: ${filename}, ${resolveUrlResponse.status}, ${resolveUrlResponse.statusText}, reason: Unable to resolve download url`
-      );
-      throw new Error(
-        `${resolveUrlResponse.status}: ${strings.failedToResolvedDownloadUrl()}`
-      );
-    }
-
-    const downloadUrl = await resolveUrlResponse.text();
-
-    if (!downloadUrl) {
-      DatabaseLogger.log(
-        `Error downloading file: ${filename}, reason: Unable to resolve download url`
-      );
-      throw new Error(strings.failedToResolvedDownloadUrl());
-    }
-
-    DatabaseLogger.log(`Download starting: ${filename}`);
-    const request = RNFetchBlob.config({
-      path: tempFilePath,
-      IOSBackgroundTask: true,
-      overwrite: true
-    })
-      .fetch("GET", downloadUrl)
-      .progress(async (recieved, total) => {
-        useAttachmentStore
-          .getState()
-          .setProgress(0, total, filename, recieved, "download");
-
-        DatabaseLogger.log(`Downloading: ${filename}, ${recieved}/${total}`);
-      });
-
-    cancelToken.cancel = async (reason) => {
-      useAttachmentStore.getState().remove(filename);
-      request.cancel();
-      RNFetchBlob.fs.unlink(tempFilePath).catch(() => {
-        /* empty */
-      });
-      DatabaseLogger.log(`Download cancelled: ${reason} ${filename}`);
-    };
-
-    const response = await request;
-
-    const contentType =
-      response.info().headers?.["content-type"] ||
-      response.info().headers?.["Content-Type"];
-
-    if (contentType === "application/xml") {
-      const error = parseS3Error(await response.text());
-      throw new Error(`[${error.Code}] ${error.Message}`);
-    }
-
-    const status = response.info().status;
-    useAttachmentStore.getState().remove(filename);
-
-    if (await exists(originalFilePath)) {
-      await RNFetchBlob.fs.unlink(originalFilePath).catch(() => {
-        /* empty */
-      });
-    }
-
-    await RNFetchBlob.fs.mv(tempFilePath, originalFilePath);
-
-    if (!(await exists(filename))) {
-      throw new Error("File size mismatch");
-    }
-
-    return status >= 200 && status < 300;
-  } catch (e) {
-    if (
-      (e as Error).message !== "canceled" &&
-      !(e as Error).message.includes("NoSuchKey")
-    ) {
-      const toast = {
-        heading: strings.downloadError((e as Error).message),
-        message: (e as Error).message,
-        type: "error" as const,
-        context: "global"
-      };
-      ToastManager.show(toast);
-      toast.context = "local";
-      ToastManager.show(toast);
-    }
-
-    useAttachmentStore.getState().remove(filename);
-    RNFetchBlob.fs.unlink(tempFilePath).catch(() => {
-      /* empty */
-    });
-    RNFetchBlob.fs.unlink(originalFilePath).catch(() => {
-      /* empty */
-    });
-    DatabaseLogger.error(e, "Download failed: ", {
-      url
-    });
-    return false;
-  }
-}
-
-export async function checkAttachment(hash: string) {
-  const internetState = await NetInfo.fetch();
-  const isInternetReachable =
-    internetState.isConnected && internetState.isInternetReachable;
-  if (!isInternetReachable) return;
-  const attachment = await db.attachments.attachment(hash);
-  if (!attachment) return { failed: "Attachment not found." };
-
-  try {
-    const size = await getUploadedFileSize(hash);
-
-    if (size === -1) return { success: true };
-
-    if (size === 0)
-      return {
-        failed: `File length is 0. Please upload this file again from the attachment manager. (File hash: ${hash})`
-      };
-  } catch (e) {
-    return { failed: (e as Error)?.message };
-  }
-  return { success: true };
-}

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

@@ -17,41 +17,19 @@ 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 { IFileStorage } from "@notesnook/core";
-import { checkAttachment, downloadFile } from "./download";
+import { checkAttachment, downloadFile, getUploadedFileSize } from "./download";
 import {
-  bulkExists,
-  clearCache,
   clearFileStorage,
-  deleteCacheFileByName,
-  deleteCacheFileByPath,
   deleteFile,
   exists,
-  getCacheSize,
-  hashBase64,
   readEncrypted,
-  writeEncryptedBase64
+  writeEncryptedBase64,
+  hashBase64
 } from "./io";
 import { uploadFile } from "./upload";
-import {
-  cancelable,
-  checkAndCreateDir,
-  getUploadedFileSize,
-  requestPermission
-} from "./utils";
+import { cancelable } from "./utils";
 
 export default {
-  checkAttachment,
-  clearCache,
-  deleteCacheFileByName,
-  deleteCacheFileByPath,
-  getCacheSize,
-  requestPermission,
-  checkAndCreateDir,
-  getUploadedFileSize
-};
-
-export const FileStorage: IFileStorage = {
   readEncrypted,
   writeEncryptedBase64,
   hashBase64,
@@ -61,5 +39,5 @@ export const FileStorage: IFileStorage = {
   exists,
   clearFileStorage,
   getUploadedFileSize,
-  bulkExists
+  checkAttachment
 };

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

@@ -0,0 +1,202 @@
+/*
+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 Sodium from "@ammarahmed/react-native-sodium";
+import { Platform } from "react-native";
+import RNFetchBlob from "react-native-blob-util";
+import { IOS_APPGROUPID } from "../../utils/constants";
+import { DatabaseLogger, db } from "../database";
+import { cacheDir, cacheDirOld, getRandomId } from "./utils";
+
+export async function readEncrypted(filename, key, cipherData) {
+  await migrateFilesFromCache();
+  DatabaseLogger.log("Read encrypted file...");
+  let path = `${cacheDir}/${filename}`;
+
+  try {
+    if (!(await exists(filename))) {
+      return false;
+    }
+
+    let output = await Sodium.decryptFile(
+      key,
+      {
+        ...cipherData,
+        hash: filename,
+        appGroupId: IOS_APPGROUPID
+      },
+      cipherData.outputType === "base64" ? "base64" : "text"
+    );
+
+    DatabaseLogger.log("File decrypted...");
+
+    return output;
+  } catch (e) {
+    RNFetchBlob.fs.unlink(path).catch(console.log);
+    DatabaseLogger.error(e);
+    return false;
+  }
+}
+
+export async function hashBase64(data) {
+  const hash = await Sodium.hashFile({
+    type: "base64",
+    data,
+    uri: ""
+  });
+  return {
+    hash: hash,
+    type: "xxh64"
+  };
+}
+
+export async function writeEncryptedBase64(data, key) {
+  await createCacheDir();
+  let filepath = cacheDir + `/${getRandomId("imagecache_")}`;
+  await RNFetchBlob.fs.writeFile(filepath, data, "base64");
+  let output = await Sodium.encryptFile(key, {
+    uri: Platform.OS === "ios" ? filepath : "file://" + filepath,
+    type: "url"
+  });
+  RNFetchBlob.fs.unlink(filepath).catch(console.log);
+  console.log("encrypted file output: ", output);
+  output.size = output.length;
+  delete output.length;
+  return {
+    ...output,
+    alg: "xcha-stream"
+  };
+}
+
+export async function deleteFile(filename, data) {
+  await createCacheDir();
+  let delFilePath = cacheDir + `/${filename}`;
+  if (!data) {
+    if (!filename) return;
+    RNFetchBlob.fs.unlink(delFilePath).catch(console.log);
+    return true;
+  }
+
+  let { url, headers } = data;
+  try {
+    let response = await RNFetchBlob.fetch("DELETE", url, headers);
+    let status = response.info().status;
+    let ok = status >= 200 && status < 300;
+    if (ok) {
+      RNFetchBlob.fs.unlink(delFilePath).catch(console.log);
+    }
+    return ok;
+  } catch (e) {
+    console.log("delete file: ", e, url, headers);
+    return false;
+  }
+}
+
+export async function clearFileStorage() {
+  try {
+    let files = await RNFetchBlob.fs.ls(cacheDir);
+    let oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
+
+    for (let file of files) {
+      await RNFetchBlob.fs.unlink(cacheDir + `/${file}`).catch(console.log);
+    }
+    for (let file of oldCache) {
+      await RNFetchBlob.fs.unlink(cacheDirOld + `/${file}`).catch(console.log);
+    }
+  } catch (e) {
+    console.log("clearFileStorage", e);
+  }
+}
+
+export async function createCacheDir() {
+  if (!(await RNFetchBlob.fs.exists(cacheDir))) {
+    await RNFetchBlob.fs.mkdir(cacheDir);
+    DatabaseLogger.log("Cache directory created");
+  }
+}
+
+export async function migrateFilesFromCache() {
+  try {
+    await createCacheDir();
+    const migratedFilesPath = cacheDir + "/.migrated_1";
+    const migrated = await RNFetchBlob.fs.exists(migratedFilesPath);
+    if (migrated) {
+      console.log("Files migrated already");
+      return;
+    }
+
+    let files = await RNFetchBlob.fs.ls(cacheDir);
+    console.log("Files to migrate:", files.join(","));
+
+    let oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
+    for (let file of oldCache) {
+      if (file.startsWith("org.") || file.startsWith("com.")) continue;
+      RNFetchBlob.fs
+        .mv(cacheDirOld + `/${file}`, cacheDir + `/${file}`)
+        .catch(console.log);
+      console.log("Moved", file);
+    }
+    await RNFetchBlob.fs.createFile(migratedFilesPath, "1", "utf8");
+  } catch (e) {
+    console.log("migrateFilesFromCache", e);
+  }
+}
+
+const ABYTES = 17;
+export async function exists(filename) {
+  let path = `${cacheDir}/${filename}`;
+
+  const iosAppGroup =
+    Platform.OS === "ios"
+      ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
+      : null;
+  const appGroupPath = `${iosAppGroup}/${filename}`;
+
+  let exists = await RNFetchBlob.fs.exists(path);
+
+  // Check if file is present in app group path.
+  let existsInAppGroup = false;
+  if (!exists && Platform.OS === "ios") {
+    existsInAppGroup = await RNFetchBlob.fs.exists(appGroupPath);
+  }
+
+  if (exists || existsInAppGroup) {
+    const attachment = await db.attachments.attachment(filename);
+    const totalChunks = Math.ceil(attachment.size / attachment.chunkSize);
+    const totalAbytes = totalChunks * ABYTES;
+    const expectedFileSize = attachment.size + totalAbytes;
+
+    const stat = await RNFetchBlob.fs.stat(
+      existsInAppGroup ? appGroupPath : path
+    );
+
+    if (stat.size !== expectedFileSize) {
+      DatabaseLogger.log(
+        `File size mismatch: ${filename}, expected: ${expectedFileSize}, actual: ${stat.size}`
+      );
+      RNFetchBlob.fs
+        .unlink(existsInAppGroup ? appGroupPath : path)
+        .catch(console.log);
+      return false;
+    }
+
+    exists = true;
+  }
+  return exists;
+}

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

@@ -1,311 +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 Sodium from "@ammarahmed/react-native-sodium";
-import {
-  FileEncryptionMetadataWithHash,
-  FileEncryptionMetadataWithOutputType,
-  Output,
-  RequestOptions
-} from "@notesnook/core";
-import { DataFormat, SerializedKey } from "@notesnook/crypto";
-import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
-import { eSendEvent } from "../../services/event-manager";
-import { IOS_APPGROUPID } from "../../utils/constants";
-import { DatabaseLogger, db } from "../database";
-import { ABYTES, cacheDir, cacheDirOld, getRandomId } from "./utils";
-
-export async function readEncrypted<TOutputFormat extends DataFormat>(
-  filename: string,
-  key: SerializedKey,
-  cipherData: FileEncryptionMetadataWithOutputType<TOutputFormat>
-) {
-  await migrateFilesFromCache();
-  DatabaseLogger.log("Read encrypted file...");
-  const path = `${cacheDir}/${filename}`;
-
-  try {
-    if (!(await exists(filename))) {
-      return;
-    }
-
-    const output = await Sodium.decryptFile(
-      key,
-      {
-        ...cipherData,
-        hash: filename,
-        appGroupId: IOS_APPGROUPID
-      },
-      cipherData.outputType === "base64" ? "base64" : "text"
-    );
-
-    DatabaseLogger.log("File decrypted...");
-
-    return output as Output<TOutputFormat>;
-  } catch (e) {
-    RNFetchBlob.fs.unlink(path).catch(() => {
-      /* empty */
-    });
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function hashBase64(data: string) {
-  const hash = await Sodium.hashFile({
-    type: "base64",
-    data,
-    uri: ""
-  });
-  return {
-    hash: hash,
-    type: "xxh64"
-  };
-}
-
-export async function writeEncryptedBase64(
-  data: string,
-  encryptionKey: SerializedKey,
-  mimeType: string
-): Promise<FileEncryptionMetadataWithHash> {
-  await createCacheDir();
-  const filepath = cacheDir + `/${getRandomId("imagecache_")}`;
-  await RNFetchBlob.fs.writeFile(filepath, data, "base64");
-  const output = await Sodium.encryptFile(encryptionKey, {
-    uri: Platform.OS === "ios" ? filepath : "file://" + filepath,
-    type: "url"
-  });
-
-  RNFetchBlob.fs.unlink(filepath).catch(() => {
-    /* empty */
-  });
-
-  return {
-    ...output,
-    alg: "xcha-stream"
-  };
-}
-
-export async function deleteFile(
-  filename: string,
-  requestOptions?: RequestOptions
-): Promise<boolean> {
-  await createCacheDir();
-  const localFilePath = cacheDir + `/${filename}`;
-  if (!requestOptions) {
-    RNFetchBlob.fs.unlink(localFilePath).catch(() => {
-      /* empty */
-    });
-    return true;
-  }
-
-  const { url, headers } = requestOptions;
-
-  try {
-    const response = await RNFetchBlob.fetch("DELETE", url, headers);
-    const status = response.info().status;
-    const ok = status >= 200 && status < 300;
-    if (ok) {
-      RNFetchBlob.fs.unlink(localFilePath).catch(() => {
-        /* empty */
-      });
-    }
-    return ok;
-  } catch (e) {
-    DatabaseLogger.error(e, "Delete file", {
-      url: url
-    });
-    return false;
-  }
-}
-
-export async function clearFileStorage() {
-  try {
-    const files = await RNFetchBlob.fs.ls(cacheDir);
-    const oldCache = await RNFetchBlob.fs.ls(cacheDirOld);
-
-    for (const file of files) {
-      await RNFetchBlob.fs.unlink(cacheDir + `/${file}`).catch(() => {
-        /* empty */
-      });
-    }
-    for (const file of oldCache) {
-      await RNFetchBlob.fs.unlink(cacheDirOld + `/${file}`).catch(() => {
-        /* empty */
-      });
-    }
-  } catch (e) {
-    DatabaseLogger.error(e, "clearFileStorage");
-  }
-}
-
-export async function createCacheDir() {
-  try {
-    if (!(await RNFetchBlob.fs.exists(cacheDir))) {
-      await RNFetchBlob.fs.mkdir(cacheDir);
-      DatabaseLogger.log("Cache directory created");
-    }
-  } catch (e) {
-    DatabaseLogger.error(e);
-  }
-}
-
-export async function migrateFilesFromCache() {
-  try {
-    await createCacheDir();
-    const migratedFilesPath = cacheDir + "/.migrated_1";
-    const migrated = await RNFetchBlob.fs.exists(migratedFilesPath);
-    if (migrated) {
-      return;
-    }
-
-    const files = await RNFetchBlob.fs.ls(cacheDir);
-
-    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 */
-        });
-    }
-    await RNFetchBlob.fs.createFile(migratedFilesPath, "1", "utf8");
-  } catch (e) {
-    DatabaseLogger.error(e, "migrateFilesFromCache");
-  }
-}
-
-export async function clearCache() {
-  await RNFetchBlob.fs.unlink(cacheDir).catch(() => {
-    /* empty */
-  });
-  await createCacheDir();
-  eSendEvent("cache-cleared");
-}
-
-export async function deleteCacheFileByPath(path: string) {
-  await RNFetchBlob.fs.unlink(path).catch(() => {
-    /* empty */
-  });
-}
-
-export async function deleteCacheFileByName(name: string) {
-  const iosAppGroup =
-    Platform.OS === "ios"
-      ? 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 */
-  });
-}
-
-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 */
-      });
-    }
-  }
-}
-
-export async function exists(filename: string) {
-  const path = `${cacheDir}/${filename}`;
-
-  const iosAppGroup =
-    Platform.OS === "ios"
-      ? await (RNFetchBlob.fs as any).pathForAppGroup(IOS_APPGROUPID)
-      : null;
-  const appGroupPath = `${iosAppGroup}/${filename}`;
-
-  let exists = await RNFetchBlob.fs.exists(path);
-
-  // Check if file is present in app group path.
-  let existsInAppGroup = false;
-  if (!exists && Platform.OS === "ios") {
-    existsInAppGroup = await RNFetchBlob.fs.exists(appGroupPath);
-  }
-
-  if (exists || existsInAppGroup) {
-    const attachment = await db.attachments.attachment(filename);
-    if (!attachment) return false;
-    const totalChunks = Math.ceil(attachment.size / attachment.chunkSize);
-    const totalAbytes = totalChunks * ABYTES;
-    const expectedFileSize = attachment.size + totalAbytes;
-
-    const stat = await RNFetchBlob.fs.stat(
-      existsInAppGroup ? appGroupPath : path
-    );
-
-    if (stat.size !== expectedFileSize) {
-      DatabaseLogger.log(
-        `File size mismatch: ${filename}, expected: ${expectedFileSize}, actual: ${stat.size}`
-      );
-      RNFetchBlob.fs
-        .unlink(existsInAppGroup ? appGroupPath : path)
-        .catch(() => {
-          /* empty */
-        });
-      return false;
-    }
-
-    exists = true;
-  }
-  return exists;
-}
-
-export async function bulkExists(files: string[]) {
-  try {
-    await createCacheDir();
-    const cacheFiles = await RNFetchBlob.fs.ls(cacheDir);
-    let missingFiles = files.filter((file) => !cacheFiles.includes(file));
-
-    if (Platform.OS === "ios") {
-      const iosAppGroup =
-        Platform.OS === "ios"
-          ? await (RNFetchBlob.fs as any).pathForAppGroup(IOS_APPGROUPID)
-          : null;
-      const appGroupFiles = await RNFetchBlob.fs.ls(iosAppGroup);
-      missingFiles = missingFiles.filter(
-        (file) => !appGroupFiles.includes(file)
-      );
-    }
-    return missingFiles;
-  } catch (e) {
-    DatabaseLogger.error(e);
-    return [];
-  }
-}
-
-export async function getCacheSize() {
-  await createCacheDir();
-  const stat = await RNFetchBlob.fs.lstat(`file://` + cacheDir);
-  let total = 0;
-
-  stat.forEach((file) => {
-    total += parseInt(file.size as unknown as string);
-  });
-  return total;
-}

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

@@ -0,0 +1,132 @@
+/*
+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 RNFetchBlob from "react-native-blob-util";
+import { useAttachmentStore } from "../../stores/use-attachment-store";
+import { DatabaseLogger, db } from "../database";
+import { cacheDir } from "./utils";
+import { isImage, isDocument } from "@notesnook/core/dist/utils/filename";
+import { Platform } from "react-native";
+import { IOS_APPGROUPID } from "../../utils/constants";
+import { createCacheDir } from "./io";
+import { getUploadedFileSize } from "./download";
+
+export async function uploadFile(filename, data, cancelToken) {
+  if (!data) return false;
+  let { url, headers } = data;
+  await createCacheDir();
+  DatabaseLogger.info(`Preparing to upload file: ${filename}`);
+
+  try {
+    const uploadedFileSize = await getUploadedFileSize(filename);
+    if (uploadedFileSize === -1) {
+      DatabaseLogger.log("Upload verification failed.");
+      return false;
+    }
+
+    const isUploaded = uploadedFileSize !== 0;
+    if (isUploaded) {
+      DatabaseLogger.log(`File ${filename} is already uploaded.`);
+      return true;
+    }
+
+    let res = await fetch(url, {
+      method: "PUT",
+      headers
+    });
+    if (!res.ok) throw new Error(`${res.status}: Unable to resolve upload url`);
+    const uploadUrl = await res.text();
+    if (!uploadUrl) throw new Error("Unable to resolve attachment upload url");
+    let uploadFilePath = `${cacheDir}/${filename}`;
+
+    const iosAppGroup =
+      Platform.OS === "ios"
+        ? await RNFetchBlob.fs.pathForAppGroup(IOS_APPGROUPID)
+        : null;
+    const appGroupPath = `${iosAppGroup}/${filename}`;
+    let exists = await RNFetchBlob.fs.exists(uploadFilePath);
+    if (!exists && Platform.OS === "ios") {
+      uploadFilePath = appGroupPath;
+      exists = await RNFetchBlob.fs.exists(uploadFilePath);
+    }
+
+    if (!exists) {
+      throw new Error(
+        `Trying to upload file at path ${uploadFilePath} that doest not exist.`
+      );
+    }
+
+    DatabaseLogger.info(`Starting upload: ${filename}`);
+
+    let request = RNFetchBlob.config({
+      IOSBackgroundTask: !globalThis["IS_SHARE_EXTENSION"]
+    })
+      .fetch(
+        "PUT",
+        uploadUrl,
+        {
+          "content-type": ""
+        },
+        RNFetchBlob.wrap(uploadFilePath)
+      )
+      .uploadProgress((sent, total) => {
+        useAttachmentStore
+          .getState()
+          .setProgress(sent, total, filename, 0, "upload");
+        DatabaseLogger.info(
+          `File upload progress: ${filename}, ${sent}/${total}`
+        );
+      });
+
+    cancelToken.cancel = () => {
+      useAttachmentStore.getState().remove(filename);
+      request.cancel();
+    };
+    let response = await request;
+
+    let status = response.info().status;
+    let text = await response.text();
+    let result = status >= 200 && status < 300 && text.length === 0;
+    useAttachmentStore.getState().remove(filename);
+    if (result) {
+      DatabaseLogger.info(
+        `File upload status: ${filename}, ${status}, ${text}`
+      );
+      let attachment = await db.attachments.attachment(filename);
+      if (!attachment) return result;
+      if (!isImage(attachment.mimeType) && !isDocument(attachment.mimeType)) {
+        RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
+      }
+    } else {
+      const fileInfo = await RNFetchBlob.fs.stat(uploadFilePath);
+      throw new Error(
+        `${status}, ${text}, name: ${fileInfo.filename}, length: ${
+          fileInfo.size
+        }, info: ${JSON.stringify(response.info())}`
+      );
+    }
+
+    return result;
+  } catch (e) {
+    useAttachmentStore.getState().remove(filename);
+    DatabaseLogger.info(`File upload error: ${filename}, ${e}`);
+    DatabaseLogger.error(e);
+    return false;
+  }
+}

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

@@ -1,147 +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 { RequestOptions } from "@notesnook/core";
-import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
-import { ToastManager } from "../../services/event-manager";
-import { useAttachmentStore } from "../../stores/use-attachment-store";
-import { IOS_APPGROUPID } from "../../utils/constants";
-import { DatabaseLogger, db } from "../database";
-import { createCacheDir } from "./io";
-import {
-  cacheDir,
-  checkUpload,
-  FileSizeResult,
-  getUploadedFileSize
-} from "./utils";
-
-export async function uploadFile(
-  filename: string,
-  requestOptions: RequestOptions,
-  cancelToken: {
-    cancel: (reason?: string) => Promise<void>;
-  }
-) {
-  if (!requestOptions) return false;
-  const { url, headers } = requestOptions;
-  await createCacheDir();
-  DatabaseLogger.info(`Preparing to upload file: ${filename}`);
-
-  try {
-    let filePath = `${cacheDir}/${filename}`;
-    let exists = await RNFetchBlob.fs.exists(filePath);
-    // Check for file in appGroupPath if it doesn't exist in cacheDir
-    if (!exists && Platform.OS === "ios") {
-      const iosAppGroup =
-        Platform.OS === "ios"
-          ? await (RNFetchBlob.fs as any).pathForAppGroup(IOS_APPGROUPID)
-          : null;
-      const appGroupPath = `${iosAppGroup}/${filename}`;
-      filePath = appGroupPath;
-      exists = await RNFetchBlob.fs.exists(filePath);
-    }
-
-    if (!exists) {
-      throw new Error(
-        `Trying to upload file at path ${filePath} that doest not exist.`
-      );
-    }
-
-    const fileSize = (await RNFetchBlob.fs.stat(filePath)).size;
-
-    const remoteFileSize = await getUploadedFileSize(filename);
-    if (remoteFileSize === FileSizeResult.Error) return false;
-
-    if (remoteFileSize > FileSizeResult.Empty && remoteFileSize === fileSize) {
-      DatabaseLogger.log(`File ${filename} is already uploaded.`);
-      return true;
-    }
-
-    const uploadUrlResponse = await fetch(url, {
-      method: "PUT",
-      headers
-    });
-
-    const uploadUrl = uploadUrlResponse.ok
-      ? await uploadUrlResponse.text()
-      : await uploadUrlResponse.json();
-
-    if (typeof uploadUrl !== "string") {
-      throw new Error(
-        uploadUrl.error || "Unable to resolve attachment upload url."
-      );
-    }
-
-    DatabaseLogger.info(`Starting upload: ${filename}`);
-
-    const uploadRequest = RNFetchBlob.config({
-      //@ts-ignore
-      IOSBackgroundTask: !globalThis["IS_SHARE_EXTENSION"]
-    })
-      .fetch(
-        "PUT",
-        uploadUrl,
-        {
-          "content-type": ""
-        },
-        RNFetchBlob.wrap(filePath)
-      )
-      .uploadProgress((sent, total) => {
-        useAttachmentStore
-          .getState()
-          .setProgress(sent, total, filename, 0, "upload");
-        DatabaseLogger.info(
-          `File upload progress: ${filename}, ${sent}/${total}`
-        );
-      });
-
-    cancelToken.cancel = async () => {
-      useAttachmentStore.getState().remove(filename);
-      uploadRequest.cancel();
-    };
-
-    const uploadResponse = await uploadRequest;
-    const status = uploadResponse.info().status;
-    const uploaded = status >= 200 && status < 300;
-
-    useAttachmentStore.getState().remove(filename);
-
-    if (!uploaded) {
-      const fileInfo = await RNFetchBlob.fs.stat(filePath);
-      throw new Error(
-        `${status}, name: ${fileInfo.filename}, length: ${
-          fileInfo.size
-        }, info: ${JSON.stringify(uploadResponse.info())}`
-      );
-    }
-    const attachment = await db.attachments.attachment(filename);
-    if (!attachment) return false;
-    await checkUpload(filename, requestOptions.chunkSize, attachment.size);
-    DatabaseLogger.info(`File upload status: ${filename}, ${status}`);
-    return uploaded;
-  } catch (e) {
-    useAttachmentStore.getState().remove(filename);
-    ToastManager.error(e as Error, "File upload failed");
-    DatabaseLogger.error(e, "File upload failed", {
-      filename
-    });
-    return false;
-  }
-}

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

@@ -0,0 +1,93 @@
+/*
+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 * as ScopedStorage from "react-native-scoped-storage";
+import { Platform } from "react-native";
+import RNFetchBlob from "react-native-blob-util";
+
+export const cacheDirOld = RNFetchBlob.fs.dirs.CacheDir;
+
+export const cacheDir =
+  Platform.OS == "ios"
+    ? RNFetchBlob.fs.dirs.LibraryDir + "/.cache"
+    : RNFetchBlob.fs.dirs.DocumentDir + "/.cache";
+
+export function getRandomId(prefix) {
+  return Math.random()
+    .toString(36)
+    .replace("0.", prefix || "");
+}
+
+export function extractValueFromXmlTag(code, xml) {
+  if (!xml.includes(code)) return `Unknown ${code}`;
+  return xml.slice(
+    xml.indexOf(`<${code}>`) + code.length + 2,
+    xml.indexOf(`</${code}>`)
+  );
+}
+
+export async function fileCheck(response, totalSize) {
+  if (totalSize < 1000) {
+    let text = await response.text();
+    if (text.startsWith("<?xml")) {
+      let errorJson = {
+        Code: extractValueFromXmlTag("Code", text),
+        Message: extractValueFromXmlTag("Message", text)
+      };
+      throw new Error(`${errorJson.Code}: ${errorJson.Message}`);
+    }
+  }
+}
+
+export function cancelable(operation) {
+  const cancelToken = {
+    cancel: () => {}
+  };
+  return (filename, { url, headers }) => {
+    return {
+      execute: () => operation(filename, { url, headers }, cancelToken),
+      cancel: async () => {
+        await cancelToken.cancel();
+        RNFetchBlob.fs.unlink(`${cacheDir}/${filename}`).catch(console.log);
+      }
+    };
+  };
+}
+
+export function copyFileAsync(source, dest) {
+  return new Promise((resolve, reject) => {
+    ScopedStorage.copyFile(source, dest, (e, r) => {
+      if (e) {
+        reject(e);
+        return;
+      }
+      resolve();
+    });
+  });
+}
+
+export async function releasePermissions(path) {
+  if (Platform.OS === "ios") return;
+  const uris = await ScopedStorage.getPersistedUriPermissions();
+  for (let uri of uris) {
+    if (path.startsWith(uri)) {
+      await ScopedStorage.releasePersistableUriPermission(uri);
+    }
+  }
+}

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

@@ -1,175 +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 { hosts, RequestOptions } from "@notesnook/core";
-import { Platform } from "react-native";
-import RNFetchBlob from "react-native-blob-util";
-import * as ScopedStorage from "react-native-scoped-storage";
-import { DatabaseLogger, db } from "../database";
-
-export const ABYTES = 17;
-export const cacheDirOld = RNFetchBlob.fs.dirs.CacheDir;
-
-export const cacheDir =
-  Platform.OS == "ios"
-    ? RNFetchBlob.fs.dirs.LibraryDir + "/.cache"
-    : RNFetchBlob.fs.dirs.DocumentDir + "/.cache";
-
-export function getRandomId(prefix: string) {
-  return Math.random()
-    .toString(36)
-    .replace("0.", prefix || "");
-}
-
-export function parseS3Error(data?: string) {
-  const xml = typeof data === "string" ? data : null;
-
-  const error = {
-    Code: "UNKNOWN",
-    Message: xml
-  };
-
-  try {
-    if (!xml) return error;
-    const doc = new DOMParser().parseFromString(xml, "text/xml");
-
-    const ErrorElement = doc.getElementsByTagName("Error")[0];
-    if (!ErrorElement) return error;
-
-    for (const child of ErrorElement.children) {
-      if (
-        child.textContent &&
-        (child.tagName === "Code" || child.tagName === "Message")
-      )
-        error[child.tagName] = child.textContent;
-    }
-    return error;
-  } catch (e) {
-    return error;
-  }
-}
-
-export function cancelable(
-  operation: (
-    filename: string,
-    requestOptions: RequestOptions,
-    cancelToken: {
-      cancel: (reason?: string) => Promise<void>;
-    }
-  ) => Promise<boolean>
-) {
-  const cancelToken = {
-    cancel: async (reason?: string) => {}
-  };
-  return (filename: string, requestOptions: RequestOptions) => {
-    return {
-      execute: () => operation(filename, requestOptions, cancelToken),
-      cancel: async () => {
-        await cancelToken.cancel();
-      }
-    };
-  };
-}
-
-export function copyFileAsync(source: string, dest: string) {
-  return new Promise((resolve, reject) => {
-    //@ts-ignore
-    ScopedStorage.copyFile(source, dest, (e: any, r: any) => {
-      if (e) {
-        reject(e);
-        return;
-      }
-      resolve(true);
-    });
-  });
-}
-
-export async function releasePermissions(path: string) {
-  if (Platform.OS === "ios") return;
-  const uris = await ScopedStorage.getPersistedUriPermissions();
-  for (const uri of uris) {
-    if (path.startsWith(uri)) {
-      await ScopedStorage.releasePersistableUriPermission(uri);
-    }
-  }
-}
-
-export const FileSizeResult = {
-  Empty: 0,
-  Error: -1
-};
-
-export async function getUploadedFileSize(hash: string) {
-  try {
-    const url = `${hosts.API_HOST}/s3?name=${hash}`;
-    const token = await db.tokenManager.getAccessToken();
-    const attachmentInfo = await fetch(url, {
-      method: "HEAD",
-      headers: { Authorization: `Bearer ${token}` }
-    });
-    const contentLength = parseInt(
-      attachmentInfo.headers?.get("content-length") || "0"
-    );
-    return isNaN(contentLength) ? FileSizeResult.Empty : contentLength;
-  } catch (e) {
-    DatabaseLogger.error(e);
-    return FileSizeResult.Error;
-  }
-}
-
-export async function checkUpload(
-  filename: string,
-  chunkSize: number,
-  expectedSize: number
-) {
-  const size = await getUploadedFileSize(filename);
-  const totalChunks = Math.ceil(size / chunkSize);
-  const decryptedLength = size - totalChunks * ABYTES;
-  const error =
-    size === 0
-      ? `File size is 0.`
-      : size === -1
-      ? `File verification check failed.`
-      : expectedSize !== decryptedLength
-      ? `File size mismatch. Expected ${size} bytes but got ${decryptedLength} bytes.`
-      : undefined;
-  if (error) throw new Error(error);
-}
-
-export async function requestPermission() {
-  if (Platform.OS === "ios") return true;
-  return true;
-}
-export async function checkAndCreateDir(path: string) {
-  const dir =
-    Platform.OS === "ios"
-      ? RNFetchBlob.fs.dirs.DocumentDir + path
-      : RNFetchBlob.fs.dirs.SDCardDir + "/Notesnook/" + path;
-
-  try {
-    const exists = await RNFetchBlob.fs.exists(dir);
-    const isDir = await RNFetchBlob.fs.isDir(dir);
-    if (!exists || !isDir) {
-      await RNFetchBlob.fs.mkdir(dir);
-    }
-  } catch (e) {
-    await RNFetchBlob.fs.mkdir(dir);
-  }
-  return dir;
-}

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

@@ -20,13 +20,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import React from "react";
 import { Linking, View } from "react-native";
 //import SettingsBackupAndRestore from '../../screens/settings/backup-restore';
-import { useThemeColors } from "@notesnook/theme";
 import { eSendEvent, presentSheet } from "../../services/event-manager";
-import { eCloseAnnouncementDialog } from "../../utils/events";
+import Sync from "../../services/sync";
+import { useThemeColors } from "@notesnook/theme";
+import { eCloseAnnouncementDialog, eCloseSheet } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import { PricingPlans } from "../premium/pricing-plans";
 import SheetProvider from "../sheet-provider";
+import { Progress } from "../sheets/progress";
 import { Button } from "../ui/button";
 import { allowedOnPlatform, getStyle } from "./functions";
 
@@ -41,9 +43,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: (
@@ -56,6 +56,13 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
           />
         )
       });
+    } else if (item.type === "force-sync") {
+      eSendEvent(eCloseSheet);
+      await sleep(300);
+      Progress.present();
+      Sync.run("global", true, true, () => {
+        eSendEvent(eCloseSheet);
+      });
     }
   };
   return (

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

@@ -18,15 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import React, { useCallback, useEffect, useRef } from "react";
-import {
-  AppStateStatus,
-  Platform,
-  TextInput,
-  useWindowDimensions,
-  View
-} from "react-native";
+import { AppStateStatus, Platform, TextInput, View } from "react-native";
 //@ts-ignore
 import { useThemeColors } from "@notesnook/theme";
+import { enabled } from "react-native-privacy-snapshot";
 import { DatabaseLogger } from "../../common/database";
 import {
   decrypt,
@@ -39,21 +34,17 @@ import {
 import { MMKV } from "../../common/database/mmkv";
 import { useAppState } from "../../hooks/use-app-state";
 import BiometricService from "../../services/biometrics";
-import { ToastManager } from "../../services/event-manager";
 import SettingsService from "../../services/settings";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { useUserStore } from "../../stores/use-user-store";
 import { NotesnookModule } from "../../utils/notesnook-module";
 import { SIZE } from "../../utils/size";
-import { Toast } from "../toast";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
 import Input from "../ui/input";
 import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
-import { strings } from "@notesnook/intl";
 
 const getUser = () => {
   const user = MMKV.getString("user");
@@ -94,7 +85,6 @@ const AppLockedOverlay = () => {
   const appState = useAppState();
   const lastAppState = useRef<AppStateStatus>(appState);
   const biometricUnlockAwaitingUserInput = useRef(false);
-  const { height } = useWindowDimensions();
   const keyboardType = useSettingStore(
     (state) => state.settings.applockKeyboardType
   );
@@ -129,6 +119,7 @@ const AppLockedOverlay = () => {
     );
     if (unlocked) {
       lockApp(false);
+      enabled(false);
       password.current = undefined;
     }
     biometricUnlockAwaitingUserInput.current = false;
@@ -155,13 +146,8 @@ const AppLockedOverlay = () => {
         }
 
         lockApp(false);
+        enabled(false);
         password.current = undefined;
-      } else {
-        ToastManager.show({
-          heading: strings.invalid(keyboardType),
-          type: "error",
-          context: "local"
-        });
       }
     } catch (e) {
       console.error(e);
@@ -169,6 +155,10 @@ const AppLockedOverlay = () => {
   };
 
   useEffect(() => {
+    if (appState === "active") {
+      enabled(false);
+    }
+
     const prevState = lastAppState.current;
     lastAppState.current = appState;
 
@@ -194,28 +184,31 @@ const AppLockedOverlay = () => {
         DatabaseLogger.info("Biometric unlock request");
         onUnlockAppRequested();
       }
+
+      enabled(false);
     } else {
       SettingsService.appEnteredBackground();
+
+      if (
+        SettingsService.get().privacyScreen ||
+        SettingsService.getProperty("appLockEnabled")
+      ) {
+        enabled(true);
+      }
     }
   }, [appState, onUnlockAppRequested, appLocked]);
 
   return appLocked ? (
-    <KeyboardAwareScrollView
+    <View
       style={{
         backgroundColor: colors.primary.background,
         width: "100%",
         height: "100%",
         position: "absolute",
-        zIndex: 999
+        zIndex: 999,
+        justifyContent: "center"
       }}
-      contentContainerStyle={{
-        justifyContent: "center",
-        minHeight: height
-      }}
-      keyboardDismissMode="interactive"
-      keyboardShouldPersistTaps="handled"
     >
-      <Toast context="local" />
       <View
         style={{
           flex: 1,
@@ -251,7 +244,7 @@ const AppLockedOverlay = () => {
             textAlign: "center"
           }}
         >
-          {strings.unlockNotes()}
+          Unlock your notes
         </Heading>
 
         <Paragraph
@@ -261,7 +254,7 @@ const AppLockedOverlay = () => {
             maxWidth: "90%"
           }}
         >
-          {strings.verifyItsYou()}
+          {"Please verify it's you"}
         </Paragraph>
         <Seperator />
         <View
@@ -279,13 +272,13 @@ const AppLockedOverlay = () => {
                 keyboardType={
                   appLockHasPasswordSecurity ? keyboardType : "default"
                 }
-                placeholder={
+                placeholder={`Enter ${
                   appLockHasPasswordSecurity
-                    ? keyboardType === "numeric"
-                      ? strings.enterApplockPassword()
-                      : strings.enterApplockPin()
-                    : strings.enterAccountPassword()
-                }
+                    ? `app lock ${
+                        keyboardType === "numeric" ? "pin" : "password"
+                      }`
+                    : "account password"
+                }`}
                 onChangeText={(v) => (password.current = v)}
                 onSubmit={() => {
                   onSubmit();
@@ -302,7 +295,7 @@ const AppLockedOverlay = () => {
             {user || appLockHasPasswordSecurity ? (
               <>
                 <Button
-                  title={strings.continue()}
+                  title="Continue"
                   type="accent"
                   onPress={onSubmit}
                   width={250}
@@ -318,7 +311,7 @@ const AppLockedOverlay = () => {
 
             {biometricsAuthEnabled ? (
               <Button
-                title={strings.unlockWithBiometrics()}
+                title="Unlock with Biometrics"
                 width={250}
                 onPress={onUnlockAppRequested}
                 icon={"fingerprint"}
@@ -328,7 +321,7 @@ const AppLockedOverlay = () => {
           </View>
         </View>
       </View>
-    </KeyboardAwareScrollView>
+    </View>
   ) : null;
 };
 

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

@@ -30,8 +30,6 @@ import filesystem from "../../common/filesystem";
 import downloadAttachment from "../../common/filesystem/download-attachment";
 import { useAttachmentProgress } from "../../hooks/use-attachment-progress";
 import picker from "../../screens/editor/tiptap/picker";
-import { useTabStore } from "../../screens/editor/tiptap/use-tab-store";
-import { editorController } from "../../screens/editor/tiptap/utils";
 import {
   ToastManager,
   eSendEvent,
@@ -51,23 +49,22 @@ import { Dialog } from "../dialog";
 import { presentDialog } from "../dialog/functions";
 import { openNote } from "../list-items/note/wrapper";
 import { DateMeta } from "../properties/date-meta";
-import SheetProvider from "../sheet-provider";
 import { Button } from "../ui/button";
 import { Notice } from "../ui/notice";
 import { Pressable } from "../ui/pressable";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import { strings } from "@notesnook/intl";
+import { useTabStore } from "../../screens/editor/tiptap/use-tab-store";
+import { editorController } from "../../screens/editor/tiptap/utils";
+import SheetProvider from "../sheet-provider";
 
 const Actions = ({
   attachment,
   close,
   setAttachments,
-  fwdRef,
-  context
+  fwdRef
 }: {
   attachment: Attachment;
-  context: string;
   setAttachments: (attachments?: VirtualizedGrouping<Attachment>) => void;
   close?: () => void;
   fwdRef: RefObject<ActionSheetRef>;
@@ -81,25 +78,26 @@ const Actions = ({
   const [loading, setLoading] = useState<{
     name?: string;
   }>({});
+
   const actions = [
     {
-      name: strings.network.download(),
+      name: "Download",
       onPress: async () => {
         if (currentProgress) {
           await db.fs().cancel(attachment.hash);
           useAttachmentStore.getState().remove(attachment.hash);
         }
-        downloadAttachment(attachment.hash, context === "global");
-        fwdRef.current?.hide();
+        downloadAttachment(attachment.hash, false);
+        eSendEvent(eCloseSheet, contextId);
       },
       icon: "download"
     },
     {
-      name: strings.network.reupload(),
+      name: "Reupload",
       onPress: async () => {
         if (!PremiumService.get()) {
           ToastManager.show({
-            heading: strings.upgradeToPro(),
+            heading: "Upgrade to pro",
             type: "error",
             context: "local"
           });
@@ -115,19 +113,17 @@ const Actions = ({
       icon: "upload"
     },
     {
-      name: strings.fileCheck(),
+      name: "Run file check",
       onPress: async () => {
         setLoading({
-          name: strings.fileCheck()
+          name: "Run file check"
         });
-        const result = await filesystem.checkAttachment(attachment.hash);
-        if (!result) return;
-
-        if (result.failed) {
-          db.attachments.markAsFailed(attachment.id, result.failed);
-          setFailed(result.failed);
+        const res = await filesystem.checkAttachment(attachment.hash);
+        if (res.failed) {
+          db.attachments.markAsFailed(attachment.id, res.failed);
+          setFailed(res.failed);
           ToastManager.show({
-            heading: strings.fileCheckFailed(result.failed),
+            heading: "File check failed with error: " + res.failed,
             type: "error",
             context: "local"
           });
@@ -136,7 +132,7 @@ const Actions = ({
           db.attachments.markAsFailed(attachment.id);
           eSendEvent(eDBItemUpdate, attachment.id);
           ToastManager.show({
-            heading: strings.fileCheckPassed(),
+            heading: "File check passed",
             type: "success",
             context: "local"
           });
@@ -150,11 +146,13 @@ const Actions = ({
       icon: "file-check"
     },
     {
-      name: strings.rename(),
+      name: "Rename",
       onPress: () => {
         presentDialog({
+          context: contextId as any,
           input: true,
-          title: strings.renameFile(),
+          title: "Rename file",
+          paragraph: "Enter a new name for the file",
           defaultValue: attachment.filename,
           positivePress: async (value) => {
             if (value && value.length > 0) {
@@ -167,13 +165,13 @@ const Actions = ({
               eSendEvent(eDBItemUpdate, attachment.id);
             }
           },
-          positiveText: strings.rename()
+          positiveText: "Rename"
         });
       },
       icon: "form-textbox"
     },
     {
-      name: strings.delete(),
+      name: "Delete",
       onPress: async () => {
         const relations = await db.relations.to(attachment, "note").get();
         await db.attachments.remove(attachment.hash, false);
@@ -219,7 +217,6 @@ const Actions = ({
       style={{
         maxHeight: "100%"
       }}
-      keyboardShouldPersistTaps="never"
     >
       <Dialog context={contextId} />
       <SheetProvider context={contextId} />
@@ -257,7 +254,8 @@ const Actions = ({
 
           {notes.length ? (
             <Paragraph size={SIZE.xs} color={colors.secondary.paragraph}>
-              {strings.notes(notes.length)}
+              {notes.length} note
+              {notes.length > 1 ? "s" : ""}
             </Paragraph>
           ) : null}
           <Paragraph
@@ -265,7 +263,7 @@ const Actions = ({
               Clipboard.setString(attachment.hash);
               ToastManager.show({
                 type: "success",
-                heading: strings.hashCopied(),
+                heading: "Attachment hash copied",
                 context: "local"
               });
             }}
@@ -295,7 +293,7 @@ const Actions = ({
               }}
               size={SIZE.sm}
             >
-              {strings.listOf()} {strings.dataTypesPlural.note()}:
+              List of notes:
             </Heading>
 
             {notes.map((item) => (
@@ -354,7 +352,7 @@ const Actions = ({
         {failed ? (
           <Notice
             type="alert"
-            text={strings.fileCheckFailed(failed)}
+            text={`File check failed: ${failed} Try reuploading the file to fix the issue.`}
             size="small"
           />
         ) : null}
@@ -376,7 +374,6 @@ Actions.present = (
         setAttachments={set}
         close={close}
         attachment={attachment}
-        context={context || "global"}
       />
     )
   });

apps/mobile/app/components/attachments/attachment-item.tsx

@@ -22,6 +22,7 @@ import { Attachment, VirtualizedGrouping } from "@notesnook/core";
 import { useThemeColors } from "@notesnook/theme";
 import React from "react";
 import { TouchableOpacity, View } from "react-native";
+import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import { useAttachmentProgress } from "../../hooks/use-attachment-progress";
 import { useDBItem } from "../../hooks/use-db-item";
@@ -30,8 +31,6 @@ import { IconButton } from "../ui/icon-button";
 import { ProgressCircleComponent } from "../ui/svg/lazy";
 import Paragraph from "../ui/typography/paragraph";
 import Actions from "./actions";
-import { strings } from "@notesnook/intl";
-import { Pressable } from "../ui/pressable";
 
 function getFileExtension(filename: string) {
   const ext = /^.+\.([^.]+)$/.exec(filename);
@@ -45,8 +44,7 @@ export const AttachmentItem = ({
   setAttachments,
   pressable = true,
   hideWhenNotDownloading,
-  context,
-  errorOnly
+  context
 }: {
   id: string | number;
   attachments?: VirtualizedGrouping<Attachment>;
@@ -55,9 +53,9 @@ export const AttachmentItem = ({
   pressable?: boolean;
   hideWhenNotDownloading?: boolean;
   context?: string;
-  errorOnly?: boolean;
 }) => {
   const [attachment] = useDBItem(id, "attachment", attachments);
+
   const { colors } = useThemeColors();
   const [currentProgress, setCurrentProgress] = useAttachmentProgress(
     attachment,
@@ -69,8 +67,10 @@ export const AttachmentItem = ({
     Actions.present(attachment, setAttachments, context);
   };
 
-  return errorOnly && attachment && !attachment?.failed ? null : (
-    <Pressable
+  return hideWhenNotDownloading &&
+    (!currentProgress || !currentProgress.value) ? null : (
+    <TouchableOpacity
+      activeOpacity={0.9}
       onPress={onPress}
       style={{
         flexDirection: "row",
@@ -78,6 +78,8 @@ export const AttachmentItem = ({
         justifyContent: "space-between",
         padding: 12,
         paddingVertical: 6,
+        borderRadius: 5,
+        backgroundColor: colors.secondary.background,
         minHeight: 45
       }}
     >
@@ -87,46 +89,41 @@ export const AttachmentItem = ({
             style={{
               flexShrink: 1,
               flexDirection: "row",
-              alignItems: "center",
-              gap: 10
+              alignItems: "center"
             }}
           >
             <View
               style={{
                 justifyContent: "center",
                 alignItems: "center",
-                marginLeft: -5,
-                borderWidth: 1,
-                borderColor: colors.secondary.border,
-                paddingHorizontal: 2,
-                width: 30,
-                height: 30,
-                borderRadius: 5
+                marginLeft: -5
               }}
             >
+              <Icon name="file" size={SIZE.xxxl} color={colors.primary.icon} />
+
               <Paragraph
                 adjustsFontSizeToFit
-                size={8}
-                color={colors.secondary.paragraph}
+                size={6}
+                color={colors.static.white}
                 style={{
-                  maxWidth: 30
+                  position: "absolute"
                 }}
-                numberOfLines={1}
               >
-                {getFileExtension(attachment.filename).toUpperCase() ||
-                  attachment.mimeType.split("/")?.[1]?.toUpperCase()}
+                {getFileExtension(attachment.filename).toUpperCase()}
               </Paragraph>
             </View>
 
             <View
               style={{
-                flexShrink: 1
+                flexShrink: 1,
+                marginLeft: 10
               }}
             >
               <Paragraph
-                size={SIZE.sm}
+                size={SIZE.sm - 1}
                 style={{
-                  flexWrap: "wrap"
+                  flexWrap: "wrap",
+                  marginBottom: 2.5
                 }}
                 numberOfLines={1}
                 lineBreakMode="middle"
@@ -136,8 +133,11 @@ export const AttachmentItem = ({
               </Paragraph>
 
               {!hideWhenNotDownloading ? (
-                <Paragraph color={colors.secondary.paragraph} size={SIZE.xxs}>
-                  {strings.fileSize()}: {formatBytes(attachment.size)}
+                <Paragraph color={colors.secondary.paragraph} size={SIZE.xs}>
+                  {formatBytes(attachment.size)}{" "}
+                  {currentProgress?.type
+                    ? "(" + currentProgress.type + "ing - tap to cancel)"
+                    : ""}
                 </Paragraph>
               ) : null}
             </View>
@@ -186,6 +186,6 @@ export const AttachmentItem = ({
           )}
         </>
       )}
-    </Pressable>
+    </TouchableOpacity>
   );
 };

apps/mobile/app/components/attachments/download-attachments.tsx

@@ -0,0 +1,297 @@
+/*
+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 React, { useRef, useState } from "react";
+import { Platform, View } from "react-native";
+import { db } from "../../common/database";
+import { downloadAttachments } from "../../common/filesystem/download-attachment";
+import {
+  PresentSheetOptions,
+  presentSheet
+} from "../../services/event-manager";
+import { Button } from "../ui/button";
+import Heading from "../ui/typography/heading";
+import Paragraph from "../ui/typography/paragraph";
+import { ProgressBarComponent } from "../ui/svg/lazy";
+import { useThemeColors } from "@notesnook/theme";
+import { FlatList } from "react-native-actions-sheet";
+import { AttachmentItem } from "./attachment-item";
+import { Attachment, VirtualizedGrouping } from "@notesnook/core";
+
+const DownloadAttachments = ({
+  close,
+  attachments,
+  isNote,
+  update
+}: {
+  attachments: VirtualizedGrouping<Attachment>;
+  close?: ((ctx?: string | undefined) => void) | undefined;
+  isNote?: boolean;
+  update?: (props: PresentSheetOptions) => void;
+}) => {
+  const { colors } = useThemeColors();
+  const [downloading, setDownloading] = useState(false);
+  const [progress, setProgress] = useState({
+    value: 0,
+    statusText: "Download started... Please wait"
+  });
+  const [result, setResult] = useState(new Map());
+  const canceled = useRef(false);
+  const groupId = useRef<string>();
+
+  const onDownload = async () => {
+    update?.({
+      disableClosing: true
+    } as PresentSheetOptions);
+    setDownloading(true);
+    canceled.current = false;
+    groupId.current = Date.now().toString();
+    const result = await downloadAttachments(
+      await attachments.ids(),
+      (progress: number, statusText: string) =>
+        setProgress({ value: progress, statusText }),
+      canceled,
+      groupId.current
+    );
+    if (canceled.current) return;
+    setResult(result || new Map());
+    setDownloading(false);
+    update?.({
+      disableClosing: false
+    } as PresentSheetOptions);
+  };
+
+  const cancel = async () => {
+    update?.({
+      disableClosing: false
+    } as PresentSheetOptions);
+    canceled.current = true;
+    if (!groupId.current) return;
+    console.log(groupId.current, "canceling groupId downloads");
+    await db.fs().cancel(groupId.current);
+    setDownloading(false);
+    setResult(new Map());
+    groupId.current = undefined;
+  };
+
+  const failedResults = () => {
+    const results = [];
+    for (const value of result.values()) {
+      if (value.status === 0) results.push(value.attachment);
+    }
+    return results;
+  };
+
+  function getResultText() {
+    const downloadedAttachmentsCount =
+      attachments?.placeholders?.length - failedResults().length;
+    if (downloadedAttachmentsCount === 0)
+      return "Failed to download all attachments";
+    return `Successfully downloaded ${downloadedAttachmentsCount}/${
+      attachments?.placeholders.length
+    } attachments as a zip file at ${
+      Platform.OS === "android" ? "the selected folder" : "Notesnook/downloads"
+    }`;
+  }
+
+  return (
+    <View
+      style={{
+        alignItems: "center",
+        width: "100%",
+        paddingVertical: 12,
+        paddingHorizontal: 12
+      }}
+    >
+      <Heading>
+        {downloading
+          ? "Downloading attachments"
+          : result?.size
+          ? "Downloaded attachments"
+          : "Download attachments"}
+      </Heading>
+
+      {downloading ? (
+        <Paragraph
+          style={{
+            textAlign: "center"
+          }}
+        >
+          {progress.statusText}
+        </Paragraph>
+      ) : result?.size ? (
+        <Paragraph
+          style={{
+            textAlign: "center"
+          }}
+        >
+          {getResultText()}
+        </Paragraph>
+      ) : (
+        <Paragraph
+          style={{
+            textAlign: "center"
+          }}
+        >
+          Are you sure you want to download all attachments
+          {isNote ? " of this note?" : "?"}
+        </Paragraph>
+      )}
+
+      {downloading ? (
+        <View
+          style={{
+            width: 200,
+            marginTop: 10
+          }}
+        >
+          <ProgressBarComponent
+            height={5}
+            width={null}
+            animated={true}
+            useNativeDriver
+            progress={
+              progress.value
+                ? progress.value / attachments.placeholders?.length
+                : 0
+            }
+            unfilledColor={colors.secondary.background}
+            color={colors.primary.accent}
+            borderWidth={0}
+          />
+        </View>
+      ) : null}
+
+      <FlatList
+        style={{
+          maxHeight: 300,
+          width: "100%",
+          minHeight: 60,
+          backgroundColor: colors.secondary.background,
+          borderRadius: 5,
+          marginVertical: 12
+        }}
+        data={downloading ? attachments.placeholders : undefined}
+        ListEmptyComponent={
+          <View
+            style={{
+              width: "100%",
+              justifyContent: "center",
+              alignItems: "center",
+              height: 60
+            }}
+          >
+            <Paragraph color={colors.secondary.paragraph}>
+              No downloads in progress.
+            </Paragraph>
+          </View>
+        }
+        keyExtractor={(index) => "attachment_download" + index}
+        renderItem={({ index }) => {
+          return (
+            <AttachmentItem
+              id={index}
+              setAttachments={() => {}}
+              pressable={false}
+              hideWhenNotDownloading={true}
+              attachments={attachments}
+            />
+          );
+        }}
+      />
+
+      {result?.size ? (
+        <Button
+          style={{
+            width: 250,
+            borderRadius: 100,
+            marginTop: 20
+          }}
+          onPress={() => {
+            close?.();
+          }}
+          type="accent"
+          title="Done"
+        />
+      ) : !downloading ? (
+        <View
+          style={{
+            flexDirection: "row",
+            width: "100%",
+            marginTop: 20
+          }}
+        >
+          <Button
+            style={{
+              flex: 1,
+              borderRadius: 100,
+              marginRight: 5
+            }}
+            onPress={() => {
+              close?.();
+            }}
+            type="secondary"
+            title="No"
+          />
+          <Button
+            style={{
+              flex: 1,
+              borderRadius: 100,
+              marginLeft: 5
+            }}
+            onPress={onDownload}
+            type="accent"
+            title="Yes"
+          />
+        </View>
+      ) : (
+        <Button
+          style={{
+            width: 250,
+            borderRadius: 100,
+            marginTop: 20
+          }}
+          onPress={cancel}
+          type="error"
+          title="Cancel"
+        />
+      )}
+    </View>
+  );
+};
+
+DownloadAttachments.present = (
+  context: string,
+  attachments: VirtualizedGrouping<Attachment>,
+  isNote?: boolean
+) => {
+  presentSheet({
+    context: context,
+    component: (ref, close, update) => (
+      <DownloadAttachments
+        close={close}
+        attachments={attachments}
+        isNote={isNote}
+        update={update}
+      />
+    )
+  });
+};
+
+export default DownloadAttachments;

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

@@ -19,29 +19,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import {
   Attachment,
-  FilteredSelector,
   Note,
   SortOptions,
   VirtualizedGrouping
 } from "@notesnook/core";
-import { strings } from "@notesnook/intl";
+import { FilteredSelector } from "@notesnook/core/dist/database/sql-collection";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
-import { ActivityIndicator, View } from "react-native";
+import { ActivityIndicator, ScrollView, View } from "react-native";
 import { FlashList } from "react-native-actions-sheet/dist/src/views/FlashList";
-import { ScrollView } from "react-native-gesture-handler";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
-import create, { State } from "zustand";
 import { db } from "../../common/database";
 import filesystem from "../../common/filesystem";
-import { downloadAttachments } from "../../common/filesystem/download-attachment";
-import { AttachmentGroupProgress } from "../../screens/settings/attachment-group-progress";
-import { presentSheet, ToastManager } from "../../services/event-manager";
-import { useAttachmentStore } from "../../stores/use-attachment-store";
+import { presentSheet } from "../../services/event-manager";
+import { useSettingStore } from "../../stores/use-setting-store";
 import { SIZE } from "../../utils/size";
-import { Dialog } from "../dialog";
-import { presentDialog } from "../dialog/functions";
-import { Header } from "../header";
 import SheetProvider from "../sheet-provider";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
@@ -50,105 +42,22 @@ import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { AttachmentItem } from "./attachment-item";
+import DownloadAttachments from "./download-attachments";
 
 const DEFAULT_SORTING: SortOptions = {
   sortBy: "dateEdited",
   sortDirection: "desc"
 };
 
-type RecheckerProgress = {
-  failed: number;
-  passed: number;
-  isWorking: boolean;
-  shown: boolean;
-  filter: string;
-};
-
-interface RecheckerState extends State {
-  progress: {
-    [key: string]: RecheckerProgress;
-  };
-  setProgress: (key: string, progress: RecheckerProgress) => void;
-  currentFilter: string;
-}
-
-const useRechecker = create<RecheckerState>((set) => ({
-  progress: {
-    all: {
-      failed: 0,
-      passed: 0,
-      isWorking: false,
-      shown: false,
-      filter: "all"
-    }
-  },
-  currentFilter: "all",
-  setProgress: (key: string, progress: RecheckerProgress) => {
-    set((state) => ({
-      progress: {
-        ...state.progress,
-        [key]: progress
-      }
-    }));
-  }
-}));
-
-const attachmentTypes = [
-  {
-    title: strings.mediaTypes.all(),
-    filterBy: "all"
-  },
-  {
-    title: strings.mediaTypes.image(),
-    filterBy: "images"
-  },
-  {
-    title: strings.mediaTypes.audio(),
-    filterBy: "audio"
-  },
-  {
-    title: strings.mediaTypes.video(),
-    filterBy: "video"
-  },
-  {
-    title: strings.mediaTypes.document(),
-    filterBy: "documents"
-  },
-  {
-    title: strings.mediaTypes.orphaned(),
-    filterBy: "orphaned"
-  },
-  {
-    title: strings.mediaTypes.errors(),
-    filterBy: "errors"
-  }
-];
-
-export const AttachmentDialog = ({
-  note,
-  isSheet
-}: {
-  note?: Note;
-  isSheet: boolean;
-}) => {
+export const AttachmentDialog = ({ note }: { note?: Note }) => {
   const { colors } = useThemeColors();
+  const { height } = useSettingStore((state) => state.dimensions);
   const [attachments, setAttachments] =
     useState<VirtualizedGrouping<Attachment>>();
   const attachmentSearchValue = useRef<string>();
-  const [loading, setLoading] = useState(true);
   const searchTimer = useRef<NodeJS.Timeout>();
+  const [loading, setLoading] = useState(false);
   const [currentFilter, setCurrentFilter] = useState("all");
-  const rechecker = useRechecker((state) =>
-    note ? state.progress[note.id] || {} : state.progress.all
-  );
-  const currentFilterRef = useRef(currentFilter);
-  currentFilterRef.current = currentFilter;
-
-  useEffect(() => {
-    useRechecker.setState({
-      currentFilter: currentFilter
-    });
-  }, [currentFilter]);
 
   const refresh = React.useCallback(() => {
     if (note) {
@@ -159,7 +68,6 @@ export const AttachmentDialog = ({
           sortBy: "dateModified"
         })
         .then((attachments) => {
-          setLoading(false);
           setAttachments(attachments);
         });
     } else {
@@ -168,10 +76,7 @@ export const AttachmentDialog = ({
           ...DEFAULT_SORTING,
           sortBy: "dateModified"
         })
-        .then((attachments) => {
-          setAttachments(attachments);
-          setLoading(false);
-        });
+        .then((attachments) => setAttachments(attachments));
     }
   }, [note]);
 
@@ -203,71 +108,53 @@ export const AttachmentDialog = ({
       setAttachments={async () => {
         setAttachments(await filterAttachments(currentFilter));
       }}
-      errorOnly={currentFilter === "errors"}
       attachments={attachments}
       id={index}
-      context={!isSheet ? "global" : "attachments-list"}
+      context="attachments-list"
     />
   );
 
   const onCheck = async () => {
-    const getState = () =>
-      useRechecker.getState().progress[note?.id || "all"] || {};
-    const setState = (state: Partial<RecheckerProgress>) =>
-      useRechecker.getState().setProgress(note?.id || "all", {
-        ...getState(),
-        ...state
-      });
+    if (!attachments) return;
+    setLoading(true);
 
-    if (!attachments || getState().isWorking) return;
-    setState({
-      isWorking: true,
-      failed: 0,
-      passed: 0,
-      shown: true,
-      filter: currentFilterRef.current
-    });
-    const filter = currentFilterRef.current;
-    const filteredAttachments = await filterAttachments(
-      currentFilterRef.current
-    );
-
-    for (let i = 0; i < filteredAttachments.placeholders.length; i++) {
-      if (!getState().isWorking) {
-        ToastManager.show({
-          message: strings.attachmentRecheckCancelled(),
-          type: "info",
-          context: isSheet ? "local" : "global"
-        });
-        return;
-      }
+    for (let i = 0; i < attachments.placeholders.length; i++) {
       const attachment = (await attachments.item(i))?.item;
-      if (currentFilter == "errors" && !attachment?.failed) continue;
-
       if (!attachment) continue;
       const result = await filesystem.checkAttachment(attachment.hash);
-      if (!result) return;
       if (result.failed) {
-        setState({
-          failed: getState().failed + 1
-        });
         await db.attachments.markAsFailed(attachment.hash, result.failed);
       } else {
-        setState({
-          passed: getState().passed + 1
-        });
-        await db.attachments.markAsFailed(attachment.id);
+        await db.attachments.markAsFailed(attachment.id, undefined);
       }
     }
-    if (filter === useRechecker.getState().currentFilter) {
-      setAttachments(await filterAttachments(currentFilter));
-    }
-
-    setState({
-      isWorking: false
-    });
+    refresh();
+    setLoading(false);
   };
 
+  const attachmentTypes = [
+    {
+      title: "All",
+      filterBy: "all"
+    },
+    {
+      title: "Images",
+      filterBy: "images"
+    },
+    {
+      title: "Documents",
+      filterBy: "documents"
+    },
+    {
+      title: "Video",
+      filterBy: "video"
+    },
+    {
+      title: "Audio",
+      filterBy: "audio"
+    }
+  ];
+
   const filterAttachments = async (type: string) => {
     let items: FilteredSelector<Attachment> = db.attachments.all;
 
@@ -296,14 +183,6 @@ export const AttachmentDialog = ({
         items = note
           ? db.attachments.ofNote(note.id, "documents")
           : db.attachments.documents;
-        break;
-      case "orphaned":
-        items = db.attachments.orphaned;
-        break;
-      case "errors":
-        items = items = note
-          ? db.attachments.ofNote(note.id, "all")
-          : db.attachments.all;
     }
 
     return await items.sorted({
@@ -313,59 +192,39 @@ export const AttachmentDialog = ({
   };
 
   return (
-    <>
-      {isSheet ? (
-        <>
-          <SheetProvider context="attachments-list" />
-          <Dialog context="local" />
-        </>
-      ) : null}
-      {!isSheet ? (
-        <Header
-          title={strings.manageAttachments()}
-          renderedInRoute="SettingsGroup"
-          canGoBack
-          headerRightButtons={[
-            {
-              onPress() {
-                onCheck();
-              },
-              title: strings.recheckAll()
-            },
-            {
-              onPress() {
-                if (!attachments) return;
-                presentDialog({
-                  title: strings.doActions.download.attachment(
-                    attachments.placeholders.length
-                  ),
-                  positiveText: strings.network.download(),
-                  positivePress: async () => {
-                    downloadAttachments(await attachments.ids());
-                  },
-                  negativeText: strings.cancel()
-                });
-              },
-              title: strings.downloadAllAttachments()
-            }
-          ]}
-        />
-      ) : (
+    <View
+      style={{
+        width: "100%",
+        alignSelf: "center",
+        paddingHorizontal: 12,
+        height: height * 0.85
+      }}
+    >
+      <SheetProvider context="attachments-list" />
+      <View
+        style={{
+          flexDirection: "row",
+          justifyContent: "space-between",
+          alignItems: "center"
+        }}
+      >
+        <Heading>Attachments</Heading>
+
         <View
           style={{
-            flexDirection: "row",
-            justifyContent: "space-between",
-            alignItems: "center",
-            paddingHorizontal: 12
+            flexDirection: "row"
           }}
         >
-          <Heading>{strings.dataTypesPluralCamelCase.attachment()}</Heading>
-
-          <View
-            style={{
-              flexDirection: "row"
-            }}
-          >
+          {loading ? (
+            <ActivityIndicator
+              style={{
+                height: 40,
+                width: 40,
+                marginRight: 10
+              }}
+              size={SIZE.lg}
+            />
+          ) : (
             <IconButton
               name="check-all"
               style={{
@@ -377,244 +236,125 @@ export const AttachmentDialog = ({
               size={SIZE.lg}
               onPress={onCheck}
             />
+          )}
 
-            <IconButton
-              name="download"
-              style={{
-                height: 40,
-                width: 40
-              }}
-              color={colors.primary.paragraph}
-              onPress={() => {
-                if (!attachments) return;
-                presentDialog({
-                  title: strings.doActions.download.attachment(
-                    attachments.placeholders.length
-                  ),
-                  positiveText: strings.network.download(),
-                  positivePress: async () => {
-                    downloadAttachments(await attachments.ids());
-                  },
-                  negativeText: strings.cancel()
-                });
-              }}
-              size={SIZE.lg}
-            />
-          </View>
+          <IconButton
+            name="download"
+            style={{
+              height: 40,
+              width: 40
+            }}
+            color={colors.primary.paragraph}
+            onPress={() => {
+              if (!attachments) return;
+              DownloadAttachments.present(
+                "attachments-list",
+                attachments,
+                !!note
+              );
+            }}
+            size={SIZE.lg}
+          />
         </View>
-      )}
+      </View>
 
-      <View
-        style={{
-          width: "100%",
-          alignSelf: "center",
-          paddingHorizontal: 12,
-          height: "100%"
+      <Seperator />
+      <Input
+        placeholder="Filter attachments by filename, type or hash"
+        onChangeText={onChangeText}
+        onSubmit={() => {
+          onChangeText(attachmentSearchValue.current as string);
         }}
-      >
-        <Seperator />
-        <Input
-          placeholder={strings.filterAttachments()}
-          onChangeText={onChangeText}
-          onSubmit={() => {
-            onChangeText(attachmentSearchValue.current as string);
-          }}
-        />
+      />
 
-        {rechecker.shown ? (
+      <View>
+        <ScrollView
+          style={{
+            width: "100%",
+            height: 50,
+            flexDirection: "row",
+            backgroundColor: colors.primary.background
+          }}
+          contentContainerStyle={{
+            minWidth: "100%",
+            height: 50
+          }}
+          horizontal
+        >
+          {attachmentTypes.map((item) => (
+            <Button
+              type={
+                currentFilter === item.filterBy ? "secondaryAccented" : "plain"
+              }
+              key={item.title}
+              title={item.title}
+              style={{
+                borderRadius: 0,
+                borderBottomWidth: 1,
+                flexGrow: 1,
+                borderBottomColor:
+                  currentFilter !== item.filterBy
+                    ? "transparent"
+                    : colors.primary.accent
+              }}
+              onPress={async () => {
+                setCurrentFilter(item.filterBy);
+                setAttachments(await filterAttachments(item.filterBy));
+              }}
+            />
+          ))}
+        </ScrollView>
+      </View>
+      <FlashList
+        keyboardDismissMode="none"
+        keyboardShouldPersistTaps="always"
+        ListEmptyComponent={
           <View
             style={{
-              flexDirection: "row",
-              alignItems: "center",
-              width: "100%",
-              borderRadius: 10,
-              padding: 10,
-              borderWidth: 1,
-              borderColor: colors.primary.border,
-              gap: 12,
-              justifyContent: "space-between"
-            }}
-          >
-            <View
-              style={{
-                flexDirection: "row",
-                gap: 12,
-                alignItems: "center"
-              }}
-            >
-              {rechecker.isWorking ? (
-                <ActivityIndicator color={colors.primary.accent} />
-              ) : (
-                <Icon
-                  name="file-check"
-                  size={30}
-                  color={colors.primary.accent}
-                />
-              )}
-
-              <View>
-                <Paragraph>
-                  {rechecker.isWorking
-                    ? note
-                      ? strings.checkingNoteAttachments()
-                      : strings.checkingAllAttachments()
-                    : strings.attachmentRecheckComplete()}
-                </Paragraph>
-                <Paragraph>
-                  {`${
-                    rechecker.isWorking ? `${strings.pleaseWait()} ` : ""
-                  }${strings.passed()}: ${
-                    rechecker.passed
-                  }, ${strings.failed()}: ${rechecker.failed}`}
-                </Paragraph>
-              </View>
-            </View>
-
-            <IconButton
-              type={rechecker.isWorking ? "errorShade" : "plain"}
-              name={rechecker.isWorking ? "close" : "check"}
-              size={SIZE.lg}
-              color={
-                rechecker.isWorking ? colors.error.icon : colors.primary.accent
-              }
-              onPress={() => {
-                useRechecker.getState().setProgress(note?.id || "all", {
-                  ...useRechecker.getState().progress[note?.id || "all"],
-                  shown: false,
-                  isWorking: false
-                });
-              }}
-            />
-          </View>
-        ) : null}
-
-        <View>
-          <ScrollView
-            style={{
-              backgroundColor: colors.primary.background,
-              flexWrap: "wrap",
-              flexDirection: "row",
-              paddingVertical: 12
-            }}
-            contentContainerStyle={{
+              height: 150,
+              justifyContent: "center",
               alignItems: "center"
             }}
-            horizontal
           >
-            {attachmentTypes.map((item) =>
-              item.filterBy === "orphaned" && note ? null : (
-                <Button
-                  type={
-                    currentFilter === item.filterBy
-                      ? "secondaryAccented"
-                      : "plain"
-                  }
-                  key={item.title}
-                  title={item.title}
-                  fontSize={SIZE.sm}
-                  style={{
-                    borderRadius: 100,
-                    paddingHorizontal: 12,
-                    height: 40,
-                    minWidth: 80
-                  }}
-                  onPress={async () => {
-                    const filterBy = item.filterBy;
-                    setCurrentFilter(filterBy);
-                    setLoading(true);
-                    filterAttachments(filterBy)
-                      .then((results) => {
-                        if (filterBy !== currentFilterRef.current) return;
-                        setAttachments(results);
-                        setLoading(false);
-                      })
-                      .catch(() => {
-                        /* empty */
-                      });
-                  }}
-                />
-              )
-            )}
-          </ScrollView>
-        </View>
-
-        <FlashList
-          keyboardDismissMode="none"
-          keyboardShouldPersistTaps="always"
-          ListEmptyComponent={
-            <View
-              style={{
-                height: "100%",
-                justifyContent: "center",
-                alignItems: "center"
-              }}
-            >
-              {loading ? (
-                <ActivityIndicator size={40} color={colors.primary.accent} />
-              ) : (
-                <>
-                  <Icon
-                    name="attachment"
-                    size={60}
-                    color={colors.secondary.icon}
-                  />
-                  <Paragraph>{strings.noAttachments()}</Paragraph>
-                </>
-              )}
-            </View>
-          }
-          ListHeaderComponent={<AllProgress note={note} />}
-          ListFooterComponent={
-            <View
-              style={{
-                height: 350
-              }}
-            />
-          }
-          estimatedItemSize={50}
-          data={loading ? [] : attachments?.placeholders}
-          renderItem={renderItem}
-        />
-      </View>
-    </>
-  );
-};
-
-const AllProgress = ({ note }: { note?: Note }) => {
-  const progress = useAttachmentStore((state) =>
-    note
-      ? {
-          downloading: {
-            [note.id]: state.downloading?.[note.id]
-          },
-          uploading: {
-            [note.id]: state.uploading?.[note.id]
-          }
+            <Icon name="attachment" size={60} color={colors.secondary.icon} />
+            <Paragraph>
+              {note ? "No attachments on this note" : "No attachments"}
+            </Paragraph>
+          </View>
         }
-      : state
-  );
+        ListFooterComponent={
+          <View
+            style={{
+              height: 350
+            }}
+          />
+        }
+        estimatedItemSize={50}
+        data={attachments?.placeholders}
+        renderItem={renderItem}
+      />
 
-  return (
-    <View
-      style={{
-        gap: 10,
-        width: "100%"
-      }}
-    >
-      {Object.keys(progress.downloading || {}).map((groupId) => (
-        <AttachmentGroupProgress key={groupId} groupId={groupId} />
-      ))}
-
-      {Object.keys(progress.uploading || {}).map((groupId) => (
-        <AttachmentGroupProgress key={groupId} groupId={groupId} />
-      ))}
+      <Paragraph
+        color={colors.secondary.paragraph}
+        size={SIZE.xs}
+        style={{
+          textAlign: "center",
+          marginTop: 10
+        }}
+      >
+        <Icon
+          name="shield-key-outline"
+          size={SIZE.xs}
+          color={colors.primary.icon}
+        />
+        {"  "}All attachments are end-to-end encrypted.
+      </Paragraph>
     </View>
   );
 };
 
 AttachmentDialog.present = (note?: Note) => {
   presentSheet({
-    component: () => <AttachmentDialog note={note} isSheet={true} />,
-    keyboardHandlerDisabled: true
+    component: () => <AttachmentDialog note={note} />
   });
 };

apps/mobile/app/components/auth/auth-modal.js

@@ -36,7 +36,6 @@ import { IconButton } from "../ui/icon-button";
 import { hideAuth, initialAuthMode } from "./common";
 import { Login } from "./login";
 import { Signup } from "./signup";
-import { strings } from "@notesnook/intl";
 
 export const AuthMode = {
   login: 0,
@@ -154,7 +153,7 @@ const AuthModal = () => {
 
           {initialAuthMode.current !== AuthMode.welcomeSignup ? null : (
             <Button
-              title={strings.skip()}
+              title="Skip"
               onPress={() => {
                 hideAuth();
               }}

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

@@ -35,7 +35,6 @@ import Seperator from "../ui/seperator";
 import { Dialog } from "../dialog";
 import BackupService from "../../services/backup";
 import { sleep } from "../../utils/time";
-import { strings } from "@notesnook/intl";
 
 export const ChangePassword = () => {
   const passwordInputRef = useRef();
@@ -50,8 +49,8 @@ export const ChangePassword = () => {
   const changePassword = async () => {
     if (!user?.isEmailConfirmed) {
       ToastManager.show({
-        heading: strings.emailNotConfirmed(),
-        message: strings.emailNotConfirmedDesc(),
+        heading: "Email not confirmed",
+        message: "Please confirm your email to change account password",
         type: "error",
         context: "local"
       });
@@ -59,8 +58,8 @@ export const ChangePassword = () => {
     }
     if (error || !oldPassword.current || !password.current) {
       ToastManager.show({
-        heading: strings.allFieldsRequired(),
-        message: strings.allFieldsRequiredDesc(),
+        heading: "All fields required",
+        message: "Fill all the fields and try again.",
         type: "error",
         context: "local"
       });
@@ -68,18 +67,13 @@ export const ChangePassword = () => {
     }
     setLoading(true);
     try {
-      const result = await BackupService.run(
-        false,
-        "change-password-dialog",
-        "partial"
-      );
-      if (result.error) {
-        throw new Error(strings.backupFailed() + `: ${result.error}`);
-      }
+      const result = await BackupService.run(false, "change-password-dialog");
+      if (!result) throw new Error("Failed to create backup");
 
+      await db.user.clearSessions();
       await db.user.changePassword(oldPassword.current, password.current);
       ToastManager.show({
-        heading: strings.passwordChangedSuccessfully(),
+        heading: "Account password updated",
         type: "success",
         context: "global"
       });
@@ -90,7 +84,7 @@ export const ChangePassword = () => {
     } catch (e) {
       setLoading(false);
       ToastManager.show({
-        heading: strings.passwordChangeFailed(),
+        heading: "Failed to change password",
         message: e.message,
         type: "error",
         context: "local"
@@ -107,7 +101,10 @@ export const ChangePassword = () => {
       }}
     >
       <Dialog context="change-password-dialog" />
-      <DialogHeader title={strings.changePassword()} />
+      <DialogHeader
+        title="Change password"
+        paragraph="Enter your old and new passwords"
+      />
       <Seperator />
 
       <Input
@@ -121,7 +118,7 @@ export const ChangePassword = () => {
         autoComplete="password"
         autoCapitalize="none"
         autoCorrect={false}
-        placeholder={strings.oldPassword()}
+        placeholder="Old Password"
       />
 
       <Input
@@ -130,21 +127,27 @@ export const ChangePassword = () => {
           password.current = value;
         }}
         onErrorCheck={(e) => setError(e)}
-        returnKeyLabel={strings.next()}
+        returnKeyLabel="Next"
         returnKeyType="next"
         secureTextEntry
         validationType="password"
         autoComplete="password"
         autoCapitalize="none"
         autoCorrect={false}
-        placeholder={strings.newPassword()}
+        placeholder="New password"
       />
 
-      <Notice text={strings.changePasswordNotice()} type="alert" />
+      <Notice
+        text={`Changing password is an irreversible process. You will be logged out from all your devices. Please make sure you do not close the app while your password is changing and have good internet connection.`}
+        type="alert"
+      />
 
       <View style={{ height: 10 }} />
 
-      <Notice text={strings.changePasswordNotice2()} type="alert" />
+      <Notice
+        text={`Once your password is changed, please make sure to save the new account recovery key.`}
+        type="alert"
+      />
 
       <Button
         style={{
@@ -154,7 +157,7 @@ export const ChangePassword = () => {
         loading={loading}
         onPress={changePassword}
         type="accent"
-        title={loading ? null : strings.changePasswordConfirm()}
+        title={loading ? null : "I understand, change my password"}
       />
     </View>
   );

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

@@ -32,7 +32,6 @@ import Input from "../ui/input";
 import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
-import { strings } from "@notesnook/intl";
 
 export const ForgotPassword = () => {
   const { colors } = useThemeColors("sheet");
@@ -45,7 +44,7 @@ export const ForgotPassword = () => {
   const sendRecoveryEmail = async () => {
     if (!email.current || error) {
       ToastManager.show({
-        heading: strings.emailRequired(),
+        heading: "Account email is required.",
         type: "error",
         context: "local"
       });
@@ -58,15 +57,15 @@ export const ForgotPassword = () => {
         lastRecoveryEmailTime &&
         Date.now() - JSON.parse(lastRecoveryEmailTime) < 60000 * 3
       ) {
-        throw new Error(strings.pleaseWaitBeforeSendEmail());
+        throw new Error("Please wait before requesting another email");
       }
       await db.user.recoverAccount(email.current.toLowerCase());
       SettingsService.set({
         lastRecoveryEmailTime: Date.now()
       });
       ToastManager.show({
-        heading: strings.recoveryEmailSent(),
-        message: strings.recoveryEmailSentDesc(),
+        heading: "Check your email to reset password",
+        message: `Recovery email has been sent to ${email.current.toLowerCase()}`,
         type: "success",
         context: "local",
         duration: 7000
@@ -76,7 +75,7 @@ export const ForgotPassword = () => {
     } catch (e) {
       setLoading(false);
       ToastManager.show({
-        heading: strings.recoveryEmailFailed(),
+        heading: "Recovery email not sent",
         message: e.message,
         type: "error",
         context: "local"
@@ -122,13 +121,13 @@ export const ForgotPassword = () => {
               name="email"
               size={50}
             />
-            <Heading>{strings.recoveryEmailSent()}</Heading>
+            <Heading>Recovery email sent!</Heading>
             <Paragraph
               style={{
                 textAlign: "center"
               }}
             >
-              {strings.recoveryEmailSentDesc()}
+              Please follow the link in the email to recover your account.
             </Paragraph>
           </View>
         ) : (
@@ -141,7 +140,10 @@ export const ForgotPassword = () => {
               padding: 12
             }}
           >
-            <DialogHeader title={strings.accountRecovery()} />
+            <DialogHeader
+              title="Account recovery"
+              paragraph="We will send you an email with steps on how to reset your password."
+            />
             <Seperator />
 
             <Input
@@ -151,14 +153,14 @@ export const ForgotPassword = () => {
               }}
               defaultValue={email.current}
               onErrorCheck={(e) => setError(e)}
-              returnKeyLabel={strings.next()}
+              returnKeyLabel="Next"
               returnKeyType="next"
               autoComplete="email"
               validationType="email"
               autoCorrect={false}
               autoCapitalize="none"
-              errorMessage={strings.emailInvalid()}
-              placeholder={strings.email()}
+              errorMessage="Email is invalid"
+              placeholder="Email"
               onSubmit={() => {}}
             />
 
@@ -170,7 +172,7 @@ export const ForgotPassword = () => {
               loading={loading}
               onPress={sendRecoveryEmail}
               type="accent"
-              title={loading ? null : strings.next()}
+              title={loading ? null : "Next"}
             />
           </View>
         )}

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

@@ -17,16 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useState } from "react";
 import { TouchableOpacity, View, useWindowDimensions } from "react-native";
 import { SheetManager } from "react-native-actions-sheet";
 import { DDS } from "../../services/device-detection";
 import { eSendEvent } from "../../services/event-manager";
-import Sync from "../../services/sync";
-import { useSettingStore } from "../../stores/use-setting-store";
-import { useUserStore } from "../../stores/use-user-store";
-import { eUserLoggedIn } from "../../utils/events";
+import { useThemeColors } from "@notesnook/theme";
 import { SIZE } from "../../utils/size";
 import { sleep } from "../../utils/time";
 import SheetProvider from "../sheet-provider";
@@ -38,7 +34,11 @@ import Paragraph from "../ui/typography/paragraph";
 import { hideAuth } from "./common";
 import { ForgotPassword } from "./forgot-password";
 import { useLogin } from "./use-login";
-import { strings } from "@notesnook/intl";
+import { useSettingStore } from "../../stores/use-setting-store";
+import { eUserLoggedIn } from "../../utils/events";
+import { useUserStore } from "../../stores/use-user-store";
+import Sync from "../../services/sync";
+import { Notice } from "../ui/notice";
 
 const LoginSteps = {
   emailAuth: 1,
@@ -67,7 +67,7 @@ export const Login = ({ changeMode }) => {
     Progress.present();
     setTimeout(() => {
       if (!useUserStore.getState().syncing) {
-        Sync.run("global", false, "full");
+        Sync.run("global", false, true);
       }
     }, 5000);
   });
@@ -148,7 +148,7 @@ export const Login = ({ changeMode }) => {
             extraBold
             size={SIZE.xxl}
           >
-            {strings.loginToYourAccount()}
+            Login to your {"\n"}account
           </Heading>
         </View>
 
@@ -179,16 +179,12 @@ export const Login = ({ changeMode }) => {
             validationType="email"
             autoCorrect={false}
             autoCapitalize="none"
-            errorMessage={strings.emailInvalid()}
-            placeholder={strings.email()}
+            errorMessage="Email is invalid"
+            placeholder="Enter your email"
             defaultValue={email.current}
             editable={step === LoginSteps.emailAuth && !loading}
             onSubmit={() => {
-              if (step === LoginSteps.emailAuth) {
-                login();
-              } else {
-                passwordInputRef.current?.focus();
-              }
+              passwordInputRef.current?.focus();
             }}
           />
 
@@ -200,20 +196,20 @@ export const Login = ({ changeMode }) => {
                   password.current = value;
                 }}
                 testID="input.password"
-                returnKeyLabel={strings.done()}
+                returnKeyLabel="Done"
                 returnKeyType="done"
                 secureTextEntry
                 autoComplete="password"
                 autoCapitalize="none"
                 autoCorrect={false}
-                placeholder={strings.password()}
+                placeholder="Password"
                 marginBottom={0}
                 editable={!loading}
                 defaultValue={password.current}
                 onSubmit={() => login()}
               />
               <Button
-                title={strings.forgotPassword()}
+                title="Forgot your password?"
                 style={{
                   alignSelf: "flex-end",
                   height: 30,
@@ -247,15 +243,14 @@ export const Login = ({ changeMode }) => {
                 width: 250,
                 borderRadius: 100
               }}
-              height={50}
               fontSize={SIZE.md}
               type="accent"
-              title={!loading ? strings.continue() : null}
+              title={!loading ? "Continue" : null}
             />
 
             {step === LoginSteps.passwordAuth && (
               <Button
-                title={strings.cancelLogin()}
+                title="Cancel logging in"
                 style={{
                   alignSelf: "center",
                   height: 30,
@@ -291,12 +286,12 @@ export const Login = ({ changeMode }) => {
                   size={SIZE.xs + 1}
                   color={colors.secondary.paragraph}
                 >
-                  {strings.dontHaveAccount()}{" "}
+                  Don't have an account?{" "}
                   <Paragraph
                     size={SIZE.xs + 1}
                     style={{ color: colors.primary.accent }}
                   >
-                    {strings.signUp()}
+                    Sign up
                   </Paragraph>
                 </Paragraph>
               </TouchableOpacity>

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

@@ -47,7 +47,6 @@ import Input from "../ui/input";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { LoginSteps, useLogin } from "./use-login";
-import { strings } from "@notesnook/intl";
 
 function getObfuscatedEmail(email) {
   if (!email) return "";
@@ -113,11 +112,7 @@ export const SessionExpired = () => {
       if (!res) throw new Error("no token found");
       if (db.tokenManager._isTokenExpired(res))
         throw new Error("token expired");
-
-      const key = await db.user.getEncryptionKey();
-      if (!key) throw new Error("No encryption key found.");
-
-      Sync.run("global", false, "full", async (complete) => {
+      Sync.run("global", false, true, async (complete) => {
         if (!complete) {
           let user = await db.user.getUser();
           if (!user) return;
@@ -132,6 +127,7 @@ export const SessionExpired = () => {
         setVisible(false);
       });
     } catch (e) {
+      console.log(e);
       let user = await db.user.getUser();
       if (!user) return;
       email.current = user.email;
@@ -194,14 +190,15 @@ export const SessionExpired = () => {
               size={50}
             />
             <Heading size={SIZE.xxxl} color={colors.primary.heading}>
-              {strings.sessionExpired()}
+              Session expired
             </Heading>
             <Paragraph
               style={{
                 textAlign: "center"
               }}
             >
-              {strings.sessionExpiredDesc(getObfuscatedEmail(email.current))}
+              Your session on this device has expired. Please enter password for{" "}
+              {getObfuscatedEmail(email.current)} to continue.
             </Paragraph>
           </View>
 
@@ -211,13 +208,13 @@ export const SessionExpired = () => {
               onChangeText={(value) => {
                 password.current = value;
               }}
-              returnKeyLabel={strings.done()}
+              returnKeyLabel="Next"
               returnKeyType="next"
               secureTextEntry
               autoComplete="password"
               autoCapitalize="none"
               autoCorrect={false}
-              placeholder={strings.password()}
+              placeholder="Password"
               onSubmit={() => login()}
             />
           ) : null}
@@ -231,7 +228,7 @@ export const SessionExpired = () => {
             loading={loading}
             onPress={() => login()}
             type="accent"
-            title={loading ? null : strings.login()}
+            title={loading ? null : "Login"}
           />
 
           <Button
@@ -242,15 +239,16 @@ export const SessionExpired = () => {
             onPress={() => {
               presentDialog({
                 context: "session_expiry",
-                title: strings.logoutFromDevice(),
-                paragraph: strings.logoutDesc(),
-                positiveText: strings.logout(),
+                title: "Logout",
+                paragraph:
+                  "Are you sure you want to logout from this device? Any unsynced changes will be lost.",
+                positiveText: "Logout",
                 positiveType: "errorShade",
                 positivePress: logout
               });
             }}
             type="errorShade"
-            title={loading ? null : strings.logoutFromDevice()}
+            title={loading ? null : "Logout from this device"}
           />
         </View>
         <Toast context="local" />

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

@@ -35,8 +35,6 @@ import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
 import { hideAuth } from "./common";
 import { useSettingStore } from "../../stores/use-setting-store";
-import SettingsService from "../../services/settings";
-import { strings } from "@notesnook/intl";
 
 export const Signup = ({ changeMode, trial }) => {
   const { colors } = useThemeColors();
@@ -55,8 +53,8 @@ export const Signup = ({ changeMode, trial }) => {
   const validateInfo = () => {
     if (!password.current || !email.current || !confirmPassword.current) {
       ToastManager.show({
-        heading: strings.allFieldsRequired(),
-        message: strings.allFieldsRequiredDesc(),
+        heading: "All fields required",
+        message: "Fill all the fields and try again",
         type: "error",
         context: "local"
       });
@@ -79,7 +77,6 @@ export const Signup = ({ changeMode, trial }) => {
       clearMessage();
       setEmailVerifyMessage();
       hideAuth();
-      SettingsService.setProperty("encryptedBackup", true);
       await sleep(300);
       if (trial) {
         PremiumService.sheet(null, null, true);
@@ -89,7 +86,7 @@ export const Signup = ({ changeMode, trial }) => {
     } catch (e) {
       setLoading(false);
       ToastManager.show({
-        heading: strings.signupFailed(),
+        heading: "Signup failed",
         message: e.message,
         type: "error",
         context: "local"
@@ -157,7 +154,7 @@ export const Signup = ({ changeMode, trial }) => {
             }}
             size={SIZE.xxl}
           >
-            {strings.createYourAccount()}
+            Create your {"\n"}account
           </Heading>
         </View>
 
@@ -176,14 +173,14 @@ export const Signup = ({ changeMode, trial }) => {
             }}
             testID="input.email"
             onErrorCheck={(e) => setError(e)}
-            returnKeyLabel={strings.next()}
+            returnKeyLabel="Next"
             returnKeyType="next"
             autoComplete="email"
             validationType="email"
             autoCorrect={false}
             autoCapitalize="none"
-            errorMessage={strings.email()}
-            placeholder={strings.email()}
+            errorMessage="Email is invalid"
+            placeholder="Email"
             onSubmit={() => {
               passwordInputRef.current?.focus();
             }}
@@ -196,14 +193,14 @@ export const Signup = ({ changeMode, trial }) => {
             }}
             testID="input.password"
             onErrorCheck={(e) => setError(e)}
-            returnKeyLabel={strings.next()}
+            returnKeyLabel="Next"
             returnKeyType="next"
             secureTextEntry
             autoComplete="password"
             autoCapitalize="none"
             validationType="password"
             autoCorrect={false}
-            placeholder={strings.password()}
+            placeholder="Password"
             onSubmit={() => {
               confirmPasswordInputRef.current?.focus();
             }}
@@ -216,7 +213,7 @@ export const Signup = ({ changeMode, trial }) => {
             }}
             testID="input.confirmPassword"
             onErrorCheck={(e) => setError(e)}
-            returnKeyLabel={strings.done()}
+            returnKeyLabel="Signup"
             returnKeyType="done"
             secureTextEntry
             autoComplete="password"
@@ -224,7 +221,7 @@ export const Signup = ({ changeMode, trial }) => {
             autoCorrect={false}
             validationType="confirmPassword"
             customValidator={() => password.current}
-            placeholder={strings.confirmPassword()}
+            placeholder="Confirm password"
             marginBottom={12}
             onSubmit={signup}
           />
@@ -236,7 +233,7 @@ export const Signup = ({ changeMode, trial }) => {
             size={SIZE.xs}
             color={colors.secondary.paragraph}
           >
-            {strings.signupAgreement[0]()}
+            By signing up, you agree to our{" "}
             <Paragraph
               size={SIZE.xs}
               onPress={() => {
@@ -247,9 +244,9 @@ export const Signup = ({ changeMode, trial }) => {
               }}
               color={colors.primary.accent}
             >
-              {strings.signupAgreement[1]()}
+              Terms of Service{" "}
             </Paragraph>
-            {strings.signupAgreement[2]()}
+            and{" "}
             <Paragraph
               size={SIZE.xs}
               onPress={() => {
@@ -260,13 +257,14 @@ export const Signup = ({ changeMode, trial }) => {
               }}
               color={colors.primary.accent}
             >
-              {strings.signupAgreement[3]()}
-            </Paragraph>
-            {strings.signupAgreement[4]()}
+              Privacy Policy.
+            </Paragraph>{" "}
+            You also agree to recieve marketing emails from us which you can
+            opt-out of from app settings.
           </Paragraph>
 
           <Button
-            title={!loading ? strings.continue() : null}
+            title={!loading ? "Continue" : null}
             type="accent"
             loading={loading}
             onPress={signup}
@@ -291,12 +289,12 @@ export const Signup = ({ changeMode, trial }) => {
             }}
           >
             <Paragraph size={SIZE.xs + 1} color={colors.secondary.paragraph}>
-              {strings.alreadyHaveAccount()}{" "}
+              Already have an account?{" "}
               <Paragraph
                 size={SIZE.xs + 1}
                 style={{ color: colors.primary.accent }}
               >
-                {strings.login()}
+                Login
               </Paragraph>
             </Paragraph>
           </TouchableOpacity>

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

@@ -17,11 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { strings } from "@notesnook/intl";
-import { useThemeColors } from "@notesnook/theme";
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { View } from "react-native";
-import { ScrollView } from "react-native-actions-sheet";
 import { db } from "../../common/database/index";
 import useTimer from "../../hooks/use-timer";
 import {
@@ -29,16 +26,19 @@ import {
   presentSheet,
   ToastManager
 } from "../../services/event-manager";
+import { useThemeColors } from "@notesnook/theme";
 import { eCloseSheet } from "../../utils/events";
 import { SIZE } from "../../utils/size";
 import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
 import Input from "../ui/input";
 import { Pressable } from "../ui/pressable";
+import Seperator from "../ui/seperator";
 import Heading from "../ui/typography/heading";
 import Paragraph from "../ui/typography/paragraph";
+import { useCallback } from "react";
 
-const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
+const TwoFactorVerification = ({ onMfaLogin, mfaInfo }) => {
   const { colors } = useThemeColors();
   const code = useRef();
   const [currentMethod, setCurrentMethod] = useState({
@@ -50,6 +50,20 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
   const inputRef = useRef();
   const [sending, setSending] = useState(false);
 
+  const codeHelpText = {
+    app: "Enter the 6 digit code from your authenticator app to continue logging in",
+    sms: "Enter the 6 digit code sent to your phone number to continue logging in",
+    email: "Enter the 6 digit code sent to your email to continue logging in",
+    recoveryCode: "Enter the recovery code to continue logging in"
+  };
+
+  const secondaryMethodsText = {
+    app: "I don't have access to authenticator app",
+    sms: "I don't have access to my phone",
+    email: "I don't have access to email",
+    recoveryCode: "I don't have recovery codes"
+  };
+
   const onNext = async () => {
     if (!code.current || code.current.length < 6) return;
     setLoading(true);
@@ -79,22 +93,22 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
   const methods = [
     {
       id: "sms",
-      title: strings.sendCodeSms(),
+      title: "Send code via SMS",
       icon: "message-plus-outline"
     },
     {
       id: "email",
-      title: strings.sendCodeEmail(),
+      title: "Send code via email",
       icon: "email-outline"
     },
     {
       id: "app",
-      title: strings.authAppCode(),
+      title: "Enter code from authenticator app",
       icon: "cellphone-key"
     },
     {
       id: "recoveryCode",
-      title: strings.recoveryCode(),
+      title: "I have a recovery code",
       icon: "key"
     }
   ];
@@ -129,15 +143,11 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
   }, [currentMethod.method, mfaInfo.token, seconds, sending, start]);
 
   return (
-    <ScrollView
-      keyboardShouldPersistTaps="handled"
-      keyboardDismissMode="interactive"
-    >
+    <View>
       <View
         style={{
           alignItems: "center",
-          paddingHorizontal: currentMethod.method ? 12 : 0,
-          gap: 12
+          paddingHorizontal: currentMethod.method ? 12 : 0
         }}
       >
         <IconButton
@@ -154,7 +164,9 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
             textAlign: "center"
           }}
         >
-          {currentMethod.method ? strings["2fa"]() : strings.select2faMethod()}
+          {currentMethod.method
+            ? "Two factor authentication"
+            : "Select methods for two-factor authentication"}
         </Heading>
         <Paragraph
           style={{
@@ -162,10 +174,12 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
             textAlign: "center"
           }}
         >
-          {strings["2faCodeHelpText"][currentMethod.method]?.() ||
-            strings.select2faCodeHelpText()}
+          {codeHelpText[currentMethod.method] ||
+            "Select how you would like to recieve the code"}
         </Paragraph>
 
+        <Seperator />
+
         {currentMethod.method === "sms" || currentMethod.method === "email" ? (
           <Button
             onPress={onSendCode}
@@ -173,17 +187,15 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
             title={
               sending
                 ? ""
-                : `${
-                    seconds
-                      ? strings.resend2faCode(seconds)
-                      : strings.sendCode()
-                  }`
+                : `${seconds ? `Resend code in (${seconds})` : "Send code"}`
             }
             loading={sending}
             height={30}
           />
         ) : null}
 
+        <Seperator />
+
         {currentMethod.method ? (
           <>
             <Input
@@ -202,7 +214,6 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
                 code.current = value;
                 //onNext();
               }}
-              onSubmitEditing={onNext}
               caretHidden
               inputStyle={{
                 fontSize: SIZE.lg,
@@ -214,7 +225,6 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
               keyboardType={
                 currentMethod.method === "recoveryCode" ? "default" : "numeric"
               }
-              enablesReturnKeyAutomatically
               containerStyle={{
                 height: 60,
                 borderWidth: 0,
@@ -222,33 +232,25 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
                 minWidth: "50%"
               }}
             />
-
+            <Seperator />
             <Button
-              title={loading ? null : strings.next()}
+              title={loading ? null : "Next"}
               type="accent"
               width={250}
               loading={loading}
               onPress={onNext}
               style={{
-                borderRadius: 100
+                borderRadius: 100,
+                marginBottom: 10
               }}
             />
 
             <Button
-              title={strings["2faCodeSecondaryMethodText"][
-                currentMethod.method
-              ]()}
+              title={secondaryMethodsText[currentMethod.method]}
               type="plain"
               onPress={onRequestSecondaryMethod}
               height={30}
             />
-
-            <Button
-              title={strings.cancel()}
-              type="plain"
-              onPress={onCancel}
-              height={30}
-            />
           </>
         ) : (
           <>
@@ -295,20 +297,19 @@ const TwoFactorVerification = ({ onMfaLogin, mfaInfo, onCancel }) => {
           </>
         )}
       </View>
-    </ScrollView>
+    </View>
   );
 };
 
-TwoFactorVerification.present = (onMfaLogin, data, onCancel, context) => {
+TwoFactorVerification.present = (onMfaLogin, data, context) => {
   presentSheet({
     component: () => (
-      <TwoFactorVerification
-        onMfaLogin={onMfaLogin}
-        mfaInfo={data}
-        onCancel={onCancel}
-      />
+      <TwoFactorVerification onMfaLogin={onMfaLogin} mfaInfo={data} />
     ),
     context: context || "two_factor_verify",
+    onClose: () => {
+      onMfaLogin();
+    },
     disableClosing: true
   });
 };

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

@@ -26,7 +26,6 @@ import SettingsService from "../../services/settings";
 import { useUserStore } from "../../stores/use-user-store";
 import { eCloseSheet } from "../../utils/events";
 import TwoFactorVerification from "./two-factor";
-import { strings } from "@notesnook/intl";
 
 export const LoginSteps = {
   emailAuth: 1,
@@ -50,8 +49,8 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
       (!email.current && step === LoginSteps.emailAuth)
     ) {
       ToastManager.show({
-        heading: strings.allFieldsRequired(),
-        message: strings.allFieldsRequiredDesc(),
+        heading: "All fields required",
+        message: "Fill all the fields and try again",
         type: "error",
         context: "local"
       });
@@ -70,43 +69,35 @@ 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) => {
-                try {
-                  const success = await db.user.authenticateMultiFactorCode(
-                    mfa.code,
-                    mfa.method
-                  );
+            TwoFactorVerification.present(async (mfa, callback) => {
+              try {
+                const success = await db.user.authenticateMultiFactorCode(
+                  mfa.code,
+                  mfa.method
+                );
 
-                  if (success) {
-                    setStep(LoginSteps.passwordAuth);
-                    setLoading(false);
-                    setTimeout(() => {
-                      passwordInputRef.current?.focus();
-                    }, 500);
-                    callback && callback(true);
-                  }
-                  callback && callback(false);
-                } catch (e) {
-                  callback && callback(false);
-                  if (e.message === "invalid_grant") {
-                    eSendEvent(eCloseSheet, "two_factor_verify");
-                    setLoading(false);
-                    setStep(LoginSteps.emailAuth);
-                  }
+                if (success) {
+                  setStep(LoginSteps.passwordAuth);
+                  setLoading(false);
+                  setTimeout(() => {
+                    passwordInputRef.current?.focus();
+                  }, 1);
+                  callback && callback(true);
+                }
+                callback && callback(false);
+              } catch (e) {
+                callback && callback(false);
+                if (e.message === "invalid_grant") {
+                  eSendEvent(eCloseSheet, "two_factor_verify");
+                  setLoading(false);
+                  setStep(LoginSteps.emailAuth);
                 }
-              },
-              mfaInfo,
-              () => {
-                eSendEvent(eCloseSheet, "two_factor_verify");
-                setLoading(false);
-                setStep(LoginSteps.emailAuth);
               }
-            );
+            }, mfaInfo);
           } else {
-            finishWithError(new Error(strings.unableToSend2faCode()));
+            finishWithError(new Error("Unable to send 2FA code"));
           }
           break;
         }
@@ -131,7 +122,7 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
     if (e.message === "invalid_grant") setStep(LoginSteps.emailAuth);
     setLoading(false);
     ToastManager.show({
-      heading: strings.loginFailed(),
+      heading: "Login failed",
       message: e.message,
       type: "error",
       context: "local"
@@ -140,13 +131,13 @@ export const useLogin = (onFinishLogin, sessionExpired = false) => {
 
   const finishLogin = async () => {
     const user = await db.user.getUser();
-    if (!user) throw new Error(strings.emailOrPasswordIncorrect());
+    if (!user) throw new Error("Email or password incorrect!");
     PremiumService.setPremiumStatus();
     setUser(user);
     clearMessage();
     ToastManager.show({
-      heading: strings.loginSuccess(),
-      message: strings.loginSuccessDesc(),
+      heading: "Login successful",
+      message: `Logged in as ${user.email}`,
       type: "success",
       context: "global"
     });

apps/mobile/app/components/container/floating-button.tsx

@@ -34,9 +34,11 @@ import { useSelectionStore } from "../../stores/use-selection-store";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { getElevationStyle } from "../../utils/elevation";
 import { SIZE, normalize } from "../../utils/size";
+import NativeTooltip from "../../utils/tooltip";
 import { Pressable } from "../ui/pressable";
 
 interface FloatingButtonProps {
+  title: string;
   onPress: () => void;
   color?: string;
   shouldShow?: boolean;
@@ -44,6 +46,7 @@ interface FloatingButtonProps {
 }
 
 const FloatingButton = ({
+  title,
   onPress,
   color,
   alwaysVisible = false
@@ -123,6 +126,11 @@ const FloatingButton = ({
           ...getElevationStyle(5),
           borderRadius: 100
         }}
+        onLongPress={(event) => {
+          if (title) {
+            NativeTooltip.show(event, title, NativeTooltip.POSITIONS.LEFT);
+          }
+        }}
         onPress={onPress}
       >
         <View

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

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

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

@@ -38,7 +38,7 @@ import { useAppState } from "../../hooks/use-app-state";
 
 export interface BaseDialogProps extends PropsWithChildren {
   animation?: "fade" | "none" | "slide" | undefined;
-  visible?: boolean;
+  visible: boolean;
   onRequestClose?: () => void;
   onShow?: () => void;
   premium?: boolean;
@@ -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/dialog/dialog-buttons.js

@@ -26,13 +26,12 @@ import { SIZE } from "../../utils/size";
 import { Button } from "../ui/button";
 import Paragraph from "../ui/typography/paragraph";
 import { getColorLinearShade } from "../../utils/colors";
-import { strings } from "@notesnook/intl";
 
 const DialogButtons = ({
   onPressPositive,
   onPressNegative,
   positiveTitle,
-  negativeTitle = strings.cancel(),
+  negativeTitle = "Cancel",
   loading,
   doneText,
   positiveType

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

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

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

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

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

@@ -37,8 +37,6 @@ import DialogHeader from "./dialog-header";
 import { useCallback } from "react";
 import { Button } from "../ui/button";
 import { getContainerBorder } from "../../utils/colors";
-import { Notice } from "../ui/notice";
-import { strings } from "@notesnook/intl";
 
 export const Dialog = ({ context = "global" }) => {
   const { colors } = useThemeColors();
@@ -51,8 +49,8 @@ export const Dialog = ({ context = "global" }) => {
   const [dialogInfo, setDialogInfo] = useState({
     title: "",
     paragraph: "",
-    positiveText: strings.done(),
-    negativeText: strings.cancel(),
+    positiveText: "Done",
+    negativeText: "Cancel",
     positivePress: () => {},
     onClose: () => {},
     positiveType: "transparent",
@@ -64,8 +62,7 @@ export const Dialog = ({ context = "global" }) => {
     disableBackdropClosing: false,
     check: {
       info: "Check",
-      type: "transparent",
-      defaultValue: false
+      type: "transparent"
     }
   });
 
@@ -89,7 +86,7 @@ export const Dialog = ({ context = "global" }) => {
       if (!data.context) data.context = "global";
       if (data.context !== context) return;
       setDialogInfo(data);
-      setChecked(data.check?.defaultValue);
+      setChecked(false);
       values.current.inputValue = data.defaultValue;
       setVisible(true);
     },
@@ -177,25 +174,11 @@ export const Dialog = ({ context = "global" }) => {
               onSubmit={onPressPositive}
               returnKeyLabel="Done"
               returnKeyType="done"
-              keyboardType={dialogInfo.keyboardType || "default"}
               placeholder={dialogInfo.inputPlaceholder}
             />
           </View>
         ) : null}
 
-        {dialogInfo?.notice ? (
-          <View
-            style={{
-              paddingHorizontal: 12
-            }}
-          >
-            <Notice
-              type={dialogInfo.notice.type || "information"}
-              text={dialogInfo.notice.text}
-            />
-          </View>
-        ) : null}
-
         {dialogInfo.check ? (
           <>
             <Button
@@ -214,7 +197,7 @@ export const Dialog = ({ context = "global" }) => {
               iconSize={20}
               width="100%"
               title={dialogInfo.check.info}
-              type={checked ? dialogInfo.check.type || "plain" : "plain"}
+              type={checked ? dialogInfo.check.type || "selected" : "plain"}
             />
           </>
         ) : null}

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

@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
 import { TextInput, View } from "react-native";
-import { db } from "../../../common/database";
 import {
   clearAppLockVerificationCipher,
   setAppLockVerificationCipher,
@@ -45,11 +44,9 @@ import BaseDialog from "../../dialog/base-dialog";
 import DialogButtons from "../../dialog/dialog-buttons";
 import DialogHeader from "../../dialog/dialog-header";
 import { Toast } from "../../toast";
-import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
 import Input from "../../ui/input";
 import Seperator from "../../ui/seperator";
-import { strings } from "@notesnook/intl";
 
 export const AppLockPassword = () => {
   const { colors } = useThemeColors();
@@ -69,7 +66,6 @@ export const AppLockPassword = () => {
     confirmPassword?: string;
   }>({});
   const [secureTextEntry, setSecureTextEntry] = useState(true);
-  const [accountPass, setAccountPass] = useState(false);
 
   useEffect(() => {
     const subs = [
@@ -77,7 +73,6 @@ export const AppLockPassword = () => {
         eOpenAppLockPasswordDialog,
         (mode: "create" | "change" | "remove") => {
           setMode(mode);
-          setAccountPass(false);
           setVisible(true);
         }
       ),
@@ -120,7 +115,20 @@ export const AppLockPassword = () => {
         }}
       >
         <DialogHeader
-          title={strings.changeAppLockCredentials(mode, keyboardType)}
+          title={
+            mode === "change"
+              ? `Change app lock ${keyboardType}`
+              : mode === "remove"
+              ? `Remove app lock ${keyboardType}`
+              : `Set up app lock ${keyboardType}`
+          }
+          paragraph={
+            mode === "change"
+              ? `Change app lock ${keyboardType}`
+              : mode === "remove"
+              ? `Remove app lock ${keyboardType}`
+              : `Set up a custom app lock ${keyboardType} to unlock the app`
+          }
           icon="shield"
           padding={12}
         />
@@ -143,15 +151,11 @@ export const AppLockPassword = () => {
               }}
               defaultValue={values.current.currentPassword}
               autoComplete="password"
-              returnKeyLabel={strings.next()}
+              returnKeyLabel="Next"
               keyboardType={keyboardType === "pin" ? "number-pad" : "default"}
               returnKeyType="next"
               secureTextEntry={secureTextEntry}
-              placeholder={
-                keyboardType === "pin"
-                  ? strings.currentPin()
-                  : strings.currentPassword()
-              }
+              placeholder={`Current ${keyboardType}`}
             />
           ) : null}
 
@@ -165,47 +169,35 @@ export const AppLockPassword = () => {
               confirmPasswordInputRef.current?.focus();
             }}
             defaultValue={values.current.password}
-            keyboardType={
-              keyboardType === "pin" && !accountPass ? "number-pad" : "default"
-            }
+            keyboardType={keyboardType === "pin" ? "number-pad" : "default"}
             autoComplete="password"
-            returnKeyLabel={
-              mode !== "remove" ? strings.next() : strings.remove()
-            }
+            returnKeyLabel={mode !== "remove" ? "Next" : "Remove"}
             returnKeyType={mode !== "remove" ? "next" : "done"}
             secureTextEntry={secureTextEntry}
             buttonLeft={
-              accountPass ? null : (
-                <IconButton
-                  name={keyboardType === "password" ? "numeric" : "keyboard"}
-                  onPress={() => {
-                    setKeyboardType(
-                      keyboardType === "password" ? "pin" : "password"
-                    );
-                    setSecureTextEntry(false);
-                    setImmediate(() => {
-                      setSecureTextEntry(true);
-                    });
-                  }}
-                  style={{
-                    width: 25,
-                    height: 25,
-                    marginRight: 5
-                  }}
-                  size={SIZE.lg}
-                />
-              )
+              <IconButton
+                name={keyboardType === "password" ? "numeric" : "keyboard"}
+                onPress={() => {
+                  setKeyboardType(
+                    keyboardType === "password" ? "pin" : "password"
+                  );
+                  setSecureTextEntry(false);
+                  setImmediate(() => {
+                    setSecureTextEntry(true);
+                  });
+                }}
+                style={{
+                  width: 25,
+                  height: 25,
+                  marginRight: 5
+                }}
+                size={SIZE.lg}
+              />
             }
             placeholder={
-              accountPass
-                ? strings.enterAccountPassword()
-                : mode === "change"
-                ? keyboardType === "pin"
-                  ? strings.newPin()
-                  : strings.newPassword()
-                : `${
-                    keyboardType === "pin" ? strings.pin() : strings.password()
-                  }`
+              mode === "change"
+                ? `New ${keyboardType}`
+                : `${keyboardType === "pin" ? "Pin" : "Password"}`
             }
           />
 
@@ -224,46 +216,12 @@ export const AppLockPassword = () => {
               customValidator={() => values.current.password || ""}
               validationType="confirmPassword"
               autoComplete="password"
-              returnKeyLabel={strings.done()}
+              returnKeyLabel="Done"
               returnKeyType="done"
               secureTextEntry={secureTextEntry}
-              placeholder={
-                keyboardType === "pin"
-                  ? strings.confirmPin()
-                  : strings.confirmPassword()
-              }
+              placeholder={`Confirm ${keyboardType}`}
             />
           ) : null}
-
-          {mode === "remove" ? (
-            <>
-              <Button
-                icon={
-                  accountPass ? "checkbox-marked" : "checkbox-blank-outline"
-                }
-                onPress={() => {
-                  setSecureTextEntry(false);
-                  setAccountPass(!accountPass);
-                  setTimeout(() => {
-                    setSecureTextEntry(true);
-                  });
-                }}
-                iconSize={SIZE.lg}
-                type="plain"
-                iconColor={
-                  accountPass ? colors.primary.accent : colors.primary.icon
-                }
-                title={strings.useAccountPassword()}
-                style={{
-                  width: "100%",
-                  alignSelf: "flex-start",
-                  justifyContent: "flex-start",
-                  paddingHorizontal: 0,
-                  height: 30
-                }}
-              />
-            </>
-          ) : null}
         </View>
 
         <DialogButtons
@@ -272,7 +230,7 @@ export const AppLockPassword = () => {
             if (mode === "create") {
               if (!values.current.password || !values.current.confirmPassword) {
                 ToastManager.error(
-                  new Error(strings.allFieldsRequired()),
+                  new Error("All inputs are required"),
                   undefined,
                   "local"
                 );
@@ -281,14 +239,17 @@ export const AppLockPassword = () => {
 
               if (values.current.password !== values.current.confirmPassword) {
                 ToastManager.error(
-                  new Error(strings.mismatch(keyboardType)),
+                  new Error(
+                    `${
+                      keyboardType === "pin" ? "Pin" : "Password"
+                    } does not match`
+                  ),
                   undefined,
                   "local"
                 );
                 return;
               }
-              const password = values.current.password;
-              setAppLockVerificationCipher(password);
+              await setAppLockVerificationCipher(values.current.password);
               SettingsService.setProperty("appLockHasPasswordSecurity", true);
             } else if (mode === "change") {
               if (
@@ -297,7 +258,7 @@ export const AppLockPassword = () => {
                 !values.current.confirmPassword
               ) {
                 ToastManager.error(
-                  new Error(strings.allFieldsRequired()),
+                  new Error("All inputs are required"),
                   undefined,
                   "local"
                 );
@@ -306,49 +267,52 @@ export const AppLockPassword = () => {
 
               if (values.current.password !== values.current.confirmPassword) {
                 ToastManager.error(
-                  new Error(strings.mismatch(keyboardType)),
+                  new Error(
+                    `${
+                      keyboardType === "pin" ? "Pin" : "Password"
+                    } does not match`
+                  ),
                   undefined,
                   "local"
                 );
                 return;
               }
+
               const isCurrentPasswordCorrect = await validateAppLockPassword(
                 values.current.currentPassword
               );
 
               if (!isCurrentPasswordCorrect) {
                 ToastManager.error(
-                  new Error(strings.incorrect(keyboardType)),
+                  new Error(
+                    `${keyboardType === "pin" ? "Pin" : "Password"} incorrect`
+                  ),
                   undefined,
                   "local"
                 );
                 return;
               }
 
-              const password = values.current.password;
-              await clearAppLockVerificationCipher();
               SettingsService.setProperty("appLockHasPasswordSecurity", true);
-              await setAppLockVerificationCipher(password);
+              await setAppLockVerificationCipher(values.current.password);
             } else if (mode === "remove") {
               if (!values.current.password) {
                 ToastManager.error(
-                  new Error(strings.allFieldsRequired()),
+                  new Error("All inputs are required"),
                   undefined,
                   "local"
                 );
                 return;
               }
 
-              const isCurrentPasswordCorrect = accountPass
-                ? await db.user.verifyPassword(values.current.password)
-                : await validateAppLockPassword(values.current.password);
+              const isCurrentPasswordCorrect = await validateAppLockPassword(
+                values.current.password
+              );
 
               if (!isCurrentPasswordCorrect) {
                 ToastManager.error(
                   new Error(
-                    accountPass
-                      ? strings.passwordIncorrect()
-                      : strings.incorrect(keyboardType)
+                    `${keyboardType === "pin" ? "Pin" : "Password"} incorrect`
                   ),
                   undefined,
                   "local"
@@ -365,7 +329,7 @@ export const AppLockPassword = () => {
                 SettingsService.setProperty("appLockEnabled", false);
                 SettingsService.setPrivacyScreen(SettingsService.get());
                 ToastManager.show({
-                  message: strings.applockDisabled(),
+                  message: "App lock disabled",
                   type: "success"
                 });
               }
@@ -378,14 +342,8 @@ export const AppLockPassword = () => {
 
             close();
           }}
-          positiveTitle={
-            mode === "remove"
-              ? strings.remove()
-              : mode === "change"
-              ? strings.change()
-              : strings.save()
-          }
-          negativeTitle={strings.cancel()}
+          positiveTitle="Save"
+          negativeTitle="Cancel"
           positiveType="transparent"
           loading={false}
           doneText=""

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

@@ -17,22 +17,15 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import React, { useState } from "react";
-import {
-  Image,
-  Platform,
-  ScrollView,
-  TouchableOpacity,
-  View
-} from "react-native";
+import { Image, ScrollView, TouchableOpacity, View } from "react-native";
 import { Image as ImageType } from "react-native-image-crop-picker";
-import { useThemeColors } from "@notesnook/theme";
+import { useThemeColors } from "../../../../../../packages/theme/dist";
 import { presentSheet } from "../../../services/event-manager";
 import { SIZE } from "../../../utils/size";
 import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
 import { Notice } from "../../ui/notice";
 import Paragraph from "../../ui/typography/paragraph";
-import { strings } from "@notesnook/intl";
 
 export default function AttachImage({
   response,
@@ -65,17 +58,14 @@ export default function AttachImage({
         }}
       >
         <Paragraph style={{ color: colors.primary.paragraph, marginBottom: 6 }}>
-          {strings.attachImageHeading(response?.length || 1)}
+          Attaching {response?.length} image(s):
         </Paragraph>
         <ScrollView horizontal>
           {response?.map?.((item) => (
             <TouchableOpacity key={item.filename} activeOpacity={0.9}>
               <Image
                 source={{
-                  uri:
-                    Platform.OS === "ios"
-                      ? item.sourceURL || item.path
-                      : item.path
+                  uri: item.sourceURL || item.path
                 }}
                 style={{
                   width: 100,
@@ -124,14 +114,14 @@ export default function AttachImage({
           }}
           size={SIZE.sm}
         >
-          {strings.compress()} ({strings.recommended().toLowerCase()})
+          Compress (recommended)
         </Paragraph>
       </TouchableOpacity>
 
       {!compress ? (
         <Notice
           type="alert"
-          text={strings.compressionOffNotice()}
+          text="Images uploaded without compression are slow to load and take more bandwidth. We recommend compressing images unless you need image in original quality."
           size="small"
           style={{
             width: "100%",
@@ -141,7 +131,7 @@ export default function AttachImage({
       ) : (
         <Notice
           type="information"
-          text={strings.compressionOnNotice()}
+          text="Compressed images are uploaded in Full HD resolution and usually are good enough for most use cases."
           size="small"
           style={{
             width: "100%",
@@ -151,7 +141,9 @@ export default function AttachImage({
       )}
 
       <Button
-        title={strings.attachImageHeading(response?.length || 1)}
+        title={`${
+          (response?.length || 0) > 1 ? "Attach Images" : "Attach Image"
+        }`}
         type="accent"
         width="100%"
         onPress={() => {
@@ -180,7 +172,7 @@ AttachImage.present = (response: ImageType[], context?: string) => {
           close={close}
           onAttach={(result) => {
             resolved = true;
-
+            console.log("closing");
             resolve(result);
             close?.();
           }}

apps/mobile/app/components/dialogs/color-picker/index.tsx

@@ -33,7 +33,6 @@ import { Toast } from "../../toast";
 import { Button } from "../../ui/button";
 import Input from "../../ui/input";
 import { Pressable } from "../../ui/pressable";
-import { strings } from "@notesnook/intl";
 
 const HEX_COLOR_REGEX_ALPHA =
   /^#(?:(?:[\da-fA-F]{3}){1,2}|(?:[\da-fA-F]{4}){1,2})$/;
@@ -149,37 +148,36 @@ const ColorPicker = ({
               }}
               testID="color-title-input"
               defaultValue={title.current}
-              placeholder={title.current || strings.colorTitle()}
+              placeholder={title.current || "Color title"}
             />
 
             <Button
-              title={strings.addColor()}
+              title="Add color"
               style={{
                 marginBottom: 10
               }}
               onPress={async () => {
                 if (!selectedColor)
                   return ToastManager.error(
-                    new Error(strings.noColorSelected()),
+                    new Error("Select a color"),
                     undefined,
                     "color-picker"
                   );
                 if (!title.current)
                   return ToastManager.error(
-                    new Error(strings.allFieldsRequired())
+                    new Error("Enter a title for the color")
                   );
                 const exists = await db.colors.all.find((v) =>
                   v.and([v(`colorCode`, "==", selectedColor)])
                 );
                 if (exists)
                   return ToastManager.error(
-                    new Error(strings.colorExists(selectedColor))
+                    new Error(`Color #${selectedColor} already exists`)
                   );
                 const id = await db.colors.add({
                   title: title.current,
                   colorCode: selectedColor
                 });
-                if (!id) return;
                 useRelationStore.getState().update();
                 useMenuStore.getState().setColorNotes();
                 setVisible(false);

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

@@ -44,8 +44,6 @@ import { ProgressBarComponent } from "../../ui/svg/lazy";
 import Paragraph from "../../ui/typography/paragraph";
 import { sleep } from "../../../utils/time";
 import { MMKV } from "../../../common/database/mmkv";
-import { deleteCacheFileByPath } from "../../../common/filesystem/io";
-import { strings } from "@notesnook/intl";
 
 const WIN_WIDTH = Dimensions.get("window").width;
 const WIN_HEIGHT = Dimensions.get("window").height;
@@ -126,7 +124,6 @@ const PDFPreview = () => {
   );
 
   const close = () => {
-    deleteCacheFileByPath(pdfSource);
     setPDFSource(null);
     setVisible(false);
     setPassword("");
@@ -138,10 +135,10 @@ const PDFPreview = () => {
       presentDialog({
         context: attachment?.hash,
         input: true,
-        inputPlaceholder: strings.enterPassword(),
-        positiveText: strings.open(),
-        title: strings.pdfLocked(),
-        paragraph: strings.pdfLockedDesc(),
+        inputPlaceholder: "Enter password",
+        positiveText: "Unlock",
+        title: "Decrypt",
+        paragraph: "Please input password to view pdf.",
         positivePress: (value) => {
           setTimeout(() => {
             setPassword(value);
@@ -188,7 +185,8 @@ const PDFPreview = () => {
                 }}
                 color={colors.static.white}
               >
-                {strings.loadingWithProgress(progress?.percent)}
+                Loading {`${progress?.percent ? `(${progress?.percent})` : ""}`}
+                ... Please wait
               </Paragraph>
             </Animated.View>
           ) : (
@@ -307,7 +305,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

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

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

@@ -39,9 +39,10 @@ const ResultDialog = () => {
   const { colors } = useThemeColors();
   const [visible, setVisible] = useState(false);
   const [dialogData, setDialogData] = useState({
-    title: "",
-    paragraph: "",
-    button: ""
+    title: "Thank you for signing up!",
+    paragraph:
+      "Try out all features of Notesnook free for 7 days. No limitations. No commitments.",
+    button: "Start taking notes"
   });
   useEffect(() => {
     eSubscribeEvent(eOpenResultDialog, open);

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

@@ -52,7 +52,6 @@ import { Button } from "../../ui/button";
 import Input from "../../ui/input";
 import Seperator from "../../ui/seperator";
 import Paragraph from "../../ui/typography/paragraph";
-import { strings } from "@notesnook/intl";
 
 export class VaultDialog extends Component {
   constructor(props) {
@@ -77,7 +76,7 @@ export class VaultDialog extends Component {
       changePassword: false,
       copyNote: false,
       revokeFingerprintAccess: false,
-      title: strings.goToEditor(),
+      title: "Unlock Note",
       description: null,
       clearVault: false,
       deleteVault: false,
@@ -92,25 +91,46 @@ export class VaultDialog extends Component {
     this.password = null;
     this.confirmPassword = null;
     this.newPassword = null;
-    this.title = !this.state.novault
-      ? strings.createVault()
+    (this.title = !this.state.novault
+      ? "Create Vault"
       : this.state.fingerprintAccess
-      ? strings.vaultFingerprintUnlock()
+      ? "Vault Fingerprint Unlock"
       : this.state.revokeFingerprintAccess
-      ? strings.revokeVaultFingerprintUnlock()
+      ? "Revoke Vault Fingerprint Unlock"
       : this.state.changePassword
-      ? strings.changeVaultPassword()
+      ? "Change Vault Password"
       : this.state.noteLocked
       ? this.state.deleteNote
-        ? strings.deleteNote()
+        ? "Delete note"
         : this.state.share
-        ? strings.shareNote()
+        ? "Share note"
         : this.state.copyNote
-        ? strings.copyNote()
+        ? "Copy note"
         : this.state.goToEditor
-        ? strings.goToEditor()
-        : strings.goToEditor()
-      : strings.lockNote();
+        ? "Unlock note"
+        : "Unlock note"
+      : "Lock note"),
+      (this.description = !this.state.novault
+        ? "Set a password to create vault"
+        : this.state.fingerprintAccess
+        ? "Enter vault password to enable fingerprint unlocking."
+        : this.state.revokeFingerprintAccess
+        ? "Disable vault fingerprint unlock "
+        : this.state.changePassword
+        ? "Setup a new password for the vault."
+        : this.state.permanant
+        ? "Enter password to remove note from vault."
+        : this.state.noteLocked
+        ? this.state.deleteNote
+          ? "Unlock note to delete it. If biometrics are not working, you can enter device pin to unlock vault."
+          : this.state.share
+          ? "Unlock note to share it. If biometrics are not working, you can enter device pin to unlock vault."
+          : this.state.copyNote
+          ? "Unlock note to copy it. If biometrics are not working, you can enter device pin to unlock vault."
+          : this.state.goToEditor
+          ? "Unlock note to open it in editor."
+          : "Enter vault password to unlock note. If biometrics are not working, you can enter device pin to unlock vault."
+        : "Enter vault password to lock note. If biometrics are not working, you can enter device pin to lock note.");
   }
 
   componentDidMount() {
@@ -179,7 +199,7 @@ export class VaultDialog extends Component {
     if (this.state.loading) {
       ToastManager.show({
         heading: this.state.title,
-        message: strings.pleaseWait() + "...",
+        message: "Please wait and do not close the app.",
         type: "success",
         context: "local"
       });
@@ -214,7 +234,8 @@ export class VaultDialog extends Component {
 
     if (!this.password) {
       ToastManager.show({
-        heading: strings.passwordNotEntered(),
+        heading: "Password not entered",
+        message: "Enter a password for the vault and try again.",
         type: "error",
         context: "local"
       });
@@ -224,7 +245,7 @@ export class VaultDialog extends Component {
     if (!this.state.novault) {
       if (this.password !== this.confirmPassword) {
         ToastManager.show({
-          heading: strings.passwordNotMatched(),
+          heading: "Passwords do not match",
           type: "error",
           context: "local"
         });
@@ -250,7 +271,7 @@ export class VaultDialog extends Component {
             this._enrollFingerprint(this.newPassword);
           }
           ToastManager.show({
-            heading: strings.passwordUpdated(),
+            heading: "Vault password updated successfully",
             type: "success",
             context: "global"
           });
@@ -262,7 +283,8 @@ export class VaultDialog extends Component {
           });
           if (e.message === db.vault.ERRORS.wrongPassword) {
             ToastManager.show({
-              heading: strings.passwordIncorrect(),
+              heading: "Incorrect password",
+              message: "Please enter the correct password and try again",
               type: "error",
               context: "local"
             });
@@ -273,7 +295,8 @@ export class VaultDialog extends Component {
     } else if (this.state.locked) {
       if (!this.password || this.password.trim() === 0) {
         ToastManager.show({
-          heading: strings.passwordIncorrect(),
+          heading: "Incorrect password",
+          message: "Please enter the correct password and try again",
           type: "error",
           context: "local"
         });
@@ -311,10 +334,8 @@ export class VaultDialog extends Component {
       loading: true
     });
     try {
-      let verified = true;
-      if (await db.user.getUser()) {
-        verified = await db.user.verifyPassword(this.password);
-      }
+      let verified = await db.user.verifyPassword(this.password);
+      if (!(await db.user.getUser())) verified = true;
       if (verified) {
         let noteIds = [];
         if (this.state.deleteAll) {
@@ -322,20 +343,19 @@ export class VaultDialog extends Component {
           const relations = await db.relations.from(vault, "note").get();
           noteIds = relations.map((item) => item.toId);
         }
+
         await db.vault.delete(this.state.deleteAll);
 
-        if (this.state.deleteAll) {
-          noteIds.forEach((id) => {
-            eSendEvent(
-              eUpdateNoteInEditor,
-              {
-                id: id,
-                deleted: true
-              },
-              true
-            );
-          });
-        }
+        noteIds.forEach((id) => {
+          eSendEvent(
+            eUpdateNoteInEditor,
+            {
+              id: id,
+              deleted: true
+            },
+            true
+          );
+        });
 
         eSendEvent("vaultUpdated");
         this.setState({
@@ -344,7 +364,8 @@ export class VaultDialog extends Component {
         this.close();
       } else {
         ToastManager.show({
-          heading: strings.passwordIncorrect(),
+          heading: "Account password incorrect",
+          message: "Please enter correct password for your account.",
           type: "error",
           context: "local"
         });
@@ -385,7 +406,8 @@ export class VaultDialog extends Component {
       eSendEvent("vaultUpdated");
     } catch (e) {
       ToastManager.show({
-        heading: strings.passwordIncorrect(),
+        heading: "Vault password incorrect",
+        message: "Please enter correct password to clear vault.",
         type: "error",
         context: "local"
       });
@@ -398,7 +420,7 @@ export class VaultDialog extends Component {
   async _lockNote() {
     if (!this.password || this.password.trim() === 0) {
       ToastManager.show({
-        heading: strings.passwordIncorrect(),
+        heading: "Incorrect password",
         type: "error",
         context: "local"
       });
@@ -406,11 +428,12 @@ 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();
       ToastManager.show({
-        message: strings.noteLocked(),
+        message: "Note locked successfully",
         type: "error",
         context: "local"
       });
@@ -423,7 +446,8 @@ export class VaultDialog extends Component {
   async _unlockNote() {
     if (!this.password || this.password.trim() === 0) {
       ToastManager.show({
-        heading: strings.passwordIncorrect(),
+        heading: "Incorrect password",
+        message: "Please enter the correct password and try again",
         type: "error",
         context: "local"
       });
@@ -459,7 +483,7 @@ export class VaultDialog extends Component {
   async _deleteNote() {
     try {
       await db.vault.remove(this.state.note.id, this.password);
-      await deleteItems("note", [this.state.note.id]);
+      await deleteItems([this.state.note.id], "note");
       this.close();
     } catch (e) {
       this._takeErrorAction(e);
@@ -480,7 +504,8 @@ export class VaultDialog extends Component {
           });
           eSendEvent("vaultUpdated");
           ToastManager.show({
-            heading: strings.biometricUnlockEnabled(),
+            heading: "Biometric unlocking enabled!",
+            message: "Now you can unlock notes in vault with biometrics.",
             type: "success",
             context: "global"
           });
@@ -488,7 +513,9 @@ export class VaultDialog extends Component {
         } catch (e) {
           this.close();
           ToastManager.show({
-            heading: strings.passwordIncorrect(),
+            heading: "Incorrect password",
+            message:
+              "Please enter the correct vault password to enable biometrics.",
             type: "error",
             context: "local"
           });
@@ -513,20 +540,20 @@ export class VaultDialog extends Component {
         loading: false
       });
       ToastManager.show({
-        heading: strings.noteLocked(),
+        heading: "Note added to vault",
         type: "success",
         context: "global"
       });
       this.close();
     } else {
+      eSendEvent("vaultUpdated");
       ToastManager.show({
-        heading: strings.vaultCreated(),
+        heading: "Vault created successfully",
         type: "success",
         context: "global"
       });
       this.close();
     }
-    eSendEvent("vaultUpdated");
   }
 
   _permanantUnlock() {
@@ -534,7 +561,7 @@ export class VaultDialog extends Component {
       .remove(this.state.note.id, this.password)
       .then(() => {
         ToastManager.show({
-          heading: strings.noteUnlocked(),
+          heading: "Note permanently unlocked.",
           type: "success",
           context: "global"
         });
@@ -559,10 +586,11 @@ export class VaultDialog extends Component {
   }
 
   async _copyNote(note) {
-    Clipboard.setString((await convertNoteToText(note, true)) || "");
+    Clipboard.setString(await convertNoteToText(note));
     ToastManager.show({
-      heading: strings.noteCopied(),
+      heading: "Note copied",
       type: "success",
+      message: "Note has been copied to clipboard!",
       context: "global"
     });
     this.close();
@@ -572,9 +600,9 @@ export class VaultDialog extends Component {
     this.close();
     try {
       await Share.open({
-        heading: note.title,
+        heading: "Share note",
         failOnCancel: false,
-        message: (await convertNoteToText(note)) || ""
+        message: await convertNoteToText(note)
       });
     } catch (e) {
       console.error(e);
@@ -582,17 +610,24 @@ export class VaultDialog extends Component {
   }
 
   _takeErrorAction(e) {
-    this.setState({
-      wrongPassword: true,
-      visible: true
-    });
-    setTimeout(() => {
-      ToastManager.show({
-        heading: strings.passwordIncorrect(),
-        type: "error",
-        context: "local"
+    if (
+      e.message === db.vault.ERRORS.wrongPassword ||
+      e.message === "FAILURE"
+    ) {
+      this.setState({
+        wrongPassword: true,
+        visible: true
       });
-    }, 500);
+      setTimeout(() => {
+        ToastManager.show({
+          heading: "Incorrect password",
+          type: "error",
+          context: "local"
+        });
+      }, 500);
+
+      return;
+    }
   }
 
   _revokeFingerprintAccess = async () => {
@@ -600,13 +635,14 @@ export class VaultDialog extends Component {
       await BiometricService.resetCredentials();
       eSendEvent("vaultUpdated");
       ToastManager.show({
-        heading: strings.biometricUnlockDisabled(),
+        heading: "Biometric unlocking disabled!",
         type: "success",
         context: "global"
       });
     } catch (e) {
       ToastManager.show({
-        heading: e.message,
+        heading: "Failed to disable Biometric unlocking.",
+        message: e.message,
         type: "success",
         context: "global"
       });
@@ -672,7 +708,12 @@ export class VaultDialog extends Component {
             paddingTop: 12
           }}
         >
-          <DialogHeader title={this.state.title} icon="shield" padding={12} />
+          <DialogHeader
+            title={this.state.title}
+            paragraph={this.state.description}
+            icon="shield"
+            padding={12}
+          />
           <Seperator half />
 
           <View
@@ -708,16 +749,10 @@ export class VaultDialog extends Component {
                       : this.onPress;
                   }}
                   autoComplete="password"
-                  returnKeyLabel={
-                    changePassword ? strings.next() : this.state.title
-                  }
+                  returnKeyLabel={changePassword ? "Next" : this.state.title}
                   returnKeyType={changePassword ? "next" : "done"}
                   secureTextEntry
-                  placeholder={
-                    changePassword
-                      ? strings.currentPassword()
-                      : strings.password()
-                  }
+                  placeholder={changePassword ? "Current password" : "Password"}
                 />
 
                 {!this.state.biometricUnlock ||
@@ -726,11 +761,11 @@ export class VaultDialog extends Component {
                 changePassword ? null : (
                   <Button
                     onPress={() =>
-                      this._onPressFingerprintAuth(strings.unlockNote(), "")
+                      this._onPressFingerprintAuth("Unlock note", "")
                     }
                     icon="fingerprint"
                     width="100%"
-                    title={strings.unlockWithBiometrics()}
+                    title={"Biometric unlock"}
                     type="transparent"
                   />
                 )}
@@ -753,7 +788,7 @@ export class VaultDialog extends Component {
                   marginTop: 10
                 }}
                 width="100%"
-                title={strings.deleteAllNotes()}
+                title={"Delete all notes"}
                 type="errorShade"
               />
             )}
@@ -774,7 +809,7 @@ export class VaultDialog extends Component {
                   returnKeyLabel="Change"
                   returnKeyType="done"
                   secureTextEntry
-                  placeholder={strings.newPassword()}
+                  placeholder={"New password"}
                 />
               </>
             ) : null}
@@ -789,13 +824,13 @@ export class VaultDialog extends Component {
                     this.password = value;
                   }}
                   autoComplete="password"
-                  returnKeyLabel={strings.next()}
+                  returnKeyLabel="Next"
                   returnKeyType="next"
                   secureTextEntry
                   onSubmit={() => {
                     this.confirmPassRef.current?.focus();
                   }}
-                  placeholder={strings.password()}
+                  placeholder="Password"
                 />
 
                 <Input
@@ -824,7 +859,7 @@ export class VaultDialog extends Component {
                     }
                   }}
                   onSubmit={this.onPress}
-                  placeholder={strings.confirmPassword()}
+                  placeholder="Confirm password"
                 />
               </View>
             ) : null}
@@ -832,7 +867,9 @@ export class VaultDialog extends Component {
             {this.state.biometricUnlock &&
             !this.state.isBiometryEnrolled &&
             novault ? (
-              <Paragraph>{strings.vaultEnableBiometrics()}</Paragraph>
+              <Paragraph>
+                Unlock with password once to enable biometric access.
+              </Paragraph>
             ) : null}
 
             {this.state.isBiometryAvailable &&
@@ -851,7 +888,7 @@ export class VaultDialog extends Component {
                 }}
                 icon="fingerprint"
                 width="100%"
-                title={strings.unlockWithBiometrics()}
+                title="Biometric unlocking"
                 iconColor={
                   this.state.biometricUnlock
                     ? colors.selected.accent
@@ -871,26 +908,26 @@ export class VaultDialog extends Component {
             }
             positiveTitle={
               deleteVault
-                ? strings.delete()
+                ? "Delete"
                 : clearVault
-                ? strings.clear()
+                ? "Clear"
                 : fingerprintAccess
-                ? strings.enable()
+                ? "Enable"
                 : this.state.revokeFingerprintAccess
-                ? strings.revoke()
+                ? "Revoke"
                 : changePassword
-                ? strings.change()
+                ? "Change"
                 : this.state.noteLocked
                 ? deleteNote
-                  ? strings.delete()
+                  ? "Delete"
                   : share
-                  ? strings.share()
+                  ? "Share "
                   : goToEditor
-                  ? strings.open()
-                  : strings.unlock()
+                  ? "Open"
+                  : "Unlock"
                 : !note.id
-                ? strings.create()
-                : strings.lock()
+                ? "Create"
+                : "Lock"
             }
           />
         </View>

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

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

@@ -33,6 +33,7 @@ import { eScrollEvent } from "../../utils/events";
 import { LeftMenus } from "./left-menus";
 import { RightMenus } from "./right-menus";
 import { Title } from "./title";
+import { useNavigation } from "@react-navigation/native";
 
 type HeaderRightButton = {
   title: string;
@@ -54,7 +55,7 @@ export const Header = ({
   onSearch
 }: {
   onLeftMenuButtonPress?: () => void;
-  renderedInRoute?: RouteName;
+  renderedInRoute: RouteName;
   id?: string;
   title: string;
   headerRightButtons?: HeaderRightButton[];
@@ -66,6 +67,8 @@ export const Header = ({
   hasSearch?: boolean;
   onSearch?: () => void;
 }) => {
+  const navigation = useNavigation();
+
   const { colors } = useThemeColors();
   const insets = useGlobalSafeAreaInsets();
   const [borderHidden, setBorderHidden] = useState(true);

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

@@ -19,8 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { useRef } from "react";
 import { Platform, StyleSheet, View } from "react-native";
+//@ts-ignore
 import { useThemeColors } from "@notesnook/theme";
-import { Menu } from "react-native-material-menu";
+import Menu from "react-native-reanimated-material-menu";
 import { notesnook } from "../../../e2e/test.ids";
 import {
   HeaderRightButton,
@@ -41,7 +42,7 @@ export const RightMenus = ({
   onSearch
 }: {
   headerRightButtons?: HeaderRightButton[];
-  renderedInRoute?: RouteName;
+  renderedInRoute: RouteName;
   id?: string;
   onPressDefaultRightButton?: () => void;
   search?: boolean;
@@ -95,17 +96,14 @@ export const RightMenus = ({
           animationDuration={200}
           style={{
             borderRadius: 5,
-            backgroundColor: contextMenuColors.primary.background,
-            marginTop: 35
+            backgroundColor: contextMenuColors.primary.background
           }}
           onRequestClose={() => {
-            //@ts-ignore
             menuRef.current?.hide();
           }}
           anchor={
             <IconButton
               onPress={() => {
-                //@ts-ignore
                 menuRef.current?.show();
               }}
               name="dots-vertical"
@@ -117,10 +115,9 @@ export const RightMenus = ({
           {headerRightButtons.map((item) => (
             <Button
               style={{
+                width: 150,
                 justifyContent: "flex-start",
-                borderRadius: 0,
-                alignSelf: "flex-start",
-                width: "100%"
+                borderRadius: 0
               }}
               type="plain"
               buttonType={{
@@ -129,7 +126,6 @@ export const RightMenus = ({
               key={item.title}
               title={item.title}
               onPress={async () => {
-                //@ts-ignore
                 menuRef.current?.hide();
                 if (Platform.OS === "ios") await sleep(300);
                 item.onPress();

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();