mobile: Upcoming Reminders -> Reminders in home widgets

When system time changes, reminder widgets keep showing reminders that have passed as active.

.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
@@ -171,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
@@ -215,7 +215,7 @@ jobs:
       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
@@ -142,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
@@ -246,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
@@ -314,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
@@ -378,7 +378,7 @@ jobs:
 
     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

@@ -24,7 +24,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
@@ -58,7 +58,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
@@ -92,7 +92,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
@@ -126,7 +126,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

.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

.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/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/desktop",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/desktop",
-      "version": "3.4.3",
+      "version": "3.4.4",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/desktop/package.json

@@ -2,7 +2,7 @@
   "name": "@notesnook/desktop",
   "productName": "Notesnook",
   "description": "Your private note taking space",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "appAppleId": "1544027013",
   "private": true,
   "main": "./dist/cjs/index.js",

apps/desktop/src/main.ts

@@ -141,7 +141,8 @@ 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, "/")}`);
@@ -164,6 +165,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;
   });

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/android/app/build.gradle

@@ -140,7 +140,7 @@ android {
         if (project.hasProperty("prBuildNumber")) {
             versionCode Integer.parseInt(prBuildNumber())
         } else {
-            versionCode 3111
+            versionCode 3113
         }
         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"
@@ -230,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("nn://note/" + note.getId()));
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, getActivityOptionsBundle());
+        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);
         }
     }
 

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,4 @@
+- Add option to clear note version history
 - Minor bug fixes and improvements
 
 Thank you for using Notesnook!

apps/mobile/app/components/merge-conflicts/index.tsx

@@ -72,6 +72,7 @@ const MergeConflicts = () => {
   const insets = useGlobalSafeAreaInsets();
   const content = useRef<UnencryptedContentItem>(null);
   const { height } = useSettingStore((state) => state.dimensions);
+  const keepScreenOn = useSettingStore((state) => state.settings.keepScreenOn);
 
   const applyChanges = async () => {
     const contentToSave = selectedContent;
@@ -155,9 +156,9 @@ const MergeConflicts = () => {
               ...item.content,
               conflicted: currentContent?.conflicted
                 ? await db.vault.decryptContent(
-                    currentContent?.conflicted as EncryptedContentItem,
-                    password
-                  )
+                  currentContent?.conflicted as EncryptedContentItem,
+                  password
+                )
                 : undefined
             } as UnencryptedContentItem;
 
@@ -182,9 +183,9 @@ const MergeConflicts = () => {
                     ...item.content,
                     conflicted: currentContent?.conflicted
                       ? await db.vault.decryptContent(
-                          currentContent?.conflicted as EncryptedContentItem,
-                          password
-                        )
+                        currentContent?.conflicted as EncryptedContentItem,
+                        password
+                      )
                       : undefined
                   } as UnencryptedContentItem;
 
@@ -385,7 +386,7 @@ const MergeConflicts = () => {
           paddingTop: insets.top
         }}
       >
-        <KeepAwake />
+        {keepScreenOn && <KeepAwake />}
         {dialogVisible && (
           <BaseDialog visible={true}>
             <DialogContainer>

apps/mobile/app/components/note-history/index.tsx

@@ -29,7 +29,7 @@ import { ActionSheetRef, ScrollView } from "react-native-actions-sheet";
 import Icon from "react-native-vector-icons/MaterialCommunityIcons";
 import { db } from "../../common/database";
 import { useDBItem } from "../../hooks/use-db-item";
-import { presentSheet } from "../../services/event-manager";
+import { presentSheet, ToastManager } from "../../services/event-manager";
 import { openLinkInBrowser } from "../../utils/functions";
 import { AppFontSize } from "../../utils/size";
 import { DefaultAppStyles } from "../../utils/styles";
@@ -39,15 +39,19 @@ import { Pressable } from "../ui/pressable";
 import Seperator from "../ui/seperator";
 import Paragraph from "../ui/typography/paragraph";
 import NotePreview from "./preview";
+import { presentDialog } from "../dialog/functions";
+import { Dialog } from "../dialog";
 
 const HistoryItem = ({
   index,
   items,
-  note
+  note,
+  refresh
 }: {
   index: number;
   items?: VirtualizedGrouping<HistorySession>;
   note: Note;
+  refresh: () => void;
 }) => {
   const [item] = useDBItem(index, "noteHistory", items);
   const { colors } = useThemeColors();
@@ -75,12 +79,13 @@ const HistoryItem = ({
             }}
             content={content}
             note={note}
+            update={refresh}
           />
         ),
         context: "note_history"
       });
     },
-    [note]
+    [note, refresh]
   );
 
   return (
@@ -112,7 +117,8 @@ const HistoryItem = ({
 };
 
 export default function NoteHistory({
-  note
+  note,
+  fwdRef
 }: {
   note: Note;
   fwdRef: RefObject<ActionSheetRef>;
@@ -121,7 +127,7 @@ export default function NoteHistory({
   const [_loading, setLoading] = useState(true);
   const { colors } = useThemeColors();
 
-  useEffect(() => {
+  const refresh = useCallback(() => {
     db.noteHistory
       .get(note.id)
       .sorted({
@@ -137,17 +143,56 @@ export default function NoteHistory({
       });
   }, [note.id]);
 
+  useEffect(() => {
+    refresh();
+  }, [refresh]);
+
   const renderItem = useCallback(
     ({ index }: { index: number }) => (
-      <HistoryItem index={index} items={history} note={note} />
+      <HistoryItem
+        index={index}
+        items={history}
+        note={note}
+        refresh={refresh}
+      />
     ),
-    [history, note]
+    [history, note, refresh]
   );
 
   return (
     <View>
       <SheetProvider context="note_history" />
-      <DialogHeader title={strings.noteHistory()} padding={12} />
+      <Dialog context="local" />
+      <DialogHeader
+        title={strings.noteHistory()}
+        padding={12}
+        button={
+          history?.placeholders.length
+            ? {
+                title: strings.clearHistory(),
+                type: "secondary",
+                onPress: () => {
+                  presentDialog({
+                    title: strings.clearHistory(),
+                    paragraph: strings.clearHistoryConfirmation(),
+                    positiveText: strings.clear(),
+                    negativeText: strings.cancel(),
+                    positiveType: "errorShade",
+                    context: "local",
+                    positivePress: async () => {
+                      await db.noteHistory.clearSessions(note.id);
+                      fwdRef.current?.hide();
+                      ToastManager.show({
+                        heading: strings.historyCleared(),
+                        type: "success"
+                      });
+                    }
+                  });
+                }
+              }
+            : undefined
+        }
+      />
 
       <Seperator />
 

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

@@ -53,7 +53,8 @@ import {
 export default function NotePreview({
   session,
   content,
-  note
+  note,
+  update
 }: {
   session?: HistorySession & { session: string };
   content:
@@ -64,6 +65,7 @@ export default function NotePreview({
       >
     | undefined;
   note: TrashOrItem<Note>;
+  update?: () => void;
 }) {
   const { colors } = useThemeColors();
   const [locked, setLocked] = useState(false);
@@ -107,24 +109,35 @@ export default function NotePreview({
   }, [note]);
 
   const deleteNote = async () => {
+    const isSession = !!session;
+
     presentDialog({
-      title: strings.deleteNote(),
-      paragraph: strings.deleteNoteConfirmation(),
+      title: isSession ? strings.deleteVersion() : strings.deleteNote(),
+      paragraph: isSession
+        ? strings.deleteVersionConfirmation()
+        : strings.deleteNoteConfirmation(),
       positiveText: strings.delete(),
       negativeText: strings.cancel(),
-      context: "local",
+      context: "preview",
       positivePress: async () => {
-        if (note) {
+        if (isSession) {
+          await db.noteHistory.remove(session.id);
+          update?.();
+          eSendEvent(eCloseSheet, "note_history");
+          Navigation.queueRoutesForUpdate();
+        } else if (note.type === "trash") {
           await db.trash.delete(note.id);
           useTrashStore.getState().refresh();
           useSelectionStore.getState().setSelectionMode();
-          ToastManager.show({
-            heading: strings.noteDeleted(),
-            type: "success",
-            context: "local"
-          });
           eSendEvent(eCloseSheet);
         }
+        ToastManager.show({
+          heading: isSession ? strings.versionDeleted() : strings.noteDeleted(),
+          type: "success",
+          context: isSession ? "local" : "global"
+        });
+
+        return true;
       },
       positiveType: "error"
     });
@@ -137,7 +150,7 @@ export default function NotePreview({
         width: "100%"
       }}
     >
-      <Dialog context="local" />
+      <Dialog context="preview" />
       <DialogHeader
         padding={12}
         title={content?.title || note.title || session?.session}

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

@@ -112,7 +112,8 @@ const PayWall = (props: NavigationProps<"PayWall">) => {
       }
       setStep(Steps.buy);
     }
-  }, [pricingPlans, routeParams.state]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [routeParams.state]);
 
   useEffect(() => {
     let listener: NativeEventSubscription;

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

@@ -170,147 +170,147 @@ export const SelectionHeader = React.memo(
           {!selectedItemsList.length
             ? null
             : (focusedRouteId === "Monographs"
-                ? [
-                    {
-                      title: strings.unpublish(),
-                      onPress: () => {
-                        presentDialog({
-                          title: strings.doActions.unpublish.note(
-                            selectedItemsList.length
-                          ),
-                          positiveText: strings.unpublish(),
-                          negativeText: strings.cancel(),
-                          positivePress: async () => {
-                            for (const id of selectedItemsList) {
-                              await db.monographs.unpublish(id);
-                            }
-                            Navigation.queueRoutesForUpdate();
-                            clearSelection();
-                          },
-                          positiveType: "errorShade"
-                        });
-                      },
-                      visible: true,
-                      icon: "delete"
-                    }
-                  ]
-                : [
-                    {
-                      title: strings.manageTags(),
-                      onPress: async () => {
-                        ManageTags.present(selectedItemsList);
-                      },
-                      visible: type === "note",
-                      icon: "pound"
-                    },
-                    {
-                      title: strings.export(),
-                      onPress: async () => {
-                        ExportNotesSheet.present(selectedItemsList);
-                      },
-                      visible: type === "note",
-                      icon: "export"
-                    },
-                    {
-                      title: strings.addToNotebook(),
-                      onPress: async () => {
-                        Navigation.navigate("LinkNotebooks", {
-                          noteIds: selectedItemsList
-                        });
-                      },
-                      visible: type === "note",
-                      icon: "plus"
-                    },
-                    {
-                      title: strings.unlinkNotebook(),
-                      onPress: async () => {
-                        if (!id) return;
-                        await db.notes.removeFromNotebook(
-                          id,
-                          ...selectedItemsList
-                        );
-                        updateNotebook(id);
+              ? [
+                {
+                  title: strings.unpublish(),
+                  onPress: () => {
+                    presentDialog({
+                      title: strings.doActions.unpublish.note(
+                        selectedItemsList.length
+                      ),
+                      positiveText: strings.unpublish(),
+                      negativeText: strings.cancel(),
+                      positivePress: async () => {
+                        for (const id of selectedItemsList) {
+                          await db.monographs.unpublish(id);
+                        }
                         Navigation.queueRoutesForUpdate();
                         clearSelection();
                       },
-                      visible: renderedInRoute === "Notebook",
-                      icon: "minus"
-                    },
-                    {
-                      title: strings.unfavorite(),
-                      onPress: addToFavorite,
-                      visible: focusedRouteId === "Favorites",
-                      icon: "star-off"
-                    },
-                    {
-                      title: strings.moveToTrash(),
-                      onPress: async () => {
-                        const selection = useSelectionStore.getState();
-                        if (!selection.selectionMode) return;
-                        await deleteItems(
-                          selection.selectionMode as ItemType,
-                          selection.selectedItemsList
-                        );
-                        selection.clearSelection();
-                        selection.setSelectionMode(undefined);
-                      },
-                      visible: type === "note" || type === "notebook",
-                      icon: "delete"
-                    },
-                    {
-                      title: strings.doActions.delete.unknown(
-                        type!,
-                        selectedItemsList.length
-                      ),
-                      onPress: async () => {
-                        const selection = useSelectionStore.getState();
-                        if (!selection.selectionMode) return;
-                        await deleteItems(
-                          selection.selectionMode as ItemType,
-                          selection.selectedItemsList
-                        );
-                        selection.clearSelection();
-                        selection.setSelectionMode(undefined);
-                      },
-                      visible:
-                        type !== "trash" &&
-                        type !== "note" &&
-                        type !== "notebook",
-                      icon: "delete"
-                    },
-                    {
-                      title: strings.restore(),
-                      onPress: restoreItem,
-                      visible: type === "trash",
-                      icon: "delete-restore"
-                    },
-                    {
-                      title: strings.delete(),
-                      onPress: deleteItem,
-                      visible: type === "trash",
-                      icon: "delete"
-                    }
-                  ]
-              ).map((item) =>
-                !item.visible ? null : (
-                  <IconButton
-                    size={AppFontSize.lg}
-                    type="plain"
-                    tooltipText={item.title}
-                    tooltipPosition={NativeTooltip.POSITIONS.TOP}
-                    testID={`select-${item.icon}`}
-                    name={item.icon}
-                    key={item.title}
-                    color={colors.primary.icon}
-                    onPress={async () => {
-                      //@ts-ignore
-                      menuRef.current?.hide();
-                      if (Platform.OS === "ios") await sleep(300);
-                      item.onPress();
-                    }}
-                  />
-                )
-              )}
+                      positiveType: "errorShade"
+                    });
+                  },
+                  visible: true,
+                  icon: "delete"
+                }
+              ]
+              : [
+                {
+                  title: strings.manageTags(),
+                  onPress: async () => {
+                    ManageTags.present(selectedItemsList);
+                  },
+                  visible: type === "note",
+                  icon: "pound"
+                },
+                {
+                  title: strings.export(),
+                  onPress: async () => {
+                    ExportNotesSheet.present(selectedItemsList);
+                  },
+                  visible: type === "note",
+                  icon: "export"
+                },
+                {
+                  title: strings.addToNotebook(),
+                  onPress: async () => {
+                    Navigation.navigate("LinkNotebooks", {
+                      noteIds: selectedItemsList
+                    });
+                  },
+                  visible: type === "note",
+                  icon: "plus"
+                },
+                {
+                  title: strings.unlinkNotebook(),
+                  onPress: async () => {
+                    if (!id) return;
+                    await db.notes.removeFromNotebook(
+                      id,
+                      ...selectedItemsList
+                    );
+                    updateNotebook(id);
+                    Navigation.queueRoutesForUpdate();
+                    clearSelection();
+                  },
+                  visible: renderedInRoute === "Notebook",
+                  icon: "minus"
+                },
+                {
+                  title: strings.unfavorite(),
+                  onPress: addToFavorite,
+                  visible: focusedRouteId === "Favorites",
+                  icon: "star-off"
+                },
+                {
+                  title: strings.moveToTrash(),
+                  onPress: async () => {
+                    const selection = useSelectionStore.getState();
+                    if (!selection.selectionMode) return;
+                    await deleteItems(
+                      selection.selectionMode as ItemType,
+                      selection.selectedItemsList
+                    );
+                    selection.clearSelection();
+                    selection.setSelectionMode(undefined);
+                  },
+                  visible: type === "note" || type === "notebook",
+                  icon: "delete"
+                },
+                {
+                  title: strings.doActions.delete.unknown(
+                    type!,
+                    selectedItemsList.length
+                  ),
+                  onPress: async () => {
+                    const selection = useSelectionStore.getState();
+                    if (!selection.selectionMode) return;
+                    await deleteItems(
+                      selection.selectionMode as ItemType,
+                      selection.selectedItemsList
+                    );
+                    selection.clearSelection();
+                    selection.setSelectionMode(undefined);
+                  },
+                  visible:
+                    type !== "trash" &&
+                    type !== "note" &&
+                    type !== "notebook",
+                  icon: "delete"
+                },
+                {
+                  title: strings.restore(),
+                  onPress: restoreItem,
+                  visible: type === "trash",
+                  icon: "delete-restore"
+                },
+                {
+                  title: strings.delete(),
+                  onPress: deleteItem,
+                  visible: type === "trash",
+                  icon: "delete"
+                }
+              ]
+            ).map((item) =>
+              !item.visible ? null : (
+                <IconButton
+                  size={AppFontSize.lg}
+                  type="plain"
+                  tooltipText={item.title}
+                  tooltipPosition={NativeTooltip.POSITIONS.TOP}
+                  testID={`select-${item.icon}`}
+                  name={item.icon}
+                  key={item.title}
+                  color={colors.primary.icon}
+                  onPress={async () => {
+                    //@ts-ignore
+                    menuRef.current?.hide();
+                    if (Platform.OS === "ios") await sleep(300);
+                    item.onPress();
+                  }}
+                />
+              )
+            )}
         </View>
 
         <IconButton

apps/mobile/app/components/sheets/link-note/index.tsx

@@ -28,7 +28,7 @@ import { NativeEvents } from "@notesnook/editor-mobile/src/utils/native-events";
 import { strings } from "@notesnook/intl";
 import { useThemeColors } from "@notesnook/theme";
 import React, { useEffect, useRef, useState } from "react";
-import { TextInput, View } from "react-native";
+import { ActivityIndicator, TextInput, View } from "react-native";
 import { FlatList } from "react-native-actions-sheet";
 import { db } from "../../../common/database";
 import { useDBItem } from "../../../hooks/use-db-item";
@@ -40,6 +40,8 @@ import { Button } from "../../ui/button";
 import Input from "../../ui/input";
 import { Pressable } from "../../ui/pressable";
 import Paragraph from "../../ui/typography/paragraph";
+import Navigation from "../../../services/navigation";
+import { useUserStore } from "../../../stores/use-user-store";
 
 const ListNoteItem = ({
   id,
@@ -118,8 +120,8 @@ const ListBlockItem = ({
           {item?.content.length > 200
             ? item?.content.slice(0, 200) + "..."
             : !item.content || item.content.trim() === ""
-            ? strings.linkNoteEmptyBlock()
-            : item.content}
+              ? strings.linkNoteEmptyBlock()
+              : item.content}
         </Paragraph>
 
         <View
@@ -158,6 +160,7 @@ export default function LinkNote(props: {
 
   const [selectedNote, setSelectedNote] = useState<Note>();
   const [selectedNodeId, setSelectedNodeId] = useState<string>();
+  const [blocksLoading, setBlocksLoading] = useState(false);
 
   useEffect(() => {
     db.notes.all.sorted(db.settings.getGroupOptions("notes")).then((notes) => {
@@ -206,10 +209,12 @@ export default function LinkNote(props: {
 
   const onSelectNote = async (note: Note) => {
     setSelectedNote(note);
+    setBlocksLoading(true);
     inputRef.current?.clear();
     setTimeout(async () => {
       nodesRef.current = await db.notes.contentBlocks(note.id);
       setNodes(nodesRef.current);
+      setBlocksLoading(false);
     });
     // Fetch and set note's nodes.
   };
@@ -224,6 +229,7 @@ export default function LinkNote(props: {
     <View
       style={{
         paddingHorizontal: DefaultAppStyles.GAP,
+        paddingBottom: DefaultAppStyles.GAP,
         minHeight: "100%",
         maxHeight: "100%"
       }}
@@ -330,28 +336,42 @@ export default function LinkNote(props: {
           windowSize={3}
           keyExtractor={(item) => item.id}
           ListEmptyComponent={
-            <View
-              style={{
-                gap: DefaultAppStyles.GAP_VERTICAL,
-                backgroundColor: colors.secondary.background,
-                padding: DefaultAppStyles.GAP,
-                borderRadius: defaultBorderRadius,
-                borderWidth: 0.5,
-                borderColor: colors.secondary.border,
-                alignItems: "center"
-              }}
-            >
-              <Paragraph color={colors.secondary.paragraph}>
-                {blockLinking?.error}
-              </Paragraph>
-              <Button
-                title={strings.upgradePlan()}
+            !blockLinking || blocksLoading ? (
+              <ActivityIndicator size={25} color={colors.primary.accent} />
+            ) : !blockLinking.isAllowed ? (
+              <View
                 style={{
-                  width: "100%"
+                  gap: DefaultAppStyles.GAP_VERTICAL,
+                  backgroundColor: colors.secondary.background,
+                  padding: DefaultAppStyles.GAP,
+                  borderRadius: defaultBorderRadius,
+                  borderWidth: 0.5,
+                  borderColor: colors.secondary.border,
+                  alignItems: "center"
                 }}
-                type="accent"
-              />
-            </View>
+              >
+                <Paragraph color={colors.secondary.paragraph}>
+                  {blockLinking?.error}
+                </Paragraph>
+                <Button
+                  title={strings.upgradePlan()}
+                  style={{
+                    width: "100%"
+                  }}
+                  type="accent"
+                  onPress={() => {
+                    Navigation.navigate("PayWall", {
+                      context: useUserStore.getState().user
+                        ? "logged-in"
+                        : "logged-out",
+                      canGoBack: true
+                    });
+
+                    props.close?.();
+                  }}
+                />
+              </View>
+            ) : null
           }
           data={blockLinking?.isAllowed ? nodes : []}
         />

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

@@ -81,6 +81,7 @@ import {
   setUpdateAvailableMessage
 } from "../services/message";
 import Navigation from "../services/navigation";
+import { NotePreviewWidget } from "../services/note-preview-widget";
 import Notifications from "../services/notifications";
 import PremiumService from "../services/premium";
 import SettingsService from "../services/settings";
@@ -574,6 +575,11 @@ export const useAppEvents = () => {
   useEffect(() => {
     if (isAppLoading) return;
 
+    // Widgets outlive the app process, so they can be left showing content the app no longer has
+    // (most obviously after the user clears app data). Nothing can run at that moment, so the
+    // first launch afterwards is the earliest chance to put them right.
+    NotePreviewWidget.updateNotes();
+
     let subscriptions: EventManagerSubscription[] = [];
     const eventManager = db.eventManager;
     subscriptions = [

apps/mobile/app/navigation/fluid-panels-view.tsx

@@ -447,7 +447,9 @@ const onChangeTab = async (event: { i: number; from: number }) => {
   if (event.i === 2) {
     editorState().movedAway = false;
     editorState().isFocused = true;
-    activateKeepAwake();
+    if (useSettingStore.getState().settings.keepScreenOn) {
+      activateKeepAwake();
+    }
     eSendEvent(eOnEnterEditor);
 
     if (

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

@@ -210,7 +210,7 @@ export const settingsGroups: SettingSection[] = [
               : status === SubscriptionStatus.ACTIVE
                 ? strings.subRenewOn(expiryDate)
                 : status === SubscriptionStatus.CANCELED ||
-                    status === SubscriptionStatus.PAUSED
+                  status === SubscriptionStatus.PAUSED
                   ? strings.subEndsOn(expiryDate)
                   : status === SubscriptionStatus.EXPIRED
                     ? subscriptionDaysLeft.time < -3
@@ -965,6 +965,14 @@ export const settingsGroups: SettingSection[] = [
             property: "checkForUpdates",
             icon: "update"
           },
+          {
+            id: "keep-screen-on",
+            type: "switch",
+            name: strings.keepScreenOn(),
+            description: strings.keepScreenOnDesc(),
+            property: "keepScreenOn",
+            icon: "cellphone-screenshot",
+          },
           {
             id: "image-compression",
             type: "component",

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

@@ -34,6 +34,10 @@ export const NotePreviewWidget = {
 
         NotesnookModule.updateWidgetNote(id, JSON.stringify(newNote));
       }
+      // Redraw from the widgets that actually exist rather than only the ones we
+      // have notes for. After app data is cleared there are none, and the widgets
+      // would otherwise keep showing content that no longer exists.
+      NotesnookModule.refreshWidgets();
     }, 500);
   },
   updateNote: async (id: string, note: Note) => {

apps/mobile/app/services/notifications.ts

@@ -17,8 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { getFormattedReminderTime } from "@notesnook/common";
-import { isReminderActive, Reminder } from "@notesnook/core";
+import { getFormattedDate, getFormattedReminderTime } from "@notesnook/common";
+import {
+  getUpcomingReminderTime,
+  isReminderActive,
+  Reminder
+} from "@notesnook/core";
 import { strings } from "@notesnook/intl";
 import notifee, {
   AndroidStyle,
@@ -35,7 +39,7 @@ import notifee, {
 import NetInfo from "@react-native-community/netinfo";
 import dayjs, { Dayjs } from "dayjs";
 import { encodeNonAsciiHTML } from "entities";
-import { Platform } from "react-native";
+import { AppState, Platform } from "react-native";
 import { db, setupDatabase } from "../common/database";
 import { MMKV } from "../common/database/mmkv";
 import { presentDialog } from "../components/dialog/functions";
@@ -45,7 +49,7 @@ import { useRelationStore } from "../stores/use-relation-store";
 import { useReminderStore } from "../stores/use-reminder-store";
 import { useSettingStore } from "../stores/use-setting-store";
 import { useUserStore } from "../stores/use-user-store";
-import { eOnLoadNote } from "../utils/events";
+import { eCloseSimpleDialog, eOnLoadNote } from "../utils/events";
 import { fluidTabsRef } from "../utils/global-refs";
 import { convertNoteToText } from "../utils/note-to-text";
 import { NotesnookModule } from "../utils/notesnook-module";
@@ -262,8 +266,13 @@ const onEvent = async ({ type, detail }: Event) => {
 
 type ReminderWithFormattedTime = Reminder & {
   formattedTime?: string;
+  triggerDate?: number;
+  formattedTimeOfDay?: string;
+  formattedDateTime?: string;
 };
 
+const RECENTLY_PASSED_WINDOW = 3 * 60 * 60 * 1000;
+
 async function updateRemindersForWidget() {
   if (Platform.OS === "ios") return;
   const reminders: ReminderWithFormattedTime[] = await db.reminders?.all.items(
@@ -273,18 +282,33 @@ async function updateRemindersForWidget() {
       sortDirection: "asc"
     }
   );
-  const activeReminders = [];
+  const widgetReminders = [];
   if (!reminders) return;
   for (const reminder of reminders) {
-    if (isReminderActive(reminder)) {
-      reminder.formattedTime = getFormattedReminderTime(reminder);
-      activeReminders.push(reminder);
-    }
+    const triggerDate =
+      reminder.snoozeUntil && reminder.snoozeUntil > Date.now()
+        ? reminder.snoozeUntil
+        : reminder.mode === "repeat"
+          ? getUpcomingReminderTime(reminder)
+          : reminder.date;
+
+    const recentlyPassed =
+      reminder.mode === "once" &&
+      !reminder.disabled &&
+      triggerDate > Date.now() - RECENTLY_PASSED_WINDOW;
+
+    if (!isReminderActive(reminder) && !recentlyPassed) continue;
+
+    reminder.triggerDate = triggerDate;
+    reminder.formattedTimeOfDay = getFormattedDate(triggerDate, "time");
+    reminder.formattedDateTime = getFormattedDate(triggerDate, "date-time");
+    reminder.formattedTime = getFormattedReminderTime(reminder);
+    widgetReminders.push(reminder);
   }
   NotesnookModule.setString(
     "appPreview",
     "remindersList",
-    JSON.stringify(activeReminders)
+    JSON.stringify(widgetReminders)
   );
   NotesnookModule.updateReminderWidget();
 }
@@ -577,7 +601,7 @@ async function displayNotification({
 }
 
 function openSettingsDialog(context: string) {
-  return new Promise((resolve) => {
+  return new Promise<boolean>((resolve) => {
     presentDialog({
       title: strings.notificationsDisabled(),
       paragraph: strings.notificationsDisabledDesc(),
@@ -597,49 +621,94 @@ function openSettingsDialog(context: string) {
   });
 }
 
+function waitForAppFocusAfterSettings(timeoutMs = 120000): Promise<void> {
+  return new Promise((resolve) => {
+    let didLeaveApp = AppState.currentState !== "active";
+    const timeout = setTimeout(() => {
+      subscription.remove();
+      resolve();
+    }, timeoutMs);
+
+    const subscription = AppState.addEventListener("change", (state) => {
+      if (state !== "active") {
+        didLeaveApp = true;
+        return;
+      }
+
+      if (didLeaveApp && state === "active") {
+        clearTimeout(timeout);
+        subscription.remove();
+        resolve();
+      }
+    });
+  });
+}
+
 async function checkAndRequestPermissions(
   promptUser?: boolean
 ): Promise<boolean> {
   let permissionStatus = await notifee.getNotificationSettings();
   if (Platform.OS === "android") {
-    if (
-      permissionStatus.authorizationStatus === AuthorizationStatus.AUTHORIZED &&
-      permissionStatus.android.alarm === 1
-    )
+    const hasNotificationPermission =
+      permissionStatus.authorizationStatus === AuthorizationStatus.AUTHORIZED;
+    const hasAlarmPermission = permissionStatus.android.alarm === 1;
+
+    if (hasNotificationPermission && hasAlarmPermission) {
       return true;
+    }
+
     if (permissionStatus.authorizationStatus === AuthorizationStatus.DENIED) {
       permissionStatus = await notifee.requestPermission();
     }
+
+    // Wait for user to return from exact alarm settings
     if (permissionStatus.android.alarm !== 1) {
+      const waitForAppFocus = waitForAppFocusAfterSettings();
+
       await notifee.openAlarmPermissionSettings();
+      await waitForAppFocus;
     }
     permissionStatus = await notifee.getNotificationSettings();
 
-    if (
+    const authorized =
       permissionStatus.authorizationStatus === AuthorizationStatus.AUTHORIZED &&
-      permissionStatus.android.alarm === 1
-    )
-      return true;
+      permissionStatus.android.alarm === 1;
 
-    if (promptUser) {
-      if (await openSettingsDialog("local")) {
-        await notifee.openNotificationSettings();
-        return false;
-      }
+    if (authorized) {
+      return true;
     }
 
-    return false;
-  } else {
-    permissionStatus = await notifee.requestPermission();
-    if (permissionStatus.authorizationStatus === AuthorizationStatus.AUTHORIZED)
-      return true;
     if (promptUser) {
-      await openSettingsDialog("local");
+      const openSettings = await openSettingsDialog("local");
+      if (openSettings) {
+        const waitForAppFocus = waitForAppFocusAfterSettings();
+        await notifee.openNotificationSettings();
+        await waitForAppFocus;
+        permissionStatus = await notifee.getNotificationSettings();
+        const finalAuthorized =
+          permissionStatus.authorizationStatus ===
+            AuthorizationStatus.AUTHORIZED &&
+          permissionStatus.android.alarm === 1;
+        if (finalAuthorized) {
+          eSendEvent(eCloseSimpleDialog);
+          return true;
+        }
+      }
+      return false;
     }
     return false;
   }
-}
 
+  // iOS
+  permissionStatus = await notifee.requestPermission();
+  if (permissionStatus.authorizationStatus === AuthorizationStatus.AUTHORIZED) {
+    return true;
+  }
+  if (promptUser) {
+    await openSettingsDialog("local");
+  }
+  return false;
+}
 async function getTriggers(
   reminder: Reminder
 ): Promise<(Trigger & { id: string })[] | undefined> {

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

@@ -104,6 +104,7 @@ export type Settings = {
   checkForUpdates?: boolean;
   defaultLineHeight: number;
   imageCompression: "ask-every-time" | "enabled" | "disabled";
+  keepScreenOn?: boolean;
 };
 
 type DimensionsType = {
@@ -213,7 +214,8 @@ export const defaultSettings: SettingStore["settings"] = {
   lastFullBackupDate: 0,
   checkForUpdates: true,
   defaultLineHeight: EDITOR_LINE_HEIGHT.DEFAULT,
-  imageCompression: "ask-every-time"
+  imageCompression: "ask-every-time",
+  keepScreenOn: true
 };
 
 export const useSettingStore = create<SettingStore>((set, get) => ({

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

@@ -45,6 +45,7 @@ interface NotesnookModuleInterface {
   hasWidgetNote: (noteId: string) => Promise<boolean>;
   updateWidgetNote: (noteId: string, data: string) => void;
   updateReminderWidget: () => void;
+  refreshWidgets: () => void;
   isGestureNavigationEnabled: () => boolean;
   addShortcut: (
     id: string,
@@ -81,6 +82,7 @@ export const NotesnookModule: NotesnookModuleInterface = Platform.select({
     hasWidgetNote: () => {},
     updateWidgetNote: () => {},
     updateReminderWidget: () => {},
+    refreshWidgets: () => {},
     isGestureNavigationEnabled: () => true,
     addShortcut: () => Promise.resolve(false),
     removeShortcut: () => Promise.resolve(false),

apps/mobile/ios/build-configs/ios-build.active.xcconfig

@@ -1,6 +1,6 @@
 // Production iOS build identifiers
-IOS_CURRENT_PROJECT_VERSION = 2189
-IOS_MARKETING_VERSION = 3.4.5
+IOS_CURRENT_PROJECT_VERSION = 2191
+IOS_MARKETING_VERSION = 3.4.7
 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook
 IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget
 IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share

apps/mobile/ios/build-configs/ios-build.production.xcconfig

@@ -1,6 +1,6 @@
 // Production iOS build identifiers
-IOS_CURRENT_PROJECT_VERSION = 2189
-IOS_MARKETING_VERSION = 3.4.5
+IOS_CURRENT_PROJECT_VERSION = 2191
+IOS_MARKETING_VERSION = 3.4.7
 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook
 IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget
 IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share

apps/mobile/ios/build-configs/ios-build.staging.xcconfig

@@ -1,6 +1,6 @@
 // Staging iOS build identifiers
-IOS_CURRENT_PROJECT_VERSION = 2189
-IOS_MARKETING_VERSION = 3.4.5
+IOS_CURRENT_PROJECT_VERSION = 2191
+IOS_MARKETING_VERSION = 3.4.7
 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook
 IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget
 IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share

apps/mobile/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.4.0-beta.1",
+  "version": "3.4.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/mobile",
-      "version": "3.4.0-beta.1",
+      "version": "3.4.5",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
@@ -290,7 +290,7 @@
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
-        "@notesnook-importer/core": "^2.2.5",
+        "@notesnook-importer/core": "^2.4.5",
         "@notesnook/common": "file:../common",
         "@notesnook/intl": "file:../intl",
         "@notesnook/theme": "file:../theme",

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.4.5",
+  "version": "3.4.7",
   "private": true,
   "license": "GPL-3.0-or-later",
   "scripts": {

apps/vericrypt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notesnook/vericrypt",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "private": true,
   "devDependencies": {
     "@types/platform": "^1.3.6",
@@ -43,4 +43,4 @@
       "last 1 safari version"
     ]
   }
-}
+}

apps/vericrypt/src/app.tsx

@@ -31,7 +31,7 @@ import { PasteEncryptedData, SyncRequestBody } from "./components/step-4";
 import { StepSeperator } from "./components/step-seperator";
 import { Footer } from "./components/footer";
 import { useState } from "react";
-import { NNCrypto } from "@notesnook/crypto";
+import { NNCrypto, Cipher } from "@notesnook/crypto";
 import { Code } from "./components/code";
 import { Accordion } from "./components/accordion";
 import { DecryptedResult } from "./components/decrypted-result";
@@ -41,7 +41,7 @@ const instructions = [
   "Go to Notesnook",
   "Open Settings",
   <>
-    Click on <Code text="Backup data recovery key" />
+    Click on <Code text="Save data recovery key" />
   </>,
   "Enter your account password for verification",
   "Confirm that your generated encryption key matches"
@@ -52,6 +52,7 @@ function App() {
   const [salt, setSalt] = useState<string>();
   const [key, setKey] = useState<string>();
   const [data, setData] = useState<SyncRequestBody | undefined>();
+  const [accountDataKey, setAccountDataKey] = useState<Cipher<"base64"> | null | undefined>();
   const theme = useTheme({ accent: getDefaultAccentColor(), theme: "light" });
 
   return (
@@ -67,7 +68,7 @@ function App() {
         >
           <LoginToNotesnook />
           <StepSeperator />
-          <GetAccountSalt onSaltSubmitted={setSalt} />
+          <GetAccountSalt onSaltSubmitted={setSalt} setAccountDataKey={setAccountDataKey} />
 
           {salt && (
             <>
@@ -91,7 +92,7 @@ function App() {
                   return true;
                 }}
                 popup={{
-                  title: "Your data encryption key",
+                  title: "Your master encryption key",
                   body: key ? (
                     <>
                       <Text
@@ -146,11 +147,13 @@ function App() {
                 password={password}
                 salt={salt}
                 data={data}
+                accountKey={accountDataKey}
                 onRestartProcess={() => {
                   setSalt(undefined);
                   setPassword(undefined);
                   setKey(undefined);
                   setData(undefined);
+                  setAccountDataKey(undefined);
                 }}
               />
             </>

apps/vericrypt/src/components/decrypted-result.tsx

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { Flex, Button, Text, Link } from "@theme-ui/components";
 import { StepContainer } from "./step-container";
 import { SyncRequestBody } from "./step-4";
-import { NNCrypto } from "@notesnook/crypto";
+import { NNCrypto, Cipher } from "@notesnook/crypto";
 import { useEffect, useState } from "react";
 import { FcDataEncryption } from "react-icons/fc";
 import { Code } from "./code";
@@ -32,6 +32,7 @@ type DecryptedResultProps = {
   password: string;
   salt: string;
   data: SyncRequestBody;
+  accountKey: Cipher<"base64"> | null | undefined;
   onRestartProcess: () => void;
 };
 
@@ -51,10 +52,19 @@ export function DecryptedResult(props: DecryptedResultProps) {
         };
         const crypto = new NNCrypto();
         const key = await crypto.exportKey(props.password, props.salt);
+        let encryptionKey = undefined;
+        if (props.accountKey != null){
+          // Need to decrypt the account key
+          props.accountKey.format = "base64"; // account keys don't have the format set, but they're base64.
+          const dataEncryptionKey = JSON.parse(await crypto.decrypt(key, props.accountKey, "text"))
+          encryptionKey = dataEncryptionKey;
+        } else {
+          encryptionKey = key;
+        }
         for (const arrayKey in data) {
           const array = data[arrayKey];
           for (const encryptedItem of (props.data as any)[arrayKey]) {
-            const data = await crypto.decrypt(key, encryptedItem, "text");
+            const data = await crypto.decrypt(encryptionKey, encryptedItem, "text");
             array.push(JSON.parse(data));
           }
         }
@@ -150,19 +160,9 @@ export function DecryptedResult(props: DecryptedResultProps) {
             support@streetwriters.co
           </Link>{" "}
           or{" "}
-          <Link href="https://discord.gg/">joining our Discord community</Link>.
+          <Link href="https://go.notesnook.com/discord">join our Discord community</Link>.
           We&apos;ll do our best to alleviate all your worries.
         </Text>
-        <Text as="p" variant="body" sx={{ mx: 2, mt: 2, fontWeight: "bold" }}>
-          What about open sourcing Notesnook?
-        </Text>
-        <Text as="p" variant="body" sx={{ mx: 2, my: 2 }}>
-          Open sourcing is another part of garnering our users&apos; trust. We
-          have <Link href="https://notesnook.com/roadmap">plans</Link> to begin
-          open sourcing in May but open sourcing will not make this tool
-          obsolete. Verifying the integrity of encrypted data at any point in
-          time is very important even if the software is open source.
-        </Text>
       </Accordion>
       <Flex sx={{ alignSelf: "center", mt: 4 }}>
         <Button

apps/vericrypt/src/components/step-1.tsx

@@ -38,11 +38,6 @@ export function LoginToNotesnook() {
     >
       <Text variant="title">Welcome to Vericrypt</Text>
       <Text as="p" variant="body" sx={{ mt: 1 }}>
-        <del>
-          Trust is a huge problem in closed source end-to-end encrypted
-          applications. How can you be sure that the app is actually encrypting
-          your data?
-        </del>
       </Text>
       <Text as="p" variant="body" sx={{ mt: 1 }}>
         The only way to earn a user&apos;s trust is by allowing them to see how
@@ -56,9 +51,10 @@ export function LoginToNotesnook() {
         </Link>
       </Text>
       <Text as="p" variant="body" sx={{ mt: 1 }}>
-        Yes, that&apos;s right. Notesnook is now 100% open source under the
-        GPLv3 license. That includes the app, the encryption library, the
-        backend server, and everything else.
+        Yes, that&apos;s right. Notesnook is 100% open source under the
+        GPLv3 license. That includes the app, the encryption library, and
+        everything else. We&apos;ve even open sourced the server, available under the
+        AGPLv3 license.
       </Text>
       <Text as="p" variant="body" sx={{ mt: 1 }}>
         However, even with an open source app, how can you be sure that the app
@@ -86,7 +82,7 @@ export function LoginToNotesnook() {
         sx={{ alignSelf: "center", mt: 2 }}
         onClick={() => window.open("https://app.notesnook.com/login", "_blank")}
       >
-        Login to Notesnook
+        Get Started by Logging in
       </Button>
     </StepContainer>
   );

apps/vericrypt/src/components/step-2.tsx

@@ -16,11 +16,11 @@ 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 { Flex, Text, Image, Input } from "@theme-ui/components";
+import { Flex, Text, Image, Textarea } from "@theme-ui/components";
 import { StepContainer } from "./step-container";
-import DevtoolsCopySaltChrome from "../assets/screenshots/devtools_copy_salt.png";
+import DevtoolsCopyUsersChrome from "../assets/screenshots/devtools_copy_users.png";
 
-import DevtoolsCopySaltFirefox from "../assets/screenshots/firefox/firefox_copy_salt.png";
+import DevtoolsCopyUsersFirefox from "../assets/screenshots/firefox/firefox_copy_users.png";
 
 import { Accordion } from "./accordion";
 import { getCombo } from "../utils/keycombos";
@@ -29,9 +29,11 @@ import { KeyCombo } from "./key-combo";
 import { Code } from "./code";
 import { useState } from "react";
 import { getSourceUrl } from "../utils/links";
+import { Cipher } from "@notesnook/crypto";
 
 type GetAccountSaltProps = {
   onSaltSubmitted: (salt: string) => void;
+  setAccountDataKey: (accountDataKey: Cipher<"base64"> | null) => void;
 };
 
 const steps = {
@@ -52,10 +54,10 @@ const steps = {
     </Text>,
     <Flex key="key-named-salt" sx={{ flexDirection: "column" }}>
       <Text as="p">Follow the steps as shown in the image:</Text>
-      <Image src={DevtoolsCopySaltChrome} width={"100%"} sx={{ mt: 1 }} />
+      <Image src={DevtoolsCopyUsersChrome} width={"100%"} sx={{ mt: 1 }} />
     </Flex>,
     <Flex key="copy-salt" sx={{ flexDirection: "column" }}>
-      <Text as="p">Copy the salt and paste it below.</Text>
+      <Text as="p">Copy everything in the response and paste it below.</Text>
     </Flex>
   ],
   firefox: [
@@ -75,10 +77,10 @@ const steps = {
     </Text>,
     <Flex key="key-named-salt" sx={{ flexDirection: "column" }}>
       <Text as="p">Follow the steps as shown in the image:</Text>
-      <Image src={DevtoolsCopySaltFirefox} width={"100%"} sx={{ mt: 1 }} />
+      <Image src={DevtoolsCopyUsersFirefox} width={"100%"} sx={{ mt: 1 }} />
     </Flex>,
     <Flex key="copy-salt" sx={{ flexDirection: "column" }}>
-      <Text as="p">Copy the salt and paste it below.</Text>
+      <Text as="p">Copy everything in the response and paste it below.</Text>
     </Flex>
   ]
 };
@@ -114,14 +116,14 @@ export function GetAccountSalt(props: GetAccountSaltProps) {
       sx={{ flexDirection: "column" }}
     >
       <Flex sx={{ justifyContent: "space-between", alignItems: "center" }}>
-        <Text variant="title">Account salt</Text>
+        <Text variant="title">Account Key Data</Text>
         <Code
           text="src/components/step-2.tsx"
           href={getSourceUrl("src/components/step-2.tsx")}
         />
       </Flex>
       <Accordion
-        title="How to get your account salt?"
+        title="How to get your key data?"
         sx={{
           border: "1px solid var(--border)",
           mt: 2,
@@ -129,9 +131,9 @@ export function GetAccountSalt(props: GetAccountSaltProps) {
         }}
       >
         <Text variant="body" sx={{ mx: 2 }}>
-          We&apos;ll be extracting your account&apos;s salt right from
+          You&apos;ll be extracting your account&apos;s keys right from
           Notesnook&apos;s local database that lives in your web browser. So put
-          on your seat belt and let&apos;s get some salt!
+          on your seat belt and let&apos;s retrieve those keys.
         </Text>
         <Text as="ol" variant="body" sx={{ mb: 2 }}>
           {instructions?.map((item, index) => (
@@ -141,12 +143,11 @@ export function GetAccountSalt(props: GetAccountSaltProps) {
           ))}
         </Text>
       </Accordion>
-      <Input
+      <Textarea
         variant="forms.clean"
-        id="salt"
-        name="salt"
-        type="text"
-        placeholder="Enter your account salt"
+        id="account-data"
+        name="account-data"
+        placeholder="Paste the response here"
         sx={{
           mt: 2,
           fontSize: "subheading",
@@ -162,13 +163,21 @@ export function GetAccountSalt(props: GetAccountSaltProps) {
         spellCheck={false}
         onChange={(e) => {
           setIsSaltValid(undefined);
+          /*
+          If there is no dataEncryptionKey, try reading the legacyDataEncryptionKey.
+          If there is a legacyDataEncryptionKey, use this one.
+          If there is no legacyDataEncryptionKey, it is a legacy account (pre DEK update) that has not
+          changed passwords. (Use master key instead.)
+          */
           try {
-            const value = e.target.value;
-            const isValid = Buffer.from(value, "base64").length === 16;
+            const value = JSON.parse(e.target.value);
+            props.setAccountDataKey(value.dataEncryptionKey ?? value.legacyDataEncryptionKey ?? null);
+            const salt = value.salt;
+            const isValid = Buffer.from(salt, "base64").length === 16;
             if (!isValid) setIsSaltValid(false);
             else {
               setIsSaltValid(true);
-              props.onSaltSubmitted(value);
+              props.onSaltSubmitted(salt);
             }
           } catch (e) {
             console.error(e);

apps/web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/web",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/web",
-      "version": "3.4.3",
+      "version": "3.4.4",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {

apps/web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notesnook/web",
   "description": "Your private note taking space",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "private": true,
   "main": "./src/app.js",
   "homepage": "https://notesnook.com/",

apps/web/src/components/editor/index.tsx

@@ -252,16 +252,6 @@ const MemoizedEditorView = React.memo(EditorView, (prev, next) => {
     prev.session.activeSearchResultId === next.session.activeSearchResultId &&
     prev.session.nonce === next.session.nonce;
 
-  if (
-    "attachmentsLength" in prev.session &&
-    "attachmentsLength" in next.session
-  ) {
-    return (
-      baseConditions &&
-      prev.session.attachmentsLength === next.session.attachmentsLength
-    );
-  }
-
   if ("note" in prev.session && "note" in next.session) {
     return (
       baseConditions &&

apps/web/src/components/editor/tiptap.tsx

@@ -684,6 +684,12 @@ function TiptapWrapper(
     }
   }, [props.spellcheck]);
 
+  useEffect(() => {
+    if (editorContainerRef.current) {
+      editorContainerRef.current.style.fontSize = `${editorConfig.fontSize}px`;
+    }
+  }, [editorConfig.fontSize]);
+
   return (
     <Flex
       ref={containerRef}

apps/web/src/utils/web-extension-server.ts

@@ -31,6 +31,7 @@ import { getFormattedDate } from "@notesnook/common";
 import { useStore as useThemeStore } from "../stores/theme-store";
 import { isCipher } from "@notesnook/core";
 import { attachFiles } from "../components/editor/picker";
+import { BaseAttachment } from "@notesnook/editor";
 
 export class WebExtensionServer implements Server {
   async login() {
@@ -88,11 +89,16 @@ export class WebExtensionServer implements Server {
         }
       );
 
-      let attachment;
-      for await (const message of attachFiles([clippedFile])) {
-        if (message.type === "done") attachment = message.attachment;
-        else if (message.type === "error") return;
-      }
+      let attachment: BaseAttachment | undefined;
+      await attachFiles([clippedFile], (message) => {
+        switch (message.type) {
+          case ("done"):
+            attachment = message.attachment;
+            break;
+          case ("error"):
+            return;
+        }
+      })
       if (!attachment) return;
 
       clipContent += h("iframe", [], {
@@ -116,14 +122,14 @@ export class WebExtensionServer implements Server {
     content +=
       clip.mode === "bookmark"
         ? h("div", [
-            h("p", [`Date bookmarked: ${getFormattedDate(Date.now())}`]),
-            h("hr")
-          ]).innerHTML
+          h("p", [`Date bookmarked: ${getFormattedDate(Date.now())}`]),
+          h("hr")
+        ]).innerHTML
         : h("div", [
-            h("hr"),
-            h("p", ["Clipped from ", h("a", [clip.title], { href: clip.url })]),
-            h("p", [`Date clipped: ${getFormattedDate(Date.now())}`])
-          ]).innerHTML;
+          h("hr"),
+          h("p", ["Clipped from ", h("a", [clip.title], { href: clip.url })]),
+          h("p", [`Date clipped: ${getFormattedDate(Date.now())}`])
+        ]).innerHTML;
 
     const id = await db.notes.add({
       id: note?.id,

docs/help/contents/how-is-my-data-encrypted.md

@@ -21,7 +21,7 @@ On all three platforms we use the same exact library for all cryptographic funct
 
 > info Fun story
 >
-> When we first added encryption, we used AES-GCM-256 across platforms but the cross-platform compatbility was abyssmal. That is when I found out about the great libsodium. Written in C, wrappers available for all platforms...what more could I want?
+> When we first added encryption, we used AES-GCM-256 across platforms but the cross-platform compatibility was abyssmal. That is when I found out about the great libsodium. Written in C, wrappers available for all platforms...what more could I want?
 
 ## Process
 
@@ -41,13 +41,7 @@ This process is repeated every time you sign in.
 
 ### 2. Key generation
 
-After you are signed in, the app requests your user data which includes, among other things, your salt.
-
-> info Salt generation
->
-> When you create an account, the server generates a cryptographically secure random salt for you. This salt is used for key generation.
-
-You password & salt is then used to derive a strong irreversible key using Argon2 as the password key derivation function (PKDF).
+When you first sign up for an account, your client generates two encryption keys. One is a unique data encryption key that encrypts all your notes and other data. The second is your master encryption key, this is derived by your password and predictable salt. This key protects all your encryption keys, like the aforementioned data encryption key. If you change your password, your client will re-encrypt your existing data encryption key with your new master key.
 
 ### 3. Encryption key storage
 
@@ -55,7 +49,7 @@ You password & salt is then used to derive a strong irreversible key using Argon
 
 Instead of storing the key as plain text (and allowing anyone to copy/move it), we use browser's `IndexedDB` to store the key as a `CryptoKey`.
 
-`CryptoKey` is stored securely by the browser and cannot be exported, viewed, copied except by the app & browser.
+`CryptoKey` is stored securely by the browser and cannot be exported, viewed, or copied except by the app & browser.
 
 # [Mobile](#/tab/mobile)
 
@@ -65,12 +59,12 @@ On iOS and Android, the encryption key is stored in the phone's keychain.
 
 ### 4. Data encryption
 
-Encryption only takes place when you sync. Each item in the database is encrypted seperately using XChaCha-Poly1305-IETF.
+Encryption only takes place when you sync. Each item in the database is encrypted separately using XChaCha-Poly1305-IETF.
 
 #### How it works
 
 1. The item is read from the database as JSON object and stringified (i.e. converted to a string).
-2. The string is encrypted using the encryption key generated earlier.
+2. The string is encrypted using the data encryption key generated earlier.
 3. The result is a JSON object which contains:
    1. A base64 encoded `cipher`
    2. A 192-bit nonce (`iv`)
@@ -83,3 +77,9 @@ Encryption only takes place when you sync. Each item in the database is encrypte
 > See the whole process in action [here.](https://vericrypt.notesnook.com/)
 
 This object is then sent to the server for storage. The server performs no further operation on this data (because it can't).
+
+## Faqs
+
+### I am an old user of Notesnook, I don't have a data encryption key.
+
+Your data encryption key will be created when you change your password.

docs/help/contents/mobile-integration/quick-note-from-notification.md

@@ -2,7 +2,7 @@
 
 > error This feature is Android only.
 
-A simple, quick and convinient way to take notes on your phone from notifications. This works the same way as a messaging/chat app allows you to reply to messages from notifications.
+A simple, quick and convenient way to take notes on your phone from notifications. This works the same way as a messaging/chat app allows you to reply to messages from notifications.
 
 ![Notes in notifications](/static/mobile-integration/android-quick-note-notifications.png)
 

docs/help/contents/mobile-integration/share-things-from-other-apps.md

@@ -2,7 +2,7 @@
 
 Basic web clipping support is available on both Android & iOS apps via share extensions.
 
-We are going to use browser app as an example to demonstarte how you can clip information from webpages and other apps on your iPhone.
+We are going to use browser app as an example to demonstrate how you can clip information from webpages and other apps on your iPhone.
 
 1. Select some text on a webpage then Tap on "Share" on the context menu.
 
@@ -40,7 +40,7 @@ We are going to use browser app as an example to demonstarte how you can clip in
 
 > info
 >
-> Share exenstion will save the note you selected so in future web clips, it will be selected by default until you reset it.
+> Share extension will save the note you selected so in future web clips, it will be selected by default until you reset it.
 
 ## Clipping full webpage content
 

docs/help/contents/recovering-your-account.md

@@ -29,7 +29,7 @@ The first step to recovering your account consists of requesting an account reco
 5. On the next page, your email should be prefilled. If it isn't, fill it out.
    ![](/static/account-recovery/step-2.png)
 6. Click on `Send recovery email`
-7. If everything goes well, you should recieve an email from Notesnook in your inbox:
+7. If everything goes well, you should receive an email from Notesnook in your inbox:
    ![](/static/account-recovery/recovery_email.png)
    > info What if I didn't receive an email?
    >

fastlane/metadata/android/en-US/changelogs/15564.txt

@@ -0,0 +1,3 @@
+- Minor bug fixes and improvements
+
+Thank you for using Notesnook!

fastlane/metadata/android/en-US/changelogs/15569.txt

@@ -0,0 +1,4 @@
+- Add option to clear note version history
+- Minor bug fixes and improvements
+
+Thank you for using Notesnook!

packages/core/src/index.ts

@@ -30,6 +30,7 @@ export { type DatabaseUpdatedEvent } from "./database/index.js";
 export { FilteredSelector } from "./database/sql-collection.js";
 export {
   getUpcomingReminder,
+  getUpcomingReminderTime,
   formatReminderTime,
   isReminderToday,
   isReminderActive

packages/editor-mobile/package-lock.json

@@ -63,7 +63,7 @@
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "dependencies": {
-        "@notesnook-importer/core": "^2.2.5",
+        "@notesnook-importer/core": "^2.4.5",
         "@notesnook/common": "file:../common",
         "@notesnook/intl": "file:../intl",
         "@notesnook/theme": "file:../theme",

packages/intl/locale/en.po

@@ -138,7 +138,7 @@ msgstr "{count, plural, one {Are you sure you want to download all attachments o
 msgid "{count, plural, one {Are you sure you want to move this notebook to {selectedNotebookTitle}?} other {Are you sure you want to move these # notebooks {selectedNotebookTitle}?}}"
 msgstr "{count, plural, one {Are you sure you want to move this notebook to {selectedNotebookTitle}?} other {Are you sure you want to move these # notebooks {selectedNotebookTitle}?}}"
 
-#: generated/action-confirmations.ts:76
+#: generated/action-confirmations.ts:82
 msgid "{count, plural, one {Are you sure you want to permanently delete this item?} other {Are you sure you to permanently delete these items?}}"
 msgstr "{count, plural, one {Are you sure you want to permanently delete this item?} other {Are you sure you to permanently delete these items?}}"
 
@@ -150,6 +150,10 @@ msgstr "{count, plural, one {Are you sure you want to permanently delete this no
 msgid "{count, plural, one {Are you sure you want to permanently delete this notebook?} other {Are you sure you to permanently delete these notebooks?}}"
 msgstr "{count, plural, one {Are you sure you want to permanently delete this notebook?} other {Are you sure you to permanently delete these notebooks?}}"
 
+#: generated/action-confirmations.ts:69
+msgid "{count, plural, one {Are you sure you want to permanently delete this version?} other {Are you sure you to permanently delete these versions?}}"
+msgstr "{count, plural, one {Are you sure you want to permanently delete this version?} other {Are you sure you to permanently delete these versions?}}"
+
 #: src/strings.ts:135
 msgid "{count, plural, one {Attach image} other {Attach # images}}"
 msgstr "{count, plural, one {Attach image} other {Attach # images}}"
@@ -162,7 +166,7 @@ msgstr "{count, plural, one {Attachment deleted} other {# attachments deleted}}"
 msgid "{count, plural, one {Attachment downloaded at {path}} other {#/{total} attachments downloaded as a zip file at {path}}}"
 msgstr "{count, plural, one {Attachment downloaded at {path}} other {#/{total} attachments downloaded as a zip file at {path}}}"
 
-#: generated/actions.ts:216
+#: generated/actions.ts:222
 msgid "{count, plural, one {Color renamed} other {# colors renamed}}"
 msgstr "{count, plural, one {Color renamed} other {# colors renamed}}"
 
@@ -175,7 +179,7 @@ msgid "{count, plural, one {Delete color} other {Delete # colors}}"
 msgstr "{count, plural, one {Delete color} other {Delete # colors}}"
 
 #: generated/do-actions.ts:12
-#: generated/do-actions.ts:53
+#: generated/do-actions.ts:59
 msgid "{count, plural, one {Delete item} other {Delete # items}}"
 msgstr "{count, plural, one {Delete item} other {Delete # items}}"
 
@@ -195,6 +199,10 @@ msgstr "{count, plural, one {Delete reminder} other {Delete # reminders}}"
 msgid "{count, plural, one {Delete tag} other {Delete # tags}}"
 msgstr "{count, plural, one {Delete tag} other {Delete # tags}}"
 
+#: generated/do-actions.ts:36
+msgid "{count, plural, one {Delete version} other {Delete # versions}}"
+msgstr "{count, plural, one {Delete version} other {Delete # versions}}"
+
 #: generated/in-progress-actions.ts:16
 msgid "{count, plural, one {Deleting attachment...} other {Deleting # attachments...}}"
 msgstr "{count, plural, one {Deleting attachment...} other {Deleting # attachments...}}"
@@ -219,27 +227,27 @@ msgstr "{count, plural, one {Deleting reminder...} other {Deleting # reminders..
 msgid "{count, plural, one {Deleting tag...} other {Deleting # tags...}}"
 msgstr "{count, plural, one {Deleting tag...} other {Deleting # tags...}}"
 
-#: generated/do-actions.ts:274
+#: generated/do-actions.ts:280
 msgid "{count, plural, one {Download attachment} other {Download # attachments}}"
 msgstr "{count, plural, one {Download attachment} other {Download # attachments}}"
 
-#: generated/do-actions.ts:283
+#: generated/do-actions.ts:289
 msgid "{count, plural, one {Download item} other {Download # items}}"
 msgstr "{count, plural, one {Download item} other {Download # items}}"
 
-#: generated/do-actions.ts:208
+#: generated/do-actions.ts:214
 msgid "{count, plural, one {Edit item} other {Edit # items}}"
 msgstr "{count, plural, one {Edit item} other {Edit # items}}"
 
-#: generated/do-actions.ts:191
+#: generated/do-actions.ts:197
 msgid "{count, plural, one {Edit notebook} other {Edit # notebooks}}"
 msgstr "{count, plural, one {Edit notebook} other {Edit # notebooks}}"
 
-#: generated/do-actions.ts:195
+#: generated/do-actions.ts:201
 msgid "{count, plural, one {Edit reminder} other {Edit # reminders}}"
 msgstr "{count, plural, one {Edit reminder} other {Edit # reminders}}"
 
-#: generated/do-actions.ts:187
+#: generated/do-actions.ts:193
 msgid "{count, plural, one {Edit tag} other {Edit # tags}}"
 msgstr "{count, plural, one {Edit tag} other {Edit # tags}}"
 
@@ -255,41 +263,41 @@ msgstr "{count, plural, one {Item could not be published} other {# items could n
 msgid "{count, plural, one {Item could not be unpublished} other {# items could not be unpublished}}"
 msgstr "{count, plural, one {Item could not be unpublished} other {# items could not be unpublished}}"
 
-#: generated/actions.ts:208
+#: generated/actions.ts:214
 msgid "{count, plural, one {Item created} other {# items created}}"
 msgstr "{count, plural, one {Item created} other {# items created}}"
 
-#: generated/actions.ts:41
+#: generated/actions.ts:47
 msgid "{count, plural, one {Item deleted} other {# items deleted}}"
 msgstr "{count, plural, one {Item deleted} other {# items deleted}}"
 
-#: generated/actions.ts:179
+#: generated/actions.ts:185
 msgid "{count, plural, one {Item edited} other {# items edited}}"
 msgstr "{count, plural, one {Item edited} other {# items edited}}"
 
-#: generated/actions.ts:64
+#: generated/actions.ts:70
 msgid "{count, plural, one {Item moved to trash} other {# items moved to trash}}"
 msgstr "{count, plural, one {Item moved to trash} other {# items moved to trash}}"
 
-#: generated/actions.ts:80
-#: generated/actions.ts:93
+#: generated/actions.ts:86
+#: generated/actions.ts:99
 msgid "{count, plural, one {Item permanently deleted} other {# items permanently deleted}}"
 msgstr "{count, plural, one {Item permanently deleted} other {# items permanently deleted}}"
 
-#: generated/actions.ts:110
+#: generated/actions.ts:116
 msgid "{count, plural, one {Item published} other {# items published}}"
 msgstr "{count, plural, one {Item published} other {# items published}}"
 
-#: generated/actions.ts:225
+#: generated/actions.ts:231
 msgid "{count, plural, one {Item renamed} other {# items renamed}}"
 msgstr "{count, plural, one {Item renamed} other {# items renamed}}"
 
-#: generated/actions.ts:143
-#: generated/actions.ts:156
+#: generated/actions.ts:149
+#: generated/actions.ts:162
 msgid "{count, plural, one {Item restored} other {# items restored}}"
 msgstr "{count, plural, one {Item restored} other {# items restored}}"
 
-#: generated/actions.ts:127
+#: generated/actions.ts:133
 msgid "{count, plural, one {Item unpublished} other {# items unpublished}}"
 msgstr "{count, plural, one {Item unpublished} other {# items unpublished}}"
 
@@ -321,23 +329,23 @@ msgstr "{count, plural, one {Note deleted} other {# notes deleted}}"
 msgid "{count, plural, one {Note exported} other {# notes exported}}"
 msgstr "{count, plural, one {Note exported} other {# notes exported}}"
 
-#: generated/actions.ts:49
+#: generated/actions.ts:55
 msgid "{count, plural, one {Note moved to trash} other {# notes moved to trash}}"
 msgstr "{count, plural, one {Note moved to trash} other {# notes moved to trash}}"
 
-#: generated/actions.ts:72
+#: generated/actions.ts:78
 msgid "{count, plural, one {Note permanently deleted} other {# notes permanently deleted}}"
 msgstr "{count, plural, one {Note permanently deleted} other {# notes permanently deleted}}"
 
-#: generated/actions.ts:101
+#: generated/actions.ts:107
 msgid "{count, plural, one {Note published} other {# notes published}}"
 msgstr "{count, plural, one {Note published} other {# notes published}}"
 
-#: generated/actions.ts:135
+#: generated/actions.ts:141
 msgid "{count, plural, one {Note restored} other {# notes restored}}"
 msgstr "{count, plural, one {Note restored} other {# notes restored}}"
 
-#: generated/actions.ts:118
+#: generated/actions.ts:124
 msgid "{count, plural, one {Note unpublished} other {# notes unpublished}}"
 msgstr "{count, plural, one {Note unpublished} other {# notes unpublished}}"
 
@@ -345,7 +353,7 @@ msgstr "{count, plural, one {Note unpublished} other {# notes unpublished}}"
 msgid "{count, plural, one {Note will be automatically deleted from all other devices & any future changes won't get synced. Are you sure you want to continue?} other {# notes will be automatically deleted from all other devices & any future changes won't get synced. Are you sure you want to continue?}}"
 msgstr "{count, plural, one {Note will be automatically deleted from all other devices & any future changes won't get synced. Are you sure you want to continue?} other {# notes will be automatically deleted from all other devices & any future changes won't get synced. Are you sure you want to continue?}}"
 
-#: generated/actions.ts:187
+#: generated/actions.ts:193
 msgid "{count, plural, one {Notebook created} other {# notebooks created}}"
 msgstr "{count, plural, one {Notebook created} other {# notebooks created}}"
 
@@ -353,28 +361,28 @@ msgstr "{count, plural, one {Notebook created} other {# notebooks created}}"
 msgid "{count, plural, one {Notebook deleted} other {# notebooks deleted}}"
 msgstr "{count, plural, one {Notebook deleted} other {# notebooks deleted}}"
 
-#: generated/actions.ts:168
+#: generated/actions.ts:174
 msgid "{count, plural, one {Notebook edited} other {# notebooks edited}}"
 msgstr "{count, plural, one {Notebook edited} other {# notebooks edited}}"
 
-#: generated/actions.ts:53
+#: generated/actions.ts:59
 msgid "{count, plural, one {Notebook moved to trash} other {# notebooks moved to trash}}"
 msgstr "{count, plural, one {Notebook moved to trash} other {# notebooks moved to trash}}"
 
-#: generated/actions.ts:76
+#: generated/actions.ts:82
 msgid "{count, plural, one {Notebook permanently deleted} other {# notebooks permanently deleted}}"
 msgstr "{count, plural, one {Notebook permanently deleted} other {# notebooks permanently deleted}}"
 
-#: generated/actions.ts:139
+#: generated/actions.ts:145
 msgid "{count, plural, one {Notebook restored} other {# notebooks restored}}"
 msgstr "{count, plural, one {Notebook restored} other {# notebooks restored}}"
 
-#: generated/do-actions.ts:141
+#: generated/do-actions.ts:147
 msgid "{count, plural, one {Permanently delete attachment} other {Permanently delete # attachments}}"
 msgstr "{count, plural, one {Permanently delete attachment} other {Permanently delete # attachments}}"
 
-#: generated/do-actions.ts:145
-#: generated/do-actions.ts:156
+#: generated/do-actions.ts:151
+#: generated/do-actions.ts:162
 msgid "{count, plural, one {Permanently delete item} other {Permanently delete # items}}"
 msgstr "{count, plural, one {Permanently delete item} other {Permanently delete # items}}"
 
@@ -383,15 +391,15 @@ msgstr "{count, plural, one {Permanently delete item} other {Permanently delete
 msgid "{count, plural, one {permanently deleting item...} other {permanently deleting # items...}}"
 msgstr "{count, plural, one {permanently deleting item...} other {permanently deleting # items...}}"
 
-#: generated/do-actions.ts:99
+#: generated/do-actions.ts:105
 msgid "{count, plural, one {Pin item} other {Pin # items}}"
 msgstr "{count, plural, one {Pin item} other {Pin # items}}"
 
-#: generated/do-actions.ts:84
+#: generated/do-actions.ts:90
 msgid "{count, plural, one {Pin note} other {Pin # notes}}"
 msgstr "{count, plural, one {Pin note} other {Pin # notes}}"
 
-#: generated/do-actions.ts:88
+#: generated/do-actions.ts:94
 msgid "{count, plural, one {Pin notebook} other {Pin # notebooks}}"
 msgstr "{count, plural, one {Pin notebook} other {Pin # notebooks}}"
 
@@ -399,11 +407,11 @@ msgstr "{count, plural, one {Pin notebook} other {Pin # notebooks}}"
 msgid "{count, plural, one {Prevent note from syncing} other {Prevent # notes from syncing}}"
 msgstr "{count, plural, one {Prevent note from syncing} other {Prevent # notes from syncing}}"
 
-#: generated/do-actions.ts:133
+#: generated/do-actions.ts:139
 msgid "{count, plural, one {Publish item} other {Publish # items}}"
 msgstr "{count, plural, one {Publish item} other {Publish # items}}"
 
-#: generated/do-actions.ts:124
+#: generated/do-actions.ts:130
 msgid "{count, plural, one {Publish note} other {Publish # notes}}"
 msgstr "{count, plural, one {Publish note} other {Publish # notes}}"
 
@@ -411,47 +419,47 @@ msgstr "{count, plural, one {Publish note} other {Publish # notes}}"
 msgid "{count, plural, one {Reminder deleted} other {# reminders deleted}}"
 msgstr "{count, plural, one {Reminder deleted} other {# reminders deleted}}"
 
-#: generated/do-actions.ts:253
+#: generated/do-actions.ts:259
 msgid "{count, plural, one {Remove attachment} other {Remove # attachments}}"
 msgstr "{count, plural, one {Remove attachment} other {Remove # attachments}}"
 
-#: generated/do-actions.ts:249
+#: generated/do-actions.ts:255
 msgid "{count, plural, one {Remove color} other {Remove # colors}}"
 msgstr "{count, plural, one {Remove color} other {Remove # colors}}"
 
-#: generated/do-actions.ts:266
+#: generated/do-actions.ts:272
 msgid "{count, plural, one {Remove item} other {Remove # items}}"
 msgstr "{count, plural, one {Remove item} other {Remove # items}}"
 
-#: generated/do-actions.ts:245
+#: generated/do-actions.ts:251
 msgid "{count, plural, one {Remove shortcut} other {Remove # shortcuts}}"
 msgstr "{count, plural, one {Remove shortcut} other {Remove # shortcuts}}"
 
-#: generated/do-actions.ts:216
+#: generated/do-actions.ts:222
 msgid "{count, plural, one {Rename attachment} other {Rename # attachments}}"
 msgstr "{count, plural, one {Rename attachment} other {Rename # attachments}}"
 
-#: generated/do-actions.ts:220
+#: generated/do-actions.ts:226
 msgid "{count, plural, one {Rename color} other {Rename # colors}}"
 msgstr "{count, plural, one {Rename color} other {Rename # colors}}"
 
-#: generated/do-actions.ts:237
+#: generated/do-actions.ts:243
 msgid "{count, plural, one {Rename item} other {Rename # items}}"
 msgstr "{count, plural, one {Rename item} other {Rename # items}}"
 
-#: generated/do-actions.ts:224
+#: generated/do-actions.ts:230
 msgid "{count, plural, one {Rename tag} other {Rename # tags}}"
 msgstr "{count, plural, one {Rename tag} other {Rename # tags}}"
 
-#: generated/do-actions.ts:179
+#: generated/do-actions.ts:185
 msgid "{count, plural, one {Restore item} other {Restore # items}}"
 msgstr "{count, plural, one {Restore item} other {Restore # items}}"
 
-#: generated/do-actions.ts:164
+#: generated/do-actions.ts:170
 msgid "{count, plural, one {Restore note} other {Restore # notes}}"
 msgstr "{count, plural, one {Restore note} other {Restore # notes}}"
 
-#: generated/do-actions.ts:168
+#: generated/do-actions.ts:174
 msgid "{count, plural, one {Restore notebook} other {Restore # notebooks}}"
 msgstr "{count, plural, one {Restore notebook} other {Restore # notebooks}}"
 
@@ -460,11 +468,11 @@ msgstr "{count, plural, one {Restore notebook} other {Restore # notebooks}}"
 msgid "{count, plural, one {Restoring item...} other {Restoring # items...}}"
 msgstr "{count, plural, one {Restoring item...} other {Restoring # items...}}"
 
-#: generated/actions.ts:195
+#: generated/actions.ts:201
 msgid "{count, plural, one {Shortcut created} other {# shortcuts created}}"
 msgstr "{count, plural, one {Shortcut created} other {# shortcuts created}}"
 
-#: generated/actions.ts:191
+#: generated/actions.ts:197
 msgid "{count, plural, one {Tag created} other {# tags created}}"
 msgstr "{count, plural, one {Tag created} other {# tags created}}"
 
@@ -472,30 +480,34 @@ msgstr "{count, plural, one {Tag created} other {# tags created}}"
 msgid "{count, plural, one {Tag deleted} other {# tags deleted}}"
 msgstr "{count, plural, one {Tag deleted} other {# tags deleted}}"
 
-#: generated/actions.ts:164
+#: generated/actions.ts:170
 msgid "{count, plural, one {Tag edited} other {# tags edited}}"
 msgstr "{count, plural, one {Tag edited} other {# tags edited}}"
 
-#: generated/do-actions.ts:76
+#: generated/do-actions.ts:82
 msgid "{count, plural, one {Unpin item} other {Unpin # items}}"
 msgstr "{count, plural, one {Unpin item} other {Unpin # items}}"
 
-#: generated/do-actions.ts:61
+#: generated/do-actions.ts:67
 msgid "{count, plural, one {Unpin note} other {Unpin # notes}}"
 msgstr "{count, plural, one {Unpin note} other {Unpin # notes}}"
 
-#: generated/do-actions.ts:65
+#: generated/do-actions.ts:71
 msgid "{count, plural, one {Unpin notebook} other {Unpin # notebooks}}"
 msgstr "{count, plural, one {Unpin notebook} other {Unpin # notebooks}}"
 
-#: generated/do-actions.ts:116
+#: generated/do-actions.ts:122
 msgid "{count, plural, one {Unpublish item} other {Unpublish # items}}"
 msgstr "{count, plural, one {Unpublish item} other {Unpublish # items}}"
 
-#: generated/do-actions.ts:107
+#: generated/do-actions.ts:113
 msgid "{count, plural, one {Unpublish note} other {Unpublish # notes}}"
 msgstr "{count, plural, one {Unpublish note} other {Unpublish # notes}}"
 
+#: generated/actions.ts:28
+msgid "{count, plural, one {Version deleted} other {# versions deleted}}"
+msgstr "{count, plural, one {Version deleted} other {# versions deleted}}"
+
 #: src/strings.ts:2510
 msgid "{count} characters"
 msgstr "{count} characters"
@@ -1647,6 +1659,10 @@ msgstr "Clear data & reset account"
 msgid "Clear default notebook"
 msgstr "Clear default notebook"
 
+#: src/strings.ts:2800
+msgid "Clear history"
+msgstr "Clear history"
+
 #: src/strings.ts:1015
 msgid "Clear logs"
 msgstr "Clear logs"
@@ -2295,6 +2311,10 @@ msgstr "Delete account"
 msgid "Delete all"
 msgstr "Delete all"
 
+#: src/strings.ts:2802
+msgid "Delete all version history for this note?"
+msgstr "Delete all version history for this note?"
+
 #: src/strings.ts:2732
 msgid "Delete attachment"
 msgstr "Delete attachment"
@@ -3821,6 +3841,10 @@ msgstr "Keep"
 msgid "Keep open"
 msgstr "Keep open"
 
+#: src/strings.ts:2800
+msgid "Keep screen on"
+msgstr "Keep screen on"
+
 #: src/strings.ts:1361
 msgid "Keep your data safe"
 msgstr "Keep your data safe"
@@ -5191,6 +5215,10 @@ msgstr "Pressing \"X\" will hide the app in your system tray."
 msgid "Prevent note title from appearing in tab/window title."
 msgstr "Prevent note title from appearing in tab/window title."
 
+#: src/strings.ts:2802
+msgid "Prevent the screen from turning off while the editor is focused."
+msgstr "Prevent the screen from turning off while the editor is focused."
+
 #: src/strings.ts:2325
 msgid "Preview attachment"
 msgstr "Preview attachment"
@@ -7525,6 +7553,10 @@ msgstr "Verifying your email"
 msgid "Version"
 msgstr "Version"
 
+#: src/strings.ts:2801
+msgid "Version history cleared"
+msgstr "Version history cleared"
+
 #: src/strings.ts:50
 msgid "Vibrate"
 msgstr "Vibrate"

packages/intl/locale/pseudo-LOCALE.po

@@ -138,7 +138,7 @@ msgstr ""
 msgid "{count, plural, one {Are you sure you want to move this notebook to {selectedNotebookTitle}?} other {Are you sure you want to move these # notebooks {selectedNotebookTitle}?}}"
 msgstr ""
 
-#: generated/action-confirmations.ts:76
+#: generated/action-confirmations.ts:82
 msgid "{count, plural, one {Are you sure you want to permanently delete this item?} other {Are you sure you to permanently delete these items?}}"
 msgstr ""
 
@@ -150,6 +150,10 @@ msgstr ""
 msgid "{count, plural, one {Are you sure you want to permanently delete this notebook?} other {Are you sure you to permanently delete these notebooks?}}"
 msgstr ""
 
+#: generated/action-confirmations.ts:69
+msgid "{count, plural, one {Are you sure you want to permanently delete this version?} other {Are you sure you to permanently delete these versions?}}"
+msgstr ""
+
 #: src/strings.ts:135
 msgid "{count, plural, one {Attach image} other {Attach # images}}"
 msgstr ""
@@ -162,7 +166,7 @@ msgstr ""
 msgid "{count, plural, one {Attachment downloaded at {path}} other {#/{total} attachments downloaded as a zip file at {path}}}"
 msgstr ""
 
-#: generated/actions.ts:216
+#: generated/actions.ts:222
 msgid "{count, plural, one {Color renamed} other {# colors renamed}}"
 msgstr ""
 
@@ -175,7 +179,7 @@ msgid "{count, plural, one {Delete color} other {Delete # colors}}"
 msgstr ""
 
 #: generated/do-actions.ts:12
-#: generated/do-actions.ts:53
+#: generated/do-actions.ts:59
 msgid "{count, plural, one {Delete item} other {Delete # items}}"
 msgstr ""
 
@@ -195,6 +199,10 @@ msgstr ""
 msgid "{count, plural, one {Delete tag} other {Delete # tags}}"
 msgstr ""
 
+#: generated/do-actions.ts:36
+msgid "{count, plural, one {Delete version} other {Delete # versions}}"
+msgstr ""
+
 #: generated/in-progress-actions.ts:16
 msgid "{count, plural, one {Deleting attachment...} other {Deleting # attachments...}}"
 msgstr ""
@@ -219,27 +227,27 @@ msgstr ""
 msgid "{count, plural, one {Deleting tag...} other {Deleting # tags...}}"
 msgstr ""
 
-#: generated/do-actions.ts:274
+#: generated/do-actions.ts:280
 msgid "{count, plural, one {Download attachment} other {Download # attachments}}"
 msgstr ""
 
-#: generated/do-actions.ts:283
+#: generated/do-actions.ts:289
 msgid "{count, plural, one {Download item} other {Download # items}}"
 msgstr ""
 
-#: generated/do-actions.ts:208
+#: generated/do-actions.ts:214
 msgid "{count, plural, one {Edit item} other {Edit # items}}"
 msgstr ""
 
-#: generated/do-actions.ts:191
+#: generated/do-actions.ts:197
 msgid "{count, plural, one {Edit notebook} other {Edit # notebooks}}"
 msgstr ""
 
-#: generated/do-actions.ts:195
+#: generated/do-actions.ts:201
 msgid "{count, plural, one {Edit reminder} other {Edit # reminders}}"
 msgstr ""
 
-#: generated/do-actions.ts:187
+#: generated/do-actions.ts:193
 msgid "{count, plural, one {Edit tag} other {Edit # tags}}"
 msgstr ""
 
@@ -255,41 +263,41 @@ msgstr ""
 msgid "{count, plural, one {Item could not be unpublished} other {# items could not be unpublished}}"
 msgstr ""
 
-#: generated/actions.ts:208
+#: generated/actions.ts:214
 msgid "{count, plural, one {Item created} other {# items created}}"
 msgstr ""
 
-#: generated/actions.ts:41
+#: generated/actions.ts:47
 msgid "{count, plural, one {Item deleted} other {# items deleted}}"
 msgstr ""
 
-#: generated/actions.ts:179
+#: generated/actions.ts:185
 msgid "{count, plural, one {Item edited} other {# items edited}}"
 msgstr ""
 
-#: generated/actions.ts:64
+#: generated/actions.ts:70
 msgid "{count, plural, one {Item moved to trash} other {# items moved to trash}}"
 msgstr ""
 
-#: generated/actions.ts:80
-#: generated/actions.ts:93
+#: generated/actions.ts:86
+#: generated/actions.ts:99
 msgid "{count, plural, one {Item permanently deleted} other {# items permanently deleted}}"
 msgstr ""
 
-#: generated/actions.ts:110
+#: generated/actions.ts:116
 msgid "{count, plural, one {Item published} other {# items published}}"
 msgstr ""
 
-#: generated/actions.ts:225
+#: generated/actions.ts:231
 msgid "{count, plural, one {Item renamed} other {# items renamed}}"
 msgstr ""
 
-#: generated/actions.ts:143
-#: generated/actions.ts:156
+#: generated/actions.ts:149
+#: generated/actions.ts:162
 msgid "{count, plural, one {Item restored} other {# items restored}}"
 msgstr ""
 
-#: generated/actions.ts:127
+#: generated/actions.ts:133
 msgid "{count, plural, one {Item unpublished} other {# items unpublished}}"
 msgstr ""
 
@@ -321,23 +329,23 @@ msgstr ""
 msgid "{count, plural, one {Note exported} other {# notes exported}}"
 msgstr ""
 
-#: generated/actions.ts:49
+#: generated/actions.ts:55
 msgid "{count, plural, one {Note moved to trash} other {# notes moved to trash}}"
 msgstr ""
 
-#: generated/actions.ts:72
+#: generated/actions.ts:78
 msgid "{count, plural, one {Note permanently deleted} other {# notes permanently deleted}}"
 msgstr ""
 
-#: generated/actions.ts:101
+#: generated/actions.ts:107
 msgid "{count, plural, one {Note published} other {# notes published}}"
 msgstr ""
 
-#: generated/actions.ts:135
+#: generated/actions.ts:141
 msgid "{count, plural, one {Note restored} other {# notes restored}}"
 msgstr ""
 
-#: generated/actions.ts:118
+#: generated/actions.ts:124
 msgid "{count, plural, one {Note unpublished} other {# notes unpublished}}"
 msgstr ""
 
@@ -345,7 +353,7 @@ msgstr ""
 msgid "{count, plural, one {Note will be automatically deleted from all other devices & any future changes won't get synced. Are you sure you want to continue?} other {# notes will be automatically deleted from all other devices & any future changes won't get synced. Are you sure you want to continue?}}"
 msgstr ""
 
-#: generated/actions.ts:187
+#: generated/actions.ts:193
 msgid "{count, plural, one {Notebook created} other {# notebooks created}}"
 msgstr ""
 
@@ -353,28 +361,28 @@ msgstr ""
 msgid "{count, plural, one {Notebook deleted} other {# notebooks deleted}}"
 msgstr ""
 
-#: generated/actions.ts:168
+#: generated/actions.ts:174
 msgid "{count, plural, one {Notebook edited} other {# notebooks edited}}"
 msgstr ""
 
-#: generated/actions.ts:53
+#: generated/actions.ts:59
 msgid "{count, plural, one {Notebook moved to trash} other {# notebooks moved to trash}}"
 msgstr ""
 
-#: generated/actions.ts:76
+#: generated/actions.ts:82
 msgid "{count, plural, one {Notebook permanently deleted} other {# notebooks permanently deleted}}"
 msgstr ""
 
-#: generated/actions.ts:139
+#: generated/actions.ts:145
 msgid "{count, plural, one {Notebook restored} other {# notebooks restored}}"
 msgstr ""
 
-#: generated/do-actions.ts:141
+#: generated/do-actions.ts:147
 msgid "{count, plural, one {Permanently delete attachment} other {Permanently delete # attachments}}"
 msgstr ""
 
-#: generated/do-actions.ts:145
-#: generated/do-actions.ts:156
+#: generated/do-actions.ts:151
+#: generated/do-actions.ts:162
 msgid "{count, plural, one {Permanently delete item} other {Permanently delete # items}}"
 msgstr ""
 
@@ -383,15 +391,15 @@ msgstr ""
 msgid "{count, plural, one {permanently deleting item...} other {permanently deleting # items...}}"
 msgstr ""
 
-#: generated/do-actions.ts:99
+#: generated/do-actions.ts:105
 msgid "{count, plural, one {Pin item} other {Pin # items}}"
 msgstr ""
 
-#: generated/do-actions.ts:84
+#: generated/do-actions.ts:90
 msgid "{count, plural, one {Pin note} other {Pin # notes}}"
 msgstr ""
 
-#: generated/do-actions.ts:88
+#: generated/do-actions.ts:94
 msgid "{count, plural, one {Pin notebook} other {Pin # notebooks}}"
 msgstr ""
 
@@ -399,11 +407,11 @@ msgstr ""
 msgid "{count, plural, one {Prevent note from syncing} other {Prevent # notes from syncing}}"
 msgstr ""
 
-#: generated/do-actions.ts:133
+#: generated/do-actions.ts:139
 msgid "{count, plural, one {Publish item} other {Publish # items}}"
 msgstr ""
 
-#: generated/do-actions.ts:124
+#: generated/do-actions.ts:130
 msgid "{count, plural, one {Publish note} other {Publish # notes}}"
 msgstr ""
 
@@ -411,47 +419,47 @@ msgstr ""
 msgid "{count, plural, one {Reminder deleted} other {# reminders deleted}}"
 msgstr ""
 
-#: generated/do-actions.ts:253
+#: generated/do-actions.ts:259
 msgid "{count, plural, one {Remove attachment} other {Remove # attachments}}"
 msgstr ""
 
-#: generated/do-actions.ts:249
+#: generated/do-actions.ts:255
 msgid "{count, plural, one {Remove color} other {Remove # colors}}"
 msgstr ""
 
-#: generated/do-actions.ts:266
+#: generated/do-actions.ts:272
 msgid "{count, plural, one {Remove item} other {Remove # items}}"
 msgstr ""
 
-#: generated/do-actions.ts:245
+#: generated/do-actions.ts:251
 msgid "{count, plural, one {Remove shortcut} other {Remove # shortcuts}}"
 msgstr ""
 
-#: generated/do-actions.ts:216
+#: generated/do-actions.ts:222
 msgid "{count, plural, one {Rename attachment} other {Rename # attachments}}"
 msgstr ""
 
-#: generated/do-actions.ts:220
+#: generated/do-actions.ts:226
 msgid "{count, plural, one {Rename color} other {Rename # colors}}"
 msgstr ""
 
-#: generated/do-actions.ts:237
+#: generated/do-actions.ts:243
 msgid "{count, plural, one {Rename item} other {Rename # items}}"
 msgstr ""
 
-#: generated/do-actions.ts:224
+#: generated/do-actions.ts:230
 msgid "{count, plural, one {Rename tag} other {Rename # tags}}"
 msgstr ""
 
-#: generated/do-actions.ts:179
+#: generated/do-actions.ts:185
 msgid "{count, plural, one {Restore item} other {Restore # items}}"
 msgstr ""
 
-#: generated/do-actions.ts:164
+#: generated/do-actions.ts:170
 msgid "{count, plural, one {Restore note} other {Restore # notes}}"
 msgstr ""
 
-#: generated/do-actions.ts:168
+#: generated/do-actions.ts:174
 msgid "{count, plural, one {Restore notebook} other {Restore # notebooks}}"
 msgstr ""
 
@@ -460,11 +468,11 @@ msgstr ""
 msgid "{count, plural, one {Restoring item...} other {Restoring # items...}}"
 msgstr ""
 
-#: generated/actions.ts:195
+#: generated/actions.ts:201
 msgid "{count, plural, one {Shortcut created} other {# shortcuts created}}"
 msgstr ""
 
-#: generated/actions.ts:191
+#: generated/actions.ts:197
 msgid "{count, plural, one {Tag created} other {# tags created}}"
 msgstr ""
 
@@ -472,30 +480,34 @@ msgstr ""
 msgid "{count, plural, one {Tag deleted} other {# tags deleted}}"
 msgstr ""
 
-#: generated/actions.ts:164
+#: generated/actions.ts:170
 msgid "{count, plural, one {Tag edited} other {# tags edited}}"
 msgstr ""
 
-#: generated/do-actions.ts:76
+#: generated/do-actions.ts:82
 msgid "{count, plural, one {Unpin item} other {Unpin # items}}"
 msgstr ""
 
-#: generated/do-actions.ts:61
+#: generated/do-actions.ts:67
 msgid "{count, plural, one {Unpin note} other {Unpin # notes}}"
 msgstr ""
 
-#: generated/do-actions.ts:65
+#: generated/do-actions.ts:71
 msgid "{count, plural, one {Unpin notebook} other {Unpin # notebooks}}"
 msgstr ""
 
-#: generated/do-actions.ts:116
+#: generated/do-actions.ts:122
 msgid "{count, plural, one {Unpublish item} other {Unpublish # items}}"
 msgstr ""
 
-#: generated/do-actions.ts:107
+#: generated/do-actions.ts:113
 msgid "{count, plural, one {Unpublish note} other {Unpublish # notes}}"
 msgstr ""
 
+#: generated/actions.ts:28
+msgid "{count, plural, one {Version deleted} other {# versions deleted}}"
+msgstr ""
+
 #: src/strings.ts:2510
 msgid "{count} characters"
 msgstr ""
@@ -1647,6 +1659,10 @@ msgstr ""
 msgid "Clear default notebook"
 msgstr ""
 
+#: src/strings.ts:2800
+msgid "Clear history"
+msgstr ""
+
 #: src/strings.ts:1015
 msgid "Clear logs"
 msgstr ""
@@ -2284,6 +2300,10 @@ msgstr ""
 msgid "Delete all"
 msgstr ""
 
+#: src/strings.ts:2802
+msgid "Delete all version history for this note?"
+msgstr ""
+
 #: src/strings.ts:2732
 msgid "Delete attachment"
 msgstr ""
@@ -3801,6 +3821,10 @@ msgstr ""
 msgid "Keep open"
 msgstr ""
 
+#: src/strings.ts:2800
+msgid "Keep screen on"
+msgstr ""
+
 #: src/strings.ts:1361
 msgid "Keep your data safe"
 msgstr ""
@@ -5165,6 +5189,10 @@ msgstr ""
 msgid "Prevent note title from appearing in tab/window title."
 msgstr ""
 
+#: src/strings.ts:2802
+msgid "Prevent the screen from turning off while the editor is focused."
+msgstr ""
+
 #: src/strings.ts:2325
 msgid "Preview attachment"
 msgstr ""
@@ -7475,6 +7503,10 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
+#: src/strings.ts:2801
+msgid "Version history cleared"
+msgstr ""
+
 #: src/strings.ts:50
 msgid "Vibrate"
 msgstr ""