Merge branch 'update-capacitor' into dev

apps/client/package.json

@@ -98,7 +98,7 @@
   },
   "devDependencies": {
     "@intlify/vite-plugin-vue-i18n": "^3.4.0",
-    "@quasar/app-vite": "npm:@deepnotes/quasar-app-vite@^2.0.0-alpha.41",
+    "@quasar/app-vite": "npm:@deepnotes/quasar-app-vite@^2.0.0-alpha.42",
     "@types/argon2-browser": "^1.18.3",
     "@types/color": "^3.0.5",
     "@types/cookie": "^0.5.3",

apps/client/src-capacitor/.gitignore

@@ -0,0 +1 @@
+/**/capacitor.config.json

apps/client/src-capacitor/android/app/.gitignore

@@ -1,2 +1,2 @@
 /build/*
-!/build/.npmkeep
+!/build/.npmkeep

apps/client/src-capacitor/android/app/build.gradle

@@ -21,9 +21,9 @@ android {
             storePassword keyStoreProperties['releaseStorePassword']
         }
     }
-
+
+    namespace "app.deepnotes"
     compileSdkVersion rootProject.ext.compileSdkVersion
-
     defaultConfig {
         applicationId "app.deepnotes"
         minSdkVersion rootProject.ext.minSdkVersion
@@ -39,8 +39,8 @@ android {
     }
     buildTypes {
         release {
-        signingConfig signingConfigs.release
-            minifyEnabled true
+            signingConfig signingConfigs.release
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

apps/client/src-capacitor/android/app/capacitor.build.gradle

@@ -2,8 +2,8 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_11
+      sourceCompatibility JavaVersion.VERSION_17
+      targetCompatibility JavaVersion.VERSION_17
   }
 }
 

apps/client/src-capacitor/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.deepnotes">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:usesCleartextTraffic="true"
@@ -13,7 +12,7 @@
 
         <activity
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
-            android:name="app.deepnotes.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/title_activity_main"
             android:theme="@style/AppTheme.NoActionBarLaunch"
             android:launchMode="singleTask"

apps/client/src-capacitor/android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath 'com.google.gms:google-services:4.3.13'
+        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.google.gms:google-services:4.3.15'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

apps/client/src-capacitor/android/capacitor.settings.gradle

@@ -1,12 +1,12 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../../../../node_modules/.pnpm/@capacitor+android@4.8.1_@capacitor+core@4.8.1/node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../../../../node_modules/.pnpm/@capacitor+android@5.5.1_@capacitor+core@5.5.1/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../../../../node_modules/.pnpm/@capacitor+app@4.1.1_@capacitor+core@4.8.1/node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/app/android')
 
 include ':capacitor-clipboard'
-project(':capacitor-clipboard').projectDir = new File('../../../../node_modules/.pnpm/@capacitor+clipboard@4.1.0_@capacitor+core@4.8.1/node_modules/@capacitor/clipboard/android')
+project(':capacitor-clipboard').projectDir = new File('../../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/clipboard/android')
 
 include ':capacitor-splash-screen'
-project(':capacitor-splash-screen').projectDir = new File('../../../../node_modules/.pnpm/@capacitor+splash-screen@4.2.0_@capacitor+core@4.8.1/node_modules/@capacitor/splash-screen/android')
+project(':capacitor-splash-screen').projectDir = new File('../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/splash-screen/android')

apps/client/src-capacitor/android/fastlane/Appfile

@@ -0,0 +1,2 @@
+json_key_file("fastlane/deepnotes-google-api-secret.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("app.deepnotes") # e.g. com.krausefx.app

apps/client/src-capacitor/android/fastlane/Fastfile

@@ -0,0 +1,47 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  desc "Runs all the tests"
+  lane :test do
+    gradle(task: "test")
+  end
+
+  desc "Submit a new Beta Build to Crashlytics Beta"
+  lane :beta do
+    gradle(task: "clean assembleRelease")
+    crashlytics
+
+    # sh "your_script.sh"
+    # You can also use other beta testing services here
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    gradle(task: "clean assembleRelease")
+    upload_to_play_store
+  end
+
+  desc "Bundle and upload a new version to the Google Play"
+  lane :playstore do
+    gradle(task: "bundle", build_type: "Release")
+    upload_to_play_store(
+      release_status: 'draft',
+      skip_upload_apk: true,
+    )
+  end
+end

apps/client/src-capacitor/android/fastlane/metadata/android/de-DE/full_description.txt

@@ -0,0 +1 @@
+DeepNotes ist ein quelloffenes, Ende-zu-Ende-verschlüsseltes visuelles Notizentool mit umfassender bidirektionaler Seitennavigation und Live-Zusammenarbeit.

apps/client/src-capacitor/android/fastlane/metadata/android/de-DE/short_description.txt

@@ -0,0 +1 @@
+Visuelle Notizen für tief miteinander verbundene Ideen

apps/client/src-capacitor/android/fastlane/metadata/android/de-DE/title.txt

@@ -0,0 +1 @@
+DeepNotes

apps/client/src-capacitor/android/fastlane/metadata/android/en-US/changelogs/62.txt

@@ -0,0 +1,4 @@
+- Fixed page deletion problems
+- Added ability to reject group invitations in free account
+- Notes now become movable when duplicated
+- Group lists now only show groups editable by the user

apps/client/src-capacitor/android/fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1 @@
+DeepNotes is an open source, end-to-end encrypted visual note-taking tool with deep bidirectional page navigation and live collaboration.

apps/client/src-capacitor/android/fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+Visual Note-Taking for Deeply Interconnected Ideas

apps/client/src-capacitor/android/fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+DeepNotes - Visual Note-taking

apps/client/src-capacitor/android/fastlane/metadata/android/en-US/video.txt

@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=cr2TRWF46Ik

apps/client/src-capacitor/android/fastlane/metadata/android/es-419/full_description.txt

@@ -0,0 +1 @@
+DeepNotes es una herramienta de código abierto para tomar notas visuales encriptadas de extremo a extremo con navegación de página bidireccional profunda y colaboración en vivo.

apps/client/src-capacitor/android/fastlane/metadata/android/es-419/short_description.txt

@@ -0,0 +1 @@
+Toma de notas visual para ideas profundamente interconectadas

apps/client/src-capacitor/android/fastlane/metadata/android/es-419/title.txt

@@ -0,0 +1 @@
+DeepNotes

apps/client/src-capacitor/android/fastlane/metadata/android/es-ES/full_description.txt

@@ -0,0 +1 @@
+DeepNotes es una herramienta de código abierto para tomar notas visuales encriptadas de extremo a extremo con navegación de página bidireccional profunda y colaboración en vivo.

apps/client/src-capacitor/android/fastlane/metadata/android/es-ES/short_description.txt

@@ -0,0 +1 @@
+Toma de notas visual para ideas profundamente interconectadas

apps/client/src-capacitor/android/fastlane/metadata/android/es-ES/title.txt

@@ -0,0 +1 @@
+DeepNotes

apps/client/src-capacitor/android/fastlane/metadata/android/fr-FR/full_description.txt

@@ -0,0 +1 @@
+DeepNotes est un outil open source de prise de notes visuelles cryptées de bout en bout avec une navigation de page bidirectionnelle approfondie et une collaboration en direct.

apps/client/src-capacitor/android/fastlane/metadata/android/fr-FR/short_description.txt

@@ -0,0 +1 @@
+Prise de notes visuelles pour des idées profondément interconnectées

apps/client/src-capacitor/android/fastlane/metadata/android/fr-FR/title.txt

@@ -0,0 +1 @@
+DeepNotes

apps/client/src-capacitor/android/fastlane/metadata/android/id/full_description.txt

@@ -0,0 +1 @@
+DeepNotes adalah open source, alat pencatat visual terenkripsi end-to-end dengan navigasi halaman dua arah yang mendalam dan kolaborasi langsung.

apps/client/src-capacitor/android/fastlane/metadata/android/id/short_description.txt

@@ -0,0 +1 @@
+Pengambilan Catatan Visual untuk Ide yang Sangat Saling Terhubung

apps/client/src-capacitor/android/fastlane/metadata/android/id/title.txt

@@ -0,0 +1 @@
+DeepNotes

apps/client/src-capacitor/android/fastlane/metadata/android/it-IT/full_description.txt

@@ -0,0 +1 @@
+DeepNotes è uno strumento per prendere appunti visivi crittografati end-to-end open source con una profonda navigazione bidirezionale delle pagine e collaborazione dal vivo.

apps/client/src-capacitor/android/fastlane/metadata/android/it-IT/short_description.txt

@@ -0,0 +1 @@
+Prendere appunti visivi per idee profondamente interconnesse

apps/client/src-capacitor/android/fastlane/metadata/android/it-IT/title.txt

@@ -0,0 +1 @@
+DeepNotes

apps/client/src-capacitor/android/fastlane/metadata/android/ja-JP/full_description.txt

@@ -0,0 +1 @@
+DeepNotes は、オープンソースのエンドツーエンド暗号化されたビジュアルメモ作成ツールであり、詳細な双方向ページナビゲーションとライブコラボレーションを備えています。

apps/client/src-capacitor/android/fastlane/metadata/android/ja-JP/short_description.txt

@@ -0,0 +1 @@
+深く相互に関連したアイデアを視覚的にメモを取る

apps/client/src-capacitor/android/fastlane/metadata/android/ja-JP/title.txt

@@ -0,0 +1 @@
+DeepNotes

apps/client/src-capacitor/android/fastlane/metadata/android/pt-BR/full_description.txt

@@ -0,0 +1 @@
+O DeepNotes é uma ferramenta de anotações visuais criptografadas de ponta a ponta, de código aberto, com navegação de página bidirecional profunda e colaboração em tempo real.

apps/client/src-capacitor/android/fastlane/metadata/android/pt-BR/short_description.txt

@@ -0,0 +1 @@
+Anotações visuais para ideias profundamente interconectadas

apps/client/src-capacitor/android/fastlane/metadata/android/pt-BR/title.txt

@@ -0,0 +1 @@
+DeepNotes

apps/client/src-capacitor/android/fastlane/metadata/android/th/full_description.txt

@@ -0,0 +1 @@
+DeepNotes เป็นเครื่องมือจดบันทึกด้วยภาพที่เข้ารหัสแบบโอเพ่นซอร์สแบบ end-to-end พร้อมการนำทางหน้าแบบสองทิศทางเชิงลึกและการทำงานร่วมกันแบบสด

apps/client/src-capacitor/android/fastlane/metadata/android/th/short_description.txt

@@ -0,0 +1 @@
+การจดบันทึกด้วยภาพสำหรับแนวคิดที่เชื่อมโยงกันอย่างลึกซึ้ง

apps/client/src-capacitor/android/fastlane/metadata/android/th/title.txt

@@ -0,0 +1 @@
+DeepNotes

apps/client/src-capacitor/android/fastlane/metadata/android/zh-CN/full_description.txt

@@ -0,0 +1 @@
+DeepNotes 是一种开源、端到端加密的可视化笔记工具，具有深度双向页面导航和实时协作。

apps/client/src-capacitor/android/fastlane/metadata/android/zh-CN/short_description.txt

@@ -0,0 +1 @@
+深度关联想法的视觉笔记

apps/client/src-capacitor/android/fastlane/metadata/android/zh-CN/title.txt

@@ -0,0 +1 @@
+DeepNotes

apps/client/src-capacitor/android/gradle.properties

@@ -20,5 +20,4 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+

apps/client/src-capacitor/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

apps/client/src-capacitor/android/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

apps/client/src-capacitor/android/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal