Merge branch 'master' into beta

mobile: release v3.4.8

.github/workflows/android.e2e.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Enable KVM
         run: |

.github/workflows/android.preview.build.yml

@@ -0,0 +1,104 @@
+name: Notesnook Android Preview Build
+
+# UNTRUSTED stage. Runs on `pull_request`, so fork code is checked out and
+# compiled with a read-only GITHUB_TOKEN and NO repository secrets. The release
+# APK is built without any signing secret (the same as before). Firebase
+# distribution and the PR comment happen in android.preview.publish.yml, which
+# runs in the trusted `workflow_run` context and never executes fork code.
+# Because no secrets are exposed here, the build runs automatically for every
+# PR (including forks) with no authorization gate.
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches: [master, beta]
+    paths:
+      - "apps/mobile/**"
+      - "packages/**"
+      - ".github/workflows/android.preview.build.yml"
+      - ".github/workflows/android.preview.publish.yml"
+
+concurrency:
+  group: android-preview-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    env:
+      STAGING_BUILD: true
+
+    steps:
+      - name: Checkout PR code
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Use specific Java version for the builds
+        uses: joschi/setup-jdk@v2
+        with:
+          java-version: "17"
+          architecture: "x64"
+
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: false
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+
+      - name: Install node modules
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=mobile
+
+      - name: Make Gradlew Executable
+        run: cd apps/mobile/android && chmod +x ./gradlew
+
+      - name: Get build number
+        id: build-number
+        run: echo "timestamp=$(($(date +%s) - 1774851180 ))" >> $GITHUB_OUTPUT
+
+      - name: Check for typescript errors
+        run: |
+          npm run tx mobile:build
+          cd apps/mobile
+          npx tsc --noEmit
+
+      - name: Build arm64-v8a apk
+        run: |
+          cd apps/mobile/android
+          ./gradlew assembleRelease -PreactNativeArchitectures=arm64-v8a -PstagingReleaseBuild=true -PprBuildNumber=${{ steps.build-number.outputs.timestamp }}
+
+      - name: Stage build artifact
+        run: |
+          set -euo pipefail
+          mkdir -p "$RUNNER_TEMP/artifact"
+          cp apps/mobile/android/app/build/outputs/apk/release/app-arm64-v8a-release.apk \
+            "$RUNNER_TEMP/artifact/app-preview.apk"
+          {
+            echo "PR_NUMBER=${{ github.event.pull_request.number }}"
+            echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}"
+          } > "$RUNNER_TEMP/artifact/pr-meta.env"
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-preview-build
+          path: ${{ runner.temp }}/artifact
+          if-no-files-found: error
+          retention-days: 1
+
+      - name: Upload sourcemaps
+        uses: actions/upload-artifact@v4
+        with:
+          name: sourcemaps
+          path: |
+            apps/mobile/android/app/build/generated/sourcemaps/**/*.map

.github/workflows/android.preview.firebase.yml

@@ -1,135 +0,0 @@
-name: Notesnook Android Preview
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-    branches: [master, beta]
-    paths:
-      - "apps/mobile/**"
-      - "packages/**"
-      - ".github/workflows/android.preview.firebase.yml"
-
-jobs:
-  authorize:
-    environment: ${{ github.event_name == 'pull_request_target' &&
-      github.event.pull_request.head.repo.full_name != github.repository &&
-      'external' || 'internal' }}
-
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo true
-
-  build:
-    needs: authorize
-    runs-on: ubuntu-22.04
-    env:
-      STAGING_BUILD: true
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Use specific Java version for the builds
-        uses: joschi/setup-jdk@v2
-        with:
-          java-version: "17"
-          architecture: "x64"
-
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: false
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-
-      - name: Install node modules
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
-
-      - name: Make Gradlew Executable
-        run: cd apps/mobile/android && chmod +x ./gradlew
-
-      - name: Get build number
-        id: build-number
-        run: echo "timestamp=$(($(date +%s) - 1774851180 ))" >> $GITHUB_OUTPUT
-
-      - name: Check for typescript errors
-        run: |
-          npm run tx mobile:build
-          cd apps/mobile
-          npx tsc --noEmit
-
-      - name: Build arm64-v8a apk
-        run: |
-          cd apps/mobile/android
-          ./gradlew assembleRelease -PreactNativeArchitectures=arm64-v8a -PstagingReleaseBuild=true -PprBuildNumber=${{ steps.build-number.outputs.timestamp }}
-
-      - name: Get app version
-        id: package-version
-        uses: saionaro/extract-package-version@master
-        with:
-          path: apps/mobile
-
-      - name: Publish to firebase CLI
-        id: firebase-output
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{secrets.FIREBASE_APP_ID}}
-          serviceCredentialsFileContent: ${{ secrets.QA_SERVICE_ACCOUNT }}
-          groups: testers
-          file: apps/mobile/android/app/build/outputs/apk/release/app-arm64-v8a-release.apk
-          releaseNotes: Preview for https://github.com/streetwriters/notesnook/pull/${{github.event.number}}
-
-      - name: Post or update PR comment
-        uses: actions/github-script@v6
-        env:
-          preview_url: ${{ steps.firebase-output.outputs.TESTING_URI }}
-        with:
-          script: |
-            const marker = '<!-- android-preview-comment -->';
-            const prNumber = context.issue.number;
-            const previewUrl = process.env.preview_url || '';
-            const body = `${marker}\n**Android App Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.GITHUB_SHA}\n`;
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: prNumber,
-            });
-            const existing = comments.find(c => c.body && c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                body,
-              });
-            }
-
-      - name: Upload sourcemaps
-        uses: actions/upload-artifact@v4
-        with:
-          name: sourcemaps
-          path: |
-            apps/mobile/android/app/build/generated/sourcemaps/**/*.map

.github/workflows/android.preview.publish.yml

@@ -0,0 +1,72 @@
+name: Notesnook Android Preview Publish
+
+# TRUSTED stage. Runs via `workflow_run` after the build workflow finishes, so
+# it has the base repo's secrets and a write-scoped token. It downloads the APK
+# the build produced and distributes it + posts the PR comment. It never checks
+# out or executes fork code.
+
+on:
+  workflow_run:
+    workflows: ["Notesnook Android Preview Build"]
+    types: [completed]
+
+jobs:
+  publish:
+    if: github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    steps:
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: android-preview-build
+          path: ${{ runner.temp }}/artifact
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Load PR metadata
+        run: cat "$RUNNER_TEMP/artifact/pr-meta.env" >> "$GITHUB_ENV"
+
+      - name: Publish to Firebase
+        id: firebase-output
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
+        with:
+          appId: ${{ secrets.FIREBASE_APP_ID }}
+          serviceCredentialsFileContent: ${{ secrets.QA_SERVICE_ACCOUNT }}
+          groups: testers
+          file: ${{ runner.temp }}/artifact/app-preview.apk
+          releaseNotes: Preview for https://github.com/${{ github.repository }}/pull/${{ env.PR_NUMBER }}
+
+      - name: Post or update PR comment
+        uses: actions/github-script@v7
+        env:
+          preview_url: ${{ steps.firebase-output.outputs.TESTING_URI }}
+        with:
+          script: |
+            const marker = '<!-- android-preview-comment -->';
+            const prNumber = Number(process.env.PR_NUMBER);
+            if (!prNumber) return;
+            const previewUrl = process.env.preview_url || '';
+            const body = `${marker}\n**Android App Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.HEAD_SHA}\n`;
+            const { data: comments } = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+            });
+            const existing = comments.find(c => c.body && c.body.includes(marker));
+            if (existing) {
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: existing.id,
+                body,
+              });
+            } else {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+                body,
+              });
+            }

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

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/android.publish.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/core.tests.yml

@@ -35,7 +35,7 @@ jobs:
     needs: authorize
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 

.github/workflows/desktop.preview.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -56,7 +56,7 @@ jobs:
       macos-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -127,7 +127,7 @@ jobs:
       linux-x64-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -146,6 +146,7 @@ jobs:
       - name: Install sqlite-better-trigram for all arch
         run: |
           npm i --cpu x64 sqlite-better-trigram
+          npm i --cpu x64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
       - name: Build Electron wrapper
@@ -170,7 +171,7 @@ jobs:
       linux-arm64-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -189,6 +190,7 @@ jobs:
       - name: Install sqlite-better-trigram for all arch
         run: |
           npm i --cpu arm64 sqlite-better-trigram
+          npm i --cpu arm64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
       - name: Build Electron wrapper
@@ -208,12 +210,12 @@ jobs:
   build-windows:
     name: Build for Windows
     needs: build
-    runs-on: windows-latest
+    runs-on: windows-2022
     outputs:
       windows-artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

.github/workflows/desktop.publish.yml

@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -107,7 +107,7 @@ jobs:
           target_commitish: ${{ github.ref }}
 
       - name: Generate flatpak sources
-        if: inputs.publish-github && inputs.build-linux
+        if: inputs.build-linux
         run: |
           sudo apt-get update
           sudo apt-get install -y --quiet flatpak flatpak-builder pipx
@@ -127,6 +127,13 @@ jobs:
           files: ./generated-sources.json
           prerelease: ${{ endsWith(steps.app_metadata.outputs.app_version, '-beta') }}
 
+      - name: Upload generated-sources.json as artifact
+        uses: actions/upload-artifact@v4
+        if: inputs.build-linux
+        with:
+          name: generated-sources
+          path: ./generated-sources.json
+
   build-macos:
     name: Build for macOS
     needs: build
@@ -135,7 +142,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -182,7 +189,9 @@ jobs:
       - name: Install sqlite-better-trigram for all arch
         run: |
           npm i --cpu arm64 sqlite-better-trigram
+          npm i --cpu arm64 sqlite3-fts5-html
           npm i --cpu x64 sqlite-better-trigram
+          npm i --cpu x64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
       - name: Install provisioning profile
@@ -237,7 +246,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -264,6 +273,7 @@ jobs:
       - name: Install sqlite-better-trigram for all arch
         run: |
           npm i --cpu x64 sqlite-better-trigram
+          npm i --cpu x64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
       - name: Build Electron wrapper
@@ -304,7 +314,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -331,6 +341,7 @@ jobs:
       - name: Install sqlite-better-trigram for all arch
         run: |
           npm i --cpu arm64 sqlite-better-trigram
+          npm i --cpu arm64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
       - name: Build Electron wrapper
@@ -363,11 +374,11 @@ jobs:
     name: Build for Windows
     needs: build
     if: inputs.build-windows
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v2

.github/workflows/desktop.tests.yml

@@ -18,12 +18,13 @@ on:
       - ".github/workflows/desktop.tests.yml"
 
 jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-22.04
+  test-macos-x64:
+    name: Test macOS x64
+    runs-on: macos-15-intel
+
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - name: Check out Git repository
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -33,44 +34,10 @@ jobs:
           npm ci --ignore-scripts --prefer-offline --no-audit
           npm run bootstrap -- --scope=web
 
-      - name: Generate desktop build
-        run: npm run tx @notesnook/web:build:desktop
-
-      - 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-15-intel
-
-    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
+      - name: Install sqlite-better-trigram for all arch
         run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=desktop
-
-      - name: Build Electron wrapper
-        run: npm run tx @notesnook/desktop:release
-
-      - name: Build app
-        run: |
-          yarn electron-builder --config=electron-builder.config.js --mac --dir --x64
+          npm i --cpu x64 sqlite-better-trigram
+          npm i --cpu x64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
       - name: Run tests x64
@@ -87,33 +54,24 @@ jobs:
 
   test-macos:
     name: Test macOS
-    needs: build
     runs-on: macos-latest
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - 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
+          npm run bootstrap -- --scope=web
 
-      - name: Build Electron wrapper
-        run: npm run tx @notesnook/desktop:release
-
-      - name: Build app
+      - name: Install sqlite-better-trigram for all arch
         run: |
-          yarn electron-builder --config=electron-builder.config.js --mac --dir --arm64
+          npm i --cpu arm64 sqlite-better-trigram
+          npm i --cpu arm64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
       - name: Run tests arm64
@@ -130,39 +88,24 @@ jobs:
 
   test-linux:
     name: Test for Linux
-    needs: build
     runs-on: ubuntu-22.04
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - 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
+          npm run bootstrap -- --scope=web
 
       - 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: npm run tx @notesnook/desktop:release
-
-      - name: Build app
-        run: |
-          yarn electron-builder --config=electron-builder.config.js --linux --dir --arm64 --x64
+          npm i --cpu x64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
       - name: Run tests
@@ -179,44 +122,26 @@ jobs:
 
   test-windows:
     name: Test for Windows
-    needs: build
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - 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
+          npm run bootstrap -- --scope=web
 
       - name: Install sqlite-better-trigram for all arch
         run: |
-          npm i --cpu arm64 sqlite-better-trigram
           npm i --cpu x64 sqlite-better-trigram
-
-          npm i --cpu arm64 sqlite3-fts5-html
           npm i --cpu x64 sqlite3-fts5-html
         working-directory: ./apps/desktop
 
-      - name: Build Electron wrapper
-        run: node scripts/execute.mjs @notesnook/desktop:release
-
-      - name: Build app
-        run: |
-          npx cross-env NOTESNOOK_STAGING=true yarn electron-builder --config=electron-builder.config.js --win --dir --arm64 --x64
-        working-directory: ./apps/desktop
-
       - name: Run tests
         run: npm run test
         working-directory: ./apps/desktop

.github/workflows/editor.tests.yml

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

.github/workflows/help.publish.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable

.github/workflows/ios.preview.build.yml

@@ -0,0 +1,152 @@
+name: Notesnook iOS Preview Build
+
+# UNTRUSTED stage. Runs on `pull_request`, so fork code is checked out and
+# compiled with a read-only GITHUB_TOKEN and NO repository secrets. It only
+# produces an *unsigned* archive. Signing, Firebase distribution and PR
+# comments happen in ios.preview.publish.yml, which runs in the trusted
+# `workflow_run` context and never executes fork code. Because no secrets are
+# exposed here, the build runs automatically for every PR (including forks)
+# with no authorization gate.
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches: [master, beta]
+    paths:
+      - "apps/mobile/**"
+      - "packages/**"
+      - ".github/workflows/ios.preview.build.yml"
+      - ".github/workflows/ios.preview.publish.yml"
+
+# A fork that spams pushes shouldn't queue up macOS builds.
+concurrency:
+  group: ios-preview-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: macos-26
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout PR code
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Setup Node
+        uses: ./.github/actions/setup-node-with-cache
+
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "26.1.1"
+
+      - name: Setup iOS Platform
+        run: |
+          # GitHub runs this as `/bin/bash -e`, so `set +e` is required -- without
+          # it the first failure aborts the step before any retry can happen.
+          # Both commands hit "Unable to connect to simulator" (exit 70) when
+          # CoreSimulatorService is wedged, so retry each and bounce it between.
+          set +e
+          DL_DIR="$RUNNER_TEMP/ios-platform"
+
+          retry() {
+            for i in 1 2 3; do
+              "$@" && return 0
+              echo "Attempt $i failed ($*); resetting CoreSimulator..."
+              sudo killall -9 com.apple.CoreSimulator.CoreSimulatorService simdiskimaged 2>/dev/null
+              sleep 20
+              xcrun simctl list runtimes >/dev/null 2>&1
+            done
+            echo "::error::Failed after 3 attempts: $*"
+            exit 1
+          }
+
+          xcrun simctl list runtimes >/dev/null 2>&1
+          retry xcodebuild -downloadPlatform iOS -exportPath "$DL_DIR"
+
+          # Find the dmg; its name embeds a build number that changes.
+          DMG="$(find "$DL_DIR" -name '*.dmg' | head -n1)"
+          [ -n "$DMG" ] || { echo "::error::No dmg in $DL_DIR"; exit 1; }
+          retry xcodebuild -importPlatform "$DMG"
+
+      - name: Install node modules
+        run: |
+          npm ci --ignore-scripts --prefer-offline --no-audit
+          npm run bootstrap -- --scope=mobile
+
+      - name: Build packages
+        run: npm run tx @notesnook/mobile:build
+
+      - name: Cache Pods
+        uses: actions/cache@v4
+        id: pods-cache
+        with:
+          path: apps/mobile/ios/Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/ios/Podfile.lock') }}
+
+      - name: Install Pods
+        run: |
+          cd apps/mobile/ios
+          pod install
+
+      - name: Check for typescript errors
+        run: |
+          npm run tx mobile:build
+          cd apps/mobile
+          npx tsc --noEmit
+
+      - name: Get marketing version
+        id: marketing-version
+        run: echo "version=$(grep "IOS_MARKETING_VERSION" apps/mobile/ios/build-configs/ios-build.staging.xcconfig | awk -F'=' '{print $2}' | xargs)" >> $GITHUB_OUTPUT
+
+      - name: Get build number
+        id: build-number
+        run: echo "timestamp=$(($(date +%s) - 1774851180 ))" >> $GITHUB_OUTPUT
+
+      - name: Make staging xcconfig active
+        run: |
+          cd apps/mobile/ios/build-configs
+          ./use-ios-build-config.sh staging --marketing-version ${{steps.marketing-version.outputs.version}} --build-number ${{steps.build-number.outputs.timestamp}}
+
+      # Archive unsigned: this job has no certs/profiles (secrets), and the iOS
+      # device SDK forbids ad-hoc signing, so real signing happens in the trusted
+      # publish workflow (ios.preview.publish.yml). Do NOT pass
+      # CODE_SIGN_ENTITLEMENTS="" -- each target must keep its own entitlements so
+      # the archive records them; blanking them dropped the App Group and crashed
+      # MMKV on launch.
+      - name: Archive (unsigned)
+        run: |
+          set -euo pipefail
+          xcodebuild \
+            -workspace apps/mobile/ios/Notesnook.xcworkspace \
+            -scheme Notesnook \
+            -configuration Release \
+            -sdk iphoneos \
+            -destination 'generic/platform=iOS' \
+            -archivePath "$RUNNER_TEMP/Notesnook.xcarchive" \
+            CODE_SIGNING_ALLOWED=NO \
+            CODE_SIGNING_REQUIRED=NO \
+            CODE_SIGN_IDENTITY="" \
+            archive
+
+      - name: Stage build artifact
+        run: |
+          set -euo pipefail
+          mkdir -p "$RUNNER_TEMP/artifact"
+          tar -czf "$RUNNER_TEMP/artifact/Notesnook.xcarchive.tar.gz" \
+            -C "$RUNNER_TEMP" Notesnook.xcarchive
+          # Carry the PR context forward; workflow_run cannot see it reliably for forks.
+          {
+            echo "PR_NUMBER=${{ github.event.pull_request.number }}"
+            echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}"
+          } > "$RUNNER_TEMP/artifact/pr-meta.env"
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ios-preview-build
+          path: ${{ runner.temp }}/artifact
+          if-no-files-found: error
+          retention-days: 1

.github/workflows/ios.preview.firebase.yml

@@ -1,173 +0,0 @@
-name: Notesnook iOS Preview
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-    branches: [master, beta]
-    paths:
-      - "apps/mobile/**"
-      - "packages/**"
-      - ".github/workflows/ios.preview.firebase.yml"
-
-jobs:
-  authorize:
-    environment: ${{ github.event_name == 'pull_request_target' &&
-      github.event.pull_request.head.repo.full_name != github.repository &&
-      'external' || 'internal' }}
-
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo true
-
-  build:
-    needs: authorize
-    runs-on: macos-26
-    timeout-minutes: 60
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.ref }}
-
-      - name: Setup Node
-        uses: ./.github/actions/setup-node-with-cache
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: "26.1.1"
-
-      - name: Setup iOS Platform
-        run: |
-          xcodebuild -downloadPlatform iOS -exportPath ~/Downloads
-          xcodebuild -importPlatform ~/Downloads/iphonesimulator_26.1_23B86.dmg
-
-      - name: Install node modules
-        run: |
-          npm ci --ignore-scripts --prefer-offline --no-audit
-          npm run bootstrap -- --scope=mobile
-
-      - name: Build packages
-        run: npm run tx @notesnook/mobile:build
-
-      - name: Cache Pods
-        uses: actions/cache@v3
-        id: pods-cache
-        with:
-          path: apps/mobile/ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('apps/mobile/ios/Podfile.lock') }}
-
-      - name: Install Pods
-        run: |
-          cd apps/mobile/ios
-          pod install
-
-      - name: Check for typescript errors
-        run: |
-          npm run tx mobile:build
-          cd apps/mobile
-          npx tsc --noEmit
-
-      - name: Get marketing version
-        id: marketing-version
-        run: echo "version=$(grep "IOS_MARKETING_VERSION" apps/mobile/ios/build-configs/ios-build.staging.xcconfig | awk -F'=' '{print $2}' | xargs)" >> $GITHUB_OUTPUT
-
-      - name: Get build number
-        id: build-number
-        run: echo "timestamp=$(($(date +%s) - 1774851180 ))" >> $GITHUB_OUTPUT
-
-      - name: Make staging xcconfig active
-        run: |
-          cd apps/mobile/ios/build-configs
-          ./use-ios-build-config.sh staging --marketing-version ${{steps.marketing-version.outputs.version}} --build-number ${{steps.build-number.outputs.timestamp}}
-
-      - name: Build iOS App
-        uses: ammarahm-ed/ios-build-action@master
-        with:
-          bundle-identifier: org.streetwriters.notesnook
-          scheme: Notesnook
-          configuration: "Release"
-          export-options: apps/mobile/ios/ExportOptionsStaging.plist
-          export-method: "ad-hoc"
-          project-path: apps/mobile/ios/Notesnook.xcodeproj
-          workspace-path: apps/mobile/ios/Notesnook.xcworkspace
-          update-targets: |
-            Notesnook
-            Make Note
-            NotesWidgetExtension
-          disable-targets: Notesnook-tvOS,Notesnook-tvOSTests,NotesnookTests
-          code-signing-identity: Apple Distribution
-          team-id: ${{ secrets.APPLE_TEAM_ID }}
-          p12-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }}
-          certificate-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
-          app-store-connect-api-key-issuer-id: ${{ secrets.API_KEY_ISSUER_ID }}
-          app-store-connect-api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
-          app-store-connect-api-key-base64: ${{ secrets.APPSTORE_CONNECT_API_KEY_BASE64 }}
-          output-path: Notesnook.ipa
-          mobileprovision-base64: |
-            ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_APP }}
-            ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_SHARE }}
-            ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_WIDGET }}
-
-      - name: Upload IPA artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ios-preview-ipa
-          path: Notesnook.ipa
-          if-no-files-found: error
-          retention-days: 1
-
-  publish:
-    runs-on: ubuntu-latest
-    needs: build
-    timeout-minutes: 20
-
-    steps:
-      - name: Download IPA artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ios-preview-ipa
-          path: .
-
-      - name: Publish to firebase CLI
-        id: firebase-output
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{secrets.FIREBASE_IOS_APP_ID}}
-          serviceCredentialsFileContent: ${{ secrets.QA_SERVICE_ACCOUNT }}
-          groups: testers
-          file: Notesnook.ipa
-          releaseNotes: Preview for https://github.com/streetwriters/notesnook/pull/${{github.event.number}}
-
-      - name: Post or update PR comment
-        uses: actions/github-script@v6
-        env:
-          preview_url: ${{ steps.firebase-output.outputs.TESTING_URI }}
-        with:
-          script: |
-            const marker = '<!-- ios-preview-comment -->';
-            const prNumber = context.issue.number;
-            const previewUrl = process.env.preview_url || '';
-            const body = `${marker}\n**iOS App Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.GITHUB_SHA}\n`;
-            const { data: comments } = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: prNumber,
-            });
-            const existing = comments.find(c => c.body && c.body.includes(marker));
-            if (existing) {
-              await github.rest.issues.updateComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                body,
-              });
-            }

.github/workflows/ios.preview.publish.yml

@@ -0,0 +1,222 @@
+name: Notesnook iOS Preview Publish
+
+# TRUSTED stage. Runs via `workflow_run` after the build workflow finishes, so
+# it has the base repo's secrets and a write-scoped token. It checks out the
+# BASE repository (never fork code), downloads the unsigned archive the build
+# produced, then signs + distributes it and posts the PR comment. Signing is
+# done directly with `codesign` on the prebuilt archive -- no app build phases
+# run here, so fork code is never executed in this trusted context.
+#
+# Split into two jobs on purpose: signing needs macOS, but the Firebase
+# distribution action is a Docker container action and only runs on Linux.
+
+on:
+  workflow_run:
+    workflows: ["Notesnook iOS Preview Build"]
+    types: [completed]
+
+jobs:
+  export:
+    # Only publish previews for builds that actually succeeded.
+    if: github.event.workflow_run.conclusion == 'success'
+    runs-on: macos-26
+    timeout-minutes: 30
+    outputs:
+      pr_number: ${{ steps.meta.outputs.PR_NUMBER }}
+      head_sha: ${{ steps.meta.outputs.HEAD_SHA }}
+
+    steps:
+      - name: Checkout base repo (trusted)
+        uses: actions/checkout@v5
+        # No `ref` -> checks out the default branch, i.e. trusted base code.
+
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "26.1.1"
+
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ios-preview-build
+          path: ${{ runner.temp }}/artifact
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Load PR metadata & extract archive
+        id: meta
+        run: |
+          set -euo pipefail
+          cat "$RUNNER_TEMP/artifact/pr-meta.env" >> "$GITHUB_OUTPUT"
+          tar -xzf "$RUNNER_TEMP/artifact/Notesnook.xcarchive.tar.gz" -C "$RUNNER_TEMP"
+
+      - name: Import signing certificate
+        uses: apple-actions/import-codesign-certs@v3
+        with:
+          p12-file-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }}
+          p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
+
+      - name: Install provisioning profiles
+        env:
+          PROFILE_APP: ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_APP }}
+          PROFILE_SHARE: ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_SHARE }}
+          PROFILE_WIDGET: ${{ secrets.APPLE_MOBILE_PROVISION_ADHOC_WIDGET }}
+        run: |
+          set -euo pipefail
+          PROFILE_DIR="$HOME/Library/MobileDevice/Provisioning Profiles"
+          mkdir -p "$PROFILE_DIR"
+          i=0
+          for p in "$PROFILE_APP" "$PROFILE_SHARE" "$PROFILE_WIDGET"; do
+            echo "$p" | base64 --decode > "$PROFILE_DIR/preview-$i.mobileprovision"
+            i=$((i + 1))
+          done
+
+      # Sign the unsigned archive by hand. `xcodebuild -exportArchive` re-signs
+      # from the archive's `archived-expanded-entitlements.xcent`, which an
+      # unsigned archive does not contain, so it dropped the App Group and the
+      # app crashed on launch. Instead we sign each bundle directly, taking the
+      # entitlements from each provisioning profile (exactly what Apple
+      # provisioned -- App Group, keychain groups with the right team prefix).
+      # Runs on macOS but executes NO fork build phases, so it stays trusted.
+      - name: Sign IPA
+        run: |
+          set -euo pipefail
+          PROFILES="$HOME/Library/MobileDevice/Provisioning Profiles"
+          APP="$(find "$RUNNER_TEMP/Notesnook.xcarchive/Products/Applications" -maxdepth 1 -name '*.app' | head -n1)"
+          [ -n "$APP" ] || { echo "::error::No .app in archive"; exit 1; }
+
+          # Single Apple Distribution identity from the imported keychain.
+          IDENTITY="$(security find-identity -v -p codesigning | awk '/Apple Distribution/{print $2; exit}')"
+          [ -n "$IDENTITY" ] || { echo "::error::No Apple Distribution identity found"; exit 1; }
+          echo "Signing identity: $IDENTITY"
+
+          TMP="$RUNNER_TEMP/sign"; mkdir -p "$TMP"
+
+          # Decode a profile's bundle id (application-identifier minus team prefix).
+          profile_bundle_id() {
+            security cms -D -i "$1" -o "$TMP/_p.plist" 2>/dev/null
+            local appid; appid="$(plutil -extract Entitlements.application-identifier raw -o - "$TMP/_p.plist")"
+            echo "${appid#*.}"
+          }
+          # Find the profile matching a bundle id; echoes its path.
+          profile_for() {
+            local want="$1" p
+            for p in "$PROFILES"/*.mobileprovision; do
+              [ -e "$p" ] || continue
+              [ "$(profile_bundle_id "$p")" = "$want" ] && { echo "$p"; return 0; }
+            done
+            return 1
+          }
+          # Embed the matching profile and sign a bundle with the profile's entitlements.
+          sign_bundle() {
+            local bundle="$1" bid prof ent
+            bid="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "$bundle/Info.plist")"
+            prof="$(profile_for "$bid")" || { echo "::error::No provisioning profile for $bid"; exit 1; }
+            ent="$TMP/ent-$bid.plist"
+            security cms -D -i "$prof" -o "$TMP/_p.plist"
+            plutil -extract Entitlements xml1 -o "$ent" "$TMP/_p.plist"
+            cp "$prof" "$bundle/embedded.mobileprovision"
+            echo "Signing $(basename "$bundle") ($bid)"
+            codesign --force --sign "$IDENTITY" --entitlements "$ent" "$bundle"
+          }
+
+          # Sign inside-out: nested code first, then extensions, then the app.
+          if [ -d "$APP/Frameworks" ]; then
+            find "$APP/Frameworks" -maxdepth 1 \( -name '*.framework' -o -name '*.dylib' \) -print0 \
+              | while IFS= read -r -d '' f; do codesign --force --sign "$IDENTITY" "$f"; done
+          fi
+          if [ -d "$APP/PlugIns" ]; then
+            for appex in "$APP/PlugIns"/*.appex; do
+              [ -e "$appex" ] || continue
+              if [ -d "$appex/Frameworks" ]; then
+                find "$appex/Frameworks" -maxdepth 1 \( -name '*.framework' -o -name '*.dylib' \) -print0 \
+                  | while IFS= read -r -d '' f; do codesign --force --sign "$IDENTITY" "$f"; done
+              fi
+              sign_bundle "$appex"
+            done
+          fi
+          sign_bundle "$APP"
+
+          codesign --verify --deep --strict --verbose=2 "$APP"
+
+          # Package into an IPA.
+          rm -rf "$TMP/Payload"; mkdir -p "$TMP/Payload"
+          cp -R "$APP" "$TMP/Payload/"
+          ( cd "$TMP" && zip -qry "$RUNNER_TEMP/Notesnook.ipa" Payload )
+
+          # Fail fast if the App Group didn't make it into the signed app -- its
+          # absence is the launch crash (MMKV nil group path). Never distribute
+          # a build without it.
+          echo "::group::Signed app entitlements"
+          codesign -d --entitlements :- "$APP" 2>/dev/null || true
+          echo "::endgroup::"
+          codesign -d --entitlements :- "$APP" 2>/dev/null | grep -q "group.org.streetwriters.notesnook" \
+            || { echo "::error::Signed app is missing the App Group entitlement; it would crash on launch."; exit 1; }
+          echo "App Group entitlement present."
+
+      - name: Upload signed IPA
+        uses: actions/upload-artifact@v4
+        with:
+          name: ios-preview-ipa
+          path: ${{ runner.temp }}/Notesnook.ipa
+          if-no-files-found: error
+          retention-days: 1
+
+  # Must be Linux: wzieba/Firebase-Distribution-Github-Action is a Docker
+  # container action, which GitHub only supports on Linux runners.
+  distribute:
+    needs: export
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    steps:
+      - name: Download signed IPA
+        uses: actions/download-artifact@v4
+        with:
+          name: ios-preview-ipa
+          path: ${{ runner.temp }}
+
+      - name: Publish to Firebase
+        id: firebase-output
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
+        with:
+          appId: ${{ secrets.FIREBASE_IOS_APP_ID }}
+          serviceCredentialsFileContent: ${{ secrets.QA_SERVICE_ACCOUNT }}
+          groups: testers
+          file: ${{ runner.temp }}/Notesnook.ipa
+          releaseNotes: Preview for https://github.com/${{ github.repository }}/pull/${{ needs.export.outputs.pr_number }}
+
+      - name: Post or update PR comment
+        uses: actions/github-script@v7
+        env:
+          preview_url: ${{ steps.firebase-output.outputs.TESTING_URI }}
+          PR_NUMBER: ${{ needs.export.outputs.pr_number }}
+          HEAD_SHA: ${{ needs.export.outputs.head_sha }}
+        with:
+          script: |
+            const marker = '<!-- ios-preview-comment -->';
+            const prNumber = Number(process.env.PR_NUMBER);
+            if (!prNumber) return;
+            const previewUrl = process.env.preview_url || '';
+            const body = `${marker}\n**iOS App Preview**\n\n${previewUrl || 'Preview URL unavailable — check workflow logs.'}\n\nCommit: ${process.env.HEAD_SHA}\n`;
+            const { data: comments } = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: prNumber,
+            });
+            const existing = comments.find(c => c.body && c.body.includes(marker));
+            if (existing) {
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: existing.id,
+                body,
+              });
+            } else {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+                body,
+              });
+            }

.github/workflows/ios.publish.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache
@@ -116,6 +116,7 @@ jobs:
           api-private-key: ${{ secrets.API_KEY }}
 
       - name: Upload Notesnook.ipa to Github
+        continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
           name: Notesnook.zip

.github/workflows/monograph.publish.yml

@@ -22,7 +22,7 @@ jobs:
       id-token: write
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node
         uses: ./.github/actions/setup-node-with-cache

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

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

.github/workflows/themes.publish.yml

@@ -22,7 +22,7 @@ jobs:
       id-token: write
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Collect package metadata
         id: package_metadata

.github/workflows/vericrypt.publish.yml

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

.github/workflows/web.preview.yml

@@ -19,7 +19,7 @@ jobs:
       CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.github/workflows/web.publish.yml

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

.github/workflows/web.tests.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 

apps/desktop/__tests__/auto-updates.test.ts

@@ -17,155 +17,91 @@ 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 { testCleanup, test } from "./test-override.js";
-import { writeFile } from "fs/promises";
-import { Page } from "playwright";
+import { test, expect } from "@nn/test";
 import { gt, lt } from "semver";
-import { describe } from "vitest";
+import { AppModel } from "../../web/__e2e__/models/app.model.js";
 
-test("update starts downloading if version is outdated", async ({
-  ctx: { page },
-  expect,
-  onTestFinished
-}) => {
-  onTestFinished(testCleanup);
+test.extend({ options: { version: "3.0.0" } })(
+  "update starts downloading if version is outdated",
+  async ({ page }) => {
+    await page.waitForSelector(".ProseMirror");
 
-  await page.waitForSelector("#authForm");
-  expect(
-    await page.getByRole("button", { name: "Create account" }).isVisible()
-  ).toBe(true);
+    await page
+      .locator(".theme-scope-statusBar")
+      .getByRole("button", { name: /updating/i })
+      .waitFor({ state: "attached" });
+  }
+);
 
-  await page
-    .getByRole("button", { name: "Skip & go directly to the app" })
-    .click();
-
-  await skipDialog(page);
-
-  await page.waitForSelector(".ProseMirror");
-
-  await page
-    .locator(".theme-scope-statusBar")
-    .getByRole("button", { name: /updating/i })
-    .waitFor({ state: "attached" });
-});
-
-test("update is only shown if version is outdated and auto updates are disabled", async ({
-  ctx,
-  expect,
-  onTestFinished
-}) => {
-  onTestFinished(testCleanup);
-
-  await ctx.app.close();
-  await writeFile(
-    ctx.configPath,
-    JSON.stringify({
+test.extend({
+  options: {
+    version: "3.0.0",
+    config: {
       automaticUpdates: false
-    })
-  );
+    }
+  }
+})(
+  "update is only shown if version is outdated and auto updates are disabled",
+  async ({ page }) => {
+    await page.waitForSelector(".ProseMirror");
 
-  await ctx.relaunch();
+    const app = new AppModel(page);
+    const settings = await app.goToSettings();
 
-  const { page } = ctx;
+    await settings.checkForUpdates();
+    await settings.close();
 
-  await page.waitForSelector("#authForm");
-
-  expect(
-    await page.getByRole("button", { name: "Create account" }).isVisible()
-  ).toBe(true);
-
-  await page
-    .getByRole("button", { name: "Skip & go directly to the app" })
-    .click();
-
-  await skipDialog(page);
+    await page
+      .locator(".theme-scope-statusBar")
+      .getByRole("button", { name: /available/i })
+      .waitFor({ state: "attached" });
+  }
+);
 
+test.extend({
+  options: {
+    version: "3.0.0-beta.0",
+    config: {
+      automaticUpdates: false,
+      releaseTrack: "beta"
+    }
+  }
+})("update to stable if it is newer", async ({ page }) => {
   await page.waitForSelector(".ProseMirror");
 
-  await page
+  const app = new AppModel(page);
+  const settings = await app.goToSettings();
+
+  await settings.checkForUpdates();
+  await settings.close();
+
+  const updateButton = page
     .locator(".theme-scope-statusBar")
-    .getByRole("button", { name: /available/i })
-    .waitFor({ state: "attached" });
+    .getByRole("button", { name: /available/i });
+  await updateButton.waitFor({ state: "visible" });
+  const content = await updateButton.textContent();
+  const version = content?.split(" ")?.[0] || "";
+  expect(gt(version, "3.0.0-beta.0")).toBe(true);
 });
 
-describe("update to stable if it is newer", () => {
-  test.scoped({ options: { version: "3.0.0-beta.0" } });
-  test("test", async ({ ctx, expect, onTestFinished }) => {
-    onTestFinished(testCleanup);
-
-    await ctx.app.close();
-    await writeFile(
-      ctx.configPath,
-      JSON.stringify({
-        automaticUpdates: false,
-        releaseTrack: "beta"
-      })
-    );
-
-    await ctx.relaunch();
-
-    const { page } = ctx;
-
-    await page.waitForSelector("#authForm");
-
-    expect(
-      await page.getByRole("button", { name: "Create account" }).isVisible()
-    ).toBe(true);
-
-    await page
-      .getByRole("button", { name: "Skip & go directly to the app" })
-      .click();
-
-    await skipDialog(page);
-
+test.extend({
+  options: {
+    version: "99.0.0-beta.0",
+    config: {
+      automaticUpdates: false,
+      releaseTrack: "beta"
+    }
+  }
+})(
+  "update is not available if it latest stable version is older",
+  async ({ page }) => {
     await page.waitForSelector(".ProseMirror");
 
-    const updateButton = page
-      .locator(".theme-scope-statusBar")
-      .getByRole("button", { name: /available/i });
-    await updateButton.waitFor({ state: "visible" });
-    const content = await updateButton.textContent();
-    const version = content?.split(" ")?.[0] || "";
-    expect(gt(version, "3.0.0-beta.0")).toBe(true);
-  });
-});
+    const app = new AppModel(page);
+    const settings = await app.goToSettings();
 
-describe("update is not available if it latest stable version is older", () => {
-  test.scoped({ options: { version: "99.0.0-beta.0" } });
-  test("test", async ({ ctx, expect, onTestFinished }) => {
-    onTestFinished(testCleanup);
-
-    await ctx.app.close();
-    await writeFile(
-      ctx.configPath,
-      JSON.stringify({
-        automaticUpdates: false,
-        releaseTrack: "beta"
-      })
-    );
-
-    await ctx.relaunch();
-
-    const { page } = ctx;
-
-    await page.waitForSelector("#authForm");
-
-    expect(
-      await page.getByRole("button", { name: "Create account" }).isVisible()
-    ).toBe(true);
-
-    await page
-      .getByRole("button", { name: "Skip & go directly to the app" })
-      .click();
-
-    await skipDialog(page);
-
-    await page.waitForSelector(".ProseMirror");
-
-    await page
-      .locator(".theme-scope-statusBar")
-      .getByRole("button", { name: /checking for updates/i })
-      .waitFor({ state: "hidden" });
+    await settings.checkForUpdates();
+    await settings.close();
 
     expect(
       await page
@@ -173,45 +109,24 @@ describe("update is not available if it latest stable version is older", () => {
         .getByRole("button", { name: /available/i })
         .isHidden()
     ).toBe(true);
-  });
-});
-
-describe("downgrade to stable on switching to stable release track", () => {
-  test.scoped({ options: { version: "99.0.0-beta.0" } });
-  test("test", async ({ ctx, expect, onTestFinished }) => {
-    onTestFinished(testCleanup);
-
-    await ctx.app.close();
-    await writeFile(
-      ctx.configPath,
-      JSON.stringify({
-        automaticUpdates: false,
-        releaseTrack: "stable"
-      })
-    );
-
-    await ctx.relaunch();
-
-    const { page } = ctx;
-
-    await page.waitForSelector("#authForm");
-
-    expect(
-      await page.getByRole("button", { name: "Create account" }).isVisible()
-    ).toBe(true);
-
-    await page
-      .getByRole("button", { name: "Skip & go directly to the app" })
-      .click();
-
-    await skipDialog(page);
+  }
+);
 
+test.extend({
+  options: {
+    version: "99.0.0-beta.0",
+    config: { automaticUpdates: false, releaseTrack: "stable" }
+  }
+})(
+  "downgrade to stable on switching to stable release track",
+  async ({ page }) => {
     await page.waitForSelector(".ProseMirror");
 
-    await page
-      .locator(".theme-scope-statusBar")
-      .getByRole("button", { name: /checking for updates/i })
-      .waitFor({ state: "hidden" });
+    const app = new AppModel(page);
+    const settings = await app.goToSettings();
+
+    await settings.checkForUpdates();
+    await settings.close();
 
     const updateButton = page
       .locator(".theme-scope-statusBar")
@@ -220,23 +135,5 @@ describe("downgrade to stable on switching to stable release track", () => {
     const content = await updateButton.textContent();
     const version = content?.split(" ")?.[0] || "";
     expect(lt(version, "99.0.0-beta.0")).toBe(true);
-  });
-});
-
-async function skipDialog(page: Page) {
-  try {
-    const dialog = page.locator(".ReactModal__Content");
-    const positiveButton = dialog.locator(
-      "button[data-role='positive-button']"
-    );
-    const negativeButton = dialog.locator(
-      "button[data-role='negative-button']"
-    );
-    if (await positiveButton.isVisible())
-      await positiveButton.click({ timeout: 1000 });
-    else if (await negativeButton.isVisible())
-      await negativeButton.click({ timeout: 1000 });
-  } catch (e) {
-    // ignore error
   }
-}
+);

apps/desktop/__tests__/electron-test/base-test.ts

@@ -0,0 +1,63 @@
+/*
+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 { mergeTests, test } from "@playwright/test";
+import type { CommonFixtures, CommonWorkerFixtures } from "./common-fixtures";
+import { commonFixtures } from "./common-fixtures";
+import { platformTest } from "./platform-fixtures";
+import { testModeTest } from "./test-mode-fixtures";
+
+export const base = test;
+
+export const baseTest = mergeTests(base, platformTest, testModeTest).extend<
+  CommonFixtures,
+  CommonWorkerFixtures
+>(commonFixtures);
+
+export function step<
+  This extends NonNullable<unknown>,
+  Args extends any[],
+  Return
+>(
+  target: (this: This, ...args: Args) => Promise<Return>,
+  context: ClassMethodDecoratorContext<
+    This,
+    (this: This, ...args: Args) => Promise<Return>
+  >
+) {
+  function replacementMethod(this: This, ...args: Args): Promise<Return> {
+    const name =
+      this.constructor.name +
+      "." +
+      (context.name as string) +
+      "(" +
+      args.map((a) => JSON.stringify(a)).join(",") +
+      ")";
+    return test.step(name, async () => {
+      return await target.call(this, ...args);
+    });
+  }
+  return replacementMethod;
+}
+
+// declare global {
+//   interface Window {
+//     builtins: Builtins;
+//   }
+// }

apps/desktop/__tests__/electron-test/common-fixtures.ts

@@ -0,0 +1,347 @@
+/* eslint-disable header/header */
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Fixtures } from "@playwright/test";
+import type { ChildProcess } from "child_process";
+import { execSync, spawn } from "child_process";
+import net from "net";
+import fs from "fs";
+import { stripAnsi } from "./playwright-utils";
+
+type TestChildParams = {
+  command: string[];
+  cwd?: string;
+  env?: NodeJS.ProcessEnv;
+  shell?: boolean;
+  onOutput?: () => void;
+};
+
+import childProcess from "child_process";
+
+type ProcessData = {
+  pid: number; // process ID
+  pgrp: number; // process group ID
+  children: Set<ProcessData>; // direct children of the process
+};
+
+function readAllProcessesLinux(): {
+  pid: number;
+  ppid: number;
+  pgrp: number;
+}[] {
+  const result: { pid: number; ppid: number; pgrp: number }[] = [];
+  for (const dir of fs.readdirSync("/proc")) {
+    const pid = +dir;
+    if (isNaN(pid)) continue;
+    try {
+      const statFile = fs.readFileSync(`/proc/${pid}/stat`, "utf8");
+      // Format of /proc/*/stat is described https://man7.org/linux/man-pages/man5/proc.5.html
+      const match = statFile.match(
+        /^(?<pid>\d+)\s+\((?<comm>.*)\)\s+(?<state>R|S|D|Z|T|t|W|X|x|K|W|P)\s+(?<ppid>\d+)\s+(?<pgrp>\d+)/
+      );
+      if (match && match.groups) {
+        result.push({
+          pid: +match.groups.pid,
+          ppid: +match.groups.ppid,
+          pgrp: +match.groups.pgrp
+        });
+      }
+    } catch (e) {
+      // We don't have access to some /proc/<pid>/stat file.
+    }
+  }
+  return result;
+}
+
+function readAllProcessesMacOS(): {
+  pid: number;
+  ppid: number;
+  pgrp: number;
+}[] {
+  const result: { pid: number; ppid: number; pgrp: number }[] = [];
+  const processTree = childProcess.spawnSync("ps", ["-eo", "pid,pgid,ppid"]);
+  const lines = processTree.stdout.toString().trim().split("\n");
+  for (const line of lines) {
+    const [pid, pgrp, ppid] = line
+      .trim()
+      .split(/\s+/)
+      .map((token) => +token);
+    // On linux, the very first line of `ps` is the header with "PID PGID PPID".
+    if (isNaN(pid) || isNaN(pgrp) || isNaN(ppid)) continue;
+    result.push({ pid, ppid, pgrp });
+  }
+  return result;
+}
+
+function buildProcessTreePosix(pid: number): ProcessData | undefined {
+  // Certain Linux distributions might not have `ps` installed.
+  const allProcesses =
+    process.platform === "darwin"
+      ? readAllProcessesMacOS()
+      : readAllProcessesLinux();
+  const pidToProcess = new Map<number, ProcessData>();
+  for (const { pid, pgrp } of allProcesses)
+    pidToProcess.set(pid, { pid, pgrp, children: new Set() });
+  for (const { pid, ppid } of allProcesses) {
+    const parent = pidToProcess.get(ppid);
+    const child = pidToProcess.get(pid);
+    // On POSIX, certain processes might not have parent (e.g. PID=1 and occasionally PID=2)
+    // or we might not have access to it proc info.
+    if (parent && child) parent.children.add(child);
+  }
+  return pidToProcess.get(pid);
+}
+
+export class TestChildProcess {
+  params: TestChildParams;
+  process: ChildProcess;
+  output = "";
+  stdout = "";
+  stderr = "";
+  fullOutput = "";
+  onOutput?: (chunk: string | Buffer) => void;
+  exited: Promise<{ exitCode: number | null; signal: string | null }>;
+  exitCode: Promise<number | null>;
+
+  private _outputCallbacks = new Set<() => void>();
+
+  constructor(params: TestChildParams) {
+    this.params = params;
+    // See https://nodejs.org/api/deprecations.html#DEP0190
+    const command = params.shell ? params.command.join(" ") : params.command[0];
+    const args = params.shell ? [] : params.command.slice(1);
+    this.process = spawn(command, args, {
+      env: {
+        ...process.env,
+        ...params.env
+      },
+      cwd: params.cwd,
+      shell: params.shell,
+      // On non-windows platforms, `detached: true` makes child process a leader of a new
+      // process group, making it possible to kill child process tree with `.kill(-pid)` command.
+      // @see https://nodejs.org/api/child_process.html#child_process_options_detached
+      detached: process.platform !== "win32"
+    });
+    if (process.env.PWTEST_DEBUG)
+      process.stdout.write(`\n\nLaunching ${params.command.join(" ")}\n`);
+    this.onOutput = params.onOutput;
+
+    const appendChunk = (type: "stdout" | "stderr", chunk: string | Buffer) => {
+      this.output += String(chunk);
+      if (type === "stderr") this.stderr += String(chunk);
+      else this.stdout += String(chunk);
+      if (process.env.PWTEST_DEBUG) process.stdout.write(String(chunk));
+      else this.fullOutput += String(chunk);
+      this.onOutput?.(chunk);
+      for (const cb of this._outputCallbacks) cb();
+      this._outputCallbacks.clear();
+    };
+
+    this.process.stderr!.on("data", appendChunk.bind(null, "stderr"));
+    this.process.stdout!.on("data", appendChunk.bind(null, "stdout"));
+
+    const killProcessGroup = this._killProcessTree.bind(this, "SIGKILL");
+    process.on("exit", killProcessGroup);
+    this.exited = new Promise((f) => {
+      this.process.on("exit", (exitCode, signal) => f({ exitCode, signal }));
+      process.off("exit", killProcessGroup);
+    });
+    this.exitCode = this.exited.then((r) => r.exitCode);
+  }
+
+  outputLines(): string[] {
+    const strippedOutput = stripAnsi(this.output);
+    return strippedOutput
+      .split("\n")
+      .filter((line) => line.startsWith("%%"))
+      .map((line) => line.substring(2).trim());
+  }
+
+  async kill(signal: "SIGINT" | "SIGKILL" = "SIGKILL") {
+    this._killProcessTree(signal);
+    return this.exited;
+  }
+
+  private _killProcessTree(signal: "SIGINT" | "SIGKILL") {
+    if (!this.process.pid || !this.process.kill(0)) return;
+    killProcessGroup(this.process.pid, signal);
+  }
+
+  async cleanExit() {
+    const r = await this.exited;
+    if (r.exitCode)
+      throw new Error(
+        `Process failed with exit code ${r.exitCode}. Output:\n${this.output}`
+      );
+    if (r.signal)
+      throw new Error(
+        `Process received signal: ${r.signal}. Output:\n${this.output}`
+      );
+  }
+
+  async waitForOutput(substring: string, count = 1) {
+    while (countTimes(stripAnsi(this.output), substring) < count)
+      await new Promise<void>((f) => this._outputCallbacks.add(f));
+  }
+
+  clearOutput() {
+    this.output = "";
+  }
+
+  write(chars: string) {
+    this.process.stdin!.write(chars);
+  }
+}
+
+export function killProcessGroup(
+  pid: number,
+  signal: "SIGINT" | "SIGKILL" = "SIGKILL"
+) {
+  // On Windows, we always call `taskkill` no matter signal.
+  if (process.platform === "win32") {
+    try {
+      execSync(`taskkill /pid ${pid} /T /F /FI "MEMUSAGE gt 0"`, {
+        stdio: "ignore"
+      });
+    } catch (e) {
+      // the process might have already stopped
+    }
+    return;
+  }
+
+  // In case of POSIX and `SIGINT` signal, send it to the main process group only.
+  if (signal === "SIGINT") {
+    try {
+      process.kill(-pid, "SIGINT");
+    } catch (e) {
+      // the process might have already stopped
+    }
+    return;
+  }
+
+  // In case of POSIX and `SIGKILL` signal, we should send it to all descendant process groups.
+  const rootProcess = buildProcessTreePosix(pid);
+  if (!rootProcess) return;
+
+  const descendantProcessGroups = (function flatten(
+    processData: ProcessData,
+    result: Set<number> = new Set()
+  ) {
+    // Process can nullify its own process group with `setpgid`. Use its PID instead.
+    result.add(processData.pgrp || processData.pid);
+    processData.children.forEach((child) => flatten(child, result));
+    return result;
+  })(rootProcess);
+  for (const pgrp of descendantProcessGroups) {
+    try {
+      process.kill(-pgrp, "SIGKILL");
+    } catch (e) {
+      // the process might have already stopped
+    }
+  }
+}
+
+export type CommonFixtures = {
+  childProcess: (params: TestChildParams) => TestChildProcess;
+  waitForPort: (port: number) => Promise<void>;
+  findFreePort: () => Promise<number>;
+};
+
+export type CommonWorkerFixtures = {
+  daemonProcess: (params: TestChildParams) => TestChildProcess;
+};
+
+export const commonFixtures: Fixtures<CommonFixtures, CommonWorkerFixtures> = {
+  childProcess: async ({}, use, testInfo) => {
+    const processes: TestChildProcess[] = [];
+    await use((params) => {
+      const process = new TestChildProcess(params);
+      processes.push(process);
+      return process;
+    });
+    await Promise.all(processes.map(async (child) => child.kill()));
+    if (
+      testInfo.status !== "passed" &&
+      testInfo.status !== "skipped" &&
+      !process.env.PWTEST_DEBUG
+    ) {
+      for (const process of processes) {
+        console.log("====== " + process.params.command.join(" "));
+        console.log(process.fullOutput.replace(/\x1Bc/g, ""));
+        console.log("=========================================");
+      }
+    }
+  },
+
+  daemonProcess: [
+    async ({}, use) => {
+      const processes: TestChildProcess[] = [];
+      await use((params) => {
+        const process = new TestChildProcess(params);
+        processes.push(process);
+        return process;
+      });
+      await Promise.all(processes.map((child) => child.kill("SIGINT")));
+    },
+    { scope: "worker" }
+  ],
+
+  waitForPort: async ({}, use) => {
+    const token = { canceled: false };
+    await use(async (port) => {
+      while (!token.canceled) {
+        const promise = new Promise<boolean>((resolve) => {
+          const conn = net
+            .connect(port, "127.0.0.1")
+            .on("error", () => resolve(false))
+            .on("connect", () => {
+              conn.end();
+              resolve(true);
+            });
+        });
+        if (await promise) return;
+        await new Promise((x) => setTimeout(x, 100));
+      }
+    });
+    token.canceled = true;
+  },
+
+  findFreePort: async ({}, use) => {
+    await use(async () => {
+      return new Promise((resolve, reject) => {
+        const server = net.createServer();
+        server.listen(0, "127.0.0.1", () => {
+          const { port } = server.address() as net.AddressInfo;
+          server.close(() => resolve(port));
+        });
+        server.on("error", reject);
+      });
+    });
+  }
+};
+
+export function countTimes(s: string, sub: string): number {
+  let result = 0;
+  for (let index = 0; index !== -1; ) {
+    index = s.indexOf(sub, index);
+    if (index !== -1) {
+      result++;
+      index += sub.length;
+    }
+  }
+  return result;
+}

apps/desktop/__tests__/electron-test/global-setup.ts

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { buildApp } from "./utils";
 
-export default async function setup() {
+export default async function globalSetup() {
+  console.log("Building the app...");
   await buildApp();
 }

apps/desktop/__tests__/electron-test/index.ts

@@ -0,0 +1,152 @@
+/*
+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/>.
+*/
+/* eslint-disable no-empty-pattern */
+
+import { AppContext, buildAndLaunchApp, TestOptions } from "./utils";
+import path from "path";
+import { version } from "../../package.json";
+import type { ElectronApplication, Page } from "@playwright/test";
+import type { TraceViewerFixtures } from "./trace-viewer-fixtures";
+import { traceViewerFixtures } from "./trace-viewer-fixtures";
+import { PageTestFixtures, PageWorkerFixtures } from "./page-test-api";
+import fs from "fs";
+import { tmpdir } from "os";
+import { baseTest } from "./base-test";
+
+export type ElectronTestFixtures = PageTestFixtures & {
+  electronApp: ElectronApplication;
+  launchElectronApp: (options?: TestOptions) => Promise<ElectronApplication>;
+  createUserDataDir: () => Promise<string>;
+  options: TestOptions;
+  newPage: () => Promise<Page>;
+};
+
+export type { Page, Browser } from "@playwright/test";
+export { expect } from "@playwright/test";
+export const test = baseTest
+  .extend<TraceViewerFixtures>(traceViewerFixtures)
+  .extend<ElectronTestFixtures, PageWorkerFixtures>({
+    browserVersion: [
+      ({}, use) => use(process.env.ELECTRON_CHROMIUM_VERSION!),
+      { scope: "worker" }
+    ],
+    browserMajorVersion: [
+      ({}, use) =>
+        use(Number(process.env.ELECTRON_CHROMIUM_VERSION!.split(".")[0])),
+      { scope: "worker" }
+    ],
+    electronMajorVersion: [
+      ({}, use) =>
+        use(
+          parseInt(require("electron/package.json").version.split(".")[0], 10)
+        ),
+      { scope: "worker" }
+    ],
+    isBidi: [false, { scope: "worker" }],
+    isAndroid: [false, { scope: "worker" }],
+    isElectron: [true, { scope: "worker" }],
+    isHeadlessShell: [false, { scope: "worker" }],
+    isFrozenWebkit: [false, { scope: "worker" }],
+
+    createUserDataDir: async ({}, run) => {
+      const dirs: string[] = [];
+      // We do not put user data dir in testOutputPath,
+      // because we do not want to upload them as test result artifacts.
+      await run(async () => {
+        const dir = await fs.promises.mkdtemp(
+          path.join(tmpdir(), "playwright-test-")
+        );
+        dirs.push(dir);
+        return dir;
+      });
+      await removeFolders(dirs);
+    },
+
+    launchElectronApp: async ({ createUserDataDir }, use) => {
+      // This env prevents 'Electron Security Policy' console message.
+      process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true";
+      const apps: AppContext[] = [];
+      await use(async (options?: TestOptions) => {
+        const userDataDir = await createUserDataDir();
+        const ctx = await buildAndLaunchApp(
+          userDataDir,
+          options || {
+            version,
+            config: {}
+          }
+        );
+        apps.push(ctx);
+        return ctx.app;
+      });
+      for (const ctx of apps) {
+        await ctx.app.close();
+      }
+      await removeFolders(apps.map((ctx) => ctx.outputDir));
+    },
+
+    electronApp: async ({ launchElectronApp, options }, use) => {
+      await use(await launchElectronApp(options));
+    },
+
+    page: async ({ electronApp, viewport }, run) => {
+      const page = await electronApp.firstWindow();
+      if (viewport) {
+        await page.setViewportSize(viewport);
+        await electronApp.evaluate((p, viewport) => {
+          const mainWindow = p.BrowserWindow.getAllWindows()[0];
+          mainWindow.setSize(viewport.width, viewport.height);
+        }, viewport);
+      }
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      page.context().app = electronApp;
+      await run(page);
+    },
+
+    context: async ({ electronApp }, run) => {
+      await run(electronApp.context());
+    },
+
+    newPage: async ({ launchElectronApp, options }, use) => {
+      await use(async () => {
+        const app = await launchElectronApp(options);
+        return app.firstWindow();
+      });
+    },
+
+    options: async ({}, use) => {
+      await use({
+        version,
+        config: {}
+      });
+    }
+  });
+
+async function removeFolders(folders: string[]) {
+  await Promise.all(
+    folders.map((folder) =>
+      fs.promises.rm(folder, {
+        force: true,
+        recursive: true,
+        maxRetries: 3,
+        retryDelay: 5000
+      })
+    )
+  );
+}

apps/desktop/__tests__/electron-test/page-test-api.ts

@@ -0,0 +1,58 @@
+/* eslint-disable header/header */
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Browser, Page, ViewportSize } from "playwright-core";
+import type {
+  PageScreenshotOptions,
+  ScreenshotMode,
+  VideoMode
+} from "@playwright/test";
+export { expect } from "@playwright/test";
+
+// Page test does not guarantee an isolated context, just a new page (because Android).
+export type PageTestFixtures = {
+  page: Page;
+};
+
+export type PageWorkerFixtures = {
+  headless: boolean;
+  channel: string | undefined;
+  screenshot:
+    | ScreenshotMode
+    | ({ mode: ScreenshotMode } & Pick<
+        PageScreenshotOptions,
+        "fullPage" | "omitBackground"
+      >);
+  trace:
+    | "off"
+    | "on"
+    | "retain-on-failure"
+    | "on-first-retry"
+    | "retain-on-first-failure"
+    | "on-all-retries"
+    | /** deprecated */ "retry-with-trace";
+  video: VideoMode | { mode: VideoMode; size: ViewportSize };
+  browserName: "chromium" | "firefox" | "webkit";
+  browserVersion: string;
+  browserMajorVersion: number;
+  electronMajorVersion: number;
+  isBidi: boolean;
+  isAndroid: boolean;
+  isElectron: boolean;
+  isHeadlessShell: boolean;
+  isFrozenWebkit: boolean;
+};

apps/desktop/__tests__/electron-test/platform-fixtures.ts

@@ -0,0 +1,47 @@
+/* eslint-disable header/header */
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { test } from "@playwright/test";
+import os from "os";
+
+export type PlatformWorkerFixtures = {
+  platform: "win32" | "darwin" | "linux";
+  isWindows: boolean;
+  isMac: boolean;
+  isLinux: boolean;
+  macVersion: number; // major only, 11 or later, zero if not mac
+};
+
+function platform(): "win32" | "darwin" | "linux" {
+  if (process.env.PLAYWRIGHT_SERVICE_OS === "linux") return "linux";
+  if (process.env.PLAYWRIGHT_SERVICE_OS === "windows") return "win32";
+  if (process.env.PLAYWRIGHT_SERVICE_OS === "macos") return "darwin";
+  return process.platform as "win32" | "darwin" | "linux";
+}
+
+function macVersion() {
+  if (process.platform !== "darwin") return 0;
+  return +os.release().split(".")[0] - 9;
+}
+
+export const platformTest = test.extend<{}, PlatformWorkerFixtures>({
+  platform: [platform(), { scope: "worker" }],
+  isWindows: [platform() === "win32", { scope: "worker" }],
+  isMac: [platform() === "darwin", { scope: "worker" }],
+  isLinux: [platform() === "linux", { scope: "worker" }],
+  macVersion: [macVersion(), { scope: "worker" }]
+});

apps/desktop/__tests__/electron-test/playwright-utils.ts

@@ -17,9 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { SQLite } from "@notesnook/desktop";
-import { expose } from "comlink";
-
-export type SQLiteWorker = typeof SQLite.prototype;
-const db = new SQLite();
-expose(db);
+const ansiRegex = new RegExp(
+  "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))",
+  "g"
+);
+export function stripAnsi(str: string): string {
+  return str.replace(ansiRegex, "");
+}

apps/desktop/__tests__/electron-test/test-mode-fixtures.ts

@@ -0,0 +1,75 @@
+/*
+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 "@playwright/test";
+import type { TestModeName } from "./test-mode";
+import { DefaultTestMode, DriverTestMode } from "./test-mode";
+
+export type TestModeWorkerOptions = {
+  mode: TestModeName;
+};
+
+export type TestModeTestFixtures = {
+  toImpl: (rpcObject?: any) => any;
+};
+
+export type TestModeWorkerFixtures = {
+  toImplInWorkerScope: (rpcObject?: any) => any;
+  playwright: typeof import("@playwright/test");
+};
+
+export const testModeTest = test.extend<
+  TestModeTestFixtures,
+  TestModeWorkerOptions & TestModeWorkerFixtures
+>({
+  mode: ["default", { scope: "worker", option: true }],
+  playwright: [
+    async ({ mode }, run) => {
+      const testMode = {
+        default: new DefaultTestMode(),
+        service: new DefaultTestMode(),
+        service2: new DefaultTestMode(),
+        "service-grid": new DefaultTestMode(),
+        wsl: new DefaultTestMode(),
+        driver: new DriverTestMode()
+      }[mode];
+      const playwright = await testMode.setup();
+      await run(playwright);
+      await testMode.teardown();
+    },
+    { scope: "worker" }
+  ],
+
+  toImplInWorkerScope: [
+    async ({ playwright }, use) => {
+      await use((playwright as any)._connection.toImpl);
+    },
+    { scope: "worker" }
+  ],
+
+  toImpl: async (
+    { toImplInWorkerScope: toImplWorker, mode },
+    use,
+    testInfo
+  ) => {
+    if (mode !== "default" || process.env.PW_TEST_REUSE_CONTEXT)
+      testInfo.skip();
+    await use(toImplWorker);
+  }
+});

apps/desktop/__tests__/electron-test/test-mode.ts

@@ -0,0 +1,52 @@
+/* eslint-disable header/header */
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+/// @ts-ignore
+import { oop, client } from "playwright-core/lib/coreBundle";
+
+export type TestModeName = "default" | "driver";
+
+const { start } = oop;
+
+interface TestMode {
+  setup(): Promise<client.Playwright>;
+  teardown(): Promise<void>;
+}
+
+export class DriverTestMode implements TestMode {
+  private _impl: { playwright: client.Playwright; stop: () => Promise<void> };
+
+  async setup() {
+    this._impl = await start({
+      NODE_OPTIONS: undefined // Hide driver process while debugging.
+    });
+    return this._impl.playwright;
+  }
+
+  async teardown() {
+    await this._impl.stop();
+  }
+}
+
+export class DefaultTestMode implements TestMode {
+  async setup() {
+    return require("playwright-core");
+  }
+
+  async teardown() {}
+}

apps/desktop/__tests__/electron-test/trace-viewer-fixtures.ts

@@ -0,0 +1,243 @@
+/* eslint-disable header/header */
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type {
+  Fixtures,
+  FrameLocator,
+  Locator,
+  Page,
+  Browser,
+  BrowserContext
+} from "@playwright/test";
+import { step } from "./base-test";
+import path from "path";
+import { CommonFixtures, TestChildProcess } from "./common-fixtures";
+
+type BaseTestFixtures = CommonFixtures & {
+  context: BrowserContext;
+};
+
+type BaseWorkerFixtures = {
+  headless: boolean;
+  browser: Browser;
+  browserName: "chromium" | "firefox" | "webkit";
+  playwright: typeof import("@playwright/test");
+};
+
+export type TraceViewerFixtures = {
+  showTraceViewer: (
+    trace: string | undefined,
+    options?: { host?: string; port?: number; stdin?: boolean }
+  ) => Promise<TraceViewerPage>;
+  runAndTrace: (
+    body: () => Promise<void>,
+    optsOverrides?: Parameters<BrowserContext["tracing"]["start"]>[0]
+  ) => Promise<TraceViewerPage>;
+};
+
+class TraceViewerPage {
+  actionTitles: Locator;
+  actionsTree: Locator;
+  callLines: Locator;
+  consoleLines: Locator;
+  logLines: Locator;
+  errorMessages: Locator;
+  consoleLineMessages: Locator;
+  consoleStacks: Locator;
+  networkRequests: Locator;
+  metadataTab: Locator;
+  snapshotContainer: Locator;
+  sourceCodeTab: Locator;
+  networkTab: Locator;
+
+  settingsDialog: Locator;
+  themeSetting: Locator;
+  displayCanvasContentSetting: Locator;
+
+  constructor(public page: Page, public process: TestChildProcess) {
+    this.actionTitles = page.locator(".action-title");
+    this.actionsTree = page.getByTestId("actions-tree");
+    this.callLines = page.locator(".call-tab .call-line");
+    this.logLines = page
+      .getByRole("list", { name: "Log entries" })
+      .getByRole("listitem");
+    this.consoleLines = page
+      .getByRole("tabpanel", { name: "Console" })
+      .getByRole("listitem");
+    this.consoleLineMessages = page.locator(".console-line-message");
+    this.errorMessages = page.locator(".error-message");
+    this.consoleStacks = page.locator(".console-stack");
+    this.networkRequests = page
+      .getByRole("list", { name: "Network requests" })
+      .getByRole("listitem");
+    this.snapshotContainer = page.locator(
+      ".snapshot-container iframe.snapshot-visible[name=snapshot]"
+    );
+    this.metadataTab = page.getByRole("tabpanel", { name: "Metadata" });
+    this.sourceCodeTab = page.getByRole("tabpanel", { name: "Source" });
+    this.networkTab = page.getByRole("tabpanel", { name: "Network" });
+
+    this.settingsDialog = page.getByTestId("settings-toolbar-dialog");
+    this.themeSetting = this.settingsDialog.getByRole("combobox", {
+      name: "Theme"
+    });
+    this.displayCanvasContentSetting = page
+      .locator(".setting")
+      .getByText("Display canvas content");
+  }
+
+  @step
+  async showAllActions() {
+    await this.page.getByRole("button", { name: "Filter actions" }).click();
+    await this.page.locator(".setting").getByText("Network routes").click();
+    await this.page.locator(".setting").getByText("Getters").click();
+    await this.page.locator(".setting").getByText("Configuration").click();
+    await this.page.getByRole("button", { name: "Filter actions" }).click();
+  }
+
+  stackFrames(options: { selected?: boolean } = {}) {
+    const entry = this.page
+      .getByRole("list", { name: "Stack trace" })
+      .getByRole("listitem");
+    if (options.selected) return entry.locator(":scope.selected");
+    return entry;
+  }
+
+  actionIconsText(action: string) {
+    const entry = this.actionsTree.getByRole("treeitem", { name: action });
+    return entry.locator(".action-icon-value").filter({ visible: true });
+  }
+
+  actionIcons(action: string) {
+    return this.actionsTree
+      .getByRole("treeitem", { name: action })
+      .locator(".action-icons")
+      .filter({ visible: true });
+  }
+
+  @step
+  async expandAction(title: string) {
+    await this.actionsTree
+      .getByRole("treeitem", { name: title })
+      .locator(".codicon-chevron-right")
+      .click();
+  }
+
+  @step
+  async selectAction(title: string, ordinal: number = 0) {
+    await this.actionsTree.getByTitle(title).nth(ordinal).click();
+  }
+
+  @step
+  async hoverAction(title: string, ordinal: number = 0) {
+    await this.actionsTree
+      .getByRole("treeitem", { name: title })
+      .nth(ordinal)
+      .hover();
+  }
+
+  @step
+  async selectSnapshot(name: string) {
+    await this.page.getByRole("tab", { name }).click();
+  }
+
+  async showErrorsTab() {
+    await this.page.getByRole("tab", { name: "Errors" }).click();
+  }
+
+  async showConsoleTab() {
+    await this.page.getByRole("tab", { name: "Console" }).click();
+  }
+
+  async showSourceTab() {
+    await this.page.getByRole("tab", { name: "Source" }).click();
+  }
+
+  async showNetworkTab() {
+    await this.page.getByRole("tab", { name: "Network" }).click();
+  }
+
+  async showMetadataTab() {
+    await this.page.getByRole("tab", { name: "Metadata" }).click();
+  }
+
+  async showSettings() {
+    await this.page.getByRole("button", { name: "Settings" }).click();
+  }
+
+  @step
+  async snapshotFrame(
+    actionName: string,
+    ordinal: number = 0,
+    hasSubframe: boolean = false
+  ): Promise<FrameLocator> {
+    await this.selectAction(actionName, ordinal);
+    while (this.page.frames().length < (hasSubframe ? 4 : 3))
+      await this.page.waitForEvent("frameattached");
+    return this.page.frameLocator("iframe.snapshot-visible[name=snapshot]");
+  }
+}
+
+export const traceViewerFixtures: Fixtures<
+  TraceViewerFixtures,
+  {},
+  BaseTestFixtures,
+  BaseWorkerFixtures
+> = {
+  showTraceViewer: async ({ playwright, childProcess, browserName }, use) => {
+    const browsers: Browser[] = [];
+    await use(async (trace: string | undefined, { host, port, stdin } = {}) => {
+      const command = [
+        "node",
+        path.join(__dirname, "../../node_modules/playwright-core/cli.js"),
+        "show-trace",
+        "--port",
+        "" + (port ?? "0")
+      ];
+      if (host) command.push("--host", host);
+      if (stdin) command.push("--stdin");
+      if (trace) command.push(trace);
+      const cp = childProcess({ command });
+      await cp.waitForOutput("Listening on");
+      const browser = await playwright.chromium.launch({
+        ...(browserName === "chromium" ? {} : { channel: "chromium" }),
+        executablePath: process.env.CRPATH // without this, setting FFPATH makes us launch Firefox with Chromium args
+      });
+      browsers.push(browser);
+      const page = await browser.newPage();
+      const url = cp.output.match(/Listening on (http:\/\/[^\s]+)/)![1];
+      await page.goto(url);
+      return new TraceViewerPage(page, cp);
+    });
+    for (const browser of browsers) await browser.close();
+  },
+
+  runAndTrace: async ({ context, showTraceViewer }, use, testInfo) => {
+    await use(async (body: () => Promise<void>, optsOverrides = {}) => {
+      const traceFile = testInfo.outputPath("trace.zip");
+      await context.tracing.start({
+        snapshots: true,
+        screenshots: true,
+        sources: true,
+        ...optsOverrides
+      });
+      await body();
+      await context.tracing.stop({ path: traceFile });
+      return showTraceViewer(traceFile);
+    });
+  }
+};

apps/desktop/__tests__/electron-test/utils.ts

@@ -19,21 +19,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { execSync } from "child_process";
 import { cp } from "fs/promises";
-import { fileURLToPath } from "node:url";
 import path, { join, resolve } from "path";
-import { _electron as electron } from "playwright";
+import {
+  _electron as electron,
+  ElectronApplication,
+  Page
+} from "@playwright/test";
 import { existsSync } from "fs";
+import { mkdir, writeFile } from "node:fs/promises";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
 const IS_DEBUG = process.env.NN_DEBUG === "true" || process.env.CI === "true";
 const productName = `NotesnookTestHarness`;
-const SOURCE_DIR = resolve("output", productName);
+const root = path.resolve(__dirname, "..", "..");
+const SOURCE_DIR = resolve(root, "output", productName);
 
 export interface AppContext {
-  app: import("playwright").ElectronApplication;
-  page: import("playwright").Page;
-  configPath: string;
+  app: ElectronApplication;
   userDataDir: string;
   outputDir: string;
   relaunch: () => Promise<void>;
@@ -41,6 +42,8 @@ export interface AppContext {
 
 export interface TestOptions {
   version: string;
+  args?: string[];
+  config?: Record<string, unknown>;
 }
 
 export interface Fixtures {
@@ -49,35 +52,43 @@ export interface Fixtures {
 }
 
 export async function buildAndLaunchApp(
+  userDataDir: string,
   options?: TestOptions
 ): Promise<AppContext> {
+  await buildApp(options?.version);
+
   const productName = `notesnooktest${makeid(10)}`;
-  const outputDir = path.join("test-artifacts", `${productName}-output`);
+  const outputDir = path.join(root, "test-artifacts", `${productName}-output`);
   const executablePath = await copyBuild({
     ...options,
     outputDir
   });
-  const { app, page, configPath, userDataDir } = await launchApp(
+
+  const configPath = path.join(userDataDir, "UserData", "config.json");
+  if (options?.config) {
+    await mkdir(path.dirname(configPath), { recursive: true });
+    await writeFile(configPath, JSON.stringify(options.config));
+  }
+
+  const { app } = await launchApp(
     executablePath,
-    productName,
-    options?.version
+    userDataDir,
+    options?.version,
+    options?.args
   );
   const ctx: AppContext = {
     app,
-    page,
-    configPath,
     userDataDir,
     outputDir,
     relaunch: async () => {
-      const { app, page, configPath, userDataDir } = await launchApp(
+      const { app } = await launchApp(
         executablePath,
-        productName,
-        options?.version
+        userDataDir,
+        options?.version,
+        options?.args
       );
       ctx.app = app;
-      ctx.page = page;
       ctx.userDataDir = userDataDir;
-      ctx.configPath = configPath;
     }
   };
   return ctx;
@@ -85,19 +96,15 @@ export async function buildAndLaunchApp(
 
 async function launchApp(
   executablePath: string,
-  packageName: string,
-  version?: string
+  userDataDir: string,
+  version?: string,
+  args: string[] = []
 ) {
-  const userDataDir = resolve(
-    __dirname,
-    "..",
-    "test-artifacts",
-    "user_data_dirs",
-    packageName
-  );
   const app = await electron.launch({
     executablePath,
-    args: IS_DEBUG ? [] : ["--hidden"],
+    args: IS_DEBUG ? [...args] : ["--hidden", ...args],
+    baseURL: "https://app.notesnook.com",
+    acceptDownloads: true,
     env: {
       ...(process.platform === "linux"
         ? {
@@ -114,20 +121,28 @@ async function launchApp(
     }
   });
 
-  const page = await app.firstWindow();
-
-  const configPath = path.join(userDataDir, "UserData", "config.json");
   return {
     app,
-    page,
-    configPath,
     userDataDir
   };
 }
 
+export function getAppFromPage(page: Page) {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  return page.context().app as ElectronApplication;
+}
+
 let MAX_RETRIES = 3;
 export async function buildApp(version?: string) {
   if (!existsSync(SOURCE_DIR)) {
+    execSync(
+      `node ${path.join(root, "scripts", "build.mjs")} --test --rebuild`,
+      {
+        stdio: IS_DEBUG ? "inherit" : "ignore"
+      }
+    );
+
     const args = [
       "electron-builder",
       "--dir",
@@ -143,6 +158,7 @@ export async function buildApp(version?: string) {
         stdio: IS_DEBUG ? "inherit" : "ignore",
         env: {
           ...process.env,
+          CSC_IDENTITY_AUTO_DISCOVERY: "false",
           NOTESNOOK_STAGING: "true",
           NN_PRODUCT_NAME: productName,
           NN_APP_ID: `com.notesnook.test.${productName}`,
@@ -151,7 +167,7 @@ export async function buildApp(version?: string) {
       });
     } catch (e) {
       if (--MAX_RETRIES) {
-        console.log("retrying...");
+        console.log("retrying...", e);
         return await buildApp(version);
       } else throw e;
     }
@@ -189,8 +205,7 @@ async function makeBuildCopyMacOS(outputDir: string, productName: string) {
   const platformDir = process.arch === "arm64" ? "mac-arm64" : "mac";
   const appDir = await makeBuildCopy(outputDir, platformDir);
   return resolve(
-    __dirname,
-    "..",
+    root,
     appDir,
     `${productName}.app`,
     "Contents",

apps/desktop/__tests__/launch.test.ts

@@ -17,24 +17,65 @@ 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 { testCleanup, test } from "./test-override.js";
+import { test, expect } from "@nn/test";
+import type { ElectronApplication } from "@playwright/test";
 
-test("make sure app loads", async ({
-  ctx: { page },
-  expect,
-  onTestFinished
-}) => {
-  onTestFinished(testCleanup);
-
-  await page.waitForSelector("#authForm");
-
-  expect(
-    await page.getByRole("button", { name: "Create account" }).isVisible()
-  ).toBe(true);
-
-  await page
-    .getByRole("button", { name: "Skip & go directly to the app" })
-    .click();
+async function getMainWindowState(app: ElectronApplication) {
+  return await app.evaluate((window) => {
+    const { BrowserWindow } = window;
+    const mainWindow = BrowserWindow.getAllWindows()[0];
+    if (!mainWindow) throw new Error("Main window not found");
+    return {
+      isMinimized: mainWindow.isMinimized(),
+      isVisible: mainWindow.isVisible()
+    };
+  });
+}
 
+test("make sure app loads", async ({ page }) => {
   await page.waitForSelector(".ProseMirror");
 });
+
+test("hidden launch minimizes when tray is disabled", async ({
+  launchElectronApp,
+  options
+}) => {
+  const app = await launchElectronApp({
+    version: options.version,
+    args: ["--hidden"],
+    config: {
+      desktopSettings: {
+        minimizeToSystemTray: false,
+        closeToSystemTray: false
+      }
+    }
+  });
+
+  const page = await app.firstWindow();
+  await page.waitForSelector(".ProseMirror");
+
+  const state = await getMainWindowState(app);
+  expect(state.isMinimized).toBe(true);
+});
+
+test("hidden launch does not minimize when close-to-tray is enabled", async ({
+  launchElectronApp,
+  options
+}) => {
+  const app = await launchElectronApp({
+    version: options.version,
+    args: ["--hidden"],
+    config: {
+      desktopSettings: {
+        minimizeToSystemTray: false,
+        closeToSystemTray: true
+      }
+    }
+  });
+
+  const page = await app.firstWindow();
+  await page.waitForSelector(".ProseMirror");
+
+  const state = await getMainWindowState(app);
+  expect(state.isMinimized).toBe(false);
+});

apps/desktop/__tests__/test-override.ts

@@ -1,64 +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 as vitestTest, TestContext } from "vitest";
-import { buildAndLaunchApp, Fixtures, TestOptions } from "./utils";
-import { mkdir, rm } from "fs/promises";
-import path from "path";
-import slugify from "slugify";
-
-export const test = vitestTest.extend<Fixtures>({
-  options: { version: "3.0.0" } as TestOptions,
-  ctx: async ({ options }, use) => {
-    const ctx = await buildAndLaunchApp(options);
-    await use(ctx);
-  }
-});
-
-export async function testCleanup(context: TestContext) {
-  const ctx = (context.task.context as unknown as Fixtures).ctx;
-  if (context.task.result?.state === "fail") {
-    await mkdir("test-results", { recursive: true });
-    await ctx.page.screenshot({
-      path: path.join(
-        "test-results",
-        `${slugify(context.task.name)}-${process.platform}-${
-          process.arch
-        }-error.png`
-      )
-    });
-  }
-  await ctx.app.close();
-  await rm(ctx.userDataDir, {
-    force: true,
-    recursive: true,
-    maxRetries: 3,
-    retryDelay: 5000
-  }).catch(() => {
-    /*ignore */
-  });
-  await rm(ctx.outputDir, {
-    force: true,
-    recursive: true,
-    maxRetries: 3,
-    retryDelay: 5000
-  }).catch(() => {
-    /*ignore */
-  });
-}

apps/desktop/__tests__/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "noEmit": true,
+    "lib": ["ESNext"],
+    "moduleResolution": "Bundler",
+    "paths": {
+      "@nn/test": ["./electron-test/index.ts"]
+    }
+  }
+}

apps/desktop/electron-builder.config.js

@@ -96,6 +96,7 @@ module.exports = {
     "node_modules/sodium-native/package.json"
   ],
   afterPack: "./scripts/removeLocales.js",
+  protocols: [{ name: "Notesnook", schemes: ["nn"] }],
   mac: {
     bundleVersion: "240",
     minimumSystemVersion: "10.12.0",
@@ -181,6 +182,7 @@ module.exports = {
     icon: "assets/icons/app.icns",
     description: "Your private note taking space",
     executableName: linuxExecutableName,
+    mimeTypes: ["x-scheme-handler/nn"],
     desktop: {
       desktopActions: {
         "new-note": {
@@ -201,11 +203,12 @@ module.exports = {
   toolsets: {
     appimage: "1.0.2"
   },
-  snap: {
-    autoStart: false,
-    confinement: "strict",
-    allowNativeWayland: true,
-    base: "core22"
+  snapcraft: {
+    base: "core24",
+    core24: {
+      confinement: "strict",
+      autoStart: false
+    }
   },
   extraResources: ["app-update.yml", "./assets/**"],
   extraMetadata: {

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.3.20",
+  "version": "3.4.5",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",
@@ -21,6 +21,17 @@
         "types": "./dist/types/index.d.ts",
         "default": "./dist/esm/index.js"
       }
+    },
+    "./testutils": "./__tests__/test-override.ts",
+    "./*": {
+      "require": {
+        "types": "./dist/types/*",
+        "default": "./dist/cjs/*"
+      },
+      "import": {
+        "types": "./dist/types/*",
+        "default": "./dist/esm/*"
+      }
     }
   },
   "homepage": "https://notesnook.com/",
@@ -43,16 +54,18 @@
     "zod": "3.24.3"
   },
   "devDependencies": {
+    "@playwright/test": "1.61.1",
     "@streetwriters/kysely": "^0.27.4",
     "@types/node": "22.15.3",
     "@types/yargs": "^17.0.33",
     "chokidar": "^4.0.3",
-    "electron": "^37.0.0",
+    "electron": "^37.10.3",
     "electron-builder": "^26.8.1",
     "esbuild": "0.21.5",
+    "fkill": "^10.0.3",
     "node-abi": "^4.5.0",
     "node-gyp-build": "^4.8.4",
-    "playwright": "1.48.2",
+    "playwright-core": "1.61.1",
     "prebuildify": "^6.0.1",
     "slugify": "1.6.6",
     "tree-kill": "^1.2.2",
@@ -73,7 +86,7 @@
     "bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --external:better-sqlite3-multiple-ciphers --external:sodium-native --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": "vitest run"
+    "test": "playwright test --tsconfig __tests__/tsconfig.json --project notesnook-desktop"
   },
   "author": {
     "name": "Streetwriters (Private) Limited",

apps/desktop/patches/@playwright+test++playwright-core+1.61.1.patch

@@ -0,0 +1,24 @@
+diff --git a/node_modules/@playwright/test/node_modules/playwright-core/lib/coreBundle.js b/node_modules/@playwright/test/node_modules/playwright-core/lib/coreBundle.js
+index 7d8468f..ab252ef 100644
+--- a/node_modules/@playwright/test/node_modules/playwright-core/lib/coreBundle.js
++++ b/node_modules/@playwright/test/node_modules/playwright-core/lib/coreBundle.js
+@@ -16010,6 +16010,7 @@ var init_validator = __esm({
+       args: tOptional(tArray(tString)),
+       chromiumSandbox: tOptional(tBoolean),
+       cwd: tOptional(tString),
++      baseURL: tOptional(tString),
+       env: tOptional(tArray(tType("NameValue"))),
+       timeout: tFloat,
+       acceptDownloads: tOptional(tEnum(["accept", "deny", "internal-browser-default"])),
+diff --git a/node_modules/@playwright/test/node_modules/playwright-core/types/types.d.ts b/node_modules/@playwright/test/node_modules/playwright-core/types/types.d.ts
+index 0bff9d3..d195697 100644
+--- a/node_modules/@playwright/test/node_modules/playwright-core/types/types.d.ts
++++ b/node_modules/@playwright/test/node_modules/playwright-core/types/types.d.ts
+@@ -21813,6 +21813,7 @@ export interface Electron {
+      * Additional arguments to pass to the application when launching. You typically pass the main script name here.
+      */
+     args?: Array<string>;
++    baseURL?: string;
+ 
+     /**
+      * If specified, artifacts (traces, videos, downloads, HAR files, etc.) are saved into this directory. The directory

apps/desktop/playwright.config.ts

@@ -0,0 +1,92 @@
+/* eslint-disable header/header */
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type {
+  Config,
+  PlaywrightTestOptions,
+  PlaywrightWorkerOptions
+} from "@playwright/test";
+import * as path from "path";
+
+process.env.PWPAGE_IMPL = "electron";
+process.env.TEST_DESKTOP = "true";
+const outputDir = path.join(__dirname, "test-results");
+const testDir = path.join(__dirname, "__tests__");
+const config: Config<PlaywrightWorkerOptions & PlaywrightTestOptions> = {
+  testDir,
+  outputDir,
+  expect: {
+    timeout: 10000
+  },
+  use: {
+    acceptDownloads: true,
+    trace: "retain-on-failure",
+    screenshot: "only-on-failure",
+    video: "retry-with-video",
+    viewport: {
+      width: 1920,
+      height: 1080
+    }
+  },
+  timeout: 60000,
+  globalTimeout: 5400000,
+  workers: process.env.CI ? 1 : undefined,
+  forbidOnly: !!process.env.CI,
+  retries: process.env.CI ? 1 : 0,
+  reporter: process.env.CI
+    ? [["dot"], ["json", { outputFile: path.join(outputDir, "report.json") }]]
+    : "line",
+  projects: [],
+  globalSetup: "./__tests__/electron-test/global-setup.ts"
+};
+
+const metadata = {
+  platform: process.platform,
+  headless: "headed",
+  browserName: "electron",
+  channel: undefined,
+  mode: "default",
+  video: false
+};
+
+config.projects?.push({
+  name: "notesnook-desktop",
+  // Share screenshots with chromium.
+  snapshotPathTemplate:
+    "{testDir}/{testFileDir}/{testFileName}-snapshots/{arg}-electron{ext}",
+  use: {
+    browserName: "chromium",
+    headless: false
+  },
+  testDir: "__tests__",
+  metadata
+});
+
+config.projects?.push({
+  name: "notesnook-web",
+  // Share screenshots with chromium.
+  snapshotPathTemplate:
+    "{testDir}/{testFileDir}/{testFileName}-snapshots/{arg}-electron{ext}",
+  use: {
+    browserName: "chromium",
+    headless: false
+  },
+  testDir: path.resolve(__dirname, "../web/__e2e__"),
+  metadata
+});
+
+export default config;

apps/desktop/scripts/build.mjs

@@ -33,6 +33,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const root = args.root || path.join(__dirname, "..");
 const skipTscBuild = args.skipTscBuild || false;
+const buildForTesting = args.test || false;
 
 const webAppPath = path.resolve(path.join(__dirname, "..", "..", "web"));
 
@@ -51,7 +52,11 @@ console.log("removed build folder");
 if (args.rebuild || !existsSync(path.join(webAppPath, "build"))) {
   console.log("rebuilding...");
   await exec(
-    "node scripts/execute.mjs @notesnook/web:build:desktop",
+    `node scripts/execute.mjs ${
+      buildForTesting
+        ? "@notesnook/web:build:test:desktop"
+        : "@notesnook/web:build:desktop"
+    }`,
     path.join(__dirname, "..", "..", "..")
   );
 }

apps/desktop/src/api/backups.ts

@@ -0,0 +1,108 @@
+/*
+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 { initTRPC } from "@trpc/server";
+import { createWriteStream, mkdirSync } from "node:fs";
+import path from "node:path";
+import { z } from "zod";
+import { config } from "../utils/config";
+import { resolvePath } from "../utils/resolve-path";
+import { app } from "electron";
+
+const t = initTRPC.create();
+
+const activeStreams = new Map<string, NodeJS.WritableStream>();
+
+function generateId() {
+  return Math.random().toString(36).slice(2);
+}
+
+function getStreamOrThrow(id: string, operation: "write" | "close") {
+  const stream = activeStreams.get(id);
+  if (!stream) {
+    throw new Error(
+      `Backup stream not found during ${operation}. The stream may have already been closed or was never opened. Stream id: ${id}`
+    );
+  }
+  return stream;
+}
+
+export const backupsRouter = t.router({
+  open: t.procedure
+    .input(z.object({ filename: z.string() }))
+    .mutation(({ input }) => {
+      const { filename } = input;
+      if (!filename.trim()) {
+        throw new Error("Invalid backup filename: filename cannot be empty.");
+      }
+      if (filename.includes(path.sep) || filename.includes("\\"))
+        throw new Error(
+          `Invalid backup filename: expected a plain file name without path separators, received "${filename}".`
+        );
+      const resolvedBackupDir = resolvePath(config.backupDirectory);
+      const backupPath = path.resolve(resolvedBackupDir, filename);
+      const relativeBackupPath = path.relative(resolvedBackupDir, backupPath);
+      if (
+        relativeBackupPath.startsWith("..") ||
+        path.isAbsolute(relativeBackupPath)
+      )
+        throw new Error(
+          `Invalid backup filename: resolved path "${backupPath}" is outside the configured backup directory "${resolvedBackupDir}". The configured backup directory may be invalid.`
+        );
+
+      mkdirSync(resolvedBackupDir, { recursive: true });
+      const stream = createWriteStream(backupPath, { encoding: "utf-8" });
+      const id = generateId();
+      activeStreams.set(id, stream);
+      return id;
+    }),
+
+  write: t.procedure
+    .input(z.object({ id: z.string(), chunk: z.string() }))
+    .mutation(({ input }) => {
+      const stream = getStreamOrThrow(input.id, "write");
+      return new Promise<void>((resolve, reject) => {
+        stream.write(Buffer.from(input.chunk, "base64"), (err) =>
+          err ? reject(err) : resolve()
+        );
+      });
+    }),
+
+  close: t.procedure
+    .input(z.object({ id: z.string() }))
+    .mutation(({ input }) => {
+      const stream = getStreamOrThrow(input.id, "close");
+      return new Promise<void>((resolve) => {
+        stream.end(() => {
+          activeStreams.delete(input.id);
+          resolve();
+        });
+      });
+    })
+});
+
+app.on("before-quit", () => {
+  try {
+    for (const stream of activeStreams.values()) {
+      stream.end();
+    }
+  } catch {
+    // ignore
+  }
+});

apps/desktop/src/api/bridge.ts

@@ -24,21 +24,43 @@ import TypedEventEmitter from "typed-emitter";
 
 export type AppEvents = {
   onCreateItem(name: "note" | "notebook" | "reminder"): void;
+  onOpenLink(url: string): void;
+  bridgeReady(): void;
 };
-
-const emitter = new EventEmitter();
-const typedEmitter = emitter as TypedEventEmitter<AppEvents>;
+let isBridgeReady = false;
+const pendingEvents: { name: string; args: unknown[] }[] = [];
+const _emitter = new EventEmitter();
+const emitter = _emitter as TypedEventEmitter<AppEvents>;
 const t = initTRPC.create();
 
 export const bridgeRouter = t.router({
-  onCreateItem: createSubscription("onCreateItem")
+  onCreateItem: createSubscription("onCreateItem"),
+  onOpenLink: createSubscription("onOpenLink"),
+  ready: t.procedure.query(() => {
+    isBridgeReady = true;
+    if (pendingEvents.length > 0) {
+      console.log(
+        "Emitting pending events",
+        pendingEvents.map((e) => e.name)
+      );
+      pendingEvents.forEach((event) => {
+        emitter.emit(event.name as any, ...(event.args as any[]));
+      });
+      pendingEvents.length = 0;
+    }
+    return true;
+  })
 });
 
 export const bridge: AppEvents = new Proxy({} as AppEvents, {
   get(_t, name) {
     if (typeof name === "symbol") return;
     return (...args: unknown[]) => {
-      emitter.emit(name, ...args);
+      if (!isBridgeReady) {
+        pendingEvents.push({ name, args });
+        return;
+      }
+      _emitter.emit(name, ...args);
     };
   }
 });
@@ -49,9 +71,9 @@ function createSubscription<TName extends keyof AppEvents>(eventName: TName) {
       const listener: AppEvents[TName] = (...args: any[]) => {
         emit.next(args[0]);
       };
-      typedEmitter.addListener(eventName, listener);
+      emitter.addListener(eventName, listener);
       return () => {
-        typedEmitter.removeListener(eventName, listener);
+        emitter.removeListener(eventName, listener);
       };
     });
   });

apps/desktop/src/api/index.ts

@@ -25,6 +25,8 @@ import { updaterRouter } from "./updater";
 import { bridgeRouter } from "./bridge";
 import { safeStorageRouter } from "./safe-storage";
 import { windowRouter } from "./window";
+import { sqliteRouter } from "./sqlite-kysely";
+import { backupsRouter } from "./backups";
 
 const t = initTRPC.create();
 
@@ -35,10 +37,13 @@ export const router = t.router({
   updater: updaterRouter,
   bridge: bridgeRouter,
   safeStorage: safeStorageRouter,
-  window: windowRouter
+  window: windowRouter,
+  sqlite: sqliteRouter,
+  backups: backupsRouter
 });
 
-export const api = router.createCaller({});
+const createCaller = t.createCallerFactory(router);
+export const api = createCaller({});
 
 // Export type router type signature,
 // NOT the router itself.

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

@@ -24,7 +24,6 @@ import {
   dialog,
   Menu,
   MenuItem,
-  nativeImage,
   nativeTheme,
   Notification,
   shell
@@ -33,17 +32,16 @@ import { AutoLaunch } from "../utils/autolaunch";
 import { config, DesktopIntegration } from "../utils/config";
 import { bringToFront } from "../utils/bring-to-front";
 import { getTheme, setTheme, Theme } from "../utils/theme";
-import { existsSync, mkdirSync, writeFileSync } from "fs";
-import { dirname } from "path";
-import { resolvePath } from "../utils/resolve-path";
+import { existsSync } from "fs";
+import { normalizePathString, resolvePath } from "../utils/resolve-path";
 import { observable } from "@trpc/server/observable";
 import { AssetManager } from "../utils/asset-manager";
 import { isFlatpak, isPortable, isSnap } from "../utils";
 import { setupDesktopIntegration } from "../utils/desktop-integration";
-import { rm } from "fs/promises";
 import { disableCustomDns, enableCustomDns } from "../utils/custom-dns";
 import type { MenuItem as NNMenuItem } from "@notesnook/ui";
 import { platform } from "os";
+import { strings } from "@notesnook/intl";
 
 const t = initTRPC.create();
 
@@ -62,6 +60,13 @@ export const osIntegrationRouter = t.router({
   isFlatpak: t.procedure.query(() => isFlatpak()),
   isSnap: t.procedure.query(() => isSnap()),
   isPortable: t.procedure.query(() => isPortable()),
+  backupDirectory: t.procedure.query(() => {
+    const backupDirectory = normalizePathString(config.backupDirectory);
+    if (backupDirectory !== config.backupDirectory) {
+      config.backupDirectory = backupDirectory;
+    }
+    return backupDirectory;
+  }),
 
   zoomFactor: t.procedure.query(() => config.zoomFactor),
   setZoomFactor: t.procedure.input(z.number()).mutation(({ input: factor }) => {
@@ -118,53 +123,19 @@ export const osIntegrationRouter = t.router({
       setupDesktopIntegration(settings);
     }),
 
-  selectDirectory: t.procedure
-    .input(
-      z.object({
-        title: z.string().optional(),
-        buttonLabel: z.string().optional(),
-        defaultPath: z.string().optional()
-      })
-    )
-    .query(async ({ input }) => {
-      if (!globalThis.window) return undefined;
+  selectBackupDirectory: t.procedure.input(z.undefined()).query(async () => {
+    if (!globalThis.window) return undefined;
 
-      const { title, buttonLabel, defaultPath } = input;
+    const result = await dialog.showOpenDialog(globalThis.window, {
+      title: strings.selectBackupDir(),
+      buttonLabel: strings.select(),
+      properties: ["openDirectory"],
+      defaultPath: config.backupDirectory && resolvePath(config.backupDirectory)
+    });
+    if (result.canceled) return undefined;
 
-      const result = await dialog.showOpenDialog(globalThis.window, {
-        title,
-        buttonLabel,
-        properties: ["openDirectory"],
-        defaultPath: defaultPath && resolvePath(defaultPath)
-      });
-      if (result.canceled) return undefined;
-
-      return result.filePaths[0];
-    }),
-
-  saveFile: t.procedure
-    .input(z.object({ data: z.string(), filePath: z.string() }))
-    .query(({ input }) => {
-      const { data, filePath } = input;
-      if (!data || !filePath) return;
-
-      const resolvedPath = resolvePath(filePath);
-
-      mkdirSync(dirname(resolvedPath), { recursive: true });
-      writeFileSync(resolvedPath, data);
-    }),
-
-  resolvePath: t.procedure
-    .input(z.object({ filePath: z.string() }))
-    .query(({ input }) => {
-      const { filePath } = input;
-      return resolvePath(filePath);
-    }),
-
-  deleteFile: t.procedure.input(z.string()).query(async ({ input }) => {
-    await rm(input);
+    config.backupDirectory = result.filePaths[0];
   }),
-
   restart: t.procedure.query(() => {
     app.relaunch();
     app.exit();
@@ -199,10 +170,12 @@ export const osIntegrationRouter = t.router({
       const { type, link } = input;
       if (type !== "path") return;
 
+      const path = decodeURIComponent(new URL(link).pathname);
       const resolvedPath = resolvePath(
         // remove leading slash from path on windows
-        platform() === "win32" ? link.slice(1) : link
+        platform() === "win32" ? path.slice(1) : path
       );
+
       if (!existsSync(resolvedPath)) {
         if (globalThis.window) {
           await dialog.showMessageBox(globalThis.window, {
@@ -214,7 +187,15 @@ export const osIntegrationRouter = t.router({
         return;
       }
 
-      await shell.openPath(resolvedPath);
+      const result = await dialog.showMessageBox(globalThis.window!, {
+        message: strings.openingLocalFileDesc(resolvedPath),
+        title: strings.openingLocalFile(),
+        buttons: [strings.cancel(), strings.open()],
+        defaultId: 1,
+        cancelId: 0,
+        type: "question"
+      });
+      result.response === 1 && (await shell.openPath(resolvedPath));
     }),
   bringToFront: t.procedure.query(() => bringToFront()),
   changeTheme: t.procedure

apps/desktop/src/api/spell-checker.ts

@@ -84,35 +84,55 @@ const LANGUAGES: Record<string, string> = {
 
 type Language = { code: string; name: string };
 
+const LANGUAGE_REDIRECT_MAP: Record<string, string> = {
+  es: "es-MX",
+  "es-419": "es-MX",
+  "es-ES": "es-AR"
+};
+
 export const spellCheckerRouter = t.router({
   isEnabled: t.procedure.query(() => config.isSpellCheckerEnabled),
-  languages: t.procedure.query(
-    () =>
-      <Language[]>(
-        globalThis.window?.webContents.session.availableSpellCheckerLanguages.map(
-          (code) => ({
-            code,
-            name: LANGUAGES[code]
-          })
-        )
-      )
-  ),
-  enabledLanguages: t.procedure.query(
-    () =>
-      <Language[]>(
-        globalThis.window?.webContents.session
-          .getSpellCheckerLanguages()
-          .map((code) => ({
-            code,
-            name: LANGUAGES[code]
-          }))
-      )
-  ),
-  setLanguages: t.procedure
-    .input(z.array(z.string()))
-    .mutation(({ input: languages }) =>
-      globalThis.window?.webContents.session.setSpellCheckerLanguages(languages)
-    ),
+  languages: t.procedure.query(() => {
+    const available =
+      globalThis.window?.webContents.session.availableSpellCheckerLanguages ||
+      [];
+
+    return <Language[]>available
+      .map((code) => ({
+        code,
+        name: LANGUAGES[code] || code
+      }))
+      .sort((a, b) => a.name.localeCompare(b.name));
+  }),
+
+  enabledLanguages: t.procedure.query(() => {
+    const enabled =
+      globalThis.window?.webContents.session.getSpellCheckerLanguages() || [];
+    const available =
+      globalThis.window?.webContents.session.availableSpellCheckerLanguages ||
+      [];
+
+    const resolved = enabled
+      .map((code) => resolveLanguage(code, available))
+      .filter(Boolean) as string[];
+
+    return <Language[]>resolved.map((code) => ({
+      code,
+      name: LANGUAGES[code] || code
+    }));
+  }),
+
+  setLanguages: t.procedure.input(z.array(z.string())).mutation(({ input }) => {
+    const available =
+      globalThis.window?.webContents.session.availableSpellCheckerLanguages ||
+      [];
+
+    const resolved = input
+      .map((code) => resolveLanguage(code, available))
+      .filter(Boolean) as string[];
+
+    globalThis.window?.webContents.session.setSpellCheckerLanguages(resolved);
+  }),
   toggle: t.procedure
     .input(z.object({ enabled: z.boolean() }))
     .mutation(({ input: { enabled } }) => {
@@ -128,3 +148,16 @@ export const spellCheckerRouter = t.router({
     );
   })
 });
+
+function resolveLanguage(code: string, available: string[]) {
+  if (LANGUAGE_REDIRECT_MAP[code]) {
+    const working = LANGUAGE_REDIRECT_MAP[code];
+    return available.includes(working) ? working : code;
+  }
+  const fallback = code.split("-")[0];
+  return available.includes(code)
+    ? code
+    : available.includes(fallback)
+    ? fallback
+    : undefined;
+}

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

@@ -19,6 +19,9 @@ 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";
+import { app } from "electron";
+import path from "node:path";
+import { initTRPC } from "@trpc/server";
 
 type SQLiteCompatibleType =
   | number
@@ -28,25 +31,32 @@ type SQLiteCompatibleType =
   | bigint
   | null;
 
-export class SQLite {
+class SQLite {
   sqlite?: Database;
   initialized = false;
   preparedStatements: Map<string, Statement<unknown[]>> = new Map();
   retryCounter: Record<string, number> = {};
   extensionsLoaded = false;
+  private filePath?: string;
 
   constructor() {
     console.log("new sqlite worker");
   }
 
-  async open(filePath: string) {
+  async open(filename: string) {
     if (this.sqlite) {
       console.error("Database is already initialized");
       return;
     }
 
+    this.filePath =
+      filename === ":memory:"
+        ? filename
+        : path.join(app.getPath("userData"), filename) + ".sql";
+    if (!isPathAllowed(this.filePath))
+      throw new Error("Database path is not allowed: " + this.filePath);
     this.sqlite = require("better-sqlite3-multiple-ciphers")(
-      filePath
+      this.filePath
     ).unsafeMode(true);
   }
 
@@ -155,9 +165,11 @@ export class SQLite {
     this.sqlite = undefined;
   }
 
-  async delete(filePath: string) {
+  async delete() {
+    if (!this.filePath) return;
+
     await this.close();
-    await require("fs/promises").rm(filePath, {
+    await require("node:fs/promises").rm(this.filePath, {
       force: true,
       maxRetries: 5,
       retryDelay: 500
@@ -221,3 +233,67 @@ function rewriteError(e: Error, message: string) {
   error.cause = e.cause;
   return error;
 }
+
+function isPathAllowed(databasePath: string) {
+  if (databasePath === ":memory:") return true;
+  const base = app.getPath("userData");
+  const resolved = path.resolve(databasePath);
+  return resolved.startsWith(base + path.sep);
+}
+
+const t = initTRPC.create();
+
+const databases: Record<string, SQLite> = {};
+
+export const sqliteRouter = t.router({
+  open: t.procedure
+    .input((v) => v)
+    .mutation(async ({ input }) => {
+      const { filePath } = input as { filePath: string };
+      if (databases[filePath]) return filePath;
+      const sqlite = new SQLite();
+      await sqlite.open(filePath);
+      databases[filePath] = sqlite;
+      return filePath;
+    }),
+  run: t.procedure
+    .input((v) => v)
+    .mutation(async ({ input }) => {
+      const { id, sql, parameters } = input as {
+        id: string;
+        sql: string;
+        parameters?: SQLiteCompatibleType[];
+      };
+      const sqlite = databases[id];
+      if (!sqlite) throw new Error("Database not found for id: " + id);
+      return await sqlite.run(sql, parameters);
+    }),
+  close: t.procedure
+    .input((v) => v)
+    .mutation(async ({ input }) => {
+      const { id } = input as { id: string };
+      const sqlite = databases[id];
+      if (!sqlite) throw new Error("Database not found for id: " + id);
+      await sqlite.close();
+      delete databases[id];
+    }),
+  delete: t.procedure
+    .input((v) => v)
+    .mutation(async ({ input }) => {
+      const { id } = input as { id: string };
+      const sqlite = databases[id];
+      if (!sqlite) throw new Error("Database not found for id: " + id);
+      await sqlite.delete();
+      delete databases[id];
+    })
+});
+
+app.on("before-quit", async () => {
+  for (const db of Object.values(databases)) {
+    try {
+      await db.close();
+    } catch (e) {
+      console.error("Error closing database:", e);
+    }
+  }
+});

apps/desktop/src/index.ts

@@ -21,4 +21,3 @@ export { PATHS } 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

@@ -39,6 +39,8 @@ import { setupDesktopIntegration } from "./utils/desktop-integration";
 import { disableCustomDns, enableCustomDns } from "./utils/custom-dns";
 import { Messages, setI18nGlobal } from "@notesnook/intl";
 import { i18n } from "@lingui/core";
+import { PATHS } from "./constants";
+import { normalizePathString } from "./utils/resolve-path";
 
 const locale =
   process.env.NODE_ENV === "development"
@@ -55,6 +57,10 @@ setI18nGlobal(i18n);
 const appHostnames = isDevelopment()
   ? ["localhost", "127.0.0.1"]
   : ["app.notesnook.com"];
+// Pending nn:// link to open once the window is ready (used on Windows/Linux
+// when the app is launched via the nn:// protocol for the first time).
+let pendingNNLink: string | undefined = findNNLink(process.argv);
+
 // only run a single instance
 if (!MAC_APP_STORE && !app.requestSingleInstanceLock()) {
   console.log("Another instance is already running!");
@@ -86,6 +92,17 @@ async function createWindow() {
   const cliOptions = await parseArguments(process.argv);
   setTheme(getTheme());
 
+  // this workaround is necessary because macos doesn't support
+  // the --hidden flag when launching the app on startup
+  if (
+    process.platform === "darwin" &&
+    app.getLoginItemSettings().wasOpenedAtLogin &&
+    config.desktopSettings.autoStart &&
+    config.desktopSettings.startMinimized
+  ) {
+    cliOptions.hidden = true;
+  }
+
   const mainWindowState = new WindowState({});
   const mainWindow = new BrowserWindow({
     show: !cliOptions.hidden,
@@ -125,9 +142,6 @@ async function createWindow() {
 
     webPreferences: {
       zoomFactor: config.zoomFactor,
-      nodeIntegration: true,
-      contextIsolation: false,
-      nodeIntegrationInWorker: true,
       spellcheck: config.isSpellCheckerEnabled,
       preload: __dirname + "/preload.js"
     }
@@ -138,7 +152,13 @@ async function createWindow() {
   mainWindow.setMenuBarVisibility(false);
   mainWindowState.manage(mainWindow);
 
-  if (cliOptions.hidden && !config.desktopSettings.minimizeToSystemTray)
+  if (
+    cliOptions.hidden &&
+    !(
+      config.desktopSettings.minimizeToSystemTray ||
+      config.desktopSettings.closeToSystemTray
+    )
+  )
     mainWindow.minimize();
 
   await mainWindow.webContents.loadURL(`${createURL(cliOptions, "/")}`);
@@ -161,6 +181,14 @@ async function createWindow() {
   );
   mainWindow.webContents.session.setProxy({ proxyRules: config.proxyRules });
 
+  mainWindow.on("show", () =>
+    /**
+     * We may set `skipTaskbar` to true at startup.
+     * This also removes the window from the Alt-Tab switcher.
+     * To fix that, whenever the app is shown, we set `skipTaskbar` to false.
+     */
+    mainWindow.setSkipTaskbar(false)
+  );
   mainWindow.once("closed", () => {
     globalThis.window = null;
   });
@@ -193,6 +221,11 @@ async function createWindow() {
     setupTray();
     setupJumplist();
   });
+
+  if (pendingNNLink) {
+    bridge.onOpenLink(pendingNNLink);
+    pendingNNLink = undefined;
+  }
 }
 
 app.once("ready", async () => {
@@ -212,9 +245,12 @@ app.once("ready", async () => {
   if (config.customDns) enableCustomDns();
   else disableCustomDns();
 
+  if (!MAC_APP_STORE) app.setAsDefaultProtocolClient("nn");
+
   if (!isDevelopment()) registerProtocol();
   await createWindow();
-  configureAutoUpdater();
+  await migrateBackupDirectory();
+  await configureAutoUpdater();
 });
 
 app.once("window-all-closed", () => {
@@ -225,6 +261,12 @@ app.once("window-all-closed", () => {
 
 app.on("second-instance", async (_ev, argv) => {
   if (!globalThis.window) return;
+  const nnLink = findNNLink(argv);
+  if (nnLink) {
+    bridge.onOpenLink(nnLink);
+    bringToFront();
+    return;
+  }
   const cliOptions = await parseArguments(argv);
   if (cliOptions.note) bridge.onCreateItem("note");
   if (cliOptions.notebook) bridge.onCreateItem("notebook");
@@ -232,12 +274,29 @@ app.on("second-instance", async (_ev, argv) => {
   bringToFront();
 });
 
+// macOS opens URLs via this event. The app may or may not be fully loaded yet.
+app.on("open-url", (event, url) => {
+  event.preventDefault();
+  if (!url.startsWith("nn://")) return;
+  if (globalThis.window) {
+    bridge.onOpenLink(url);
+    bringToFront();
+  } else {
+    // Window not ready yet — store for when createWindow finishes loading.
+    pendingNNLink = url;
+  }
+});
+
 app.on("activate", () => {
   if (globalThis.window === null) {
     createWindow();
   }
 });
 
+function findNNLink(argv: string[]): string | undefined {
+  return argv.find((arg) => arg.startsWith("nn://"));
+}
+
 function createURL(options: CLIOptions, path = "/") {
   const url = new URL(isDevelopment() ? "http://localhost:3000" : PROTOCOL_URL);
 
@@ -248,7 +307,31 @@ function createURL(options: CLIOptions, path = "/") {
   else if (typeof options.note === "string")
     url.hash = `/notes/${options.note}/edit`;
   else if (typeof options.notebook === "string")
-    url.hash = `/notebooks/${options.notebook}`;
+    url.pathname = `/notebooks/${options.notebook}`;
 
   return url;
 }
+
+async function migrateBackupDirectory() {
+  if (!globalThis.window) return;
+  try {
+    if (config.backupDirectory !== PATHS.backupsDirectory) return;
+    const oldPath = await globalThis.window?.webContents.executeJavaScript(
+      `localStorage.getItem("backupStorageLocation")`
+    );
+    if (!oldPath || oldPath === PATHS.backupsDirectory) return;
+    config.backupDirectory = normalizePathString(oldPath);
+  } catch (e) {
+    console.error("Failed to migrate backup directory", e);
+    const pressedButton = dialog.showMessageBoxSync(globalThis.window, {
+      message:
+        "Failed to migrate backup directory. It has been reset to default.",
+      title: "Backup Directory Migration Failed",
+      type: "error",
+      buttons: ["Set backup directory", "Ignore"]
+    });
+    if (pressedButton === 0) {
+      await api.integration.selectBackupDirectory();
+    }
+  }
+}

apps/desktop/src/preload.ts

@@ -19,25 +19,21 @@ 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 { ipcRenderer } from "electron";
-import { platform } from "os";
+import { ipcRenderer, contextBridge } from "electron";
 
 declare global {
-  var os: () => "mas" | ReturnType<typeof platform>;
+  var os: () => "mas" | typeof process.platform;
   var electronTRPC: any;
-  // var NativeNNCrypto: (new () => NNCrypto) | undefined;
 }
 
-process.once("loaded", async () => {
-  const electronTRPC = {
-    sendMessage: (operation: any) =>
-      ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
-    onMessage: (callback: any) =>
-      ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
-  };
-  globalThis.electronTRPC = electronTRPC;
-});
+const electronTRPC = {
+  sendMessage: (operation: any) =>
+    ipcRenderer.send(ELECTRON_TRPC_CHANNEL, operation),
+  onMessage: (callback: any) =>
+    ipcRenderer.on(ELECTRON_TRPC_CHANNEL, (_event, args) => callback(args))
+};
 
-// globalThis.NativeNNCrypto = require("@notesnook/crypto").NNCrypto;
-globalThis.os = () => (MAC_APP_STORE ? "mas" : platform());
+const os = () => (MAC_APP_STORE ? "mas" : process.platform);
+
+contextBridge.exposeInMainWorld("electronTRPC", electronTRPC);
+contextBridge.exposeInMainWorld("os", os);

apps/desktop/src/utils/config.ts

@@ -21,6 +21,7 @@ import { nativeTheme } from "electron";
 import { JSONStorage } from "./json-storage";
 import { z } from "zod";
 import { autoUpdater } from "electron-updater";
+import { PATHS } from "../constants";
 
 export const DesktopIntegration = z.object({
   autoStart: z.boolean().optional(),
@@ -53,7 +54,8 @@ export const config = {
 
   backgroundColor: nativeTheme.themeSource === "dark" ? "#0f0f0f" : "#ffffff",
   windowControlsIconColor:
-    nativeTheme.themeSource === "dark" ? "#ffffff" : "#000000"
+    nativeTheme.themeSource === "dark" ? "#ffffff" : "#000000",
+  backupDirectory: PATHS.backupsDirectory
 };
 
 type ConfigKey = keyof typeof config;

apps/desktop/src/utils/resolve-path.ts

@@ -20,11 +20,30 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { app } from "electron";
 import { isAbsolute, join } from "path";
 
+export function normalizePathString(_path: string) {
+  let normalizedPath = _path.trim();
+
+  try {
+    const parsedPath = JSON.parse(normalizedPath);
+    if (typeof parsedPath === "string") normalizedPath = parsedPath;
+  } catch {
+    // ignore invalid JSON and keep the original path string
+  }
+
+  if (normalizedPath === "~") return app.getPath("home");
+  if (/^~[\\/]/.test(normalizedPath)) {
+    return join(app.getPath("home"), normalizedPath.slice(2));
+  }
+
+  return normalizedPath;
+}
+
 export function resolvePath(_path: string) {
-  if (isAbsolute(_path)) return _path;
+  const normalizedPath = normalizePathString(_path);
+  if (isAbsolute(normalizedPath)) return normalizedPath;
 
   return join(
-    ..._path.split("/").map((segment) => {
+    ...normalizedPath.split("/").map((segment) => {
       let resolved = segment;
       try {
         resolved = app.getPath(resolved as any);

apps/desktop/tsconfig.json

@@ -1,9 +1,11 @@
 {
-  "extends": "../../tsconfig",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist/",
     "lib": ["ESNext"],
     "moduleResolution": "Bundler"
   },
-  "include": ["src", "global.d.ts"]
+  "files": ["global.d.ts"],
+  "include": ["src"],
+  "exclude": ["__tests__"]
 }

apps/mobile/.detoxrc.js

@@ -30,7 +30,7 @@ module.exports = {
       testBinaryPath:
         "android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk",
       build:
-        "cd android ; ENVFILE=.env.test ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd ..",
+        "cd android ; ENVFILE=.env.test ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug -PreactNativeArchitectures=arm64-v8a && cd ..",
       reversePorts: [8081]
     },
     "android.release": {

apps/mobile/.github/workflows/android-public-release.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
 

apps/mobile/.github/workflows/android-release.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
 

apps/mobile/.gitignore

@@ -1,4 +1,5 @@
 .yarnrc.yml
+tsconfig.tsbuildinfo
 artifacts/
 # OSX
 #

apps/mobile/android/app/build.gradle

@@ -140,7 +140,7 @@ android {
         if (project.hasProperty("prBuildNumber")) {
             versionCode Integer.parseInt(prBuildNumber())
         } else {
-            versionCode 3105
+            versionCode 3114
         }
         versionName getNpmVersion()
         testBuildType System.getProperty('testBuildType', 'debug')
@@ -233,6 +233,9 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
+    // Lets the widgets push their list data straight into the RemoteViews on every API level,
+    // instead of the deprecated RemoteViewsService adapter (which needs API 31 to do natively).
+    implementation("androidx.core:core-remoteviews:1.0.0")
     implementation("androidx.core:core-splashscreen:1.0.0")
     
     implementation 'androidx.multidex:multidex:2.0.1' 

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

@@ -86,8 +86,9 @@
             android:name=".NotePreviewWidget"
             android:exported="false"
             android:label="@string/note">
-            <intent-filter>"
+            <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_RESTORED" />
             </intent-filter>
 
             <meta-data
@@ -95,6 +96,15 @@
                 android:resource="@xml/note_widget_info" />
         </receiver>
 
+        <receiver
+            android:name=".WidgetTimeChangeReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.TIME_SET" />
+                <action android:name="android.intent.action.TIMEZONE_CHANGED" />
+            </intent-filter>
+        </receiver>
+
         <receiver
             android:name=".ReminderWidgetProvider"
             android:exported="false"
@@ -155,6 +165,15 @@
                 <data android:scheme="notesnook" />
             </intent-filter>
 
+            <intent-filter android:label="Notesnook">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="nn" />
+            </intent-filter>
+
         </activity>
         <activity
             android:name="com.facebook.react.devsupport.DevSettingsActivity"
@@ -221,11 +240,6 @@
             </intent-filter>
         </service>
 
-        <service
-            android:name=".ReminderViewsService"
-            android:exported="true"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

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

@@ -5,15 +5,11 @@ import android.appwidget.AppWidgetManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
-import android.widget.RemoteViews;
 
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactActivityDelegate;
-import com.google.gson.Gson;
-import com.streetwriters.notesnook.datatypes.Note;
 
 public class NotePreviewConfigureActivity extends ReactActivity {
 
@@ -40,18 +36,32 @@ public class NotePreviewConfigureActivity extends ReactActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(null);
-        Intent intent = getIntent();
-        Bundle extras = intent.getExtras();
-        int appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
-        if (extras != null) {
-            appWidgetId = extras.getInt(
-                    AppWidgetManager.EXTRA_APPWIDGET_ID,
-                    AppWidgetManager.INVALID_APPWIDGET_ID);
-            NotePreviewConfigureActivity.appWidgetId = appWidgetId;
-        }
+        activity = this;
+        readAppWidgetId(getIntent());
+    }
+
+    /**
+     * We launch as singleTask, so configuring a second widget while this screen is still alive
+     * arrives here rather than in onCreate(). Without this the activity would keep writing to
+     * whichever widget it happened to be opened for first.
+     */
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        activity = this;
+        readAppWidgetId(intent);
+    }
+
+    private void readAppWidgetId(Intent intent) {
+        Bundle extras = intent != null ? intent.getExtras() : null;
+        int appWidgetId = extras != null
+                ? extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID)
+                : AppWidgetManager.INVALID_APPWIDGET_ID;
+
+        NotePreviewConfigureActivity.appWidgetId = appWidgetId;
         Intent resultValue = new Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
         setResult(Activity.RESULT_CANCELED, resultValue);
-        activity = this;
     }
 
     public static void saveAndFinish(Context context) {

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

@@ -1,6 +1,5 @@
 package com.streetwriters.notesnook;
 
-import android.app.ActivityOptions;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
@@ -8,51 +7,125 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.RemoteViews;
-import com.google.gson.Gson;
 import com.streetwriters.notesnook.datatypes.Note;
 
+import java.util.HashSet;
+import java.util.Set;
+
 
 public class NotePreviewWidget extends AppWidgetProvider {
     static String OpenNoteId = "com.streetwriters.notesnook.OpenNoteId";
     static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
                                 int appWidgetId) {
-        String data = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE).getString(String.valueOf(appWidgetId), "");
-        if (data.isEmpty()) {
+        String data = context.getSharedPreferences(WidgetUtils.PREFERENCES, Context.MODE_PRIVATE).getString(String.valueOf(appWidgetId), "");
+        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.note_widget);
+
+        Note note = WidgetUtils.parseNote(data);
+        if (note == null) {
+            // Either the widget was never configured, or we lost the note it pointed at (ids
+            // reassigned, data cleared). Point it back at the picker rather than leaving the user
+            // with an inert widget they can only fix by deleting and re-adding it.
+            views.setTextViewText(R.id.widget_title, context.getString(R.string.widget_note_unconfigured_title));
+            views.setTextViewText(R.id.widget_body, context.getString(R.string.widget_note_unconfigured_body));
+            views.setOnClickPendingIntent(R.id.open_note, getConfigurePendingIntent(context, appWidgetId));
+            appWidgetManager.updateAppWidget(appWidgetId, views);
             return;
         }
-        Gson gson = new Gson();
-        Note note = gson.fromJson(data, Note.class);
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.note_widget);
+
         views.setTextViewText(R.id.widget_title, note.getTitle());
         views.setTextViewText(R.id.widget_body, note.getHeadline());
+        // Once the user shrinks the widget down to a single row there is no room for the preview
+        // text, and a clipped half-line of it looks like a rendering glitch.
+        views.setViewVisibility(R.id.widget_body,
+                hasRoomForBody(appWidgetManager, appWidgetId) ? View.VISIBLE : View.GONE);
 
         Intent intent = new Intent(context, MainActivity.class);
         intent.putExtra(OpenNoteId, note.getId());
         intent.setAction(Intent.ACTION_VIEW);
         intent.putExtra(RCTNNativeModule.IntentType, "OpenNote");
-        intent.setData(Uri.parse("https://app.notesnook.com/open_note?id=" + note.getId()));
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
+        intent.setData(Uri.parse("nn://note/" + note.getId()));
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, WidgetUtils.getActivityOptionsBundle());
         views.setOnClickPendingIntent(R.id.open_note, pendingIntent);
 
         appWidgetManager.updateAppWidget(appWidgetId, views);
     }
 
+    /**
+     * Reopens the configure screen for this widget. The launcher's own "reconfigure" gesture is
+     * hard to discover and not offered by every launcher, so an unconfigured widget needs its own
+     * way back in.
+     */
+    private static PendingIntent getConfigurePendingIntent(Context context, int appWidgetId) {
+        Intent intent = new Intent(context, NotePreviewConfigureActivity.class);
+        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+        // PendingIntent equality ignores extras, so the widget id has to be the request code for
+        // each widget to get its own.
+        return PendingIntent.getActivity(context, appWidgetId, intent,
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE,
+                WidgetUtils.getActivityOptionsBundle());
+    }
+
+    /**
+     * Height below which the note preview text is dropped, leaving just the title.
+     */
+    private static final int MIN_HEIGHT_FOR_BODY_DP = 70;
+
+    private static boolean hasRoomForBody(AppWidgetManager appWidgetManager, int appWidgetId) {
+        Bundle options = appWidgetManager.getAppWidgetOptions(appWidgetId);
+        if (options == null) return true;
+
+        int minHeight = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT);
+        // Not reported yet (the widget has just been placed): assume there is room.
+        return minHeight <= 0 || minHeight >= MIN_HEIGHT_FOR_BODY_DP;
+    }
+
     @Override
     public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
         super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);
+        // This used to do nothing at all, so resizing the widget left it rendered for its old size.
+        updateAppWidget(context, appWidgetManager, appWidgetId);
     }
 
-    private static Bundle getActivityOptionsBundle() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
-                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
-            return activityOptions.toBundle();
-        } else
-            return null;
+    /**
+     * The note shown by each widget is stored in the "appPreview" preferences under its widget id.
+     * When the system restores our widgets it hands out fresh ids, so unless we move the stored
+     * notes over to the new ids the widgets are left permanently blank with no way to recover
+     * other than removing and re-adding them.
+     *
+     * AppWidgetProvider calls onUpdate() with the new ids right after this, which re-renders them.
+     */
+    @Override
+    public void onRestored(Context context, int[] oldWidgetIds, int[] newWidgetIds) {
+        super.onRestored(context, oldWidgetIds, newWidgetIds);
+        if (oldWidgetIds == null || newWidgetIds == null) return;
+
+        int count = Math.min(oldWidgetIds.length, newWidgetIds.length);
+        SharedPreferences preferences = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE);
+
+        // Read everything up front: an old id can collide with the new id of another widget.
+        String[] notes = new String[count];
+        Set<String> newKeys = new HashSet<>();
+        for (int i = 0; i < count; i++) {
+            notes[i] = preferences.getString(String.valueOf(oldWidgetIds[i]), "");
+            newKeys.add(String.valueOf(newWidgetIds[i]));
+        }
+
+        SharedPreferences.Editor edit = preferences.edit();
+        for (int i = 0; i < count; i++) {
+            String oldKey = String.valueOf(oldWidgetIds[i]);
+            if (!newKeys.contains(oldKey)) {
+                edit.remove(oldKey);
+            }
+        }
+        for (int i = 0; i < count; i++) {
+            if (notes[i].isEmpty()) continue;
+            edit.putString(String.valueOf(newWidgetIds[i]), notes[i]);
+        }
+        edit.apply();
     }
 
     @Override

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

@@ -1,12 +1,10 @@
 package com.streetwriters.notesnook;
 
-import android.app.ActivityOptions;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.widget.RemoteViews;
 
@@ -24,20 +22,10 @@ public class NoteWidget extends AppWidgetProvider {
 
     static void setClickIntent(Context context, RemoteViews views) {
         Intent intent = new Intent(context, ShareActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, WidgetUtils.getActivityOptionsBundle());
         views.setOnClickPendingIntent(R.id.new_note, pendingIntent);
     }
 
-    private static Bundle getActivityOptionsBundle() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
-                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
-            return activityOptions.toBundle();
-        } else
-            return null;
-    }
-
     @Override
     public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
         super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);

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

@@ -12,7 +12,6 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.RectF;
 import android.graphics.drawable.Icon;
 import android.os.Build;
 import android.os.Bundle;
@@ -29,7 +28,6 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.google.gson.Gson;
 import com.streetwriters.notesnook.datatypes.Note;
 
 import java.util.ArrayList;
@@ -138,7 +136,7 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
                 if (Objects.equals(extras.getString(IntentType), "NewReminder")) {
                     map.putString(ReminderWidgetProvider.NewReminder, extras.getString(ReminderWidgetProvider.NewReminder));
                 } else if (Objects.equals(extras.getString(IntentType), "OpenReminder")) {
-                    map.putString(ReminderViewsService.OpenReminderId, extras.getString(ReminderViewsService.OpenReminderId));
+                    map.putString(ReminderWidgetProvider.OpenReminderId, extras.getString(ReminderWidgetProvider.OpenReminderId));
                 } else if (Objects.equals(extras.getString(IntentType), "OpenNote")) {
                     map.putString(NotePreviewWidget.OpenNoteId, extras.getString(NotePreviewWidget.OpenNoteId));
                 }
@@ -156,14 +154,8 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void getWidgetNotes(Promise promise) {
-        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Map<String, ?> map = pref.getAll();
         WritableArray arr = Arguments.createArray();
-        for(Map.Entry<String,?> entry : map.entrySet()){
-            if (entry.getKey().equals("remindersList")) continue;
-            String value = (String) entry.getValue();
-            Gson gson = new Gson();
-            Note note = gson.fromJson(value, Note.class);
+        for (Note note : WidgetUtils.getWidgetNotes(getReactApplicationContext()).values()) {
             arr.pushString(note.getId());
         }
         promise.resolve(arr);
@@ -171,36 +163,46 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void hasWidgetNote(final String noteId, Promise promise) {
-        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Map<String, ?> map = pref.getAll();
         boolean found = false;
-        for(Map.Entry<String,?> entry : map.entrySet()){
-            String value = (String) entry.getValue();
-            if (value.contains(noteId)) {
+        for (Note note : WidgetUtils.getWidgetNotes(getReactApplicationContext()).values()) {
+            if (note.getId().equals(noteId)) {
                 found = true;
+                break;
             }
         }
         promise.resolve(found);
     }
+
     @ReactMethod
     public void updateWidgetNote(final String noteId, final String data) {
-        SharedPreferences pref = getReactApplicationContext().getSharedPreferences("appPreview", Context.MODE_PRIVATE);
-        Map<String, ?> map = pref.getAll();
+        SharedPreferences pref = getReactApplicationContext().getSharedPreferences(WidgetUtils.PREFERENCES, Context.MODE_PRIVATE);
         SharedPreferences.Editor edit = pref.edit();
-        ArrayList<String> ids = new ArrayList<>();
-        for(Map.Entry<String,?> entry : map.entrySet()) {
-            String value = (String) entry.getValue();
-            if (value.contains(noteId)) {
-                edit.putString(entry.getKey(), data);
-                ids.add(entry.getKey());
-            }
+        List<Integer> ids = new ArrayList<>();
+
+        // Match on the note's id, not on the raw JSON containing it somewhere: a note whose body
+        // happens to mention another note's id is not the same note.
+        for (Map.Entry<Integer, Note> entry : WidgetUtils.getWidgetNotes(getReactApplicationContext()).entrySet()) {
+            if (!noteId.equals(entry.getValue().getId())) continue;
+            edit.putString(String.valueOf(entry.getKey()), data);
+            ids.add(entry.getKey());
         }
         edit.apply();
-        for (String id: ids) {
-            NotePreviewWidget.updateAppWidget(mContext, AppWidgetManager.getInstance(mContext), Integer.parseInt(id));
+
+        for (int id : ids) {
+            NotePreviewWidget.updateAppWidget(mContext, AppWidgetManager.getInstance(mContext), id);
         }
     }
 
+    /**
+     * Redraws every widget from scratch. Needed because the app can be stopped while its widgets
+     * stay on the home screen: clearing app data empties the store without the widgets ever being
+     * told, so they keep showing content that is gone until something forces a redraw.
+     */
+    @ReactMethod
+    public void refreshWidgets() {
+        WidgetUtils.refreshAll(mContext);
+    }
+
     @ReactMethod
     public void updateReminderWidget() {
         AppWidgetManager wm = AppWidgetManager.getInstance(mContext);
@@ -208,8 +210,8 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
         for (int id: ids) {
             Log.d("Reminders", "Updating" + id);
             RemoteViews views = new RemoteViews(mContext.getPackageName(), R.layout.widget_reminders);
+            // The rows are part of this update, so there is nothing left to invalidate afterwards.
             ReminderWidgetProvider.updateAppWidget(mContext, wm, id, views);
-            wm.notifyAppWidgetViewDataChanged(id, R.id.widget_list_view);
         }
     }
 
@@ -244,7 +246,7 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
                 return;
             }
 
-            String uri = "https://app.notesnook.com/open_" + type + "?id=" + id;
+            String uri = "nn://" + type + "/" + id;
             Intent intent = new Intent(Intent.ACTION_VIEW, android.net.Uri.parse(uri));
             intent.setPackage(mContext.getPackageName());
 

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

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

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

@@ -1,18 +1,22 @@
 package com.streetwriters.notesnook;
 
-import android.app.ActivityOptions;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
 import android.widget.RemoteViews;
 
+import androidx.core.widget.RemoteViewsCompat;
+
+import com.streetwriters.notesnook.datatypes.Reminder;
+
+import java.util.List;
+
 public class ReminderWidgetProvider extends AppWidgetProvider {
     static String NewReminder = "com.streetwriters.notesnook.NewReminder";
+    static String OpenReminderId = "com.streetwriters.notesnook.OpenReminderId";
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
@@ -23,20 +27,10 @@ public class ReminderWidgetProvider extends AppWidgetProvider {
     }
 
 
-    private static Bundle getActivityOptionsBundle() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            ActivityOptions activityOptions = ActivityOptions.makeBasic();
-            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
-                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
-            return activityOptions.toBundle();
-        } else
-            return null;
-    }
-
     static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId, RemoteViews views) {
         Intent listview_intent_template = new Intent(context, MainActivity.class);
         listview_intent_template.setAction(Intent.ACTION_VIEW);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, listview_intent_template, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE, getActivityOptionsBundle());
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, listview_intent_template, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE, WidgetUtils.getActivityOptionsBundle());
         views.setPendingIntentTemplate(R.id.widget_list_view, pendingIntent);
 
         Intent new_reminder_intent = new Intent(context, MainActivity.class);
@@ -44,13 +38,31 @@ public class ReminderWidgetProvider extends AppWidgetProvider {
         new_reminder_intent.setAction(Intent.ACTION_VIEW);
         new_reminder_intent.putExtra(RCTNNativeModule.IntentType, "NewReminder");
         new_reminder_intent.setData(Uri.parse("https://app.notesnook.com/new_reminder"));
-        PendingIntent pendingIntent2 = PendingIntent.getActivity(context, appWidgetId, new_reminder_intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
+        PendingIntent pendingIntent2 = PendingIntent.getActivity(context, appWidgetId, new_reminder_intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, WidgetUtils.getActivityOptionsBundle());
         views.setOnClickPendingIntent(R.id.add_button, pendingIntent2);
 
-        Intent list_remote_adapter_intent = new Intent(context, ReminderViewsService.class);
-        list_remote_adapter_intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-        views.setRemoteAdapter(R.id.widget_list_view, list_remote_adapter_intent);
+        // The rows travel with the update itself, so there is no bound service to keep in sync and
+        // nothing to invalidate separately: every update redraws from the current data.
+        List<Reminder> reminders = WidgetUtils.getWidgetReminders(context);
+        RemoteViewsCompat.RemoteCollectionItems.Builder items =
+                new RemoteViewsCompat.RemoteCollectionItems.Builder();
+        for (Reminder reminder : reminders) {
+            items.addItem(getItemId(reminder), WidgetUtils.createReminderItem(context, reminder));
+        }
+        // Two, because a reminder without a description uses the compact row layout.
+        items.setViewTypeCount(2);
+        items.setHasStableIds(true);
+
+        RemoteViewsCompat.setRemoteAdapter(context, views, appWidgetId, R.id.widget_list_view, items.build());
         views.setEmptyView(R.id.widget_list_view, R.id.empty_view);
         appWidgetManager.updateAppWidget(appWidgetId, views);
     }
-}
+
+    /**
+     * Ties a row to its reminder rather than to its position, so rows keep their identity when the
+     * list shifts around them.
+     */
+    private static long getItemId(Reminder reminder) {
+        return reminder.getId() == null ? 0 : reminder.getId().hashCode();
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.streetwriters.notesnook;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Redraws the widgets when the clock or timezone changes.
+ *
+ * Reminder rows are described relative to the current time ("Upcoming"/"Last", "Today"/"Tomorrow"),
+ * and a reminder that has passed drops off the list entirely. All of that is decided when the
+ * widget is drawn, so moving the clock leaves the previous drawing in place: a reminder can still
+ * read "Upcoming" long after its time has gone by.
+ *
+ * The app normally redraws the list when a reminder notification is delivered, but that does not
+ * happen if the reminder never fires, which is exactly the case when the clock jumps past it.
+ *
+ * Only TIME_SET and TIMEZONE_CHANGED are handled here: DATE_CHANGED is not exempt from the
+ * Android 8 limits on manifest-registered implicit broadcasts, so a receiver for it would never
+ * run. Crossing midnight is instead picked up by the widget's own periodic update.
+ */
+public class WidgetTimeChangeReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        WidgetUtils.refreshAll(context);
+    }
+}

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

@@ -0,0 +1,299 @@
+package com.streetwriters.notesnook;
+
+import android.app.ActivityOptions;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.streetwriters.notesnook.datatypes.Note;
+import com.streetwriters.notesnook.datatypes.Reminder;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Shared helpers for the home screen widgets.
+ */
+public class WidgetUtils {
+
+    static final String PREFERENCES = "appPreview";
+    static final String REMINDERS_KEY = "remindersList";
+
+    /**
+     * Every row is serialized into the widget update itself, which has to fit inside a binder
+     * transaction, so the list cannot grow without bound. Far more than fits on screen anyway.
+     */
+    private static final int MAX_REMINDERS = 50;
+
+    /**
+     * Redraws every widget that currently exists, and drops stored notes for widgets that no
+     * longer do.
+     *
+     * Everything else keys off what we have stored, which is fine while the app is running but
+     * leaves widgets showing content that no longer exists once the store is emptied underneath
+     * them (clearing app data) or a widget is removed while the app is stopped (onDeleted never
+     * arrives). Starting from the widgets the system knows about, rather than from our own data,
+     * is what makes this self-correcting.
+     *
+     * NoteWidget is left alone deliberately: it is a static button with no stored state, and its
+     * layout depends on the size it was last given.
+     */
+    static void refreshAll(Context context) {
+        AppWidgetManager manager = AppWidgetManager.getInstance(context);
+
+        int[] noteWidgetIds = manager.getAppWidgetIds(
+                new ComponentName(context, NotePreviewWidget.class));
+        removeOrphanedNotes(context, noteWidgetIds);
+        for (int appWidgetId : noteWidgetIds) {
+            NotePreviewWidget.updateAppWidget(context, manager, appWidgetId);
+        }
+
+        for (int appWidgetId : manager.getAppWidgetIds(
+                new ComponentName(context, ReminderWidgetProvider.class))) {
+            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_reminders);
+            ReminderWidgetProvider.updateAppWidget(context, manager, appWidgetId, views);
+        }
+    }
+
+    /**
+     * Drops stored notes whose widget is gone, so the preferences file cannot grow forever.
+     */
+    private static void removeOrphanedNotes(Context context, int[] liveWidgetIds) {
+        Set<String> live = new HashSet<>();
+        for (int appWidgetId : liveWidgetIds) live.add(String.valueOf(appWidgetId));
+
+        SharedPreferences preferences = context.getSharedPreferences(PREFERENCES, Context.MODE_PRIVATE);
+        SharedPreferences.Editor edit = preferences.edit();
+        boolean changed = false;
+
+        for (String key : preferences.getAll().keySet()) {
+            // Leave anything that is not a widget id alone, the reminders list included.
+            if (parseWidgetId(key) == null || live.contains(key)) continue;
+            edit.remove(key);
+            changed = true;
+        }
+        if (changed) edit.apply();
+    }
+
+    /**
+     * The note each note widget is showing, keyed by widget id.
+     *
+     * The preferences file mixes two things: one note per widget id, and the reminders list under
+     * its own key. Only numeric keys are widget notes, so anything else is skipped rather than
+     * being treated as a note.
+     */
+    static Map<Integer, Note> getWidgetNotes(Context context) {
+        SharedPreferences preferences = context.getSharedPreferences(PREFERENCES, Context.MODE_PRIVATE);
+        Map<Integer, Note> notes = new LinkedHashMap<>();
+
+        for (Map.Entry<String, ?> entry : preferences.getAll().entrySet()) {
+            Integer widgetId = parseWidgetId(entry.getKey());
+            if (widgetId == null) continue;
+            if (!(entry.getValue() instanceof String)) continue;
+
+            Note note = parseNote((String) entry.getValue());
+            if (note == null || note.getId() == null) continue;
+            notes.put(widgetId, note);
+        }
+        return notes;
+    }
+
+    /**
+     * The widget id a preferences key refers to, or null if the key is not a widget id at all.
+     */
+    private static Integer parseWidgetId(String key) {
+        try {
+            return Integer.valueOf(key);
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    static Note parseNote(String data) {
+        if (data == null || data.isEmpty()) return null;
+        try {
+            return new Gson().fromJson(data, Note.class);
+        } catch (Exception e) {
+            Log.e("NotePreviewWidget", "Could not read a stored note", e);
+            return null;
+        }
+    }
+
+    /**
+     * The reminders the app last wrote out, minus any that have now dropped out of view. Reading
+     * and filtering happens here so the provider can push the rows straight into the widget.
+     */
+    static List<Reminder> getWidgetReminders(Context context) {
+        SharedPreferences preferences = context.getSharedPreferences(PREFERENCES, Context.MODE_PRIVATE);
+        List<Reminder> stored = null;
+        try {
+            stored = new Gson().fromJson(preferences.getString(REMINDERS_KEY, "[]"),
+                    new TypeToken<List<Reminder>>() {}.getType());
+        } catch (Exception e) {
+            Log.e("Reminders", "Could not read the stored reminders list", e);
+        }
+
+        List<Reminder> active = new ArrayList<>();
+        if (stored == null) return active;
+
+        for (Reminder reminder : stored) {
+            if (!isVisibleInWidget(reminder)) continue;
+            if (active.size() >= MAX_REMINDERS) {
+                Log.w("Reminders", "Widget list truncated to " + MAX_REMINDERS + " reminders");
+                break;
+            }
+            active.add(reminder);
+        }
+        return active;
+    }
+
+    /**
+     * Builds a single row of the reminders list.
+     */
+    static RemoteViews createReminderItem(Context context, Reminder reminder) {
+        boolean useMiniLayout = reminder.getDescription() == null || reminder.getDescription().isEmpty();
+
+        RemoteViews views = new RemoteViews(context.getPackageName(),
+                useMiniLayout ? R.layout.widget_reminder_layout_small : R.layout.widget_reminder_layout);
+
+        views.setTextViewText(R.id.reminder_title, reminder.getTitle());
+        if (!useMiniLayout) {
+            views.setTextViewText(R.id.reminder_description, reminder.getDescription());
+        }
+        views.setTextViewText(R.id.reminder_time, formatReminderTime(context, reminder));
+
+        Intent fillInIntent = new Intent();
+        fillInIntent.setData(Uri.parse("https://app.notesnook.com/open_reminder?id=" + reminder.getId()));
+        fillInIntent.putExtra(RCTNNativeModule.IntentType, "OpenReminder");
+        fillInIntent.putExtra(ReminderWidgetProvider.OpenReminderId, reminder.getId());
+        views.setOnClickFillInIntent(R.id.reminder_item_btn, fillInIntent);
+        return views;
+    }
+
+    /**
+     * Options attached to the PendingIntents our widgets hand to the launcher, opting the creator
+     * (us) in to background activity starts so a tap on the widget can bring up an activity.
+     *
+     * MODE_BACKGROUND_ACTIVITY_START_ALLOWED is deprecated since API 36 and Android 17 extends the
+     * background activity launch restrictions to IntentSender, so on API 36+ we use the narrower
+     * MODE_BACKGROUND_ACTIVITY_START_ALLOW_IF_VISIBLE instead. That is enough for widgets: the
+     * sender is the launcher, which is visible whenever the user taps the widget.
+     */
+    static Bundle getActivityOptionsBundle() {
+        ActivityOptions activityOptions;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+            activityOptions = ActivityOptions.makeBasic();
+            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
+                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_IF_VISIBLE);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            activityOptions = ActivityOptions.makeBasic();
+            activityOptions.setPendingIntentCreatorBackgroundActivityStartMode(
+                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
+        } else {
+            return null;
+        }
+        return activityOptions.toBundle();
+    }
+
+    /**
+     * How long a reminder keeps its place in the list after going off, so the user can see that it
+     * happened rather than watching it vanish. Must match RECENTLY_PASSED_WINDOW in
+     * services/notifications.ts, which decides what gets written out in the first place.
+     */
+    private static final long RECENTLY_PASSED_WINDOW_MS = TimeUnit.HOURS.toMillis(3);
+
+    /**
+     * Whether a reminder should still be drawn.
+     *
+     * We re-check here rather than trusting the stored list because that list is only rewritten
+     * while the app runs. This is what actually retires a reminder once its grace period is up:
+     * every redraw re-evaluates it against the current time.
+     */
+    static boolean isVisibleInWidget(Reminder reminder) {
+        if (reminder == null) return false;
+        if (reminder.isDisabled()) return false;
+
+        long now = System.currentTimeMillis();
+        if (reminder.getSnoozeUntil() > now) return true;
+        if (!"once".equals(reminder.getMode())) return true;
+
+        long triggerDate = reminder.getTriggerDate() > 0 ? reminder.getTriggerDate() : reminder.getDate();
+        return triggerDate > now - RECENTLY_PASSED_WINDOW_MS;
+    }
+
+    /**
+     * Builds the label shown under a reminder. The app sends us the absolute trigger time plus the
+     * parts that never change ("5:00 PM", "12-05-2026, 5:00 PM"); everything that depends on the
+     * current time is decided here so it stays right as the widget redraws.
+     *
+     * Falls back to the pre-formatted string for lists written by an older version of the app.
+     */
+    static String formatReminderTime(Context context, Reminder reminder) {
+        long triggerDate = reminder.getTriggerDate();
+        String timeOfDay = reminder.getFormattedTimeOfDay();
+        if (triggerDate <= 0 || timeOfDay == null || timeOfDay.isEmpty()) {
+            return reminder.getFormattedTime();
+        }
+
+        if ("permanent".equals(reminder.getMode())) {
+            return context.getString(R.string.reminder_ongoing);
+        }
+
+        long now = System.currentTimeMillis();
+        if (reminder.getSnoozeUntil() > now) {
+            return context.getString(R.string.reminder_snoozed_until, timeOfDay);
+        }
+
+        String text;
+        long dayOffset = daysFromToday(triggerDate, now);
+        if (dayOffset == 0) {
+            text = context.getString(R.string.reminder_today, timeOfDay);
+        } else if (dayOffset == 1) {
+            text = context.getString(R.string.reminder_tomorrow, timeOfDay);
+        } else if (dayOffset == -1) {
+            text = context.getString(R.string.reminder_yesterday, timeOfDay);
+        } else {
+            text = reminder.getFormattedDateTime();
+            if (text == null || text.isEmpty()) return reminder.getFormattedTime();
+        }
+
+        return context.getString(
+                triggerDate <= now ? R.string.reminder_last : R.string.reminder_upcoming, text);
+    }
+
+    /**
+     * Calendar days between two instants. Compares midnights rather than subtracting the raw
+     * difference so that "tomorrow" is still tomorrow across a DST change or just before midnight.
+     */
+    private static long daysFromToday(long time, long now) {
+        long target = startOfDay(time);
+        long today = startOfDay(now);
+        return Math.round((target - today) / (double) DateUtils.DAY_IN_MILLIS);
+    }
+
+    private static long startOfDay(long time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(time);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return calendar.getTimeInMillis();
+    }
+}

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

@@ -2,13 +2,14 @@ package com.streetwriters.notesnook.datatypes;
 
 import androidx.annotation.Keep;
 
-import java.util.concurrent.TimeUnit;
-
 @Keep
 public class Reminder extends BaseItem {
     private String title;
     private String description;
     private String formattedTime;
+    private String formattedTimeOfDay; // e.g. "5:00 PM"
+    private String formattedDateTime; // e.g. "12-05-2026, 5:00 PM"
+    private long triggerDate; // absolute time this reminder next fires
     private String priority; // "silent", "vibrate", "urgent"
     private long date;
     private String mode; // "repeat", "once", "permanent"
@@ -107,32 +108,27 @@ public class Reminder extends BaseItem {
         this.formattedTime = formattedTime;
     }
 
-    public String formatTime(long timeInMillis) {
-        long currentTime = System.currentTimeMillis();
-        long diff = timeInMillis - currentTime;
+    public String getFormattedTimeOfDay() {
+        return formattedTimeOfDay;
+    }
 
-        if (diff < TimeUnit.MINUTES.toMillis(1)) {
-            return "in " + (diff / 1000) + " seconds";
-        } else if (diff < TimeUnit.HOURS.toMillis(1)) {
-            long minutes = TimeUnit.MILLISECONDS.toMinutes(diff);
-            return "in " + minutes + " minute" + (minutes > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(1)) {
-            long hours = TimeUnit.MILLISECONDS.toHours(diff);
-            return "in " + hours + " hour" + (hours > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(2)) {
-            return "tomorrow";
-        } else if (diff < TimeUnit.DAYS.toMillis(7)) {
-            long days = TimeUnit.MILLISECONDS.toDays(diff);
-            return "in " + days + " day" + (days > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(30)) {
-            long weeks = TimeUnit.MILLISECONDS.toDays(diff) / 7;
-            return "in " + weeks + " week" + (weeks > 1 ? "s" : "");
-        } else if (diff < TimeUnit.DAYS.toMillis(365)) {
-            long months = TimeUnit.MILLISECONDS.toDays(diff) / 30;
-            return "in " + months + " month" + (months > 1 ? "s" : "");
-        } else {
-            long years = TimeUnit.MILLISECONDS.toDays(diff) / 365;
-            return "in " + years + " year" + (years > 1 ? "s" : "");
-        }
+    public void setFormattedTimeOfDay(String formattedTimeOfDay) {
+        this.formattedTimeOfDay = formattedTimeOfDay;
+    }
+
+    public String getFormattedDateTime() {
+        return formattedDateTime;
+    }
+
+    public void setFormattedDateTime(String formattedDateTime) {
+        this.formattedDateTime = formattedDateTime;
+    }
+
+    public long getTriggerDate() {
+        return triggerDate;
+    }
+
+    public void setTriggerDate(long triggerDate) {
+        this.triggerDate = triggerDate;
     }
 }

apps/mobile/android/app/src/main/res/drawable/layout_bg.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid  android:color="@color/background"/>
     <stroke android:width="0dp" android:color="#B1BCBE" />
-    <corners android:radius="10dp"/>
+    <corners android:radius="@dimen/widget_background_radius"/>
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>

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

@@ -2,8 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/transparent"
-    android:theme="@style/ThemeOverlay.Notesnook.AppWidgetContainer">
+    android:background="@android:color/transparent">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -2,8 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/transparent"
-    android:theme="@style/ThemeOverlay.Notesnook.AppWidgetContainer">
+    android:background="@android:color/transparent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -25,7 +24,7 @@
             android:textColor="@color/text"
             android:textSize="16sp"
             android:textStyle="bold"
-            android:text="Widget unconfigured" />
+            android:text="@string/widget_note_unconfigured_title" />
         <TextView
             android:id="@+id/widget_body"
             android:layout_width="wrap_content"
@@ -34,7 +33,7 @@
             android:layout_marginLeft="8dp"
             android:textColor="@color/text"
             android:textSize="14sp"
-            android:text="Configure this widget to show a note here." />
+            android:text="@string/widget_note_unconfigured_body" />
     </LinearLayout>
 
 </RelativeLayout>

apps/mobile/android/app/src/main/res/layout/note_widget_preview.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Shown in the widget picker only. Mirrors note_widget.xml, but with sample content, since the
+  real layout has nothing to show until the widget has been configured.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:background="@drawable/layout_bg"
+        android:elevation="5dp"
+        android:orientation="vertical"
+        android:paddingHorizontal="10dp"
+        android:paddingVertical="10dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="8dp"
+            android:text="@string/widget_preview_note_title"
+            android:textColor="@color/text"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="8dp"
+            android:text="@string/widget_preview_note_body"
+            android:textColor="@color/text"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+</RelativeLayout>

apps/mobile/android/app/src/main/res/layout/widget_reminder_empty.xml

@@ -1,8 +0,0 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:text="No upcoming reminders"
-    android:textSize="16sp"
-    android:textColor="@android:color/darker_gray"
-    android:gravity="center" />

apps/mobile/android/app/src/main/res/layout/widget_reminders.xml

@@ -12,22 +12,23 @@
         android:orientation="horizontal"
         android:paddingHorizontal="12dp"
         android:layout_gravity="center"
-        android:paddingTop="12dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
         >
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_marginTop="2dp"
-            android:textSize="16sp"
+            android:textSize="15sp"
             android:textStyle="bold"
             android:textColor="@color/text"
-            android:text="Upcoming Reminders"/>
+            android:text="Reminders"/>
 
         <ImageButton
-            android:layout_width="35dp"
+            android:layout_width="25dp"
             android:id="@+id/add_button"
-            android:layout_height="35dp"
+            android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:background="@drawable/ic_newnote" />
     </RelativeLayout>
@@ -57,7 +58,8 @@
             android:layout_height="match_parent"
             android:textAlignment="center"
             android:gravity="center"
-            android:text="Tap on + to add reminder"/>
+            android:textColor="@color/text"
+            android:text="@string/widget_reminders_empty"/>
 
     </LinearLayout>
 

apps/mobile/android/app/src/main/res/layout/widget_reminders_preview.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Shown in the widget picker only. Mirrors widget_reminders.xml, but with the list replaced by
+  sample rows, since an adapter-backed list renders empty in the picker.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/layout_bg"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:paddingHorizontal="12dp"
+        android:paddingTop="12dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_marginTop="2dp"
+            android:text="Reminders"
+            android:textColor="@color/text"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <ImageButton
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_alignParentRight="true"
+            android:background="@drawable/ic_newnote"
+            android:contentDescription="@string/add_widget" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="8dp"
+        android:background="@color/border" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingHorizontal="12dp"
+        android:paddingBottom="12dp">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/widget_preview_reminder_title"
+            android:textColor="@color/text"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:text="@string/widget_preview_reminder_time"
+            android:textColor="@color/text"
+            android:textSize="12sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/widget_preview_reminder_title_alt"
+            android:textColor="@color/text"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/widget_preview_reminder_time_alt"
+            android:textColor="@color/text"
+            android:textSize="12sp" />
+    </LinearLayout>
+
+</LinearLayout>

apps/mobile/android/app/src/main/res/values-night/colors.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="light_blue_50">#FFE1F5FE</color>
-    <color name="light_blue_200">#FF81D4FA</color>
-    <color name="light_blue_600">#FF039BE5</color>
-    <color name="light_blue_900">#FF01579B</color>
     <color name="bootsplash_background">#1f1f1f</color>
     <color name="background">#1D1D1D</color>
     <color name="border">#2E2E2E</color>

apps/mobile/android/app/src/main/res/values-v31/dimens.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Android 12 onwards the launcher tells us what radius widgets should use, so ours line up
+         with every other widget on the home screen instead of being a fixed 10dp. -->
+    <dimen name="widget_background_radius">@android:dimen/system_app_widget_background_radius</dimen>
+
+</resources>

apps/mobile/android/app/src/main/res/values/attrs.xml

@@ -1,6 +0,0 @@
-<resources>
-    <declare-styleable name="AppWidgetAttrs">
-        <attr name="appWidgetBackgroundColor" format="color" />
-        <attr name="appWidgetTextColor" format="color" />
-    </declare-styleable>
-</resources>

apps/mobile/android/app/src/main/res/values/colors.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="light_blue_50">#FFE1F5FE</color>
-    <color name="light_blue_200">#FF81D4FA</color>
-    <color name="light_blue_600">#FF039BE5</color>
-    <color name="light_blue_900">#FF01579B</color>
     <color name="bootsplash_background">#FFFFFF</color>
     <color name="background">#DCEDEDED</color>
     <color name="border">#BFBFBF</color>

apps/mobile/android/app/src/main/res/values/dimens.xml

@@ -7,4 +7,8 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     -->
     <dimen name="widget_margin">0dp</dimen>
 
+    <!-- Overridden in values-v31 with the platform's own widget radius, so our widgets match the
+         rest of the home screen. This is the fallback for older versions. -->
+    <dimen name="widget_background_radius">10dp</dimen>
+
 </resources>

apps/mobile/android/app/src/main/res/values/strings.xml

@@ -4,9 +4,28 @@
     <string name="appwidget_text">EXAMPLE</string>
     <string name="add_widget">Add widget</string>
     <string name="take_a_quick_note">Take a quick note.</string>
-    <string name="reminders">Quick overview of upcoming reminders</string>
+    <string name="reminders">Quick overview of reminders</string>
     <string name="reminders_title">Reminders</string>
     <string name="note">Note</string>
     <string name="note_description">Add a note to home screen</string>
     <string name="quick_note">Quick note</string>
+    <string name="widget_reminders_empty">Tap + to add a reminder</string>
+
+    <!-- Sample content, only ever shown in the widget picker's preview. -->
+    <string name="widget_preview_note_title">Meeting notes</string>
+    <string name="widget_preview_note_body">Discuss the roadmap and agree on timelines.</string>
+    <string name="widget_preview_reminder_title">Take a walk</string>
+    <string name="widget_preview_reminder_time">Upcoming: Today, 5:00 PM</string>
+    <string name="widget_preview_reminder_title_alt">Call the dentist</string>
+    <string name="widget_preview_reminder_time_alt">Upcoming: Tomorrow, 9:00 AM</string>
+
+    <string name="widget_note_unconfigured_title">Tap to choose a note</string>
+    <string name="widget_note_unconfigured_body">Pick the note you want shown here.</string>
+    <string name="reminder_ongoing">Ongoing</string>
+    <string name="reminder_snoozed_until">Snoozed until %1$s</string>
+    <string name="reminder_today">Today, %1$s</string>
+    <string name="reminder_tomorrow">Tomorrow, %1$s</string>
+    <string name="reminder_yesterday">Yesterday, %1$s</string>
+    <string name="reminder_upcoming">Upcoming: %1$s</string>
+    <string name="reminder_last">Last: %1$s</string>
 </resources>

apps/mobile/android/app/src/main/res/values/themes.xml

@@ -1,7 +0,0 @@
-<resources>
-
-    <style name="ThemeOverlay.Notesnook.AppWidgetContainer" parent="">
-        <item name="appWidgetBackgroundColor">@color/light_blue_600</item>
-        <item name="appWidgetTextColor">@color/light_blue_50</item>
-    </style>
-</resources>

apps/mobile/android/app/src/main/res/xml-v36/note_widget_info.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Keep this in sync with res/xml/note_widget_info.xml. It exists only to add not_keyguard: from
+  Android 16 QPR1 widgets are lock screen eligible by default, and this one renders the note's
+  title and preview text, which should not be readable on a locked device.
+-->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialKeyguardLayout="@layout/note_widget"
+    android:initialLayout="@layout/note_widget"
+    android:configure="com.streetwriters.notesnook.NotePreviewConfigureActivity"
+    android:widgetFeatures="reconfigurable"
+    android:minResizeWidth="100dp"
+    android:minResizeHeight="50dp"
+    android:minWidth="400dp"
+    android:description="@string/note_description"
+    android:minHeight="50dp"
+    android:targetCellWidth="5"
+    android:targetCellHeight="1"
+    android:previewImage="@drawable/note_widget_preview"
+    android:previewLayout="@layout/note_widget_preview"
+    android:resizeMode="horizontal|vertical"
+    android:updatePeriodMillis="86400000"
+    android:widgetCategory="home_screen|not_keyguard"/>

apps/mobile/android/app/src/main/res/xml-v36/widget_reminders_info.xml

@@ -0,0 +1,15 @@
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialLayout="@layout/widget_reminders"
+    android:minWidth="250dp"
+    android:minHeight="110dp"
+    android:minResizeWidth="180dp"
+    android:minResizeHeight="110dp"
+    android:description="@string/reminders"
+    android:targetCellWidth="5"
+    android:targetCellHeight="2"
+    android:resizeMode="horizontal|vertical"
+    android:previewImage="@drawable/reminder_preview"
+    android:previewLayout="@layout/widget_reminders_preview"
+    android:updatePeriodMillis="1800000"
+    android:widgetCategory="home_screen|not_keyguard"
+    />

apps/mobile/android/app/src/main/res/xml/new_note_widget_info.xml

@@ -10,6 +10,7 @@
     android:targetCellWidth="5"
     android:targetCellHeight="1"
     android:previewImage="@drawable/widget_preview"
+    android:previewLayout="@layout/new_note_widget"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen"/>

apps/mobile/android/app/src/main/res/xml/note_widget_info.xml

@@ -12,6 +12,7 @@
     android:targetCellWidth="5"
     android:targetCellHeight="1"
     android:previewImage="@drawable/note_widget_preview"
+    android:previewLayout="@layout/note_widget_preview"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen"/>

apps/mobile/android/app/src/main/res/xml/widget_reminders_info.xml

@@ -1,14 +1,15 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:initialLayout="@layout/widget_reminders"
-    android:minWidth="400dp"
-    android:minHeight="100dp"
-    android:minResizeWidth="400dp"
-    android:minResizeHeight="50dp"
+    android:minWidth="250dp"
+    android:minHeight="110dp"
+    android:minResizeWidth="180dp"
+    android:minResizeHeight="110dp"
     android:description="@string/reminders"
     android:targetCellWidth="5"
     android:targetCellHeight="2"
     android:resizeMode="horizontal|vertical"
     android:previewImage="@drawable/reminder_preview"
-    android:updatePeriodMillis="1024"
+    android:previewLayout="@layout/widget_reminders_preview"
+    android:updatePeriodMillis="1800000"
     android:widgetCategory="home_screen"
     />

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

@@ -1,3 +1,6 @@
-- Bug fixes and improvements
+- Added sync status icon in sidebar
+- Added new reminder shortcut in app icon context menu
+- Improved editor saving reliability
+- Minor bug fixes and improvements
 
-Thank you for using Notesnook!
+Thank you for using Notesnook!

apps/mobile/app/app.tsx

@@ -23,7 +23,7 @@ import {
   THEME_COMPATIBILITY_VERSION,
   useThemeEngineStore
 } from "@notesnook/theme";
-import React, { PropsWithChildren, useEffect } from "react";
+import React, { PropsWithChildren, useEffect, useState } from "react";
 import { Appearance, I18nManager, Linking, StatusBar } from "react-native";
 import "react-native-gesture-handler";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
@@ -44,26 +44,37 @@ import { useUserStore } from "./stores/use-user-store";
 import RNBootSplash from "react-native-bootsplash";
 import AppLocked from "./components/app-lock";
 import { useSettingStore } from "./stores/use-setting-store";
+import {
+  initShortcutListener,
+  launchNewNoteTab,
+  registerAppShortcuts
+} from "./hooks/use-shortcut-manager";
+import Shortcuts from "react-native-actions-shortcuts";
 I18nManager.allowRTL(false);
 I18nManager.forceRTL(false);
 I18nManager.swapLeftAndRightInRTL(false);
+
 const { appLockEnabled, appLockMode } = SettingsService.get();
 if (appLockEnabled || appLockMode !== "none") {
   useUserStore.getState().lockApp(true);
 }
-RNBootSplash.hide({
-  fade: true
-});
-Linking.getInitialURL().then((url) => {
-  useSettingStore.setState({
-    initialUrl: url
-  });
-});
+
 const App = (props: { configureMode: "note-preview" }) => {
   useAppEvents();
   //@ts-ignore
   globalThis["IS_MAIN_APP_RUNNING"] = true;
+  const introCompleted = useSettingStore(
+    (state) => state.settings.introCompleted
+  );
+
   useEffect(() => {
+    if (introCompleted) {
+      registerAppShortcuts();
+    }
+  }, [introCompleted]);
+
+  useEffect(() => {
+    RNBootSplash.hide({ fade: true });
     SettingsService.onFirstLaunch();
     changeSystemBarColors();
     SettingsService.setPrivacyScreen(
@@ -176,4 +187,41 @@ export const withTheme = (
   };
 };
 
-export default withTheme(withErrorBoundry(App, "App"));
+export const withStartupBoundry = (
+  Element: (props: PropsWithChildren) => JSX.Element
+) => {
+  return function AppWithStartupBoundary(props: PropsWithChildren) {
+    const [ready, setReady] = useState(false);
+
+    useEffect(() => {
+      async function init() {
+        try {
+          const [url, shortcut] = await Promise.all([
+            Linking.getInitialURL(),
+            Shortcuts.getInitialShortcut()
+          ]);
+          console.log(url, shortcut);
+          if (shortcut?.type === "notesnook.action.newnote") {
+            launchNewNoteTab();
+          }
+          useSettingStore.setState({
+            initialUrl: url,
+            pendingShortcut: shortcut ?? null
+          });
+
+          initShortcutListener();
+        } finally {
+          setReady(true);
+        }
+      }
+
+      init();
+    }, []);
+
+    if (!ready) return null;
+
+    return <Element {...props} />;
+  };
+};
+
+export default withStartupBoundry(withTheme(withErrorBoundry(App, "App")));

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

@@ -31,6 +31,8 @@ import {
   generateCryptoKeyFallback
 } from "./encryption";
 import { MMKV } from "./mmkv";
+import OpenPGP from "react-native-fast-openpgp";
+import { strings } from "@notesnook/intl";
 
 export class KV {
   storage: MMKVInstance;
@@ -136,11 +138,41 @@ export const Storage: IStorage = {
   clear(): Promise<void> {
     return DefaultStorage.clear();
   },
-  generateCryptoKeyPair() {
-    throw new Error("Not implemented");
+  async generatePGPKeyPair() {
+    const keys = await OpenPGP.generate({
+      name: "NN",
+      email: "NN@NN.NN"
+    });
+    return { publicKey: keys.publicKey, privateKey: keys.privateKey };
   },
-  decryptAsymmetric() {
-    throw new Error("Not implemented");
+  async validatePGPKeyPair(keys): Promise<{
+    isValid: boolean;
+    message: string;
+  }> {
+    try {
+      const dummyData = JSON.stringify({
+        favorite: true,
+        title: "Hello world"
+      });
+      const encrypted = await OpenPGP.encrypt(dummyData, keys.publicKey);
+      const decrypted = await OpenPGP.decrypt(encrypted, keys.privateKey, "");
+
+      const isValid = decrypted === dummyData;
+
+      return {
+        isValid,
+        message: isValid ? "" : strings.invalidPgpKeyPair()
+      };
+    } catch (e) {
+      console.error("PGP key pair validation error:", e);
+      return {
+        isValid: false,
+        message: strings.invalidPgpKeyPair()
+      };
+    }
+  },
+  async decryptPGPMessage(privateKeyArmored, encryptedMessage) {
+    return await OpenPGP.decrypt(encryptedMessage, privateKeyArmored, "");
   },
   getAllKeys(): Promise<string[]> {
     return DefaultStorage.getAllKeys();

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

@@ -115,6 +115,10 @@ export const FileSizeResult = {
   Error: -1
 };
 
+function getFileSizeFromHeaders(headers: Headers) {
+  return headers.get("x-object-size") || headers.get("content-length");
+}
+
 export async function getUploadedFileSize(hash: string, retry = 0) {
   try {
     const url = `${hosts.API_HOST}/s3?name=${hash}`;
@@ -124,24 +128,21 @@ export async function getUploadedFileSize(hash: string, retry = 0) {
       headers: { Authorization: `Bearer ${token}` }
     });
 
-    if (
-      !attachmentInfo.ok ||
-      attachmentInfo.headers?.get("content-length") === null
-    ) {
+    const fileSize = getFileSizeFromHeaders(attachmentInfo.headers);
+
+    if (!attachmentInfo.ok || fileSize === null) {
       if (retry < 3) {
         DatabaseLogger.log(`Retrying file size check: ${hash}, ${retry}`);
         return getUploadedFileSize(hash, retry + 1);
       }
       throw new Error(
-        `File size check failed: ${hash}, ${
-          attachmentInfo.status
-        }, ${attachmentInfo.headers?.get("content-length")}`
+        `File size check failed: ${hash}, ${attachmentInfo.status}, ${fileSize}`
       );
     }
 
-    const contentLength = parseInt(
-      attachmentInfo.headers?.get("content-length") as string
-    );
+    console.log(attachmentInfo.headers);
+
+    const contentLength = parseInt(fileSize as string);
     return isNaN(contentLength) ? FileSizeResult.Empty : contentLength;
   } catch (e) {
     DatabaseLogger.error(e);
@@ -161,10 +162,10 @@ export async function checkUpload(
     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;
+        ? `File verification check failed.`
+        : expectedSize !== decryptedLength
+          ? `File size mismatch. Expected ${size} bytes but got ${decryptedLength} bytes.`
+          : undefined;
   if (error) throw new Error(error);
 }
 
@@ -191,7 +192,8 @@ export async function checkAndCreateDir(path: string) {
 }
 
 export const santizeUri = (uri: string) => {
-  return Platform.OS === "ios" ? decodeURI(uri).replace("file:///", "/") : uri;
+  const decoded = decodeURI(uri);
+  return Platform.OS === "ios" ? decoded.replace("file:///", "/") : decoded;
 };
 
 export function isSuccessStatusCode(statusCode: number) {

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

@@ -36,6 +36,7 @@ import { getElevationStyle } from "../../utils/elevation";
 import { AppFontSize, normalize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import { hexToRGBA, RGB_Linear_Shade } from "../../utils/colors";
+import useGlobalSafeAreaInsets from "../../hooks/use-global-safe-area-insets";
 
 interface FloatingButtonProps {
   onPress: () => void;
@@ -47,6 +48,7 @@ interface FloatingButtonProps {
   position?: "left" | "right";
   size?: "small" | "large";
   style?: ViewStyle;
+  hideOnKeyboard?: boolean;
 }
 
 const FloatingButton = ({
@@ -57,26 +59,28 @@ const FloatingButton = ({
   testID,
   position = "right",
   size = "large",
-  style
+  style,
+  hideOnKeyboard = true
 }: FloatingButtonProps) => {
   const { colors } = useThemeColors();
   const deviceMode = useSettingStore((state) => state.deviceMode);
   const selectionMode = useSelectionStore((state) => state.selectionMode);
   const translate = useSharedValue(0);
+  const keyboardHeight = useSharedValue(0);
   const route = useRoute();
+  const insets = useGlobalSafeAreaInsets();
 
-  const animatedStyle = useAnimatedStyle(() => {
-    return {
-      transform: [
-        {
-          translateX: translate.value
-        },
-        {
-          translateY: translate.value
-        }
-      ]
-    };
-  });
+  const animatedStyle = useAnimatedStyle(() => ({
+    transform: [
+      {
+        translateX: hideOnKeyboard ? translate.value : 0
+      },
+      {
+        translateY: hideOnKeyboard ? translate.value : 0
+      }
+    ],
+    bottom: hideOnKeyboard ? 15 : keyboardHeight.value + 15
+  }));
 
   const animate = useCallback(
     (toValue: number) => {
@@ -97,12 +101,22 @@ const FloatingButton = ({
       editorState().keyboardState = false;
       if (deviceMode !== "mobile") return;
       animate(0);
+      keyboardHeight.value = withTiming(0);
     };
 
-    const onKeyboardShow = () => {
+    const onKeyboardShow = (e: any) => {
       editorState().keyboardState = true;
       if (deviceMode !== "mobile") return;
-      animate(150);
+      if (hideOnKeyboard) {
+        animate(150);
+      } else {
+        keyboardHeight.value = withTiming(
+          e.endCoordinates.height - insets.bottom,
+          {
+            duration: 250
+          }
+        );
+      }
     };
 
     const sub = [
@@ -110,9 +124,9 @@ const FloatingButton = ({
       Keyboard.addListener("keyboardDidHide", onKeyboardHide)
     ];
     return () => {
-      sub.forEach((sub) => sub?.remove?.());
+      sub.forEach((sub) => sub.remove());
     };
-  }, [deviceMode, animate]);
+  }, [deviceMode, animate, hideOnKeyboard, keyboardHeight, insets.bottom]);
 
   return deviceMode !== "mobile" && !alwaysVisible ? null : (
     <Animated.View
@@ -161,10 +175,10 @@ const FloatingButton = ({
               icon
                 ? icon
                 : route.name === "Notebooks"
-                ? "notebook-plus"
-                : route.name === "Trash"
-                ? "delete"
-                : "plus"
+                  ? "notebook-plus"
+                  : route.name === "Trash"
+                    ? "delete"
+                    : "plus"
             }
             color={color || colors.primary.accent}
             size={size === "small" ? AppFontSize.xl : AppFontSize.xxxl}

apps/mobile/app/components/date-picker/index.tsx

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import React from "react";
 import { useThemeColors } from "@notesnook/theme";
 import { useRef } from "react";
-import { View } from "react-native";
+import { useWindowDimensions, View } from "react-native";
 import { defaultBorderRadius } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
 import DatePicker from "react-native-date-picker";
@@ -32,7 +32,10 @@ export default function DatePickerComponent(props: {
   onCancel: () => void;
 }) {
   const { colors, isDark } = useThemeColors();
-  const dateRef = useRef<Date>(dayjs().add(1, "day").toDate());
+  const dateRef = useRef<Date>(dayjs().add(1, "week").toDate());
+
+  const { width } = useWindowDimensions();
+
   return (
     <View
       style={{
@@ -46,6 +49,9 @@ export default function DatePickerComponent(props: {
       }}
     >
       <DatePicker
+        style={{
+          width: width * 0.8 - DefaultAppStyles.GAP * 2
+        }}
         theme={isDark ? "dark" : "light"}
         mode="date"
         minimumDate={dayjs().add(1, "day").toDate()}

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

@@ -143,9 +143,6 @@ export const Dialog = ({ context = "global" }: { context?: string }) => {
   }, [hide, show]);
 
   const onNegativePress = async () => {
-    if (dialogInfo?.onClose) {
-      await dialogInfo.onClose();
-    }
     hide();
   };
 

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

@@ -35,6 +35,7 @@ import { Button } from "../../ui/button";
 import { IconButton } from "../../ui/icon-button";
 import { Notice } from "../../ui/notice";
 import Paragraph from "../../ui/typography/paragraph";
+import SettingsService from "../../../services/settings";
 
 export default function AttachImage({
   response,
@@ -201,6 +202,17 @@ AttachImage.present = (response: ImageType[], context?: string) => {
     | undefined
   >((resolve) => {
     let resolved = false;
+
+    const imageCompressionSetting =
+      SettingsService.getProperty("imageCompression");
+
+    if (imageCompressionSetting !== "ask-every-time") {
+      resolve({
+        compress: imageCompressionSetting === "enabled" ? true : false
+      });
+      return;
+    }
+
     presentSheet({
       context: context,
       component: (ref, close, update) => (

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

@@ -51,7 +51,10 @@ import DialogButtons from "../../dialog/dialog-buttons";
 import DialogHeader from "../../dialog/dialog-header";
 import { Toast } from "../../toast";
 import { Button } from "../../ui/button";
-import Input from "../../ui/input";
+import FormInput, {
+  createFormRef,
+  validators
+} from "../../ui/input/form-input";
 import Seperator from "../../ui/seperator";
 import Paragraph from "../../ui/typography/paragraph";
 import { strings } from "@notesnook/intl";
@@ -63,15 +66,18 @@ import {
   VAULT_ERRORS
 } from "@notesnook/core";
 import { useThemeColors } from "@notesnook/theme";
+import { useUserStore } from "../../../stores/use-user-store";
+import { AppFontSize } from "../../../utils/size";
+import { Pressable } from "../../ui/pressable";
+import AppIcon from "../../ui/AppIcon";
 
 export const VaultDialog: React.FC = () => {
   const { colors } = useThemeColors();
 
   // UI State
   const [visible, setVisible] = useState(false);
+  const isUserLoggedIn = useUserStore((state) => !!state.user);
   const [loading, setLoading] = useState(false);
-  const [wrongPassword, setWrongPassword] = useState(false);
-  const [passwordsDontMatch, setPasswordsDontMatch] = useState(false);
   const [deleteAll, setDeleteAll] = useState(false);
   const [biometricUnlock, setBiometricUnlock] = useState(false);
   const [isBiometryAvailable, setIsBiometryAvailable] = useState(false);
@@ -100,15 +106,19 @@ export const VaultDialog: React.FC = () => {
     | undefined
   >(undefined);
 
+  // Form ref
+  const formRef = useRef(
+    createFormRef({
+      password: "",
+      confirmPassword: "",
+      newPassword: ""
+    })
+  );
+
   // Input refs
   const passInputRef = useRef<TextInput>(null);
   const confirmPassRef = useRef<TextInput>(null);
-  const changePassInputRef = useRef<TextInput>(null);
-
-  // Password refs
-  const passwordRef = useRef<string | null>(null);
-  const confirmPasswordRef = useRef<string | null>(null);
-  const newPasswordRef = useRef<string | null>(null);
+  const newPassInputRef = useRef<TextInput>(null);
 
   const close = useCallback(() => {
     if (loading) {
@@ -123,10 +133,11 @@ export const VaultDialog: React.FC = () => {
 
     Navigation.queueRoutesForUpdate();
 
-    // Reset password refs
-    passwordRef.current = null;
-    confirmPasswordRef.current = null;
-    newPasswordRef.current = null;
+    // Reset form values and errors
+    formRef.current.setValue("password", "");
+    formRef.current.setValue("confirmPassword", "");
+    formRef.current.setValue("newPassword", "");
+    formRef.current.clearErrors();
 
     // Reset refs
     requestTypeRef.current = null;
@@ -144,8 +155,6 @@ export const VaultDialog: React.FC = () => {
     // Reset UI state
     setVisible(false);
     setLoading(false);
-    setWrongPassword(false);
-    setPasswordsDontMatch(false);
     setDeleteAll(false);
     setBiometricUnlock(false);
     setIsBiometryAvailable(false);
@@ -155,9 +164,10 @@ export const VaultDialog: React.FC = () => {
   const deleteVault = useCallback(async () => {
     setLoading(true);
     try {
+      const { password } = formRef.current.getValues();
       let verified = true;
       if (await db.user.getUser()) {
-        verified = await db.user.verifyPassword(passwordRef.current || "");
+        verified = await db.user.verifyPassword(password);
       }
       if (verified) {
         let noteIds: string[] = [];
@@ -175,6 +185,7 @@ export const VaultDialog: React.FC = () => {
           noteIds = relations.map((item) => item.toId);
         }
         await db.vault.delete(deleteAll);
+        await BiometricService.resetCredentials();
 
         if (deleteAll) {
           noteIds.forEach((id) => {
@@ -190,16 +201,15 @@ export const VaultDialog: React.FC = () => {
         }
         eSendEvent("vaultUpdated");
         setLoading(false);
-        setTimeout(() => {
-          close();
-        }, 100);
+        close();
+        ToastManager.show({
+          message: strings.vaultDeleted(),
+          type: "success",
+          context: "global"
+        });
       } else {
         setLoading(false);
-        ToastManager.show({
-          heading: strings.passwordIncorrect(),
-          type: "error",
-          context: "local"
-        });
+        formRef.current.setError("password", strings.passwordIncorrect());
       }
     } catch (e) {
       console.error(e);
@@ -209,11 +219,12 @@ export const VaultDialog: React.FC = () => {
   const clearVault = useCallback(async () => {
     setLoading(true);
     try {
+      const { password } = formRef.current.getValues();
       const vault = await db.vaults.default();
       const relations = await db.relations.from(vault!, "note").get();
       const noteIds = relations.map((item) => item.toId);
 
-      await db.vault.clear(passwordRef.current || "");
+      await db.vault.clear(password);
 
       noteIds.forEach((id) => {
         eSendEvent(
@@ -233,11 +244,7 @@ export const VaultDialog: React.FC = () => {
         type: "success"
       });
     } catch (e) {
-      ToastManager.show({
-        heading: strings.passwordIncorrect(),
-        type: "error",
-        context: "local"
-      });
+      formRef.current.setError("password", strings.passwordIncorrect());
     }
     setLoading(false);
   }, [close]);
@@ -257,12 +264,7 @@ export const VaultDialog: React.FC = () => {
         });
         close();
       } catch (e) {
-        close();
-        ToastManager.show({
-          heading: strings.passwordIncorrect(),
-          type: "error",
-          context: "local"
-        });
+        formRef.current.setError("password", strings.passwordIncorrect());
         setLoading(false);
       }
     },
@@ -270,24 +272,14 @@ export const VaultDialog: React.FC = () => {
   );
 
   const takeErrorAction = useCallback(() => {
-    setWrongPassword(true);
+    formRef.current.setError("password", strings.passwordIncorrect());
     setVisible(true);
-    setTimeout(() => {
-      ToastManager.show({
-        heading: strings.passwordIncorrect(),
-        type: "error",
-        context: "local"
-      });
-    }, 500);
   }, []);
 
   const lockNote = useCallback(async () => {
-    if (!passwordRef.current || passwordRef.current.trim() === "") {
-      ToastManager.show({
-        heading: strings.passwordIncorrect(),
-        type: "error",
-        context: "local"
-      });
+    const { password } = formRef.current.getValues();
+    if (!password || password.trim() === "") {
+      formRef.current.setError("password", strings.passwordIncorrect());
       return;
     } else {
       await db.vault.add(noteRef.current!.id);
@@ -305,8 +297,9 @@ export const VaultDialog: React.FC = () => {
   }, [close]);
 
   const permanantUnlock = useCallback(() => {
+    const { password } = formRef.current.getValues();
     db.vault
-      .remove(noteRef.current!.id, passwordRef.current || "")
+      .remove(noteRef.current!.id, password)
       .then(async () => {
         ToastManager.show({
           heading: strings.noteUnlocked(),
@@ -315,7 +308,7 @@ export const VaultDialog: React.FC = () => {
         });
         eSendEvent(eUpdateNoteInEditor, noteRef.current, true);
         if (biometricUnlock && !isBiometryEnrolled) {
-          await enrollFingerprint(passwordRef.current || "");
+          await enrollFingerprint(password);
         }
         close();
       })
@@ -375,8 +368,9 @@ export const VaultDialog: React.FC = () => {
   );
 
   const deleteNote = useCallback(async () => {
+    const { password } = formRef.current.getValues();
     try {
-      await db.vault.remove(noteRef.current!.id, passwordRef.current || "");
+      await db.vault.remove(noteRef.current!.id, password);
       await deleteItems("note", [noteRef.current!.id]);
       close();
     } catch (e) {
@@ -385,16 +379,14 @@ export const VaultDialog: React.FC = () => {
   }, [close, takeErrorAction]);
 
   const openNote = useCallback(async () => {
+    const { password } = formRef.current.getValues();
     try {
-      if (!passwordRef.current) throw new Error("Invalid password");
+      if (!password) throw new Error("Invalid password");
 
-      const note = await db.vault.open(
-        noteRef.current!.id,
-        passwordRef.current
-      );
+      const note = await db.vault.open(noteRef.current!.id, password);
       if (!note) throw new Error("Failed to unlock note.");
       if (biometricUnlock && !isBiometryEnrolled) {
-        await enrollFingerprint(passwordRef.current || "");
+        await enrollFingerprint(password);
       }
 
       const requestType = requestTypeRef.current;
@@ -411,7 +403,6 @@ export const VaultDialog: React.FC = () => {
         requestType === VaultRequestType.CustomAction &&
         onUnlockRef.current
       ) {
-        const password = passwordRef.current;
         const unlock = onUnlockRef.current;
         close();
         await sleep(500);
@@ -433,12 +424,9 @@ export const VaultDialog: React.FC = () => {
   ]);
 
   const unlockNote = useCallback(async () => {
-    if (!passwordRef.current || passwordRef.current.trim() === "") {
-      ToastManager.show({
-        heading: strings.passwordIncorrect(),
-        type: "error",
-        context: "local"
-      });
+    const { password } = formRef.current.getValues();
+    if (!password || password.trim() === "") {
+      formRef.current.setError("password", strings.passwordIncorrect());
       return;
     }
     if (requestTypeRef.current === VaultRequestType.PermanentUnlock) {
@@ -449,10 +437,11 @@ export const VaultDialog: React.FC = () => {
   }, [permanantUnlock, openNote]);
 
   const createVault = useCallback(async () => {
-    await db.vault.create(passwordRef.current || "");
+    const { password } = formRef.current.getValues();
+    await db.vault.create(password);
 
     if (biometricUnlock) {
-      await enrollFingerprint(passwordRef.current || "");
+      await enrollFingerprint(password);
     }
     if (noteRef.current?.id) {
       await db.vault.add(noteRef.current.id);
@@ -504,36 +493,30 @@ export const VaultDialog: React.FC = () => {
 
     if (loading) return;
 
-    if (!passwordRef.current) {
-      ToastManager.show({
-        heading: strings.passwordNotEntered(),
-        type: "error",
-        context: "local"
-      });
+    if (!formRef.current.validate()) return;
+
+    const { password, newPassword } = formRef.current.getValues();
+
+    if (requestType === VaultRequestType.DeleteVault && !isUserLoggedIn) {
+      setLoading(true);
+      await deleteVault();
+      setLoading(false);
       return;
     }
 
     if (requestType === VaultRequestType.CreateVault) {
-      if (passwordRef.current !== confirmPasswordRef.current) {
-        ToastManager.show({
-          heading: strings.passwordNotMatched(),
-          type: "error",
-          context: "local"
-        });
-        setPasswordsDontMatch(true);
-        return;
-      }
-
       createVault();
     } else if (requestType === VaultRequestType.ChangePassword) {
       setLoading(true);
 
       db.vault
-        .changePassword(passwordRef.current, newPasswordRef.current || "")
-        .then(() => {
+        .changePassword(password, newPassword)
+        .then(async () => {
           setLoading(false);
           if (biometricUnlock) {
-            enrollFingerprint(newPasswordRef.current || "");
+            enrollFingerprint(newPassword);
+          } else {
+            await BiometricService.resetCredentials();
           }
           ToastManager.show({
             heading: strings.passwordUpdated(),
@@ -545,37 +528,23 @@ export const VaultDialog: React.FC = () => {
         .catch((e) => {
           setLoading(false);
           if (e.message === VAULT_ERRORS.wrongPassword) {
-            ToastManager.show({
-              heading: strings.passwordIncorrect(),
-              type: "error",
-              context: "local"
-            });
+            formRef.current.setError("password", strings.passwordIncorrect());
           } else {
-            ToastManager.error(e);
+            console.error(e);
           }
         });
     } else if (requestType === VaultRequestType.LockNote) {
-      if (!passwordRef.current || passwordRef.current.trim() === "") {
-        ToastManager.show({
-          heading: strings.passwordIncorrect(),
-          type: "error",
-          context: "local"
-        });
-        setWrongPassword(true);
-        return;
-      }
       db.vault
-        .unlock(passwordRef.current)
+        .unlock(password)
         .then(async (unlocked) => {
           if (unlocked) {
-            setWrongPassword(false);
             await lockNote();
           } else {
-            takeErrorAction();
+            formRef.current.setError("password", strings.passwordIncorrect());
           }
         })
         .catch((e) => {
-          takeErrorAction();
+          formRef.current.setError("password", strings.passwordIncorrect());
         });
     } else if (
       requestType === VaultRequestType.UnlockNote ||
@@ -586,22 +555,13 @@ export const VaultDialog: React.FC = () => {
       requestType === VaultRequestType.DeleteNote ||
       requestType === VaultRequestType.CustomAction
     ) {
-      if (!passwordRef.current || passwordRef.current.trim() === "") {
-        ToastManager.show({
-          heading: strings.passwordIncorrect(),
-          type: "error",
-          context: "local"
-        });
-        setWrongPassword(true);
-        return;
-      }
       if (noteLockedRef.current) {
         await unlockNote();
       } else {
         console.log("Error: Note should be locked for this operation");
       }
     } else if (requestType === VaultRequestType.EnableFingerprint) {
-      enrollFingerprint(passwordRef.current);
+      enrollFingerprint(password);
     } else if (requestType === VaultRequestType.ClearVault) {
       await clearVault();
     } else if (requestType === VaultRequestType.DeleteVault) {
@@ -616,7 +576,6 @@ export const VaultDialog: React.FC = () => {
     enrollFingerprint,
     unlockNote,
     lockNote,
-    takeErrorAction,
     clearVault,
     deleteVault
   ]);
@@ -632,7 +591,7 @@ export const VaultDialog: React.FC = () => {
         if (!credentials) throw new Error("Failed to get user credentials");
 
         if (credentials?.password) {
-          passwordRef.current = credentials.password;
+          formRef.current.setValue("password", credentials.password);
           onPress();
         } else {
           eSendEvent(eCloseActionSheet);
@@ -679,24 +638,28 @@ export const VaultDialog: React.FC = () => {
       setIsBiometryAvailable(available);
       setIsBiometryEnrolled(fingerprint);
       setBiometricUnlock(fingerprint);
-      setWrongPassword(false);
-      setPasswordsDontMatch(false);
       setDeleteAll(false);
       setLoading(false);
 
       // Auto-unlock with fingerprint if applicable
       const canAutoUnlock =
         fingerprint &&
+        available &&
         data.requestType !== VaultRequestType.EnableFingerprint &&
         data.requestType !== VaultRequestType.RevokeFingerprint &&
         data.requestType !== VaultRequestType.ChangePassword &&
         data.requestType !== VaultRequestType.ClearVault &&
         data.requestType !== VaultRequestType.DeleteVault &&
         data.requestType !== VaultRequestType.CustomAction &&
-        data.requestType !== VaultRequestType.PermanentUnlock;
+        data.requestType !== VaultRequestType.PermanentUnlock &&
+        data.requestType !== VaultRequestType.CreateVault;
 
-      if (canAutoUnlock) {
-        await onPressFingerprintAuth(data.title, data.description);
+      if (canAutoUnlock && available) {
+        try {
+          await onPressFingerprintAuth(data.title, data.description);
+        } catch (e) {
+          setVisible(true);
+        }
       } else {
         setVisible(true);
       }
@@ -758,7 +721,6 @@ export const VaultDialog: React.FC = () => {
           icon="shield"
           padding={12}
         />
-        <Seperator half />
 
         <View
           style={{
@@ -767,19 +729,25 @@ export const VaultDialog: React.FC = () => {
         >
           {(isChangePassword ||
             isClearVault ||
-            !isCreateVault ||
-            isDeleteVault ||
+            requestType === VaultRequestType.LockNote ||
+            requestType === VaultRequestType.UnlockNote ||
+            requestType === VaultRequestType.PermanentUnlock ||
+            isGoToEditor ||
+            isShareNote ||
+            isDeleteNote ||
+            isEnableFingerprint ||
+            (isDeleteVault && isUserLoggedIn) ||
             isCustomAction) &&
           !isRevokeFingerprint ? (
             <>
-              <Input
+              <FormInput
+                name="password"
+                formRef={formRef}
                 fwdRef={passInputRef}
                 editable={!loading}
                 autoCapitalize="none"
                 testID={notesnook.ids.dialogs.vault.pwd}
-                onChangeText={(value) => {
-                  passwordRef.current = value;
-                }}
+                autoComplete="password"
                 marginBottom={
                   !biometricUnlock ||
                   !isBiometryEnrolled ||
@@ -789,14 +757,13 @@ export const VaultDialog: React.FC = () => {
                     ? 0
                     : 10
                 }
-                onSubmit={() => {
+                onSubmitEditing={() => {
                   if (isChangePassword) {
-                    confirmPassRef.current?.focus();
+                    newPassInputRef.current?.focus();
                   } else {
                     onPress();
                   }
                 }}
-                autoComplete="password"
                 returnKeyLabel={
                   isChangePassword ? strings.next() : titleRef.current
                 }
@@ -807,6 +774,7 @@ export const VaultDialog: React.FC = () => {
                     ? strings.currentPassword()
                     : strings.password()
                 }
+                validators={[validators.required(strings.passwordRequired())]}
               />
 
               {!biometricUnlock ||
@@ -830,89 +798,98 @@ export const VaultDialog: React.FC = () => {
           ) : null}
 
           {isDeleteVault && (
-            <Button
+            <Pressable
               onPress={() => setDeleteAll(!deleteAll)}
-              icon={
-                deleteAll
-                  ? "check-circle-outline"
-                  : "checkbox-blank-circle-outline"
-              }
               style={{
-                marginTop: DefaultAppStyles.GAP_VERTICAL
+                paddingVertical: 0,
+                flexDirection: "row",
+                gap: DefaultAppStyles.GAP_SMALL,
+                marginTop: isUserLoggedIn
+                  ? DefaultAppStyles.GAP_VERTICAL_SMALL
+                  : 0,
+                justifyContent: "flex-start"
               }}
-              width="100%"
-              title={strings.deleteAllNotes()}
-              type="errorShade"
-            />
+            >
+              <AppIcon
+                name={
+                  deleteAll
+                    ? "check-circle-outline"
+                    : "checkbox-blank-circle-outline"
+                }
+                color={colors.error.accent}
+                size={AppFontSize.md}
+              />
+
+              <Paragraph color={colors.error.accent} size={AppFontSize.sm}>
+                {strings.deleteAllNotes()}
+              </Paragraph>
+            </Pressable>
           )}
 
           {isChangePassword ? (
             <>
               <Seperator half />
-              <Input
-                fwdRef={confirmPassRef}
+              <FormInput
+                name="newPassword"
+                formRef={formRef}
+                fwdRef={newPassInputRef}
                 editable={!loading}
                 testID={notesnook.ids.dialogs.vault.changePwd}
                 autoCapitalize="none"
-                onChangeText={(value) => {
-                  newPasswordRef.current = value;
-                }}
                 autoComplete="password"
-                onSubmit={() => {
+                onSubmitEditing={() => {
                   onPress();
                 }}
                 returnKeyLabel="Change"
                 returnKeyType="done"
                 secureTextEntry
                 placeholder={strings.newPassword()}
+                validators={[validators.required(strings.passwordRequired())]}
               />
             </>
           ) : null}
 
           {isCreateVault ? (
             <View>
-              <Input
+              <FormInput
+                name="password"
+                formRef={formRef}
                 fwdRef={passInputRef}
                 autoCapitalize="none"
                 testID={notesnook.ids.dialogs.vault.pwd}
-                onChangeText={(value) => {
-                  passwordRef.current = value;
-                }}
                 autoComplete="password"
                 returnKeyLabel={strings.next()}
                 returnKeyType="next"
                 secureTextEntry
-                onSubmit={() => {
+                onSubmitEditing={() => {
                   confirmPassRef.current?.focus();
                 }}
                 placeholder={strings.password()}
+                validators={[validators.required(strings.passwordRequired())]}
               />
 
-              <Input
+              <FormInput
+                name="confirmPassword"
+                formRef={formRef}
                 fwdRef={confirmPassRef}
                 autoCapitalize="none"
                 testID={notesnook.ids.dialogs.vault.pwdAlt}
                 secureTextEntry
-                validationType="confirmPassword"
-                customValidator={() => passwordRef.current || ""}
-                errorMessage="Passwords do not match."
-                onErrorCheck={() => null}
-                marginBottom={0}
                 autoComplete="password"
                 returnKeyLabel="Create"
                 returnKeyType="done"
-                onChangeText={(value) => {
-                  confirmPasswordRef.current = value;
-                  if (value !== passwordRef.current) {
-                    setPasswordsDontMatch(true);
-                  } else {
-                    setPasswordsDontMatch(false);
-                  }
-                }}
-                onSubmit={() => {
+                marginBottom={0}
+                onSubmitEditing={() => {
                   onPress();
                 }}
                 placeholder={strings.confirmPassword()}
+                validators={[
+                  validators.required(strings.confirmPasswordRequired()),
+                  validators.matchField(
+                    "password",
+                    strings.passwordNotMatched()
+                  )
+                ]}
               />
             </View>
           ) : null}

apps/mobile/app/components/fluid-panels/index.tsx

@@ -51,9 +51,10 @@ interface TabProps extends ViewProps {
   onScroll: (offset: number) => void;
   enabled: boolean;
   onDrawerStateChange: (state: boolean) => void;
+  initialPage?: FluidTabPage;
 }
 
-type FluidTabPage = "home" | "editor";
+export type FluidTabPage = "home" | "editor";
 
 export interface TabsRef {
   goToPage: (page: FluidTabPage, animated?: boolean) => void;
@@ -77,15 +78,21 @@ export const FluidPanels = forwardRef<TabsRef, TabProps>(function FluidTabs(
     onChangeTab,
     onScroll,
     enabled,
-    onDrawerStateChange
+    onDrawerStateChange,
+    initialPage
   }: TabProps,
   ref
 ) {
   const deviceMode = useSettingStore((state) => state.deviceMode);
   const fullscreen = useSettingStore((state) => state.fullscreen);
-  const translateX = useSharedValue(widths ? widths.sidebar : 0);
+  const editorStartPosition = widths.sidebar + widths.list;
+  const translateX = useSharedValue(
+    initialPage === "editor" ? editorStartPosition : widths ? widths.sidebar : 0
+  );
   const startX = useSharedValue(0);
-  const currentTab = useSharedValue(1);
+  const currentTab = useSharedValue(
+    initialPage === "editor" && deviceMode !== "tablet" ? 2 : 1
+  );
   const previousTab = useSharedValue(1);
   const isDrawerOpen = useSharedValue(false);
   const gestureStartValue = useSharedValue({