[server] remove option to set storageLimit from Member Invite workflow

## Description

## Tests

.github/workflows/auth-internal-release.yml

@@ -40,7 +40,7 @@ jobs:
 
             - name: Build PlayStore AAB
               run: |
-                  flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore
+                  flutter build appbundle --dart-define=cronetHttpNoPlay=true --release --flavor playstore
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
@@ -54,3 +54,12 @@ jobs:
                   packageName: io.ente.auth
                   releaseFiles: auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
+
+            - name: Notify Discord
+              uses: sarisia/actions-status-discord@v1
+              with:
+                  webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
+                  nodetail: true
+                  title: "🏆 Internal release available for Auth"
+                  description: "[Download](https://play.google.com/store/apps/details?id=io.ente.auth)"
+                  color: 0x800080

.github/workflows/auth-release.yml

@@ -68,7 +68,7 @@ jobs:
 
             - name: Build independent APK
               run: |
-                  flutter build apk --release --flavor independent --dart-define=app.flavor=independent
+                  flutter build apk --dart-define=cronetHttpNoPlay=true --release --flavor independent
                   mv build/app/outputs/flutter-apk/app-independent-release.apk artifacts/ente-${{ github.ref_name }}.apk
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"

.github/workflows/mobile-internal-release.yml

@@ -40,7 +40,7 @@ jobs:
 
             - name: Build PlayStore AAB
               run: |
-                  flutter build appbundle --release --flavor playstore
+                  flutter build appbundle --dart-define=cronetHttpNoPlay=true --release --flavor playstore
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
@@ -54,3 +54,12 @@ jobs:
                   packageName: io.ente.photos
                   releaseFiles: mobile/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
+            
+            - name: Notify Discord
+              uses: sarisia/actions-status-discord@v1
+              with:
+                  webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
+                  nodetail: true
+                  title: "🏆 Internal release available for Photos"
+                  description: "[Download](https://play.google.com/store/apps/details?id=io.ente.photos)"
+                  color: 0x00ff00

.github/workflows/mobile-release.yml

@@ -45,7 +45,7 @@ jobs:
 
             - name: Build independent APK
               run: |
-                flutter build apk --release --flavor independent
+                flutter build apk --dart-define=cronetHttpNoPlay=true --release --flavor independent
                 mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-${{ github.ref_name }}.apk
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"

.github/workflows/server-publish.yml

@@ -1,27 +1,24 @@
 name: "Publish ghcr (server)"
 
 on:
-    # Run manually, providing it the commit.
-    #
-    # To obtain the commit from the currently deployed museum, do:
-    # curl -s https://api.ente.io/ping | jq -r '.id'
-    #
-    # See server/docs/publish.md for more details.
+    # Run automatically on 15th of every month, at 05:00 UTC.
+    schedule:
+        - cron: '0 5 15 * *'
+    # Run manually if needed to publish out of schedule.
     workflow_dispatch:
-        inputs:
-            commit:
-                description: "Commit to publish the image from"
-                type: string
-                required: true
 
 jobs:
     publish:
         runs-on: ubuntu-latest
         steps:
+            - name: Determine commit from prod museum
+              run: |
+                  echo "museum_commit=$(curl -s https://api.ente.io/ping | jq -r .id)" >> $GITHUB_ENV
+
             - name: Checkout code
               uses: actions/checkout@v4
               with:
-                  ref: ${{ inputs.commit }}
+                  ref: ${{ env.museum_commit }}
 
             - name: Build and push
               uses: mr-smithers-excellent/docker-build-push@v6
@@ -34,8 +31,8 @@ jobs:
                   enableBuildKit: true
                   multiPlatform: true
                   platform: linux/amd64,linux/arm64
-                  buildArgs: GIT_COMMIT=${{ inputs.commit }}
-                  tags: ${{ inputs.commit }}, latest
+                  buildArgs: GIT_COMMIT=${{ env.museum_commit }}
+                  tags: ${{ env.museum_commit }}, latest
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 

auth/assets/custom-icons/_data/custom-icons.json

@@ -21,6 +21,11 @@
       "title": "airtm",
       "hex": "000000"
     },
+    {
+      "title": "AJ Bell",
+      "slug": "aj_bell",
+      "hex": "c41230"
+    },
     {
       "title": "aliyun",
       "altNames": [
@@ -30,9 +35,18 @@
     {
       "title": "Amazon"
     },
+    {
+      "title": "Ankama",
+      "slug": "ankama"
+    },
     {
       "title": "Anycoin Direct",
       "slug": "anycoindirect"
+    },
+     {
+      "title": "Aruba",
+      "slug": "aruba",
+      "hex": "ef8a33"
     },
     {
       "title": "AscendEX"
@@ -194,6 +208,10 @@
     {
       "title": "Bugzilla"
     },
+    {
+      "title": "ButterflyMX",
+      "slug": "butterflymx"
+    },
     {
       "title": "Bybit"
     },
@@ -292,6 +310,9 @@
     {
       "title": "Discourse"
     },
+    {
+      "title": "Deloitte"
+    },
     {
       "title": "DMarket"
     },
@@ -347,6 +368,14 @@
     {
       "title": "Estateguru"
     },
+    {
+      "title": "EVEOnline",
+      "slug": "eve_online",
+      "altNames": [
+        "EVE Online"
+      ],
+      "hex": "858585"
+    },
     {
       "title": "Fastmail"
     },
@@ -371,9 +400,17 @@
     {
       "title": "ForUsAll"
     },
+    {
+      "title": "FreeTaxUSA",
+      "slug": "freetaxusa"
+    },
     {
       "title": "G2A"
     },
+    {
+      "title": "Gate.io",
+      "slug": "gateio.svg"
+    },
     {
       "title": "GitHub"
     },
@@ -492,6 +529,12 @@
     {
       "title": "Kagi"
     },
+    {
+      "title": "Keygen",
+      "altNames": [
+        "keygen.sh"
+      ]
+    },
     {
       "title": "Kick"
     },
@@ -749,6 +792,11 @@
       "altNames": [
         "欧易"
       ]
+    },
+     {
+      "title": "OnShape",
+      "slug": "onshape",
+      "hex": "7abb5e"
     },
     {
       "title": "Parqet",
@@ -846,6 +894,11 @@
     {
       "title": "RealMe",
       "slug": "realme"
+    },
+     {
+      "title": "RealVNC",
+      "slug": "realvnc",
+      "hex": "488aec"
     },
     {
       "title": "Registro br",
@@ -890,6 +943,10 @@
     {
       "title": "Samsung"
     },
+    {
+      "title": "Seafile",
+      "slug": "seafile"
+    },
     {
       "title": "Sendgrid"
     },
@@ -1105,13 +1162,6 @@
       "title": "WARGAMING.NET",
       "slug": "wargamingnet"
     },
-    {
-      "title": "World Cube Association",
-      "altNames": [
-        "WCA",
-        "worldcubeassociation"
-      ]
-    },
     {
       "title": "Wealthfront"
     },
@@ -1140,6 +1190,14 @@
         "Work OS"
       ]
     },
+    {
+      "title": "World Cube Association",
+      "slug": "wca",
+      "altNames": [
+        "WCA",
+        "worldcubeassociation"
+      ]
+    },
     {
       "title": "WYZE"
     },

auth/assets/custom-icons/icons/aj_bell.svg

@@ -0,0 +1,7 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1507 1556" width="1507" height="1556">
+	<title>logo_grey-svg</title>
+	<style>
+		.s0 { fill: #c41230 } 
+	</style>
+	<path id="Layer" class="s0" d="m759.6 651c10.6 63.6 7.5 126.3-6.8 185.3-0.6-3.5-0.8-7-1.5-10.6-51.7-311.8-346.3-522.7-657.7-470.8-32.4 5.3-63.6 13.5-93.6 23.9 62.4-54.7 140.3-93.4 228.3-108.1 251.6-41.9 489.5 128.4 531.3 380.3zm84.2 340c-48.7 59.8-107.3 106.4-171.5 140 2.8-3.3 5.7-6.4 8.4-9.7 238.7-292.4 195.6-723.2-96.4-962.3-30.4-24.8-62.2-46.4-95.3-65.2 98.4 12.9 194.5 52.4 276.9 119.9 236 193.2 270.9 541.2 77.9 777.3zm409.3-532.7c66.8 402.8-204.2 783.4-605.6 852.1 313.4-230.6 489-625.2 420.9-1035.7-16.2-97.3-45.1-189.3-84.7-274.7 138.4 110.2 238.1 269.9 269.4 458.3zm241.5 84.5c78.6 473.9-241.4 921.9-714.8 1000.6-195.5 32.6-386.6-3.2-549.2-89.5 98.5 11.2 200.2 9.2 302.8-7.9 537.8-89.4 917.1-559.8 908.4-1089.5 23.9 58.8 41.9 121 52.8 186.3z"/>
+</svg>

auth/assets/custom-icons/icons/ankama.svg

@@ -0,0 +1,5 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 720 720" width="720" height="720">
+	<title>ankama</title>
+	<path class="s0" d="m572.3 253.3c-0.3-1.4-0.5-3-1.1-4.4-15.1-46-59.7-76.2-107.9-71.5-31.2 3-55.6 18.9-73.4 44.7-3.8 5.7-7.1 12-10.1 18.4-9.4 19.5-19.5 38.7-24.7 59.7-0.5 1.6-1.1 3.5-1.9 4.9-2.5 4.6-5.5 6.3-10.1 4.1-11.7-5.7-23.8-5.2-36.1-4.4-20.3 1.1-37.9-5.7-52.9-19.5-36.1-33.1-35.3-91 1.9-123 26.8-23.3 43.3-52.1 49.3-86.8 3-16.5 3.3-33.4 0-49.9-0.5-2.7-0.8-5.5-1.4-8.7 7.4-1.4 14.3 0 20.8 2.2 42.8 12.4 69.3 40.6 81.6 82.7 0.5 2.2 1.1 4.4 1.6 6.8 0.8 3 2.7 4.9 5.7 5.5 3.3 0.5 6.3-0.5 7.9-3.5 3-6.3 5.7-12.7 8.2-19.2 3.3-9.7 3.8-10.5 14.3-10.6 58.3-0.8 111.7 15.4 159.4 49 60.5 42.9 98.4 101.4 115.7 173.4 0.8 3.5 0.8 7.6 0.5 11.6-4.6 68-26.8 129.6-68.8 183.5-49 63.1-112.4 104.4-190.7 121.4-72.6 15.8-141.7 4.9-207.1-30.1-1.4-0.8-2.7-1.6-3.8-2.5-0.3 0-0.5-0.8-1.6-2.2 8.7 3 17 5.5 24.7 8.6 13.9 5.7 28.5 8.7 43.6 8.6 14.3 0 28.2 0.8 42.5 0 63.9-3.8 119.5-27.4 166.2-70.7 23.6-21.9 32.8-50.7 30.7-82.4-1.9-32.3-16.5-58.6-42.2-78.3-18.9-14.6-32-33.1-38-56.4-4.1-15.8-4.6-32-0.8-48.2 5.7-24.7 27.7-41.7 52.3-40.6 17 0.8 29.6 9 39.5 22.5 1.4 1.9 2.7 4.1 4.1 6.3 0.5 0 0.8-0.5 1.4-0.8l0.8 0.3v-0.5zm-263.5-55.1c-14.7 0-26.3 12.4-26.3 27.7 0 15.3 11.6 27.4 26.6 27.4 15 0 26-12.4 26-27.1 0-14.7-12-27.9-26.3-27.9v-0.2z"/>
+	<path class="s0" d="m168.2 314.5c7.4 1.6 14.7 3.3 22.5 4.9 10.9 2.2 14.3 6.8 12 18.1-1.6 8.2-3 16.2-4.9 24.1-0.8 3.5 0 5.7 2.5 8.2 22.8 23.6 50.1 38.4 83.8 43.6-2.2-1.4-3-2.2-4.1-2.7-19.5-10.1-27.7-25.2-25.2-46.6 1.1-9.8 0-19.2-6-27.4-3.8-5.5-9-9.7-13.9-14.3-1.6-1.6-3.8-2.5-6-4.1 5.2-3.3 10.5-3.3 15.4-3 7.4 0.3 14.7 1.4 22.2 3 11.6 2.5 21.7 8.2 30.4 16.2 6.5 6 12.4 12.4 18.7 18.4 13.9 13.6 25.2 12.8 37.2-2.7 7.6-9.8 12.4-21.4 15.8-33.1 3.8-12.7 8.2-24.9 15.4-36.1 7.4-11.6 16.5-21.7 27.4-30.1 9.7-7.4 19.7-6.8 30.7-3.3v9.7c-1.1 27.1 5.2 52.6 19.5 75.9 1.1 1.9 2.2 4.1 3.5 6 4.1 6.3 3.3 12-0.5 18.1-5.5 8.7-13.5 13.2-23.8 13.5h-6.3c-12.7 0-23.3 8.2-26.8 20.6-3 10.9 1.9 23.3 11.7 29.6 10.9 6.8 24.1 5.7 33.4-3 10.1-9.8 16.5-21.7 18.9-35.7 0.3-1.9 0.8-4.1 1.1-6 17.3-0.3 39.8 16.6 48.2 37.2 10.1 24.1 6.3 46.6-10.1 68.8-0.8-5.2-1.4-9.4-2.2-12.8-2.2-9.7-8.6-15.7-18.1-17.7-6.8-1.6-9.8 0-13.6 5.7-1.9 3-3.5 6.3-5.2 9.7-2.5 4.9-4.6 9.8-7.1 14.6-13.6 27.1-34.9 45.8-63.2 55.6-27.1 9.7-55.2 13.2-83.5 10.1-16.5-1.6-29.3-10.5-39.8-23.6 1.9-1.4 3.3-2.7 4.9-3.8 7.4-5.5 12.8-12.7 16.6-20.8 1.1-2.2 1.6-4.9 1.9-7.4 0.5-5.2-2.7-9.4-7.6-9.8-4.6-0.5-8.7 2.5-10.1 7.6-0.8 3.3-1.1 6.5-2.5 9.7-3.8 7.1-9.7 12.8-16.5 17-7.4 4.4-14.6 3.8-20-1.4-5.5-5.5-6-11.7-1.9-19.7 0.3-0.5 0.5-1.4 1.4-3-2.5 1.1-4.1 1.4-5.5 2.2-17.7 10.6-25.8 31.5-19.2 51.5 18.7 56.7-6 119.5-54 151-3.3 2.2-7.1 4.1-11.6 6.8 0-3-0.5-5.2-0.5-7.4-2.5-57.8-30.1-98.9-82.4-122.8-32.8-14.7-53.7-39.5-62.1-74-12.4-50.1 13.9-102.2 61.2-122.8 1.9-0.8 4.1-1.4 7.6-2.7-15.1 28.8-18.7 57.2-9.4 86.8 5.5 17.3 14.7 32 29 45.5 0.3-12.4-0.8-23.6 7.6-33.4 2.7 6.3 5.5 12 8.2 17.7 4.9 10.9 12.7 19.5 23.3 24.9 12 6.3 24.1 6.8 36.5 1.1 8.6-3.8 15.8-9.4 22.2-16.2 8.6-9 8.6-24.9 0.3-35.7-5.5-7.1-8.6-14.7-7.4-23.6 1.9-15.4 15.1-26.8 32-28.2 4.6-0.3 9.4 0 13.6 0.5 4.1 0.8 8.2 2.5 12.7 3.3-3.5-3.8-7.9-6.5-12.7-8.2-8.2-2.7-16.6-3.3-25.2-1.6-14.7 3.3-24.9 16.2-26.3 33.4-0.5 6.3 0 12.8 1.1 19.2 3 16.5-0.8 30.4-13.2 42.8-1.9-1.6-3.8-2.7-5.7-4.4-43.9-37.6-69.6-84.6-75.6-142.2-10.1-95.9 42.5-184.9 130.9-223 28.5-12.4 46-33.8 53.4-63.9 0.3-1.4 0.8-2.7 1.9-3.8 1.9 10.1 1.4 20.3-1.1 30.1-6 24.1-19.5 42.8-41.4 55.3-21.4 12.4-38.4 29-51.5 50.1-2.5 4.1-2.7 7.1 0 10.9 2.7 3.5 5.2 7.6 7.6 11.6 4.4 7.4 3 13.9-4.1 18.9-6.3 4.4-13.2 8.2-19.5 12.7-1.6 1.1-3.5 3.3-3.8 5.2-1.6 18.7-0.5 36.9 5.5 55.3l1.4-0.3-0.2-0.2zm192.8 132c14.3 0 25.8-11.3 25.5-25.2 0-13.6-12-25.8-25.5-25.8-13.5 0-25.2 11.3-25.5 25.5 0 14.3 11.3 25.5 25.2 25.5z"/>
+</svg>

auth/assets/custom-icons/icons/aruba.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#FF8300" fill-rule="evenodd" d="M12.1099561,17.3015551 C9.03598293,17.3015551 6.50849391,14.8423766 6.50849391,11.836714 C6.50849391,8.83105139 9.03598293,6.37187289 12.1099561,6.37187289 C15.1839292,6.37187289 17.7114182,8.83105139 17.7114182,11.836714 C17.7114182,14.8423766 15.1839292,17.3015551 12.1099561,17.3015551 L12.1099561,17.3015551 Z M12.1099561,2 C6.50849391,2 2,6.4401834 2,11.836714 C2,17.3015551 6.50849391,21.673428 12.1099561,21.673428 C14.4325135,21.673428 16.5501395,20.9220123 18.2579023,19.6241126 C19.28256,21.3318754 22.2199121,21.673428 22.2199121,21.673428 L22.2199121,11.836714 C22.2199121,6.4401834 17.7114182,2 12.1099561,2 L12.1099561,2 Z"/>
+</svg>

auth/assets/custom-icons/icons/butterflymx.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="462px" height="404px" viewBox="0 0 462 404" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="464.529999" y1="-2595.189941" x2="1224.150024" y2="-2986.919922" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0" style="stop-color:rgb(100%,92.156863%,18.039216%);stop-opacity:1;"/>
+<stop offset="0.92" style="stop-color:rgb(99.607843%,56.470591%,18.82353%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="-580.880005" y1="-2987.179932" x2="121.110001" y2="-2623.179932" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0.06" style="stop-color:rgb(0%,40.784314%,89.803922%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(3.921569%,85.09804%,100%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="1063.689941" y1="-3644.949951" x2="436.269989" y2="-3207.530029" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0" style="stop-color:rgb(93.725491%,3.921569%,21.176471%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(100%,59.215689%,54.11765%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="-389.76001" y1="-3622.02002" x2="266.369995" y2="-3164.639893" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0" style="stop-color:rgb(47.450981%,7.843138%,93.725491%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(85.882354%,41.176471%,100%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 437.566406 160.457031 C 437.566406 192.628906 411.488281 218.730469 379.324219 218.730469 L 239.71875 218.730469 C 239.71875 116.257812 317.625 31.976562 417.445312 21.886719 C 428.53125 20.769531 437.585938 29.886719 437.585938 41.027344 Z M 437.566406 160.457031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 24.640625 160.457031 C 24.640625 192.628906 50.722656 218.730469 82.882812 218.730469 L 222.492188 218.730469 C 222.492188 116.257812 144.589844 31.976562 44.777344 21.886719 C 33.695312 20.769531 24.640625 29.886719 24.640625 41.027344 Z M 24.640625 160.457031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 269.425781 338.792969 C 249.960938 308.039062 239.65625 272.375 239.71875 235.976562 L 381.667969 235.976562 C 412.507812 235.976562 437.574219 260.675781 437.574219 291.0625 C 437.566406 380.972656 317.730469 415.246094 269.425781 338.792969 Z M 269.425781 338.792969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear3);" d="M 192.78125 338.792969 C 212.25 308.039062 222.554688 272.375 222.492188 235.976562 L 80.546875 235.976562 C 49.707031 235.976562 24.640625 260.675781 24.640625 291.0625 C 24.640625 380.972656 144.480469 415.246094 192.78125 338.792969 Z M 192.78125 338.792969 "/>
+</g>
+</svg>

auth/assets/custom-icons/icons/deloitte.svg

@@ -0,0 +1,15 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1545 1333" width="1545" height="1333">
+	<title>Deloitte-svg</title>
+	<style>
+		.s0 { fill: #86bc24 } 
+		.s1 { fill: #0f0b0b } 
+	</style>
+	<g id="layer1">
+		<g id="g3359">
+			<g id="g3371">
+				<path id="path3356" class="s0" d="m1354.4 1332.5c-105.1 0-190-84.8-190-189.6 0-104.9 84.9-189.6 190-189.6 105 0 189.9 84.7 189.9 189.6 0 104.8-84.9 189.6-189.9 189.6z"/>
+				<path id="path3360" fill-rule="evenodd" class="s1" d="m1089.4 628.2q0 328.2-176.7 505.8-176.8 177.6-497.1 177.6h-414.9v-1311.1h443.9q308.8 0 476.8 161.4c112 107.6 168 263 168 466.3zm-359.7 12.5q0-180.1-69.7-267.2c-46.6-58-117.1-87-211.9-87h-100.9v734.5h77.2c105.3 0 182.5-31.2 231.6-93.8 49.1-62.4 73.7-157.9 73.7-286.5z"/>
+			</g>
+		</g>
+	</g>
+</svg>

auth/assets/custom-icons/icons/eve_online.svg

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="198.4" height="198.4" xml:space="preserve">
+<path transform="translate(0, 60)"  d="M 0,0 0,13.88 10.97,13.88 10.97,10.31 60.69,10.31 60.69,0 0,0 z M 65.84,0 99.22,58.09 132.6,0 120.7,0 C 120.7,0 100.5,34.91 99.22,37.16 97.92,34.91 77.75,0 77.75,0 L 65.84,0 z M 137.8,0 137.8,13.88 148.7,13.88 148.7,10.31 198.4,10.31 198.4,0 137.8,0 z M 0,19.12 0,29.47 60.69,29.47 60.69,19.12 0,19.12 z M 137.8,19.12 137.8,29.47 198.4,29.47 198.4,19.12 137.8,19.12 z M 0,34.66 0,48.59 60.69,48.59 60.69,38.25 10.97,38.25 10.97,34.66 0,34.66 z M 137.8,34.66 137.8,48.59 198.4,48.59 198.4,38.25 148.7,38.25 148.7,34.66 137.8,34.66 z M 42.19,69.72 C 41.32,69.72 40.71,69.89 40.41,70.19 40.1,70.49 39.97,71.03 39.97,71.84 L 39.97,76.56 C 39.97,77.38 40.1,77.93 40.41,78.22 40.71,78.52 41.32,78.66 42.19,78.66 L 48.72,78.66 C 49.59,78.66 50.19,78.52 50.5,78.22 50.8,77.93 50.97,77.38 50.97,76.56 L 50.97,71.84 C 50.97,71.03 50.8,70.49 50.5,70.19 50.19,69.89 49.59,69.72 48.72,69.72 L 42.19,69.72 z M 64.37,69.72 64.37,78.66 66.25,78.66 66.25,73.84 C 66.25,73.66 66.23,73.43 66.22,73.19 66.2,72.94 66.18,72.69 66.16,72.41 66.26,72.53 66.38,72.67 66.5,72.78 66.62,72.89 66.75,73.01 66.91,73.16 L 73.47,78.66 74.88,78.66 74.88,69.72 73.03,69.72 73.03,74.41 C 73.03,74.52 73.05,74.7 73.06,74.91 73.07,75.11 73.09,75.47 73.12,75.97 72.99,75.81 72.82,75.66 72.66,75.5 72.49,75.35 72.31,75.18 72.09,75 L 65.81,69.72 64.37,69.72 z M 88.53,69.72 88.53,78.66 97.31,78.66 97.31,77 90.59,77 90.59,69.72 88.53,69.72 z M 109.4,69.72 109.4,78.66 111.5,78.66 111.5,69.72 109.4,69.72 z M 125.1,69.72 125.1,78.66 127,78.66 127,73.84 C 127,73.66 127,73.43 126.9,73.19 126.9,72.94 126.9,72.69 126.9,72.41 127,72.53 127.1,72.67 127.2,72.78 127.3,72.89 127.5,73.01 127.6,73.16 L 134.2,78.66 135.6,78.66 135.6,69.72 133.8,69.72 133.8,74.41 C 133.8,74.52 133.8,74.7 133.8,74.91 133.8,75.11 133.8,75.47 133.8,75.97 133.7,75.81 133.6,75.66 133.4,75.5 133.2,75.35 133,75.18 132.8,75 L 126.5,69.72 125.1,69.72 z M 149.3,69.72 149.3,78.66 158.5,78.66 158.5,77 151.3,77 151.3,74.78 155.4,74.78 155.4,73.25 151.3,73.25 151.3,71.25 158.4,71.25 158.4,69.72 149.3,69.72 z M 42.03,71.31 48.87,71.31 48.87,77 42.03,77 42.03,71.31 z" /></svg>

auth/assets/custom-icons/icons/freetaxusa.svg

@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 560 400" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(2.51518 0 0 2.51518 30 162.272)"><path d="m136.108 5.893 6.356 23.513h-4.7l-1.218-5.334h-6.587l-1.284 5.334h-4.545l6.52-23.513h5.468zm-2.833 4.107-2.436 10.242h4.806zm-65.8 1.7c2.02 0 3.508.522 4.463 1.563s1.432 2.674 1.432 4.9v11.263h-3.95v-1.9c-.505.746-1.114 1.323-1.828 1.73-.706.405-1.508.615-2.322.61-1.405 0-2.502-.45-3.294-1.35s-1.176-2.182-1.176-3.786c0-1.734.577-3.1 1.73-4.1s2.804-1.586 4.956-1.762l1.78-.132v-1.02c0-1.03-.153-1.788-.462-2.27s-.8-.725-1.482-.725c-.615 0-1.086.187-1.415.56s-.56.966-.7 1.78l-3.887-.33c.264-1.713.9-2.98 1.9-3.804s2.427-1.235 4.25-1.235zm1.78 9.78-1.317.132c-.988.088-1.752.373-2.3.856s-.808 1.13-.808 1.943c0 .724.153 1.28.463 1.662s.756.577 1.35.577c.748.022 1.459-.331 1.894-.939.472-.626.708-1.476.708-2.553v-1.68zm-25.26-9.78c2.064 0 3.617.714 4.66 2.14s1.563 3.535 1.563 6.323v1.68h-8.825c.044 3.338.9 5.005 2.536 5.005.66 0 1.152-.202 1.482-.608s.548-1.092.66-2.06h4.084c-.177 1.888-.797 3.322-1.86 4.298s-2.542 1.465-4.43 1.465c-2.282 0-3.972-.73-5.07-2.2s-1.647-3.716-1.647-6.768c0-3.03.58-5.334 1.745-6.915s2.869-2.36 5.107-2.36zm-.133 3.03c-.8 0-1.372.346-1.744 1.038s-.604 1.84-.7 3.442h4.676c0-1.56-.18-2.695-.544-3.4s-.927-1.07-1.696-1.07zm-14.29-3.03c2.064 0 3.617.714 4.66 2.14s1.563 3.535 1.563 6.323v1.68h-8.825c.044 3.338.9 5.005 2.536 5.005.66 0 1.152-.202 1.482-.608s.55-1.092.66-2.06h4.084c-.177 1.888-.797 3.322-1.86 4.298s-2.542 1.465-4.43 1.465c-2.282 0-3.972-.73-5.07-2.2s-1.647-3.716-1.647-6.768c0-3.03.58-5.334 1.745-6.915s2.867-2.37 5.105-2.37zm-.133 3.03c-.8 0-1.372.346-1.744 1.038s-.604 1.84-.7 3.442h4.676c0-1.56-.18-2.695-.544-3.4s-.927-1.07-1.696-1.07zm-29.439-8.8v23.513h4.645v-9.55h7.3v-4.15h-7.3v-5.665h7.837v-4.148zm13.7 23.477v-17.2h4.215v2.306c.46-.834 1-1.477 1.647-1.927s1.305-.675 2-.675c.352 0 .747.054 1.185.165l-.493 3.952c-.33-.087-.757-.132-1.285-.132-.792-.018-1.554.306-2.09.89-.56.594-.84 1.33-.84 2.206v10.406h-4.339zm39.813 0v-19.364h-5.335v-4.15h15.315v4.15h-5.336v19.365zm30.792 0-2.832-5.665-2.7 5.665h-4.28l4.84-8.727-4.545-8.464h4.6l2.47 5.204 2.536-5.204h4.282l-4.676 8.234 4.908 8.957zm17.652-23.514h4.644v15.083c0 2.92-.68 5.155-2.04 6.702s-3.328 2.322-5.897 2.322-4.533-.773-5.896-2.322-2.04-3.78-2.04-6.702v-15.083h4.644v15.413c0 1.537.27 2.68.807 3.424s1.366 1.12 2.486 1.12 1.948-.373 2.487-1.12.807-1.887.807-3.424v-15.413zm12.118 13.14c-1.865-.548-3.237-1.377-4.116-2.486s-1.318-2.564-1.318-4.364c0-2.085.682-3.754 2.042-5.005s3.163-1.878 5.4-1.878c2.13 0 3.788.538 4.973 1.614s1.93 2.733 2.24 4.972l-4.414.594c-.22-1.23-.548-2.103-.987-2.62s-1.087-.774-1.943-.774-1.515.247-1.977.74-.7 1.224-.7 2.2c0 .813.175 1.444.527 1.894s.955.806 1.812 1.07l2.503.8c1.338.418 2.415.94 3.227 1.564.783.594 1.397 1.384 1.78 2.29.376.9.56 1.977.56 3.228 0 2.196-.675 3.936-2.025 5.22s-3.179 1.908-5.507 1.908c-4.897 0-7.5-2.547-7.84-7.64h4.612c.1 1.34.422 2.316.938 2.93s1.3.922 2.355.922c.9 0 1.597-.27 2.1-.807s.74-1.312.74-2.322c0-.9-.203-1.614-.6-2.14s-1.048-.92-1.926-1.185l-2.438-.724z" fill="#212f63"/><path d="m140.638 5.893 1.207 4.25h49.07v-4.25zm2.7 9.463 1.213 4.25 46.373-.007v-4.25zm2.79 9.802 1.208 4.25h43.6v-4.25z" fill="#bf2032"/><path d="m195.992 2.462h.33c.364 0 .546-.143.546-.432.005-.113-.036-.223-.115-.304-.076-.076-.212-.115-.406-.115h-.354v.85zm-.52 1.295v-2.577h.964c.27 0 .502.06.698.183s.29.336.29.64c0 .153-.042.294-.126.425s-.2.223-.343.273l.584 1.053h-.584l-.444-.89h-.52v.89h-.52zm.913.774c.255.001.508-.049.743-.147.232-.097.433-.234.6-.412.174-.185.31-.402.4-.64.1-.265.15-.547.147-.831.002-.28-.048-.558-.147-.819-.098-.25-.23-.465-.4-.648-.169-.181-.374-.326-.601-.425-.234-.1-.48-.153-.743-.153-.257-.002-.512.05-.748.153-.224.099-.426.244-.591.425-.169.191-.302.41-.394.648-.097.25-.145.522-.145.82-.004.284.046.565.145.831.098.25.23.462.394.64s.363.316.59.412c.237.1.491.15.748.147zm0 .47c-.318.003-.634-.06-.927-.184-.288-.122-.538-.293-.754-.514-.221-.227-.396-.494-.515-.787-.127-.304-.19-.643-.19-1.015s.062-.71.19-1.016c.12-.293.295-.56.515-.787.215-.22.471-.394.754-.514.288-.123.596-.184.927-.184.32-.002.637.061.933.184.293.123.545.293.76.514s.388.483.515.787.2.643.2 1.016-.063.71-.2 1.015-.298.568-.515.787-.468.392-.76.514c-.295.124-.613.186-.933.184z" fill="#212f63"/></g></svg>

auth/assets/custom-icons/icons/gateio.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xodm="http://www.corel.com/coreldraw/odm/2003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 2500 2500" style="enable-background:new 0 0 2500 2500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#2354E6;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#17E6A1;}
+</style>
+<g id="Layer_x0020_1">
+	<rect y="0" class="st0" width="2500" height="2500"></rect>
+	<g id="_2500576017504">
+		<path id="Fill-3" class="st1" d="M1250,1937.5c-379.7,0-687.5-307.8-687.5-687.5c0-379.7,307.8-687.5,687.5-687.5V0    C559.6,0,0,559.6,0,1250c0,690.3,559.6,1250,1250,1250c690.3,0,1250-559.6,1250-1250h-562.5    C1937.5,1629.7,1629.7,1937.5,1250,1937.5z"></path>
+		<polygon id="Fill-4" class="st2" points="1250,1250 1937.5,1250 1937.5,562.5 1250,562.5   "></polygon>
+	</g>
+</g>
+</svg>

auth/assets/custom-icons/icons/keygen.svg

@@ -0,0 +1,19 @@
+<svg width="100%" height="100%" viewBox="0 0 113 113" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(1,0,0,1,-1298.97,-1016.72)">
+        <g transform="matrix(0.5,0,0,0.5,736.463,641.721)">
+            <g transform="matrix(0.834925,0,0,0.834925,161.667,288.323)">
+                <circle cx="1198.72" cy="777.527" r="44.914" style="fill:#000811;"/>
+            </g>
+        </g>
+        <g transform="matrix(0.5,0,0,0.5,736.463,641.721)">
+            <g transform="matrix(0.834925,0,0,0.834925,311.66,138.323)">
+                <circle cx="1198.72" cy="777.527" r="44.914" style="fill:#000811;"/>
+            </g>
+        </g>
+        <g transform="matrix(0.5,0,0,0.5,736.463,641.721)">
+            <g transform="matrix(1,0,0,1,281.792,137.715)">
+                <path d="M955.708,762.285C935.011,762.285 918.208,745.482 918.208,724.785C918.208,704.088 935.011,687.285 955.708,687.285C976.405,687.285 993.208,704.088 993.208,724.785C993.208,745.482 1010.01,762.285 1030.71,762.285C1051.4,762.285 1068.21,779.088 1068.21,799.785C1068.21,820.482 1051.4,837.285 1030.71,837.285C1010.01,837.285 993.208,820.482 993.208,799.785C993.208,779.088 976.405,762.285 955.708,762.285Z" style="fill:#000811;"/>
+            </g>
+        </g>
+    </g>
+</svg>

auth/assets/custom-icons/icons/seafile.svg

@@ -0,0 +1,13 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 180 120" width="180" height="120">
+	<title>seafile</title>
+	<defs>
+		<linearGradient id="g1" x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,114.369,-177.525,0,89.989,2.834)">
+			<stop offset="0" stop-color="#fad956"/>
+			<stop offset="1" stop-color="#ffa10f"/>
+		</linearGradient>
+	</defs>
+	<style>
+		.s0 { fill: url(#g1) } 
+	</style>
+	<path class="s0" d="m1.2 52.8c0-3 2.4-5.4 5.4-5.4 1.4 0 2.7 0.6 3.6 1.5q0-0.7 0-1.4c0-9.9 8-17.9 17.9-17.9 2.5 0 4.9 0.5 7.1 1.5q0-0.8 0-1.5c0-14.8 12-26.8 26.8-26.8 14.7 0 26.6 11.9 26.8 26.6-4.8 4.2-8.7 9.6-11.2 15.7-4.8-3-10.4-4.8-16.5-4.8-12.4 0-23.2 7.1-28.3 17.8h-19.1-7.1c-3 0-5.4-2.4-5.4-5.3zm141.2-16c-6.6-6.7-15.8-10.8-25.9-10.8-18.5 0-33.8 13.7-36.3 31.5-4.5-6.1-11.8-10-20-10-13.8 0-25 11.2-25 25 0 4 0.9 7.8 2.6 11.2-8.7 1.7-15.1 8.5-15.1 16.5 0 9.4 8.8 17 19.7 17 4.7 0 9.1-1.5 12.6-4l40.2-39.5c4.4-4.1 10.3-6.6 16.8-6.6 13.6 0 24.7 10.9 25.1 24.4q0 0-0.1-0.1c0.2 4-1.8 8.1-5.7 10.3-5.3 3.1-12 1.4-15-3.7-2.9-5.1-1-11.7 4.4-14.8q1.9-1.1 3.9-1.4-1.8-0.4-3.6-0.4c-9.9 0-17.9 8-17.9 17.9 0 9.9 8 17.9 17.9 17.9q0.6 0 1.3-0.1l0.5-0.1h35.1v0.2c10.7-0.5 20.9-10.4 20.9-22.5 0-12.3-10.6-22.4-22.9-22.4q-0.1 0-0.1 0c-2 3.6-4.4 5.7-7.1 7.9 2.8-5.2 4.5-11.2 4.5-17.6-0.1-10.1-4.2-19.2-10.8-25.8z"/>
+</svg>

auth/lib/core/network.dart

@@ -8,6 +8,7 @@ import 'package:ente_auth/utils/package_info_util.dart';
 import 'package:ente_auth/utils/platform_util.dart';
 import 'package:fk_user_agent/fk_user_agent.dart';
 import 'package:flutter/foundation.dart';
+import 'package:native_dio_adapter/native_dio_adapter.dart';
 import 'package:uuid/uuid.dart';
 
 int kConnectTimeout = 15000;
@@ -50,6 +51,10 @@ class Network {
         },
       ),
     );
+
+    _dio.httpClientAdapter = NativeAdapter();
+    _enteDio.httpClientAdapter = NativeAdapter();
+
     _setupInterceptors(endpoint);
 
     Bus.instance.on<EndpointUpdatedEvent>().listen((event) {

auth/lib/events/opened_settings_event.dart

@@ -1,3 +0,0 @@
-import 'package:ente_auth/events/event.dart';
-
-class OpenedSettingsEvent extends Event {}

auth/lib/json/converter.dart

@@ -1,17 +0,0 @@
-import 'dart:typed_data';
-
-import "package:json_annotation/json_annotation.dart";
-
-class Uint8ListConverter implements JsonConverter<Uint8List, List<int>> {
-  const Uint8ListConverter();
-
-  @override
-  Uint8List fromJson(List<int>? json) {
-    return json == null ? Uint8List(0) : Uint8List.fromList(json);
-  }
-
-  @override
-  List<int> toJson(Uint8List object) {
-    return object.toList();
-  }
-}

auth/lib/l10n/arb/app_ar.arb

@@ -48,6 +48,7 @@
   "nextTotpTitle": "التالي",
   "deleteCodeTitle": "حذف الرمز؟",
   "deleteCodeMessage": "هل أنت متأكد من أنك تريد حذف هذه الشيفرة؟ هذا الإجراء لا رجعة فيه.",
+  "trash": "سلة المهملات",
   "viewLogsAction": "عرض السجلات",
   "sendLogsDescription": "سوف يُرسل هذا السجلات لنا لمساعدتنا على تصحيح مشكلتك. بينما نتخذ الاحتياطات لضمان عدم تسجيل المعلومات الحساسة، نشجعك على رؤية هذه السجلات قبل مشاركتها.",
   "preparingLogsTitle": "جارٍ إعداد السجلات...",
@@ -197,6 +198,8 @@
   "enterDetailsManually": "أدخل التفاصيل يدوياً",
   "edit": "تعديل",
   "share": "مشاركة",
+  "shareCodes": "شارك الرموز",
+  "restore": "استعادة",
   "copiedToClipboard": "تم النسخ إلى الحافظة",
   "copiedNextToClipboard": "تم نسخ الرموز التالية إلى الحافظة",
   "error": "خطأ",
@@ -248,6 +251,10 @@
   "areYouSureYouWantToLogout": "هل أنت متأكد من أنك تريد تسجيل الخروج؟",
   "yesLogout": "نعم، تسجيل الخروج",
   "exit": "خروج",
+  "theme": "السمة",
+  "lightTheme": "فاتح",
+  "darkTheme": "داكن",
+  "systemTheme": "النظام",
   "verifyingRecoveryKey": "التحقق من مفتاح الاسترداد...",
   "recoveryKeyVerified": "تم التحقق من مفتاح الاسترداد",
   "recoveryKeySuccessBody": "رائع! مفتاح الاسترداد الخاص بك صالح. شكرا لك على التحقق.\n\nيرجى تذكر الاحتفاظ بنسخة احتياطية من مفتاح الاسترداد بشكل آمن.",
@@ -318,6 +325,9 @@
       }
     }
   },
+  "manualSort": "مخصّص",
+  "mostFrequentlyUsed": "مستخدم بكثرة",
+  "mostRecentlyUsed": "مستخدمة مؤخراً",
   "activeSessions": "الجلسات النشطة",
   "somethingWentWrongPleaseTryAgain": "حدث خطأ ما، يرجى المحاولة مرة أخرى",
   "thisWillLogYouOutOfThisDevice": "سيؤدي هذا إلى تسجيل خروجك من هذا الجهاز!",
@@ -350,6 +360,7 @@
   "sigInBackupReminder": "يرجى تصدير الرموز الخاصة بك للتأكد من أن لديك نسخة احتياطية يمكنك استعادتها منها.",
   "offlineModeWarning": "لقد اخترت المضي قدما بدون نسخ احتياطية. يرجى أخذ نسخ احتياطية يدوية للتأكد من سلامة الرموز الخاصة بك.",
   "showLargeIcons": "إظهار أيقونات كبيرة",
+  "compactMode": "الوضع المضغوط",
   "shouldHideCode": "إخفاء الرموز",
   "doubleTapToViewHiddenCode": "يمكنك النقر مرتين على أي عنصر لعرض الرمز",
   "focusOnSearchBar": "التركيز على البحث عند بدء التطبيق",
@@ -468,5 +479,11 @@
   "pinLock": "قفل رقم التعريف الشخصي",
   "enterPin": "أدخل رقم التعريف الشخصي",
   "setNewPin": "عين رقم تعريف شخصي جديد",
-  "importFailureDescNew": "تعذر إعراب الملف المنتقى."
+  "importFailureDescNew": "تعذر إعراب الملف المنتقى.",
+  "duplicateCodes": "رموز مكررة",
+  "noDuplicates": "✨ لا تكرارات",
+  "youveNoDuplicateCodesThatCanBeCleared": "ليس لديك رموز مكررة يمكن مسحها",
+  "deselectAll": "ألغِ تحديد الكل",
+  "selectAll": "حدد الكل",
+  "deleteDuplicates": "احذف التكرار"
 }

auth/lib/l10n/arb/app_ca.arb

@@ -88,6 +88,8 @@
   "useRecoveryKey": "Usa la clau de recuperació",
   "incorrectPasswordTitle": "Contrasenya incorrecta",
   "welcomeBack": "Benvingut de nou!",
+  "emailAlreadyRegistered": "El correu electrònic ja està registrat.",
+  "emailNotRegistered": "El correu electrònic no està registrat.",
   "madeWithLoveAtPrefix": "fet amb ❤️ a ",
   "supportDevs": "Subscriu-te a <bold-green>ente</bold-green> per donar-nos suport",
   "supportDiscount": "Usa el codi de descompte \"AUTH\" per obtenir un 10% de descompte el primer any",
@@ -502,5 +504,13 @@
   "deselectAll": "Desselecciona-ho tot",
   "selectAll": "Seleccionar-ho tot",
   "deleteDuplicates": "Elimina duplicats",
-  "plainHTML": "HTML pla"
+  "plainHTML": "HTML pla",
+  "tellUsWhatYouThink": "Digueu-nos què us sembla",
+  "dropReview": "Deixa una ressenya a l'App/Play Store",
+  "supportEnte": "Donar suport a <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "Dona'ns una estrella a Github",
+  "free5GB": "5 GB gratuïts a <bold-green>ente</bold-green> Photos",
+  "loginWithAuthAccount": "Inicieu sessió amb el vostre compte Auth",
+  "freeStorageOffer": "10% de descompte a <bold-green>ente</bold-green> photos",
+  "freeStorageOfferDescription": "Utilitzeu el codi \"AUTH\" per obtenir un 10% de descompte el primer any"
 }

auth/lib/l10n/arb/app_de.arb

@@ -88,6 +88,8 @@
   "useRecoveryKey": "Wiederherstellungsschlüssel verwenden",
   "incorrectPasswordTitle": "Falsches Passwort",
   "welcomeBack": "Willkommen zurück!",
+  "emailAlreadyRegistered": "E-Mail ist bereits registriert.",
+  "emailNotRegistered": "E-Mail-Adresse nicht registriert.",
   "madeWithLoveAtPrefix": "gemacht mit ❤️ bei ",
   "supportDevs": "Bei <bold-green>ente</bold-green> registrieren, um das Projekt zu unterstützen",
   "supportDiscount": "Benutzen Sie den Rabattcode \"AUTH\" für 10 % Rabatt im ersten Jahr",
@@ -145,6 +147,7 @@
   "leaveFamily": "Familie verlassen",
   "leaveFamilyMessage": "Sind Sie sicher, dass Sie den Familien-Plan verlassen wollen?",
   "inFamilyPlanMessage": "Sie haben einen Familien-Plan!",
+  "hintForDesktop": "Klicken Sie mit der rechten Maustaste auf einen Code zum Bearbeiten oder Entfernen.",
   "scan": "Scannen",
   "scanACode": "Scan einen Code",
   "verify": "Überprüfen Sie",
@@ -154,6 +157,7 @@
   "twoFactorAuthTitle": "Zwei-Faktor-Authentifizierung",
   "passkeyAuthTitle": "Passkey Authentifizierung",
   "verifyPasskey": "Passkey verifizieren",
+  "loginWithTOTP": "Mit TOTP anmelden",
   "recoverAccount": "Konto wiederherstellen",
   "enterRecoveryKeyHint": "Geben Sie Ihren Wiederherstellungsschlüssel ein",
   "recover": "Wiederherstellen",
@@ -255,6 +259,10 @@
   "areYouSureYouWantToLogout": "Sind sie sicher, dass sie sich ausloggen möchten?",
   "yesLogout": "Ja ausloggen",
   "exit": "Schließen",
+  "theme": "Theme",
+  "lightTheme": "Hell",
+  "darkTheme": "Dunkel",
+  "systemTheme": "System",
   "verifyingRecoveryKey": "Verifiziere Wiederherstellungsschlüssel...",
   "recoveryKeyVerified": "Wiederherstellungsschlüssel verifiziert",
   "recoveryKeySuccessBody": "Großartig! Ihr Wiederherstellungsschlüssel ist gültig. Vielen Dank für die Verifizierung.\n\nBitte denken sie daran, dass sie ihren Wiederherstellungsschlüssel sicher aufbewahren.",
@@ -325,6 +333,10 @@
       }
     }
   },
+  "manualSort": "Benutzerdefiniert",
+  "editOrder": "Reihenfolge bearbeiten",
+  "mostFrequentlyUsed": "Häufig verwendet",
+  "mostRecentlyUsed": "Zuletzt verwendet",
   "activeSessions": "Aktive Sitzungen",
   "somethingWentWrongPleaseTryAgain": "Ein Fehler ist aufgetreten, bitte versuche es erneut",
   "thisWillLogYouOutOfThisDevice": "Dadurch wirst du von diesem Gerät abgemeldet!",
@@ -444,6 +456,7 @@
   "customEndpoint": "Mit {endpoint} verbunden",
   "pinText": "Anpinnen",
   "unpinText": "Lösen",
+  "pinned": "Angeheftet",
   "tags": "Tags",
   "createNewTag": "Neuen Tag erstellen",
   "tag": "Tag",
@@ -478,5 +491,17 @@
   "setNewPin": "Neue PIN festlegen",
   "importFailureDescNew": "Die ausgewählte Datei konnte nicht verarbeitet werden.",
   "appLockNotEnabled": "App-Sperre nicht aktiviert",
-  "appLockNotEnabledDescription": "Bitte aktivieren Sie die App-Sperre über Security > App-Sperre"
+  "appLockNotEnabledDescription": "Bitte aktivieren Sie die App-Sperre über Security > App-Sperre",
+  "authToViewPasskey": "Bitte authentifizieren, um deinen Passkey zu sehen",
+  "duplicateCodes": "Doppelte Codes",
+  "noDuplicates": "✨ Keine Duplikate",
+  "youveNoDuplicateCodesThatCanBeCleared": "Sie haben keine doppelten Codes, die gelöscht werden können",
+  "deselectAll": "Alle abwählen",
+  "selectAll": "Alles auswählen",
+  "deleteDuplicates": "Duplikate löschen",
+  "plainHTML": "Reines HTML",
+  "tellUsWhatYouThink": "Sagen Sie uns, was Sie denken",
+  "dropReview": "Eine Bewertung im App/Play Store ablegen",
+  "giveUsAStarOnGithub": "Gib uns einen Stern auf Github",
+  "loginWithAuthAccount": "Mit Ihrem Auth Account anmelden"
 }

auth/lib/l10n/arb/app_es.arb

@@ -504,5 +504,12 @@
   "deselectAll": "Deseleccionar todo",
   "selectAll": "Seleccionar todo",
   "deleteDuplicates": "Eliminar duplicados",
-  "plainHTML": "HTML plano"
+  "plainHTML": "HTML plano",
+  "tellUsWhatYouThink": "Cuéntanos cuál es su opinión",
+  "dropReview": "Danos una reseña en la App/Play Store",
+  "supportEnte": "Apoya a <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "Danos una estrella en GitHub",
+  "free5GB": "5 GB gratis en <bold-green>ente</bold-green> Fotos",
+  "freeStorageOffer": "10% de descuento en <bold-green>ente</bold-green> fotos",
+  "freeStorageOfferDescription": "Usa el cupón \"AUTH\" para obtener un 10% de descuento en el primer año"
 }

auth/lib/l10n/arb/app_fr.arb

@@ -504,5 +504,13 @@
   "deselectAll": "Tout désélectionner",
   "selectAll": "Tout sélectionner",
   "deleteDuplicates": "Supprimer les doublons",
-  "plainHTML": "HTML Pur"
+  "plainHTML": "HTML Pur",
+  "tellUsWhatYouThink": "Dites-nous ce que vous pensez",
+  "dropReview": "Déposez un avis sur l'App/Play Store",
+  "supportEnte": "Soutenir <bold-green>Ente</bold-green>",
+  "giveUsAStarOnGithub": "Donnez-nous une étoile sur Github",
+  "free5GB": "5 Go gratuits sur <bold-green>Ente</bold-green> Photos",
+  "loginWithAuthAccount": "Connectez-vous avec votre compte Auth",
+  "freeStorageOffer": "10% de réduction sur <bold-green>Ente</bold-green> Photos",
+  "freeStorageOfferDescription": "Utilisez le code coupon \"AUTH\" pour obtenir 10% de réduction la première année"
 }

auth/lib/l10n/arb/app_hi.arb

@@ -8,13 +8,13 @@
   },
   "onBoardingGetStarted": "प्रारंभ करें",
   "setupFirstAccount": "अपना पहला अकाउंट सेटअप करें",
-  "importScanQrCode": "QR कोड स्कैन करें",
+  "importScanQrCode": "एक QR कोड स्कैन करें",
   "qrCode": "QR कोड",
   "importEnterSetupKey": "",
   "importAccountPageTitle": "अकाउंट विवरण डालें",
   "incorrectDetails": "ग़लत विवरण",
   "pleaseVerifyDetails": "कृपया विवरण सत्यापित करें और पुनः प्रयास करें",
-  "codeIssuerHint": "जारीकर्ता",
+  "codeIssuerHint": "ज़ारीकर्ता",
   "codeSecretKeyHint": "सीक्रेट कुंजी",
   "secret": "सीक्रेट",
   "all": "सभी",
@@ -39,6 +39,10 @@
   "pleaseLoginAgain": "कृपया फिर से लॉगिन करें",
   "loggingOut": "लॉग आउट हो रहा है...",
   "saveAction": "सेव करें",
+  "deleteCodeMessage": "क्या आप वाकई इस कोड को हटाना चाहते हैं? इस क्रिया को वापस नहीं किया जा सकता",
+  "trashCode": "?",
+  "trashCodeMessage": "क्या आप वाकई {account} के लिए कोड नष्ट करना चाहते हैं?",
+  "trash": "नष्ट करें",
   "viewLogsAction": "लॉग देखें",
   "preparingLogsTitle": "लॉग तैयार किये जा रहे हैं...",
   "emailLogsTitle": "लॉग ईमेल करें",
@@ -50,6 +54,7 @@
       }
     }
   },
+  "copyEmailAction": "ईमेल कॉपी करें",
   "exportLogsAction": "लॉग एक्सपोर्ट करें",
   "reportABug": "बग रिपोर्ट करें",
   "reportBug": "बग रिपोर्ट करें",
@@ -79,5 +84,24 @@
   "cancel": "रद्द करें",
   "yes": "हाँ",
   "no": "नहीं",
-  "settings": "सेटिंग"
+  "settings": "सेटिंग",
+  "pleaseTryAgain": "कृपया पुन: प्रयास करें",
+  "newUser": "एंटे में नए उपयोगकर्ता",
+  "delete": "हटाएं",
+  "enterYourPasswordHint": "अपना पासवर्ड दर्ज करें",
+  "forgotPassword": "पासवर्ड भूल गए",
+  "oops": "ओह",
+  "suggestFeatures": "विशेषताएं सुझाएं",
+  "faq": "अक्सर किये गए सवाल",
+  "somethingWentWrongMessage": "कुछ गड़बड़ हुई है, कृपया दोबारा प्रयास करें",
+  "leaveFamily": "परिवार छोड़ें",
+  "leaveFamilyMessage": "क्या आप सच में परिवार प्लान छोड़ना चाहते हैं?",
+  "inFamilyPlanMessage": "आप परिवार प्लान पर हैं!",
+  "hintForMobile": "कोड को संपादित करने या हटाने के लिए उसे लंबी देर तक दबाए।",
+  "hintForDesktop": "कोड को संपादित करने या हटाने के लिए उस पर राइट क्लिक करें।",
+  "scan": "स्कैन करें",
+  "scanACode": "कोड स्कैन करें",
+  "verify": "सत्यापित करें",
+  "verifyEmail": "ईमेल सत्यापित करें",
+  "twoFactorAuthTitle": "दो-चरणीय प्रमाणीकरण |"
 }

auth/lib/l10n/arb/app_hu.arb

@@ -504,5 +504,13 @@
   "deselectAll": "Összes kijelölés megszüntetése",
   "selectAll": "Összes kijelölése",
   "deleteDuplicates": "Ismétlődések törlése",
-  "plainHTML": "Sima HTML kód"
+  "plainHTML": "Sima HTML kód",
+  "tellUsWhatYouThink": "Mondja el mit gondol",
+  "dropReview": "Írjon véleményt az App/Play Store-ban",
+  "supportEnte": "Támogassa <bold-green>ente <bold-green>",
+  "giveUsAStarOnGithub": "Adj nekünk egy csillagot a Githubon",
+  "free5GB": "5GB ingyen <bold-green>ente <bold-green> Photos",
+  "loginWithAuthAccount": "Jelentkezzen be Auth fiókjával",
+  "freeStorageOffer": "10% kedvezmény on <bold-green>ente<bold-green> photos",
+  "freeStorageOfferDescription": "Használja az \"AUTH\" kódot, hogy 10% kedvezményt kapjon az első évben"
 }

auth/lib/l10n/arb/app_ja.arb

@@ -88,6 +88,8 @@
   "useRecoveryKey": "回復キーを使用",
   "incorrectPasswordTitle": "パスワードが正しくありません",
   "welcomeBack": "おかえりなさい！",
+  "emailAlreadyRegistered": "メールアドレスはすでに登録されています。",
+  "emailNotRegistered": "メールアドレスはまだ登録されていません。",
   "madeWithLoveAtPrefix": "made with ❤️ at ",
   "supportDevs": "プロジェクト支援のために <bold-green>ente</bold-green> に登録",
   "supportDiscount": "クーポンコード \"AUTH\" の使用で初年度が 10% オフに",
@@ -258,6 +260,10 @@
   "areYouSureYouWantToLogout": "本当にログアウトしてよろしいですか？",
   "yesLogout": "はい、ログアウトします",
   "exit": "やめる",
+  "theme": "テーマ",
+  "lightTheme": "ライト",
+  "darkTheme": "ダーク",
+  "systemTheme": "システム",
   "verifyingRecoveryKey": "回復キーを確認中...",
   "recoveryKeyVerified": "回復キーが確認されました",
   "recoveryKeySuccessBody": "素晴らしい！回復キーは有効です。ご確認いただきありがとうございます。\n\n回復キーを安全にバックアップしておいてください。",
@@ -490,5 +496,21 @@
   "appLockNotEnabled": "アプリロックが有効になっていません",
   "appLockNotEnabledDescription": "セキュリティ > アプリロック からアプリロックを有効化してください",
   "authToViewPasskey": "パスキーを見るには認証してください",
-  "appLockOfflineModeWarning": "バックアップなしで進むことを選択しました。アプリロックを忘れると、データにアクセスできなくなります。"
+  "appLockOfflineModeWarning": "バックアップなしで進むことを選択しました。アプリロックを忘れると、データにアクセスできなくなります。",
+  "duplicateCodes": "重複コード",
+  "noDuplicates": "✨ 重複なし",
+  "youveNoDuplicateCodesThatCanBeCleared": "削除できる重複コードはありません",
+  "deduplicateCodes": "重複コード",
+  "deselectAll": "すべての選択を解除",
+  "selectAll": "すべて選択",
+  "deleteDuplicates": "重複を削除",
+  "plainHTML": "Plain HTML",
+  "tellUsWhatYouThink": "ご意見をお聞かせください",
+  "dropReview": "App/Playストアにレビューを投稿する",
+  "supportEnte": "<bold-green>ente</bold-green>をサポートする",
+  "giveUsAStarOnGithub": "Githubで星をつける",
+  "free5GB": "<bold-green>ente</bold-green>フォトで5GB無料",
+  "loginWithAuthAccount": "認証アカウントでログイン",
+  "freeStorageOffer": "<bold-green>ente</bold-green>の写真が10%オフ",
+  "freeStorageOfferDescription": "クーポンコード \"AUTH\" の使用で初年度が10%オフになります"
 }

auth/lib/l10n/arb/app_lt.arb

@@ -504,5 +504,11 @@
   "deselectAll": "Naikinti visų pasirinkimą",
   "selectAll": "Pasirinkti viską",
   "deleteDuplicates": "Ištrinti dublikatus",
-  "plainHTML": "Grynasis HTML"
+  "plainHTML": "Grynasis HTML",
+  "tellUsWhatYouThink": "Pasakykite mums, ką manote",
+  "giveUsAStarOnGithub": "Suteikite mums žvaigždutę platformoje „Github“",
+  "free5GB": "5 GB nemokami programai „<bold-green>ente</bold-green>“ nuotraukos",
+  "loginWithAuthAccount": "Prisijungti su jūsų „Auth“ paskyra",
+  "freeStorageOffer": "10 % nuolaida programai „<bold-green>ente</bold-green>“ nuotraukos",
+  "freeStorageOfferDescription": "Naudokite kodą „AUTH“, kad gautumėte 10 % nuolaida pirmiesiems metams. "
 }

auth/lib/l10n/arb/app_ml.arb

@@ -1 +1,28 @@
-{}
+{
+  "blog": "ബ്ലോഗ്",
+  "verifyPassword": "പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
+  "recreatePassword": "പാസ്‌വേഡ് പുനഃസൃഷ്ടിക്കുക",
+  "incorrectPasswordTitle": "തെറ്റായ പാസ്‌വേഡ്",
+  "welcomeBack": "വീണ്ടും സ്വാഗതം!",
+  "emailAlreadyRegistered": "ഇമെയിൽ ഇതിനകം രജിസ്റ്റർ ചെയ്തിട്ടുണ്ട്.",
+  "emailNotRegistered": "ഇമെയിൽ രജിസ്റ്റർ ചെയ്തിട്ടില്ല.",
+  "changeEmail": "ഇമെയിൽ മാറ്റുക",
+  "changePassword": "പാസ്സ്‌വേർഡ് മാറ്റുക",
+  "ok": "ശരി",
+  "cancel": "റദ്ദാക്കുക",
+  "yes": "അതെ",
+  "no": "അല്ല",
+  "email": "ഇമെയിൽ",
+  "somethingWentWrongMessage": "എന്തോ കുഴപ്പമുണ്ടായി, ദയവായി വീണ്ടും ശ്രമിക്കുക",
+  "inFamilyPlanMessage": "നിങ്ങൾ ഒരു ഫാമിലി പ്ലാനിലാണ്!",
+  "scan": "സ്കാൻ ചെയ്യുക",
+  "scanACode": "കോഡ് സ്കാൻ ചെയ്യുക",
+  "verify": "പരിശോധിക്കുക",
+  "verifyEmail": "ഇമെയിൽ സ്ഥിരീകരിക്കുക",
+  "enterCodeHint": "നിങ്ങളുടെ ഓതന്റിക്കേറ്റർ ആപ്പിൽ നിന്നുള്ള 6 അക്ക കോഡ് നൽകുക",
+  "twoFactorAuthTitle": "ടു-ഫാക്ടർ ആധികാരികത",
+  "createNewAccount": "പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കുക",
+  "confirmPassword": "പാസ്വേഡ് സ്ഥിരീകരിക്കുക",
+  "language": "ഭാഷ",
+  "security": "സുരക്ഷ"
+}

auth/lib/l10n/arb/app_nl.arb

@@ -504,5 +504,13 @@
   "deselectAll": "Alles deselecteren",
   "selectAll": "Alles selecteren",
   "deleteDuplicates": "Dubbelen verwijderen",
-  "plainHTML": "Alleen HTML"
+  "plainHTML": "Alleen HTML",
+  "tellUsWhatYouThink": "Vertel ons wat je vindt",
+  "dropReview": "Laat een beoordeling achter in de App/Play Store",
+  "supportEnte": "Steun <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "Geef ons een ster op Github",
+  "free5GB": "5GB gratis op <bold-green>ente</bold-green> Photos",
+  "loginWithAuthAccount": "Log in met je Auth account",
+  "freeStorageOffer": "10% korting op <bold-green>ente</bold-green> photos",
+  "freeStorageOfferDescription": "Gebruik de code \"AUTH\" voor 10% korting op je eerste jaar"
 }

auth/lib/l10n/arb/app_pl.arb

@@ -504,5 +504,13 @@
   "deselectAll": "Odznacz wszystko",
   "selectAll": "Zaznacz wszystko",
   "deleteDuplicates": "Usuń duplikaty",
-  "plainHTML": "Zwykły HTML"
+  "plainHTML": "Zwykły HTML",
+  "tellUsWhatYouThink": "Wyraź swoją opinię",
+  "dropReview": "Napisz recenzję w App Store/Play Store",
+  "supportEnte": "Wesprzyj <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "Daj nam gwiazdkę na Githubie",
+  "free5GB": "5 GB za darmo na zdjęcia <bold-green>ente</bold-green>",
+  "loginWithAuthAccount": "Zaloguj się przy użyciu konta Auth",
+  "freeStorageOffer": "10% zniżki na zdjęcia <bold-green>ente</bold-green>",
+  "freeStorageOfferDescription": "Użyj kodu „AUTH”, aby uzyskać 10% zniżki na pierwszy rok"
 }

auth/lib/l10n/arb/app_pt.arb

@@ -6,7 +6,7 @@
   "@counterAppBarTitle": {
     "description": "Text shown in the AppBar of the Counter Page"
   },
-  "onBoardingBody": "Copie com segurança seus códigos 2FA",
+  "onBoardingBody": "Salve com segurança seus códigos 2FA",
   "onBoardingGetStarted": "Introdução",
   "setupFirstAccount": "Configure sua primeira conta",
   "importScanQrCode": "Escanear QR code",
@@ -19,7 +19,7 @@
   "pleaseVerifyDetails": "Verifique os detalhes e tente novamente",
   "codeIssuerHint": "Emissor",
   "codeSecretKeyHint": "Chave secreta",
-  "secret": "Segredo",
+  "secret": "Chave secreta",
   "all": "Todos",
   "notes": "Notas",
   "notesLengthLimit": "Notas tem um limite de até {count} caracteres",
@@ -504,5 +504,13 @@
   "deselectAll": "Deselecionar tudo",
   "selectAll": "Selecionar tudo",
   "deleteDuplicates": "Excluir duplicados",
-  "plainHTML": "HTML simples"
+  "plainHTML": "HTML simples",
+  "tellUsWhatYouThink": "Diga-nos o que pensa",
+  "dropReview": "Deixe uma avaliação na App/Play Store",
+  "supportEnte": "Apoie o <bold-green>ente.io</bold-green>",
+  "giveUsAStarOnGithub": "Dê-nos uma estrela no Github",
+  "free5GB": "5GB grátis no <bold-green>ente</bold-green> Photos",
+  "loginWithAuthAccount": "Registrar-se com sua conta Auth",
+  "freeStorageOffer": "10% de desconto no <bold-green>ente</bold-green> photos",
+  "freeStorageOfferDescription": "Use o cupom \"AUTH\" para obter 10% de desconto no primeiro ano"
 }

auth/lib/l10n/arb/app_tr.arb

@@ -88,6 +88,8 @@
   "useRecoveryKey": "Kurtarma anahtarını kullan",
   "incorrectPasswordTitle": "Yanlış şifre",
   "welcomeBack": "Tekrar hoş geldiniz!",
+  "emailAlreadyRegistered": "E-posta zaten kayıtlı.",
+  "emailNotRegistered": "E-posta kayıtlı değil.",
   "madeWithLoveAtPrefix": "❤️ ile şurada yapılmıştır ",
   "supportDevs": "Bu projeyi desteklemek için <bold-green>ente</bold-green> kanalına abone olun",
   "supportDiscount": "İlk yılda %10 indirim için \"AUTH\" kupon kodunu kullanın",
@@ -333,6 +335,7 @@
     }
   },
   "manualSort": "Özel",
+  "editOrder": "Sıralamayı düzenle",
   "mostFrequentlyUsed": "Sık kullanılan",
   "mostRecentlyUsed": "Son kullanılan",
   "activeSessions": "Aktif oturumlar",
@@ -501,5 +504,6 @@
   "deselectAll": "Tümünün seçimini kaldır",
   "selectAll": "Tümünü seç",
   "deleteDuplicates": "Yinelenenleri sil",
-  "plainHTML": "Sade HTML"
+  "plainHTML": "Sade HTML",
+  "supportEnte": "<bold-Green>Ente</bold-Green>'yi destekle"
 }

auth/lib/l10n/arb/app_zh.arb

@@ -504,5 +504,13 @@
   "deselectAll": "取消全选",
   "selectAll": "全选",
   "deleteDuplicates": "删除重复项",
-  "plainHTML": "Plain HTML"
+  "plainHTML": "Plain HTML",
+  "tellUsWhatYouThink": "告诉我们您的想法",
+  "dropReview": "在 App Store/Play 商店上发表评测",
+  "supportEnte": "支持 <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "在 Github 上给我们一个星标",
+  "free5GB": "<bold-green>ente</bold-green> Photos 上 5GB 可用空间",
+  "loginWithAuthAccount": "使用您的认证账户登录",
+  "freeStorageOffer": "购买 <bold-green>ente</bold-green> Photos 可享受 10% 优惠",
+  "freeStorageOfferDescription": "使用优惠码“AUTH”可享受首年 10% 折扣"
 }

auth/lib/models/magic_metadata.dart

@@ -1,73 +0,0 @@
-import 'dart:convert';
-
-const visibilityVisible = 0;
-const visibilityArchive = 1;
-
-const magicKeyVisibility = 'visibility';
-
-const pubMagicKeyEditedTime = 'editedTime';
-const pubMagicKeyEditedName = 'editedName';
-
-class MagicMetadata {
-  // 0 -> visible
-  // 1 -> archived
-  // 2 -> hidden etc?
-  int visibility;
-
-  MagicMetadata({required this.visibility});
-
-  factory MagicMetadata.fromEncodedJson(String encodedJson) =>
-      MagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory MagicMetadata.fromJson(dynamic json) => MagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return MagicMetadata(
-      visibility: map[magicKeyVisibility] ?? visibilityVisible,
-    );
-  }
-}
-
-class PubMagicMetadata {
-  int? editedTime;
-  String? editedName;
-
-  PubMagicMetadata({this.editedTime, this.editedName});
-
-  factory PubMagicMetadata.fromEncodedJson(String encodedJson) =>
-      PubMagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory PubMagicMetadata.fromJson(dynamic json) =>
-      PubMagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return PubMagicMetadata(
-      editedTime: map[pubMagicKeyEditedTime],
-      editedName: map[pubMagicKeyEditedName],
-    );
-  }
-}
-
-class CollectionMagicMetadata {
-  // 0 -> visible
-  // 1 -> archived
-  // 2 -> hidden etc?
-  int visibility;
-
-  CollectionMagicMetadata({required this.visibility});
-
-  factory CollectionMagicMetadata.fromEncodedJson(String encodedJson) =>
-      CollectionMagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory CollectionMagicMetadata.fromJson(dynamic json) =>
-      CollectionMagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return CollectionMagicMetadata(
-      visibility: map[magicKeyVisibility] ?? visibilityVisible,
-    );
-  }
-}

auth/lib/models/public_key.dart

@@ -1,6 +0,0 @@
-class PublicKey {
-  final String email;
-  final String publicKey;
-
-  PublicKey(this.email, this.publicKey);
-}

auth/lib/services/auth_feature_flag.dart

@@ -1,23 +0,0 @@
-import 'package:ente_auth/core/configuration.dart';
-import 'package:flutter/foundation.dart';
-
-class FeatureFlagService {
-  FeatureFlagService._privateConstructor();
-  static final FeatureFlagService instance =
-      FeatureFlagService._privateConstructor();
-
-  static final _internalUserIDs = const String.fromEnvironment(
-    "internal_user_ids",
-    defaultValue: "1,2,3,4,191,125,1580559962388044,1580559962392434,10000025",
-  ).split(",").map((element) {
-    return int.parse(element);
-  }).toSet();
-
-  bool isInternalUserOrDebugBuild() {
-    final String? email = Configuration.instance.getEmail();
-    final userID = Configuration.instance.getUserID();
-    return (email != null && email.endsWith("@ente.io")) ||
-        _internalUserIDs.contains(userID) ||
-        kDebugMode;
-  }
-}

auth/lib/services/user_service.dart

@@ -877,6 +877,7 @@ class UserService {
           "twoFactorType": twoFactorTypeToString(type),
         },
       );
+      await dialog.hide();
       if (response.statusCode == 200) {
         // ignore: unawaited_futures
         Navigator.of(context).pushAndRemoveUntil(
@@ -974,6 +975,7 @@ class UserService {
           "twoFactorType": twoFactorTypeToString(type),
         },
       );
+      await dialog.hide();
       if (response.statusCode == 200) {
         showShortToast(
           context,

auth/lib/services/window_listener_service.dart

@@ -6,7 +6,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:window_manager/window_manager.dart';
 
 class WindowListenerService {
-  static const double minWindowHeight = 320.0;
+  static const double minWindowHeight = 600.0;
   static const double minWindowWidth = 800.0;
   static const double maxWindowHeight = 8192.0;
   static const double maxWindowWidth = 8192.0;

auth/lib/store/user_store.dart

@@ -1,14 +0,0 @@
-import 'package:shared_preferences/shared_preferences.dart';
-
-class UserStore {
-  UserStore._privateConstructor();
-
-  // ignore: unused_field
-  late SharedPreferences _preferences;
-
-  static final UserStore instance = UserStore._privateConstructor();
-
-  Future<void> init() async {
-    _preferences = await SharedPreferences.getInstance();
-  }
-}

auth/lib/ui/account/login_pwd_verification_page.dart

@@ -113,7 +113,7 @@ class _LoginPasswordVerificationPageState
         );
       } else {
         _logger.severe('API failure during SRP login', e, s);
-        if (e.type == DioExceptionType.unknown) {
+        if (e.type == DioExceptionType.connectionError) {
           await _showContactSupportDialog(
             context,
             context.l10n.noInternetConnection,

auth/lib/ui/common/bottom_shadow.dart

@@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-
-class BottomShadowWidget extends StatelessWidget {
-  final double offsetDy;
-  final Color? shadowColor;
-  const BottomShadowWidget({this.offsetDy = 28, this.shadowColor, super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      height: 8,
-      decoration: BoxDecoration(
-        color: Colors.transparent,
-        boxShadow: [
-          BoxShadow(
-            color: shadowColor ?? Theme.of(context).colorScheme.surface,
-            spreadRadius: 42,
-            blurRadius: 42,
-            offset: Offset(0, offsetDy), // changes position of shadow
-          ),
-        ],
-      ),
-    );
-  }
-}

auth/lib/ui/common/linear_progress_dialog.dart

@@ -1,49 +0,0 @@
-import 'package:ente_auth/ente_theme_data.dart';
-import 'package:flutter/material.dart';
-
-class LinearProgressDialog extends StatefulWidget {
-  final String message;
-
-  const LinearProgressDialog(this.message, {super.key});
-
-  @override
-  LinearProgressDialogState createState() => LinearProgressDialogState();
-}
-
-class LinearProgressDialogState extends State<LinearProgressDialog> {
-  double? _progress;
-
-  @override
-  void initState() {
-    _progress = 0;
-    super.initState();
-  }
-
-  void setProgress(double progress) {
-    setState(() {
-      _progress = progress;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return PopScope(
-      canPop: false,
-      child: AlertDialog(
-        title: Text(
-          widget.message,
-          style: const TextStyle(
-            fontSize: 16,
-          ),
-          textAlign: TextAlign.center,
-        ),
-        content: LinearProgressIndicator(
-          value: _progress,
-          valueColor: AlwaysStoppedAnimation<Color>(
-            Theme.of(context).colorScheme.alternativeColor,
-          ),
-        ),
-      ),
-    );
-  }
-}

auth/lib/ui/common/rename_dialog.dart

@@ -1,98 +0,0 @@
-
-
-import 'package:ente_auth/utils/dialog_util.dart';
-import 'package:flutter/material.dart';
-
-class RenameDialog extends StatefulWidget {
-  final String name;
-  final String type;
-  final int maxLength;
-
-  const RenameDialog(this.name, this.type, {super.key, this.maxLength = 100});
-
-  @override
-  State<RenameDialog> createState() => _RenameDialogState();
-}
-
-class _RenameDialogState extends State<RenameDialog> {
-  String? _newName;
-
-  @override
-  void initState() {
-    super.initState();
-    _newName = widget.name;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text("Enter a new name"),
-      content: SingleChildScrollView(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            TextFormField(
-              decoration: InputDecoration(
-                hintText: '${widget.type} name',
-                hintStyle: const TextStyle(
-                  color: Colors.white30,
-                ),
-                contentPadding: const EdgeInsets.all(12),
-              ),
-              onChanged: (value) {
-                setState(() {
-                  _newName = value;
-                });
-              },
-              autocorrect: false,
-              keyboardType: TextInputType.text,
-              initialValue: _newName,
-              autofocus: true,
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          child: const Text(
-            "Cancel",
-            style: TextStyle(
-              color: Colors.redAccent,
-            ),
-          ),
-          onPressed: () {
-            Navigator.of(context).pop(null);
-          },
-        ),
-        TextButton(
-          child: Text(
-            "Rename",
-            style: TextStyle(
-              color: Theme.of(context).colorScheme.onSurface,
-            ),
-          ),
-          onPressed: () {
-            if (_newName!.trim().isEmpty) {
-              showErrorDialog(
-                context,
-                "Empty name",
-                "${widget.type} name cannot be empty",
-              );
-              return;
-            }
-            if (_newName!.trim().length > widget.maxLength) {
-              showErrorDialog(
-                context,
-                "Name too large",
-                "${widget.type} name should be less than ${widget.maxLength} characters",
-              );
-              return;
-            }
-            Navigator.of(context).pop(_newName!.trim());
-          },
-        ),
-      ],
-    );
-  }
-}

auth/lib/ui/components/home_header_widget.dart

@@ -1,41 +0,0 @@
-import 'package:ente_auth/core/event_bus.dart';
-import 'package:ente_auth/events/opened_settings_event.dart';
-import 'package:flutter/material.dart';
-
-class HomeHeaderWidget extends StatefulWidget {
-  final Widget centerWidget;
-  const HomeHeaderWidget({required this.centerWidget, super.key});
-
-  @override
-  State<HomeHeaderWidget> createState() => _HomeHeaderWidgetState();
-}
-
-class _HomeHeaderWidgetState extends State<HomeHeaderWidget> {
-  @override
-  Widget build(BuildContext context) {
-    final hasNotch = View.of(context).viewPadding.top > 65;
-    return Padding(
-      padding: EdgeInsets.fromLTRB(4, hasNotch ? 4 : 8, 4, 4),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          IconButton(
-            visualDensity: const VisualDensity(horizontal: -2, vertical: -2),
-            onPressed: () {
-              Scaffold.of(context).openDrawer();
-              Bus.instance.fire(OpenedSettingsEvent());
-            },
-            splashColor: Colors.transparent,
-            icon: const Icon(
-              Icons.menu_outlined,
-            ),
-          ),
-          AnimatedSwitcher(
-            duration: const Duration(milliseconds: 250),
-            child: widget.centerWidget,
-          ),
-        ],
-      ),
-    );
-  }
-}

auth/lib/ui/settings/danger_section_widget.dart

@@ -1,69 +0,0 @@
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/services/user_service.dart';
-import 'package:ente_auth/theme/ente_theme.dart';
-import 'package:ente_auth/ui/account/delete_account_page.dart';
-import 'package:ente_auth/ui/components/captioned_text_widget.dart';
-import 'package:ente_auth/ui/components/expandable_menu_item_widget.dart';
-import 'package:ente_auth/ui/components/menu_item_widget.dart';
-import 'package:ente_auth/ui/settings/common_settings.dart';
-import 'package:ente_auth/utils/dialog_util.dart';
-import 'package:ente_auth/utils/navigation_util.dart';
-import 'package:flutter/material.dart';
-
-class DangerSectionWidget extends StatelessWidget {
-  const DangerSectionWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ExpandableMenuItemWidget(
-      title: context.l10n.exit,
-      selectionOptionsWidget: _getSectionOptions(context),
-      leadingIcon: Icons.logout_outlined,
-    );
-  }
-
-  Widget _getSectionOptions(BuildContext context) {
-    return Column(
-      children: [
-        sectionOptionSpacing,
-        MenuItemWidget(
-          captionedTextWidget: CaptionedTextWidget(
-            title: context.l10n.logout,
-          ),
-          pressedColor: getEnteColorScheme(context).fillFaint,
-          trailingIcon: Icons.chevron_right_outlined,
-          trailingIconIsMuted: true,
-          onTap: () async {
-            _onLogoutTapped(context);
-          },
-        ),
-        sectionOptionSpacing,
-        MenuItemWidget(
-          captionedTextWidget: CaptionedTextWidget(
-            title: context.l10n.deleteAccount,
-          ),
-          pressedColor: getEnteColorScheme(context).fillFaint,
-          trailingIcon: Icons.chevron_right_outlined,
-          trailingIconIsMuted: true,
-          onTap: () async {
-            // ignore: unawaited_futures
-            routeToPage(context, const DeleteAccountPage());
-          },
-        ),
-        sectionOptionSpacing,
-      ],
-    );
-  }
-
-  void _onLogoutTapped(BuildContext context) {
-    showChoiceActionSheet(
-      context,
-      title: context.l10n.areYouSureYouWantToLogout,
-      firstButtonLabel: context.l10n.yesLogout,
-      isCritical: true,
-      firstButtonOnTap: () async {
-        await UserService.instance.logout(context);
-      },
-    );
-  }
-}

auth/lib/ui/settings/debug_section_widget.dart

@@ -1,94 +0,0 @@
-import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/ui/settings/common_settings.dart';
-import 'package:ente_auth/ui/settings/settings_section_title.dart';
-import 'package:ente_auth/ui/settings/settings_text_item.dart';
-import 'package:ente_crypto_dart/ente_crypto_dart.dart';
-import 'package:expandable/expandable.dart';
-import 'package:flutter/material.dart';
-
-class DebugSectionWidget extends StatelessWidget {
-  const DebugSectionWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    // This is a debug only section not shown to end users, so these strings are
-    // not translated.
-    return ExpandablePanel(
-      header: const SettingsSectionTitle("Debug"),
-      collapsed: Container(),
-      expanded: _getSectionOptions(context),
-      theme: getExpandableTheme(),
-    );
-  }
-
-  Widget _getSectionOptions(BuildContext context) {
-    return Column(
-      children: [
-        GestureDetector(
-          behavior: HitTestBehavior.translucent,
-          onTap: () async {
-            _showKeyAttributesDialog(context);
-          },
-          child: const SettingsTextItem(
-            text: "Key attributes",
-            icon: Icons.navigate_next,
-          ),
-        ),
-      ],
-    );
-  }
-
-  void _showKeyAttributesDialog(BuildContext context) {
-    final l10n = context.l10n;
-    final keyAttributes = Configuration.instance.getKeyAttributes()!;
-    final AlertDialog alert = AlertDialog(
-      title: const Text("key attributes"),
-      content: SingleChildScrollView(
-        child: Column(
-          children: [
-            const Text(
-              "Key",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(CryptoUtil.bin2base64(Configuration.instance.getKey()!)),
-            const Padding(padding: EdgeInsets.all(12)),
-            const Text(
-              "Encrypted Key",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(keyAttributes.encryptedKey),
-            const Padding(padding: EdgeInsets.all(12)),
-            const Text(
-              "Key Decryption Nonce",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(keyAttributes.keyDecryptionNonce),
-            const Padding(padding: EdgeInsets.all(12)),
-            const Text(
-              "KEK Salt",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(keyAttributes.kekSalt),
-            const Padding(padding: EdgeInsets.all(12)),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          child: Text(l10n.ok),
-          onPressed: () {
-            Navigator.of(context, rootNavigator: true).pop('dialog');
-          },
-        ),
-      ],
-    );
-
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return alert;
-      },
-    );
-  }
-}

auth/lib/ui/settings/made_with_love_widget.dart

@@ -1,34 +0,0 @@
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class MadeWithLoveWidget extends StatelessWidget {
-  const MadeWithLoveWidget({
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-    return GestureDetector(
-      onTap: () {
-        launchUrl(Uri.parse("https://ente.io"));
-      },
-      child: RichText(
-        text: TextSpan(
-          text: l10n.madeWithLoveAtPrefix,
-          style: DefaultTextStyle.of(context).style,
-          children: const <TextSpan>[
-            TextSpan(
-              text: 'ente.io',
-              style: TextStyle(
-                fontWeight: FontWeight.bold,
-                color: Colors.green,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

auth/lib/ui/settings/settings_text_item.dart

@@ -1,35 +0,0 @@
-
-
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-
-class SettingsTextItem extends StatelessWidget {
-  final String text;
-  final IconData icon;
-  const SettingsTextItem({
-    super.key,
-    required this.text,
-    required this.icon,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Padding(padding: EdgeInsets.all(Platform.isIOS ? 4 : 6)),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Align(
-              alignment: Alignment.centerLeft,
-              child: Text(text, style: Theme.of(context).textTheme.titleMedium),
-            ),
-            Icon(icon),
-          ],
-        ),
-        Padding(padding: EdgeInsets.all(Platform.isIOS ? 4 : 6)),
-      ],
-    );
-  }
-}

auth/lib/ui/settings/support_dev_widget.dart

@@ -1,83 +0,0 @@
-import 'package:dotted_border/dotted_border.dart';
-import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/models/subscription.dart';
-import 'package:ente_auth/services/billing_service.dart';
-import 'package:ente_auth/theme/ente_theme.dart';
-import 'package:flutter/material.dart';
-import 'package:styled_text/styled_text.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class SupportDevWidget extends StatelessWidget {
-  const SupportDevWidget({
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-
-    // fetch
-    if (Configuration.instance.hasConfiguredAccount()) {
-      return FutureBuilder<Subscription>(
-        future: BillingService.instance.getSubscription(),
-        builder: (context, snapshot) {
-          if (snapshot.hasData) {
-            final subscription = snapshot.data;
-            if (subscription != null && subscription.productID == "free") {
-              return buildWidget(l10n, context);
-            }
-          }
-          return const SizedBox.shrink();
-        },
-      );
-    } else {
-      return buildWidget(l10n, context);
-    }
-  }
-
-  Widget buildWidget(AppLocalizations l10n, BuildContext context) {
-    return GestureDetector(
-      onTap: () {
-        launchUrl(Uri.parse("https://ente.io"));
-      },
-      child: DottedBorder(
-        borderType: BorderType.RRect,
-        radius: const Radius.circular(12),
-        padding: const EdgeInsets.all(6),
-        dashPattern: const <double>[3, 3],
-        color: getEnteColorScheme(context).primaryGreen,
-        child: ClipRRect(
-          borderRadius: const BorderRadius.all(Radius.circular(12)),
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 6),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                StyledText(
-                  text: l10n.supportDevs,
-                  style: getEnteTextTheme(context).large,
-                  tags: {
-                    'bold-green': StyledTextTag(
-                      style: TextStyle(
-                        fontWeight: FontWeight.bold,
-                        color: getEnteColorScheme(context).primaryGreen,
-                      ),
-                    ),
-                  },
-                ),
-                const Padding(padding: EdgeInsets.all(6)),
-                Text(
-                  l10n.supportDiscount,
-                  style: const TextStyle(
-                    color: Colors.grey,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

auth/lib/ui/settings_section_title.dart

@@ -1 +0,0 @@
-// TODO Implement this library.

auth/lib/ui/tools/lock_screen.dart

@@ -33,8 +33,7 @@ class _LockScreenState extends State<LockScreen> with WidgetsBindingObserver {
   int remainingTimeInSeconds = 0;
   final _lockscreenSetting = LockScreenSettings.instance;
   late Brightness _platformBrightness;
-  final bool hasOptedForOfflineMode =
-      Configuration.instance.hasOptedForOfflineMode();
+  final bool isLoggedIn = Configuration.instance.isLoggedIn();
 
   @override
   void initState() {
@@ -56,15 +55,15 @@ class _LockScreenState extends State<LockScreen> with WidgetsBindingObserver {
     return Scaffold(
       appBar: AppBar(
         elevation: 0,
-        leading: hasOptedForOfflineMode
-            ? const SizedBox.shrink()
-            : IconButton(
+        leading: isLoggedIn
+            ? IconButton(
                 icon: const Icon(Icons.logout_outlined),
                 color: Theme.of(context).iconTheme.color,
                 onPressed: () {
                   _onLogoutTapped(context);
                 },
-              ),
+              )
+            : const SizedBox.shrink(),
       ),
       body: GestureDetector(
         onTap: () {

auth/lib/ui/two_factor_recovery_page.dart

@@ -1,6 +1,7 @@
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/models/account/two_factor.dart';
 import 'package:ente_auth/services/user_service.dart';
+import 'package:ente_auth/theme/ente_theme.dart';
 import 'package:ente_auth/utils/email_util.dart';
 import 'package:flutter/material.dart';
 
@@ -97,7 +98,8 @@ class _TwoFactorRecoveryPageState extends State<TwoFactorRecoveryPage> {
                   style: TextStyle(
                     decoration: TextDecoration.underline,
                     fontSize: 12,
-                    color: Colors.white.withOpacity(0.9),
+                    color:
+                        getEnteColorScheme(context).textBase.withOpacity(0.9),
                   ),
                 ),
               ),

auth/lib/utils/dialog_util.dart

@@ -113,12 +113,12 @@ String parseErrorForUI(
         if (dioError.response?.data["code"] != null) {
           errorInfo = "Reason: ${dioError.response!.data["code"]}";
         } else {
-          errorInfo = "Reason: ${dioError.response!.data}";
+          errorInfo = "Reason: ${dioError.response!.data.toString()}";
         }
-      } else if (dioError.type == DioExceptionType.unknown) {
-        errorInfo = "Reason: $dioError.error";
+      } else if (dioError.type == DioExceptionType.badCertificate) {
+        errorInfo = "Reason: ${dioError.error.toString()}";
       } else {
-        errorInfo = "Reason: $dioError.type";
+        errorInfo = "Reason: ${dioError.type.toString()}";
       }
     } else {
       if (kDebugMode) {

auth/pubspec.lock

@@ -250,10 +250,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   confetti:
     dependency: "direct main"
     description:
@@ -286,6 +286,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.1"
+  cronet_http:
+    dependency: transitive
+    description:
+      name: cronet_http
+      sha256: "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
   cross_file:
     dependency: transitive
     description:
@@ -310,6 +318,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  cupertino_http:
+    dependency: transitive
+    description:
+      name: cupertino_http
+      sha256: "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   dart_style:
     dependency: transitive
     description:
@@ -346,10 +362,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "5.7.0"
+    version: "5.8.0+1"
   dio_web_adapter:
     dependency: transitive
     description:
@@ -861,6 +877,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  http_profile:
+    dependency: transitive
+    description:
+      name: http_profile
+      sha256: "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   image:
     dependency: transitive
     description:
@@ -885,6 +909,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  jni:
+    dependency: transitive
+    description:
+      name: jni
+      sha256: f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.1"
   js:
     dependency: transitive
     description:
@@ -1061,6 +1093,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  native_dio_adapter:
+    dependency: "direct main"
+    description:
+      name: native_dio_adapter
+      sha256: "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   nested:
     dependency: transitive
     description:
@@ -1077,6 +1117,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   otp:
     dependency: "direct main"
     description:

auth/pubspec.yaml

@@ -21,7 +21,7 @@ dependencies:
   connectivity_plus: ^6.0.5
   convert: ^3.1.1
   device_info_plus: ^9.1.1
-  dio: ^5.4.0
+  dio: ^5.8.0+1
   dotted_border: ^2.0.0+2
   dropdown_button2: ^2.3.9
   email_validator: ^3.0.0
@@ -72,6 +72,7 @@ dependencies:
   logging: ^1.0.1
   modal_bottom_sheet: ^3.0.0
   move_to_background: ^1.0.2
+  native_dio_adapter: ^1.4.0
   otp: ^3.1.1
   package_info_plus: ^8.0.2
   password_strength: ^0.2.0

cli/main.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 )
 
-var AppVersion = "0.2.2"
+var AppVersion = "0.2.3"
 
 func main() {
 	cliConfigDir, err := GetCLIConfigDir()
@@ -50,18 +50,21 @@ func main() {
 		}
 	}
 
-	// Define a set of commands that do not require KeyHolder initialisation.
-	skipKeyHolderCommands := map[string]struct{}{"version": {}, "docs": {}, "help": {}}
+	// Define a set of commands that do not require KeyHolder or cli initialisation.
+	skipInitCommands := map[string]struct{}{"version": {}, "docs": {}, "help": {}}
 
 	var keyHolder *secrets.KeyHolder
-
 	// Only initialise KeyHolder if the command isn't in the skip list.
+	shouldInit := len(os.Args) > 1
 	if len(os.Args) > 1 {
-		if _, skip := skipKeyHolderCommands[os.Args[1]]; !skip {
-			keyHolder = secrets.NewKeyHolder(secrets.GetOrCreateClISecret())
+		if _, skip := skipInitCommands[os.Args[1]]; skip {
+			shouldInit = false
 		}
 	}
 
+	if shouldInit {
+		keyHolder = secrets.NewKeyHolder(secrets.GetOrCreateClISecret())
+	}
 	ctrl := pkg.ClICtrl{
 		Client: api.NewClient(api.Params{
 			Debug: viper.GetBool("log.http"),
@@ -71,16 +74,10 @@ func main() {
 		KeyHolder: keyHolder,
 	}
 
-	err = ctrl.Init()
-	if err != nil {
-		panic(err)
+	if len(os.Args) == 1 {
+		// If no arguments are passed, show help
+		os.Args = append(os.Args, "help")
 	}
-	defer func() {
-		if err := db.Close(); err != nil {
-			panic(err)
-		}
-	}()
-
 	if len(os.Args) == 2 && os.Args[1] == "docs" {
 		log.Println("Generating docs")
 		err = cmd.GenerateDocs()
@@ -89,9 +86,16 @@ func main() {
 		}
 		return
 	}
-	if len(os.Args) == 1 {
-		// If no arguments are passed, show help
-		os.Args = append(os.Args, "help")
+	if shouldInit {
+		err = ctrl.Init()
+		if err != nil {
+			panic(err)
+		}
+		defer func() {
+			if err := db.Close(); err != nil {
+				panic(err)
+			}
+		}()
 	}
 	if os.Args[1] == "version" && viper.GetString("endpoint.api") != constants.EnteApiUrl {
 		log.Printf("Custom endpoint: %s\n", viper.GetString("endpoint.api"))
@@ -120,10 +124,10 @@ func initConfig(cliConfigDir string) {
 func GetCLIConfigDir() (string, error) {
 	var configDir = os.Getenv("ENTE_CLI_CONFIG_DIR")
 
-  if configDir == "" {
-    // for backward compatibility, check for ENTE_CLI_CONFIG_PATH
-    configDir = os.Getenv("ENTE_CLI_CONFIG_PATH")
-  }
+	if configDir == "" {
+		// for backward compatibility, check for ENTE_CLI_CONFIG_PATH
+		configDir = os.Getenv("ENTE_CLI_CONFIG_PATH")
+	}
 
 	if configDir != "" {
 		// remove trailing slash (for all OS)

desktop/.gitignore

@@ -21,5 +21,9 @@ out
 # electron-builder
 dist/
 
-# We download it on demand, if needed for the particular OS/arch.
+# Legacy, people who checked out main for a brief while in Jan 2025 may have
+# this. Can be removed in the future.
 build/magick*
+
+# We download it on demand, if needed for the particular OS/arch.
+build/vips*

desktop/CHANGELOG.md

@@ -1,9 +1,18 @@
 # CHANGELOG
 
-## v1.7.9 (Unreleased)
+## v1.7.10 (Unreleased)
 
+- Speed up selection for large libraries.
+- Support Japanese translations.
+- Fix video thumbnail generation on drag and drop.
 - .
 
+## v1.7.9
+
+- Light mode.
+- Faster and more stable thumbnail generation.
+- Support `.supplemental-metadata` JSON files in Google Takeout.
+
 ## v1.7.8
 
 - Parse description from image metadata.

desktop/build/io.ente.photos.appdata.xml

@@ -38,8 +38,8 @@
   </branding>
 
   <releases>
-    <release version="1.7.8" date="2025-01-13">
-      <url type="details">https://github.com/ente-io/photos-desktop/releases/tag/v1.7.8</url>
+    <release version="1.7" date="2025-01-13">
+      <url type="details">https://github.com/ente-io/photos-desktop/releases</url>
     </release>
   </releases>
 </component>

desktop/docs/dependencies.md

@@ -108,13 +108,13 @@ For video conversions and metadata extraction, we use ffmpeg. To bundle a
 [ffmpeg-static](https://github.com/eugeneware/ffmpeg-static).
 
 > There is a significant (~20x) speed difference between using the compiled
-> ffmpeg binary and using the wasm one (that our renderer process already has).
+> FFmpeg binary and using the Wasm one (that our renderer process already has).
 > Which is why we bundle it to speed up operations on the desktop app.
 
-On Linux and Windows, we use ImageMagick for thumbnail generation and JPEG
-conversion of unpreviewable images. A static OS/architecture specific binary of
-this is bundled in our extra resources (`build`) folder by `scripts/magick.sh`
-and/or `scripts/beforeBuild.js`. See "[Note: ImageMagick]" for more details.
+On Linux and Windows, we use `vips` for thumbnail generation and JPEG conversion
+of unpreviewable images. A static OS/architecture specific binary of this is
+bundled in our extra resources (`build`) folder by `scripts/vips.sh` and/or
+`scripts/beforeBuild.js`. See "[Note: vips]" for more details.
 
 On macOS, we use the `sips` CLI tool for these tasks, but that is already
 available on the host machine, and is not bundled with our app.

desktop/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.9-beta",
+    "version": "1.7.10-beta",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",
@@ -19,7 +19,7 @@
         "postinstall": "electron-builder install-app-deps",
         "lint": "yarn prettier --check --log-level warn . && yarn eslint && yarn tsc",
         "lint-fix": "yarn prettier --write --log-level warn . && yarn eslint && yarn tsc",
-        "prepare": "node scripts/magick.js"
+        "prepare": "node scripts/vips.js"
     },
     "resolutions": {
         "jackspeak": "2.1.1"
@@ -31,9 +31,9 @@
         "clip-bpe-js": "^0.0.6",
         "comlink": "^4.4.2",
         "compare-versions": "^6.1.1",
-        "electron-log": "^5.2.4",
+        "electron-log": "^5.3.0",
         "electron-store": "^8.2.0",
-        "electron-updater": "^6.4.0-alpha.3",
+        "electron-updater": "^6.4.0",
         "ffmpeg-static": "^5.2.0",
         "lru-cache": "^11.0.2",
         "next-electron-server": "^1.0.0",
@@ -41,7 +41,7 @@
         "onnxruntime-node": "^1.20.1"
     },
     "devDependencies": {
-        "@eslint/js": "^9.18.0",
+        "@eslint/js": "^9.19.0",
         "@tsconfig/node20": "^20.1.4",
         "@types/auto-launch": "^5.0.5",
         "@types/eslint__js": "^8.42.3",
@@ -49,15 +49,15 @@
         "ajv": "^8.17.1",
         "concurrently": "^9.1.2",
         "cross-env": "^7.0.3",
-        "electron": "^34.0.0",
-        "electron-builder": "^26.0.0-alpha.10",
+        "electron": "^34.1.1",
+        "electron-builder": "^26.0.0",
         "eslint": "^9",
         "prettier": "3.4.2",
         "prettier-plugin-organize-imports": "^4.1.0",
         "prettier-plugin-packagejson": "^2.5.8",
         "shx": "^0.3.4",
         "typescript": "^5.7.2",
-        "typescript-eslint": "^8.21.0"
+        "typescript-eslint": "^8.23.0"
     },
     "packageManager": "yarn@1.22.22",
     "productName": "ente"

desktop/scripts/beforeBuild.js

@@ -3,8 +3,8 @@ const fsp = require("fs/promises");
 /**
  * This hook is invoked during the initial build (e.g. when triggered by "yarn
  * build"), and importantly, on each rebuild for a different architecture during
- * the build. We use it to ensure that the magick binary is for the current
- * architecture being built. See "[Note: ImageMagick]" for more details.
+ * the build. We use it to ensure that the vips binary is for the current
+ * architecture being built. See "[Note: vips]" for more details.
  *
  * The documentation for this hook is at:
  * https://www.electron.build/app-builder-lib.interface.configuration#beforebuild
@@ -22,8 +22,10 @@ const fsp = require("fs/promises");
  *     },
  *     arch: 'arm64'
  *
- *  Note that we must not return falsey from this function, because
- * > Resolving to false will skip dependencies install or rebuild.
+ *  Note that we must not return falsey from this function, because:
+ *
+ *  > Resolving to false will skip dependencies install or rebuild.
+ *
  */
 module.exports = async (context) => {
     const { appDir, platform, arch } = context;
@@ -35,14 +37,14 @@ module.exports = async (context) => {
     // https://github.com/electron-userland/electron-builder/blob/master/packages/builder-util/src/arch.ts#L9
     // https://nodejs.org/api/process.html#processarch
     if (arch == process.arch) {
-        // `magick.js` would've already downloaded the file, nothing to do.
+        // `vips.js` would've already downloaded the file, nothing to do.
         return true;
     }
 
     const download = async (downloadName, outputName) => {
         const out = `${appDir}/build/${outputName}`;
         console.log(`Downloading ${downloadName}`);
-        const downloadPath = `https://github.com/ente-io/ImageMagick/releases/download/2025-01-21/${downloadName}`;
+        const downloadPath = `https://github.com/ente-io/libvips-packaging/releases/download/v8.16.0/${downloadName}`;
         return fetch(downloadPath)
             .then((res) => res.blob())
             .then((blob) => fsp.writeFile(out, blob.stream()))
@@ -51,13 +53,13 @@ module.exports = async (context) => {
 
     switch (`${platform.nodeName}-${arch}`) {
         case "linux-x64":
-            await download("magick-x86_64", "magick");
+            await download("vips-x64", "vips");
         case "linux-arm64":
-            await download("magick-aarch64", "magick");
+            await download("vips-arm64", "vips");
         case "win32-x64":
-            await download("magick-x64.exe", "magick.exe");
+            await download("vips-x86_64.exe", "vips.exe");
         case "linux-arm64":
-            await download("magick-arm64.exe", "magick.exe");
+            await download("vips-aarch64.exe", "vips.exe");
     }
 
     return true;

desktop/scripts/magick.js

@@ -1,78 +0,0 @@
-/**
- * [Note: ImageMagick]
- *
- * We need static builds for Linux and Windows for both x64 and ARM. For this,
- * we need a custom workflow because (as of writing):
- *
- * 1. Upstream doesn't publish ARM64 binaries for Linux
- *
- * 2. The Windows portable releases are not part of the artifacts attached to
- *    the upstream GitHub release.
- *
- * Our custom workflow is an adaption of the upstream release.yml - its goal is
- * to have 4 standalone binaries - Linux x64, Linux ARM, Win x64, Win ARM -
- * attached to a GitHub release from which we can pull them when building the
- * desktop app.
- *
- * This is our custom workflow, which runs on a fork of upstream:
- * https://github.com/ente-io/ImageMagick/commit/df895cce13d6a3f874a716c05ff2babeb33351b9
- * (For reference, we also include a copy of it in this repo - `magick.yml`).
- *
- * The binaries it creates are available at
- * https://github.com/ente-io/ImageMagick/releases/tag/2025-01-21.
- *
- * To integrate this ImageMagick binary, we need to modify two places:
- *
- * 1. This script, `magick.js`, runs during "yarn install" (it is set as the
- *    "prepare" step in our `package.json`). It downloads the relevant binary
- *    for the current OS/arch combination and places it in the `build` folder,
- *    allowing it to be used during development.
- *
- * 2. The sibling script, `beforeBuild.js`, runs during "yarn build" (it is set
- *    as the beforeBuild script in `electrons-builder.yml`). It downloads the
- *    relevant binary for the OS/arch combination being built.
- *
- * Note that `magick.js` would've already run once `beforeBuild.js` is run, but
- * on our CI we prepare builds for multiple architectures in one go, so we need
- * to unconditonally replace the binary with the relevant one for the current
- * architecture being built (which might be different from the one we're running
- * on). `beforeBuild.js` runs for each architecture being built.
- *
- * On macOS, we don't need ImageMagick since there we use the native `sips`.
- */
-
-const fs = require("fs");
-const fsp = require("fs/promises");
-
-const main = () => {
-    switch (`${process.platform}-${process.arch}`) {
-        case "linux-x64":
-            return downloadIfNeeded("magick-x86_64", "magick");
-        case "linux-arm64":
-            return downloadIfNeeded("magick-aarch64", "magick");
-        case "win32-x64":
-            return downloadIfNeeded("magick-x64.exe", "magick.exe");
-        case "linux-arm64":
-            return downloadIfNeeded("magick-arm64.exe", "magick.exe");
-    }
-};
-
-const downloadIfNeeded = (downloadName, outputName) => {
-    const out = `build/${outputName}`;
-
-    try {
-        // Making the file executable is the last step, so if the file exists at
-        // this path and is executable, we assume it is the correct one.
-        fs.accessSync(out, fs.constants.X_OK);
-        return;
-    } catch {}
-
-    console.log(`Downloading ${downloadName}`);
-    const downloadPath = `https://github.com/ente-io/ImageMagick/releases/download/2025-01-21/${downloadName}`;
-    return fetch(downloadPath)
-        .then((res) => res.blob())
-        .then((blob) => fsp.writeFile(out, blob.stream()))
-        .then(() => fsp.chmod(out, "744"));
-};
-
-main();

desktop/scripts/magick.yml

@@ -1,127 +0,0 @@
-on:
-    workflow_dispatch:
-    push: # Push a tag to build and create a draft release
-        tags:
-            - "*"
-
-name: binaries-for-ente
-jobs:
-    create_magick_binary:
-        name: Create magick binary (Linux)
-        runs-on: ${{ matrix.os }}
-
-        strategy:
-            matrix:
-                os: [ubuntu-24.04, ubuntu-24.04-arm]
-                compiler: [gcc]
-                include:
-                    - os: ubuntu-24.04
-                      arch: x86_64
-                    - os: ubuntu-24.04-arm
-                      arch: aarch64
-                    - compiler: gcc
-                      cxx_compiler: g++
-                      packages: gcc g++
-
-        steps:
-            - name: Install dependencies
-              run: |
-                  set -e
-                  export DEBIAN_FRONTEND=noninteractive
-                  sudo apt update -y
-                  sudo apt install -y autoconf curl fuse git kmod libbz2-dev libdjvulibre-dev libfontconfig-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev liblcms-dev libopenexr-dev libopenjp2-7-dev libturbojpeg0-dev liblqr-dev libraqm-dev libtiff-dev libwebp-dev libx11-dev libxml2-dev liblzma-dev make software-properties-common wget ${{ matrix.packages }}
-                  sudo add-apt-repository ppa:git-core/ppa -y
-                  sudo apt install -y git
-                  sudo add-apt-repository ppa:strukturag/libheif -y
-                  sudo add-apt-repository ppa:strukturag/libde265 -y
-                  sudo apt install libheif-dev -y
-
-            - name: Checkout
-              uses: actions/checkout@v4
-
-              # Avoid fatal: detected dubious ownership in repository at '/__w/ImageMagick/ImageMagick'
-              # Possible workaround: https://github.com/actions/runner/issues/2033#issuecomment-1598547465
-            - name: Flag current workspace as safe for git
-              run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-            - name: Download AppImage
-              run: |
-                  set -e
-                  sudo apt install -y file
-                  mkdir -p out/app-image
-                  cd out/app-image
-                  wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous -O - | grep "appimagetool-.*-${{ matrix.arch }}.AppImage" | head -n 1 | cut -d '"' -f 2)
-                  chmod +x appimagetool-*.AppImage
-
-            - name: Build ImageMagick
-              env:
-                  CFLAGS:
-                      -Wno-deprecated-declarations -Wdeclaration-after-statement
-                      -Wno-error=unused-variable
-                  CC: ${{ matrix.compiler }}
-                  CXX: ${{ matrix.cxx_compiler }}
-              run: |
-                  set -e
-                  ./configure --with-quantum-depth=16 --without-magick-plus-plus --without-perl --without-x --disable-docs --prefix=/usr
-                  make
-                  make install DESTDIR=$(readlink -f out/appdir)
-
-            - name: Create ImageMagick AppImage
-              run: |
-                  set -e
-                  mkdir -p out/appdir/usr/share/applications/
-                  cp app-image/imagemagick.desktop out/appdir/usr/share/applications/
-                  mkdir -p out/appdir/usr/share/icons/hicolor/256x256/apps/
-                  cp app-image/icon.png out/appdir/usr/share/icons/hicolor/256x256/apps/imagemagick.png
-                  unset QTDIR
-                  unset QT_PLUGIN_PATH
-                  unset LD_LIBRARY_PATH
-                  export VERSION=7
-                  cd out
-                  ./app-image/appimagetool-*.AppImage --appimage-extract-and-run -s deploy appdir/usr/share/applications/*.desktop
-                  chmod +x appdir/usr/lib/ld-linux-aarch64.so.1 || true
-                  ./app-image/appimagetool-*.AppImage --appimage-extract-and-run appdir
-                  mkdir artifacts
-                  cp ImageMagick*.AppImage artifacts/magick-${{ matrix.arch }}
-
-            - name: Upload ImageMagick AppImage
-              uses: actions/upload-artifact@v4
-              with:
-                  name: magick-${{ matrix.arch }}
-                  path: out/artifacts
-
-            - name: Create a draft GitHub release
-              uses: ncipollo/release-action@v1
-              with:
-                  artifacts: "out/artifacts/*"
-                  draft: true
-                  allowUpdates: true
-                  updateOnlyUnreleased: true
-
-    download_and_keep_windows_binaries:
-        name: Download magick binary (Windows)
-        runs-on: ubuntu-24.04
-        steps:
-            - name: Download
-              run: |
-                  mkdir -p out/artifacts
-                  curl -LO https://imagemagick.org/archive/binaries/ImageMagick-7.1.1-43-portable-Q16-x64.zip
-                  unzip ImageMagick-7.1.1-43-portable-Q16-x64.zip
-                  cp ImageMagick-7.1.1-43-portable-Q16-x64/magick.exe out/artifacts/magick-x64.exe
-                  curl -LO https://imagemagick.org/archive/binaries/ImageMagick-7.1.1-43-portable-Q16-arm64.zip
-                  unzip ImageMagick-7.1.1-43-portable-Q16-arm64.zip
-                  cp ImageMagick-7.1.1-43-portable-Q16-arm64/magick.exe out/artifacts/magick-arm64.exe
-
-            - name: Upload ImageMagick exes
-              uses: actions/upload-artifact@v4
-              with:
-                  name: magick-${{ matrix.arch }}
-                  path: out/artifacts
-
-            - name: Create a draft GitHub release
-              uses: ncipollo/release-action@v1
-              with:
-                  artifacts: "out/artifacts/*"
-                  draft: true
-                  allowUpdates: true
-                  updateOnlyUnreleased: true

desktop/scripts/vips.js

@@ -0,0 +1,68 @@
+/**
+ * [Note: vips]
+ *
+ * For use within our Electron app we need static builds for Linux and Windows
+ * for both x64 and ARM. For this, we need a custom workflow because (as of
+ * writing) upstream doesn't publish these.
+ *
+ * This is our custom workflow, which runs on a fork of upstream:
+ * https://github.com/ente-io/libvips-packaging/commit/a298aff3e1f25f713508d31d0c3a55a4f828fdd3
+ *
+ * The binaries it creates are available at
+ * https://github.com/ente-io/libvips-packaging/releases/tag/v8.16.0
+ *
+ * To integrate this binary, we need to modify two places:
+ *
+ * 1. This script, `vips.js`, runs during "yarn install" (it is set as the
+ *    "prepare" step in our `package.json`). It downloads the relevant binary
+ *    for the current OS/arch combination and places it in the `build` folder,
+ *    allowing it to be used during development.
+ *
+ * 2. The sibling script, `beforeBuild.js`, runs during "yarn build" (it is set
+ *    as the beforeBuild script in `electrons-builder.yml`). It downloads the
+ *    relevant binary for the OS/arch combination being built.
+ *
+ * Note that `vips.js` would've already run once `beforeBuild.js` is run, but on
+ * our CI we prepare builds for multiple architectures in one go, so we need to
+ * unconditonally replace the binary with the relevant one for the current
+ * architecture being built (which might be different from the one we're running
+ * on). `beforeBuild.js` runs for each architecture being built.
+ *
+ * On macOS, we don't need `vips` since there we use the native `sips`.
+ */
+
+const fs = require("fs");
+const fsp = require("fs/promises");
+
+const main = () => {
+    switch (`${process.platform}-${process.arch}`) {
+        case "linux-x64":
+            return downloadIfNeeded("vips-x64", "vips");
+        case "linux-arm64":
+            return downloadIfNeeded("vips-arm64", "vips");
+        case "win32-x64":
+            return downloadIfNeeded("vips-x86_64.exe", "vips.exe");
+        case "linux-arm64":
+            return downloadIfNeeded("vips-aarch64.exe", "vips.exe");
+    }
+};
+
+const downloadIfNeeded = (downloadName, outputName) => {
+    const out = `build/${outputName}`;
+
+    try {
+        // Making the file executable is the last step, so if the file exists at
+        // this path and is executable, we assume it is the correct one.
+        fs.accessSync(out, fs.constants.X_OK);
+        return;
+    } catch {}
+
+    console.log(`Downloading ${downloadName}`);
+    const downloadPath = `https://github.com/ente-io/libvips-packaging/releases/download/v8.16.0/${downloadName}`;
+    return fetch(downloadPath)
+        .then((res) => res.blob())
+        .then((blob) => fsp.writeFile(out, blob.stream()))
+        .then(() => fsp.chmod(out, "744"));
+};
+
+main();

desktop/scripts/vips/.gitignore

@@ -1,2 +0,0 @@
-1.heic
-1.jpeg

desktop/scripts/vips/Dockerfile

@@ -1,18 +0,0 @@
-FROM ubuntu:24.04
-
-# https://github.com/libvips/libvips/blob/master/.github/workflows/ci.yml
-RUN apt-get update -y && apt-get install -y \
-    meson pkg-config \
-    libarchive-dev libcfitsio-dev libcgif-dev \
-    libexif-dev libexpat1-dev libffi-dev \
-    libfftw3-dev libheif-dev libheif-plugin-aomenc \
-    libheif-plugin-x265 libhwy-dev libimagequant-dev \
-    libjpeg-dev libjxl-dev liblcms2-dev \
-    libmatio-dev libnifti-dev libopenexr-dev \
-    libopenjp2-7-dev libopenslide-dev libpango1.0-dev \
-    libpng-dev libpoppler-glib-dev librsvg2-dev \
-    libtiff5-dev libwebp-dev
-
-RUN apt-get install -y git && git clone --depth 1 https://github.com/libvips/libvips
-
-WORKDIR /libvips

desktop/scripts/vips/Dockerfile.staticx

@@ -1,74 +0,0 @@
-FROM debian:bullseye
-
-# Don't care about layer size.
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        gcc \
-        gcc-10 \
-        make \
-        pkg-config
-
-# Don't care about layer size.
-RUN apt-get install -y --no-install-recommends \
-    python3-minimal \
-    python3-pip \
-    python3-setuptools \
-    patchelf
-
-RUN python3 -m pip \
-        --disable-pip-version-check \
-        --no-cache-dir \
-    install \
-        'staticx==0.12.0'
-
-# Don't care about layer caching, because I'm only using docker for building.
-RUN apt-get install -y --no-install-recommends \
-    ca-certificates \
-    curl \
-    g++ \
-    g++-10 \
-    libglib2.0-dev \
-    libexpat1-dev \
-    libjpeg-dev \
-    libpng-dev \
-    libimagequant-dev \
-    libexif-dev \
-    liborc-0.4-dev \
-    && rm -rf /var/lib/apt/lists
-
-# TODO: Vendored source to remove test/ and doc/ with patches to remove test/ from configure.
-#       This would also remove the need to install ca-certificates + curl.
-
-# TODO: libspng build with meson, miniz to replace libpng-dev.
-# https://github.com/randy408/libspng/blob/master/docs/build.md#meson
-# Then, publish the final image somewhere.
-
-WORKDIR /build
-RUN curl -sL https://github.com/libvips/libvips/releases/download/v8.10.1/vips-8.10.1.tar.gz | \
-    tar -xz -f- --strip-components=1
-
-# XXX: -static doesn't work here. I'm using staticx to make the final vips binary static.
-# Could also try clang.
-# TODO: webp support
-RUN CFLAGS="-O2 -flto -pipe" CXXFLAGS="-O2 -flto -pipe" \
-    ./configure \
-        --disable-deprecated \
-        --disable-shared \
-        --disable-static \
-        --disable-dependency-tracking \
-        --disable-gtk-doc
-
-# This is the fastest easiest way I found to compile the
-# CLI as fast as possible. You can probably get more optimal,
-# but it'd be a lot harder wrestling autotools.
-RUN cd libvips \
-    && make -j"$(nproc)"
-
-RUN cd tools \
-    && make -j"$(nproc)" vips
-
-RUN cd tools \
-    && staticx vips /bin/vips \
-    && strip -s /bin/vips
-
-ENTRYPOINT ["/bin/vips"]
-CMD ["--help"]

desktop/scripts/vips/Dockerfile.vips-mini

@@ -1,38 +0,0 @@
-FROM --platform=linux/arm64/v8 alpine:3.18
-
-ARG VIPS_VERSION=8.14.5
-ARG ALPINE_VERSION=3.18
-
-# Environment variables
-ENV VIPS_HOME=/usr/local/vips-${VIPS_VERSION}
-ENV VIPS_BLOCK_UNTRUSTED=true \
-    LD_LIBRARY_PATH=$VIPS_HOME/lib \
-    PKG_CONFIG_PATH=$VIPS_HOME/lib/pkgconfig \
-    PATH=$PATH:$VIPS_HOME/bin \
-    WORKDIR=/usr/local/src
-
-WORKDIR $WORKDIR
-
-RUN apk add xz \
-    && wget https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz \
-    && tar -xf vips-${VIPS_VERSION}.tar.xz \
-    && cd vips-${VIPS_VERSION} \
-    && apk add \
-    meson \
-    build-base \
-    vips-dev \
-    fftw-dev \
-    glib-dev \
-    expat-dev expat \
-    libjpeg-turbo-dev \
-    libheif-dev \
-    libspng-dev \
-    curl
-
-RUN APK add curl-dev
-RUN meson configure -Dintrospection=false -Dmodules=disabled -Dexamples=false -Dheif=disabled -Djpeg=disabled -Dopenjpeg=disabled -Ddeprecated=false -Dcplusplus=false --default-library=static --prefer-static --buildtype release
-
-# RUN meson setup build-dir -Dintrospection=false -Dmodules=disabled -Dexamples=false --prefer-static --buildtype release \
-#     && cd build-dir \
-#     && meson compile \
-#     && meson install

desktop/scripts/vips/README.md

@@ -1,6 +0,0 @@
-Experimenting with libvips.
-
-```sh
-docker build -t vips-test .
-docker run -it --rm -v $(pwd):/w vips-test vips copy /w/1.heic /w/1.jpeg
-```

desktop/src/main.ts

@@ -10,14 +10,15 @@
  */
 
 import { nativeImage, shell } from "electron/common";
-import type { WebContents } from "electron/main";
 import {
     BrowserWindow,
     Menu,
     Tray,
     app,
     dialog,
+    nativeTheme,
     protocol,
+    type WebContents,
 } from "electron/main";
 import serveNextAt from "next-electron-server";
 import { existsSync } from "node:fs";
@@ -95,10 +96,10 @@ const main = () => {
     /**
      * Handle an open URL request, but ensuring that we have a mainWindow.
      */
-    const handleOpenURLEnsuringWindow = (url: string) => {
+    const handleOpenEnteURLEnsuringWindow = (url: string) => {
         log.info(`Attempting to handle request to open URL: ${url}`);
         if (mainWindow) handleEnteLinks(mainWindow, url);
-        else setTimeout(() => handleOpenURLEnsuringWindow(url), 1000);
+        else setTimeout(() => handleOpenEnteURLEnsuringWindow(url), 1000);
     };
 
     app.on("second-instance", (_, argv: string[]) => {
@@ -109,9 +110,15 @@ const main = () => {
             mainWindow.focus();
         }
         // On Windows and Linux, this is how we get deeplinks.
+        //
         // See: registerForEnteLinks
-        const url = argv.pop();
-        if (url) handleOpenURLEnsuringWindow(url);
+        //
+        // Note that Chromium reserves the right to fudge with the order of the
+        // command line arguments, including inserting things in arbitrary
+        // places, so we need to go through the args to find the one that is
+        // pertinent to us (if any) instead of looking at a fixed position.
+        const url = argv.find((arg) => arg.startsWith("ente://app"));
+        if (url) handleOpenEnteURLEnsuringWindow(url);
     });
 
     // Emitted once, when Electron has finished initializing.
@@ -145,7 +152,7 @@ const main = () => {
             void mainWindow.loadURL(rendererURL);
 
             // Continue on with the rest of the startup sequence.
-            Menu.setApplicationMenu(await createApplicationMenu(mainWindow));
+            Menu.setApplicationMenu(createApplicationMenu(mainWindow));
             setupTrayItem(mainWindow);
             setupAutoUpdater(mainWindow);
 
@@ -170,7 +177,7 @@ const main = () => {
     });
 
     // On macOS, this is how we get deeplinks. See: registerForEnteLinks
-    app.on("open-url", (_, url) => handleOpenURLEnsuringWindow(url));
+    app.on("open-url", (_, url) => handleOpenEnteURLEnsuringWindow(url));
 };
 
 /**
@@ -272,7 +279,7 @@ const handleEnteLinks = (mainWindow: BrowserWindow, url: string) => {
     // - the protocol we're using to serve/ our bundled web app
     //
     // use the same scheme ("ente://"), so the URL can directly be forwarded.
-    mainWindow.webContents.send("openURL", url);
+    mainWindow.webContents.send("openEnteURL", url);
 };
 
 /** Attach handlers to the (node) process. */
@@ -341,9 +348,41 @@ const createMainWindow = () => {
         ...(bounds ?? {}),
         // Enforce a minimum size
         ...minimumWindowSize(),
+        // [Note: Customize the desktop title bar]
+        //
+        // 1. Remove the default title bar.
+        // 2. Reintroduce the title bar controls.
+        // 3. Show a custom title bar in the renderer.
+        //
+        // For step 3, we use `app-region: drag` to allow dragging the window by
+        // the title bar, and use the Window Controls Overlay CSS environment
+        // variables to determine its dimensions. Note that these overlay CSS
+        // environment vars are only available when titleBarOverlay is true, so
+        // unlike the tutorial which enables it only for Windows and Linux, we
+        // do it (Step 2) unconditionally (i.e., on macOS too).
+        //
+        // https://www.electronjs.org/docs/latest/tutorial/custom-title-bar#create-a-custom-title-bar
+        //
+        // Note that by default on Windows, the color of the WCO title bar
+        // overlay (three buttons - minimize, maximize, close - on the top
+        // right) is static, and unlike Linux, doesn't adapt to the theme /
+        // content. Explicitly choosing a dark background, while it won't work
+        // always (if the user's theme is light), is better than picking a light
+        // background since the main image viewer is always dark.
+        titleBarStyle: "hidden",
+        titleBarOverlay:
+            process.platform == "win32"
+                ? { color: "black", symbolColor: "#cdcdcd" }
+                : true,
         // The color to show in the window until the web content gets loaded.
-        // See: https://www.electronjs.org/docs/latest/api/browser-window#setting-the-backgroundcolor-property
-        backgroundColor: "black",
+        // https://www.electronjs.org/docs/latest/api/browser-window#setting-the-backgroundcolor-property
+        //
+        // To avoid a flash, we want to use the same background color as the
+        // theme of their choice. Unless the user has modified their preference
+        // to not follow the system, we can deduce it from the current OS theme.
+        //
+        // See: https://www.electronjs.org/docs/latest/tutorial/dark-mode
+        backgroundColor: nativeTheme.shouldUseDarkColors ? "black" : "white",
         // We'll show it conditionally depending on `wasAutoLaunched` later.
         show: false,
     });

desktop/src/main/ipc.ts

@@ -24,6 +24,7 @@ import {
     updateAndRestart,
     updateOnNextRestart,
 } from "./services/app-update";
+import autoLauncher from "./services/auto-launcher";
 import {
     openDirectory,
     openLogDirectory,
@@ -117,6 +118,10 @@ export const attachIPCHandlers = () => {
         setLastShownChangelogVersion(version),
     );
 
+    ipcMain.handle("isAutoLaunchEnabled", () => autoLauncher.isEnabled());
+
+    ipcMain.handle("toggleAutoLaunch", () => autoLauncher.toggleAutoLaunch());
+
     // - App update
 
     ipcMain.on("updateAndRestart", () => updateAndRestart());

desktop/src/main/menu.ts

@@ -7,17 +7,14 @@ import {
 } from "electron";
 import { allowWindowClose } from "../main";
 import { forceCheckForAppUpdates } from "./services/app-update";
-import autoLauncher from "./services/auto-launcher";
-import { openLogDirectory } from "./services/dir";
 import { userPreferences } from "./stores/user-preferences";
 
 /** Create and return the entries in the app's main menu bar */
-export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
+export const createApplicationMenu = (mainWindow: BrowserWindow) => {
     // The state of checkboxes
     //
     // Whenever the menu is redrawn the current value of these variables is used
     // to set the checked state for the various settings checkboxes.
-    let isAutoLaunchEnabled = await autoLauncher.isEnabled();
     let shouldHideDockIcon = !!userPreferences.get("hideDockIcon");
 
     const macOSOnly = (options: MenuItemConstructorOptions[]) =>
@@ -25,16 +22,6 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
 
     const handleCheckForUpdates = () => forceCheckForAppUpdates(mainWindow);
 
-    const handleViewChangelog = () =>
-        void shell.openExternal(
-            "https://github.com/ente-io/ente/blob/main/desktop/CHANGELOG.md",
-        );
-
-    const toggleAutoLaunch = () => {
-        void autoLauncher.toggleAutoLaunch();
-        isAutoLaunchEnabled = !isAutoLaunchEnabled;
-    };
-
     const toggleHideDockIcon = () => {
         // Persist
         userPreferences.set("hideDockIcon", !shouldHideDockIcon);
@@ -45,13 +32,6 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
     const handleHelp = () =>
         void shell.openExternal("https://help.ente.io/photos/");
 
-    const handleSupport = () =>
-        void shell.openExternal("mailto:support@ente.io");
-
-    const handleBlog = () => void shell.openExternal("https://ente.io/blog/");
-
-    const handleViewLogs = () => void openLogDirectory();
-
     return Menu.buildFromTemplate([
         {
             label: "Ente Photos",
@@ -67,31 +47,21 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
                     label: "Check for Updates...",
                     click: handleCheckForUpdates,
                 },
-                {
-                    label: "View Changelog",
-                    click: handleViewChangelog,
-                },
                 { type: "separator" },
 
-                {
-                    label: "Preferences",
-                    submenu: [
-                        {
-                            label: "Open Ente on Startup",
-                            type: "checkbox",
-                            checked: isAutoLaunchEnabled,
-                            click: toggleAutoLaunch,
-                        },
-                        ...macOSOnly([
+                ...macOSOnly([
+                    {
+                        label: "Preferences",
+                        submenu: [
                             {
                                 label: "Hide Dock Icon",
                                 type: "checkbox",
                                 checked: shouldHideDockIcon,
                                 click: toggleHideDockIcon,
                             },
-                        ]),
-                    ],
-                },
+                        ],
+                    },
+                ]),
 
                 { type: "separator" },
                 ...macOSOnly([
@@ -169,20 +139,6 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
                     label: "Ente Help",
                     click: handleHelp,
                 },
-                { type: "separator" },
-                {
-                    label: "Support",
-                    click: handleSupport,
-                },
-                {
-                    label: "Product Updates",
-                    click: handleBlog,
-                },
-                { type: "separator" },
-                {
-                    label: "View Logs",
-                    click: handleViewLogs,
-                },
             ],
         },
     ]);
@@ -194,7 +150,6 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
  */
 export const createTrayContextMenu = (mainWindow: BrowserWindow) => {
     const handleOpen = () => {
-        mainWindow.maximize();
         mainWindow.show();
     };
 

desktop/src/main/services/ffmpeg.ts

@@ -9,7 +9,7 @@ import {
     makeTempFilePath,
 } from "../utils/temp";
 
-/* Ditto in the web app's code (used by the WASM FFmpeg invocation). */
+/* Ditto in the web app's code (used by the Wasm FFmpeg invocation). */
 const ffmpegPathPlaceholder = "FFMPEG";
 const inputPathPlaceholder = "INPUT";
 const outputPathPlaceholder = "OUTPUT";
@@ -19,7 +19,7 @@ const outputPathPlaceholder = "OUTPUT";
  *
  * [Note: FFmpeg in Electron]
  *
- * There is a wasm build of FFmpeg, but that is currently 10-20 times slower
+ * There is a Wasm build of FFmpeg, but that is currently 10-20 times slower
  * that the native build. That is slow enough to be unusable for our purposes.
  * https://ffmpegwasm.netlify.app/docs/performance
  *

desktop/src/main/services/image.ts

@@ -14,7 +14,6 @@ export const convertToJPEG = async (imageData: Uint8Array) => {
     const inputFilePath = await makeTempFilePath();
     const outputFilePath = await makeTempFilePath("jpeg");
 
-    // Construct the command first, it may throw NotAvailable on win32.
     const command = convertToJPEGCommand(inputFilePath, outputFilePath);
 
     try {
@@ -45,14 +44,7 @@ const convertToJPEGCommand = (
 
         case "linux":
         case "win32":
-            return [
-                imageMagickPath(),
-                "convert",
-                inputFilePath,
-                "-quality",
-                "100%",
-                outputFilePath,
-            ];
+            return [vipsPath(), "copy", inputFilePath, outputFilePath];
 
         default:
             throw new Error("Not available on the current OS/arch");
@@ -60,12 +52,12 @@ const convertToJPEGCommand = (
 };
 
 /**
- * Path to the magick executable bundled with our app on Linux and Windows.
+ * Path to the vips executable bundled with our app on Linux and Windows.
  */
-const imageMagickPath = () =>
+const vipsPath = () =>
     path.join(
         isDev ? "build" : process.resourcesPath,
-        process.platform == "win32" ? "magick.exe" : "magick",
+        process.platform == "win32" ? "vips.exe" : "vips",
     );
 
 export const generateImageThumbnail = async (
@@ -139,19 +131,11 @@ const generateImageThumbnailCommand = (
         case "linux":
         case "win32":
             return [
-                imageMagickPath(),
-                "convert",
+                vipsPath(),
+                "thumbnail",
                 inputFilePath,
-                "-define",
-                `jpeg:size=${2 * maxDimension}x${2 * maxDimension}`,
-                "-auto-orient",
-                "-thumbnail",
-                `${maxDimension}x${maxDimension}`,
-                "-unsharp",
-                "0x.5",
-                "-quality",
-                `${quality}`,
-                outputFilePath,
+                `${outputFilePath}[Q=${quality}]`,
+                `${maxDimension}`,
             ];
 
         default:

desktop/src/main/services/ml.ts

@@ -20,7 +20,7 @@ let _child: UtilityProcess | undefined;
  * [Note: ML IPC]
  *
  * The primary reason for doing ML tasks in the Node.js layer is so that we can
- * use the binary ONNX runtime, which is 10-20x faster than the WASM one that
+ * use the binary ONNX runtime, which is 10-20x faster than the Wasm one that
  * can be used directly on the web layer.
  *
  * For this to work, the main and renderer process need to communicate with each

desktop/src/main/utils/electron.ts

@@ -56,8 +56,6 @@ export const execAsync = async (command: string | string[]) => {
     const startTime = Date.now();
     const result = await execAsync_(escapedCommand);
     log.debug(() => `${escapedCommand} (${Date.now() - startTime} ms)`);
-    // TODO(MR): Temp for debugging in nightlies; Remove before release.
-    log.info(`${escapedCommand} (${Date.now() - startTime} ms)`);
     return result;
 };
 

desktop/src/preload.ts

@@ -122,14 +122,18 @@ const lastShownChangelogVersion = () =>
 const setLastShownChangelogVersion = (version: number) =>
     ipcRenderer.invoke("setLastShownChangelogVersion", version);
 
+const isAutoLaunchEnabled = () => ipcRenderer.invoke("isAutoLaunchEnabled");
+
+const toggleAutoLaunch = () => ipcRenderer.invoke("toggleAutoLaunch");
+
 const onMainWindowFocus = (cb: (() => void) | undefined) => {
     ipcRenderer.removeAllListeners("mainWindowFocus");
     if (cb) ipcRenderer.on("mainWindowFocus", cb);
 };
 
-const onOpenURL = (cb: ((url: string) => void) | undefined) => {
-    ipcRenderer.removeAllListeners("openURL");
-    if (cb) ipcRenderer.on("openURL", (_, url: string) => cb(url));
+const onOpenEnteURL = (cb: ((url: string) => void) | undefined) => {
+    ipcRenderer.removeAllListeners("openEnteURL");
+    if (cb) ipcRenderer.on("openEnteURL", (_, url: string) => cb(url));
 };
 
 // - App update
@@ -347,8 +351,10 @@ contextBridge.exposeInMainWorld("electron", {
     saveMasterKeyB64,
     lastShownChangelogVersion,
     setLastShownChangelogVersion,
+    isAutoLaunchEnabled,
+    toggleAutoLaunch,
     onMainWindowFocus,
-    onOpenURL,
+    onOpenEnteURL,
 
     // - App update
 

desktop/yarn.lock

@@ -177,10 +177,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.9.1.tgz#4a97e85e982099d6c7ee8410aacb55adaa576f06"
   integrity sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==
 
-"@eslint/js@^9.18.0":
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.18.0.tgz#3356f85d18ed3627ab107790b53caf7e1e3d1e84"
-  integrity sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==
+"@eslint/js@^9.19.0":
+  version "9.19.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.19.0.tgz#51dbb140ed6b49d05adc0b171c41e1a8713b7789"
+  integrity sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==
 
 "@eslint/object-schema@^2.1.4":
   version "2.1.4"
@@ -417,85 +417,85 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@8.21.0":
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.21.0.tgz#395014a75112ecdb81142b866ab6bb62e3be0f2a"
-  integrity sha512-eTH+UOR4I7WbdQnG4Z48ebIA6Bgi7WO8HvFEneeYBxG8qCOYgTOFPSg6ek9ITIDvGjDQzWHcoWHCDO2biByNzA==
+"@typescript-eslint/eslint-plugin@8.23.0":
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.23.0.tgz#7745f4e3e4a7ae5f6f73fefcd856fd6a074189b7"
+  integrity sha512-vBz65tJgRrA1Q5gWlRfvoH+w943dq9K1p1yDBY2pc+a1nbBLZp7fB9+Hk8DaALUbzjqlMfgaqlVPT1REJdkt/w==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.21.0"
-    "@typescript-eslint/type-utils" "8.21.0"
-    "@typescript-eslint/utils" "8.21.0"
-    "@typescript-eslint/visitor-keys" "8.21.0"
+    "@typescript-eslint/scope-manager" "8.23.0"
+    "@typescript-eslint/type-utils" "8.23.0"
+    "@typescript-eslint/utils" "8.23.0"
+    "@typescript-eslint/visitor-keys" "8.23.0"
     graphemer "^1.4.0"
     ignore "^5.3.1"
     natural-compare "^1.4.0"
-    ts-api-utils "^2.0.0"
+    ts-api-utils "^2.0.1"
 
-"@typescript-eslint/parser@8.21.0":
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.21.0.tgz#312c638aaba4f640d45bfde7c6795a9d75deb088"
-  integrity sha512-Wy+/sdEH9kI3w9civgACwabHbKl+qIOu0uFZ9IMKzX3Jpv9og0ZBJrZExGrPpFAY7rWsXuxs5e7CPPP17A4eYA==
+"@typescript-eslint/parser@8.23.0":
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.23.0.tgz#57acb3b65fce48d12b70d119436e145842a30081"
+  integrity sha512-h2lUByouOXFAlMec2mILeELUbME5SZRN/7R9Cw2RD2lRQQY08MWMM+PmVVKKJNK1aIwqTo9t/0CvOxwPbRIE2Q==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.21.0"
-    "@typescript-eslint/types" "8.21.0"
-    "@typescript-eslint/typescript-estree" "8.21.0"
-    "@typescript-eslint/visitor-keys" "8.21.0"
+    "@typescript-eslint/scope-manager" "8.23.0"
+    "@typescript-eslint/types" "8.23.0"
+    "@typescript-eslint/typescript-estree" "8.23.0"
+    "@typescript-eslint/visitor-keys" "8.23.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@8.21.0":
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.21.0.tgz#d08d94e2a34b4ccdcc975543c25bb62917437500"
-  integrity sha512-G3IBKz0/0IPfdeGRMbp+4rbjfSSdnGkXsM/pFZA8zM9t9klXDnB/YnKOBQ0GoPmoROa4bCq2NeHgJa5ydsQ4mA==
+"@typescript-eslint/scope-manager@8.23.0":
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.23.0.tgz#ee3bb7546421ca924b9b7a8b62a77d388193ddec"
+  integrity sha512-OGqo7+dXHqI7Hfm+WqkZjKjsiRtFUQHPdGMXzk5mYXhJUedO7e/Y7i8AK3MyLMgZR93TX4bIzYrfyVjLC+0VSw==
   dependencies:
-    "@typescript-eslint/types" "8.21.0"
-    "@typescript-eslint/visitor-keys" "8.21.0"
+    "@typescript-eslint/types" "8.23.0"
+    "@typescript-eslint/visitor-keys" "8.23.0"
 
-"@typescript-eslint/type-utils@8.21.0":
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.21.0.tgz#2e69d1a93cdbedc73fe694cd6ae4dfedd00430a0"
-  integrity sha512-95OsL6J2BtzoBxHicoXHxgk3z+9P3BEcQTpBKriqiYzLKnM2DeSqs+sndMKdamU8FosiadQFT3D+BSL9EKnAJQ==
+"@typescript-eslint/type-utils@8.23.0":
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.23.0.tgz#271e1eecece072d92679dfda5ccfceac3faa9f76"
+  integrity sha512-iIuLdYpQWZKbiH+RkCGc6iu+VwscP5rCtQ1lyQ7TYuKLrcZoeJVpcLiG8DliXVkUxirW/PWlmS+d6yD51L9jvA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "8.21.0"
-    "@typescript-eslint/utils" "8.21.0"
+    "@typescript-eslint/typescript-estree" "8.23.0"
+    "@typescript-eslint/utils" "8.23.0"
     debug "^4.3.4"
-    ts-api-utils "^2.0.0"
+    ts-api-utils "^2.0.1"
 
-"@typescript-eslint/types@8.21.0":
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.21.0.tgz#58f30aec8db8212fd886835dc5969cdf47cb29f5"
-  integrity sha512-PAL6LUuQwotLW2a8VsySDBwYMm129vFm4tMVlylzdoTybTHaAi0oBp7Ac6LhSrHHOdLM3efH+nAR6hAWoMF89A==
+"@typescript-eslint/types@8.23.0":
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.23.0.tgz#3355f6bcc5ebab77ef6dcbbd1113ec0a683a234a"
+  integrity sha512-1sK4ILJbCmZOTt9k4vkoulT6/y5CHJ1qUYxqpF1K/DBAd8+ZUL4LlSCxOssuH5m4rUaaN0uS0HlVPvd45zjduQ==
 
-"@typescript-eslint/typescript-estree@8.21.0":
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.21.0.tgz#5ce71acdbed3b97b959f6168afba5a03c88f69a9"
-  integrity sha512-x+aeKh/AjAArSauz0GiQZsjT8ciadNMHdkUSwBB9Z6PrKc/4knM4g3UfHml6oDJmKC88a6//cdxnO/+P2LkMcg==
+"@typescript-eslint/typescript-estree@8.23.0":
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.23.0.tgz#f633ef08efa656e386bc44b045ffcf9537cc6924"
+  integrity sha512-LcqzfipsB8RTvH8FX24W4UUFk1bl+0yTOf9ZA08XngFwMg4Kj8A+9hwz8Cr/ZS4KwHrmo9PJiLZkOt49vPnuvQ==
   dependencies:
-    "@typescript-eslint/types" "8.21.0"
-    "@typescript-eslint/visitor-keys" "8.21.0"
+    "@typescript-eslint/types" "8.23.0"
+    "@typescript-eslint/visitor-keys" "8.23.0"
     debug "^4.3.4"
     fast-glob "^3.3.2"
     is-glob "^4.0.3"
     minimatch "^9.0.4"
     semver "^7.6.0"
-    ts-api-utils "^2.0.0"
+    ts-api-utils "^2.0.1"
 
-"@typescript-eslint/utils@8.21.0":
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.21.0.tgz#bc4874fbc30feb3298b926e3b03d94570b3999c5"
-  integrity sha512-xcXBfcq0Kaxgj7dwejMbFyq7IOHgpNMtVuDveK7w3ZGwG9owKzhALVwKpTF2yrZmEwl9SWdetf3fxNzJQaVuxw==
+"@typescript-eslint/utils@8.23.0":
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.23.0.tgz#b269cbdc77129fd6e0e600b168b5ef740a625554"
+  integrity sha512-uB/+PSo6Exu02b5ZEiVtmY6RVYO7YU5xqgzTIVZwTHvvK3HsL8tZZHFaTLFtRG3CsV4A5mhOv+NZx5BlhXPyIA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.21.0"
-    "@typescript-eslint/types" "8.21.0"
-    "@typescript-eslint/typescript-estree" "8.21.0"
+    "@typescript-eslint/scope-manager" "8.23.0"
+    "@typescript-eslint/types" "8.23.0"
+    "@typescript-eslint/typescript-estree" "8.23.0"
 
-"@typescript-eslint/visitor-keys@8.21.0":
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.21.0.tgz#a89744c4cdc83b5c761eb5878befe6c33d1481b2"
-  integrity sha512-BkLMNpdV6prozk8LlyK/SOoWLmUFi+ZD+pcqti9ILCbVvHGk1ui1g4jJOc2WDLaeExz2qWwojxlPce5PljcT3w==
+"@typescript-eslint/visitor-keys@8.23.0":
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.23.0.tgz#40405fd26a61d23f5f4c2ed0f016a47074781df8"
+  integrity sha512-oWWhcWDLwDfu++BGTZcmXWqpwtkwb5o7fxUIGksMQQDSdPW9prsSnfIOZMlsj4vBOSrcnjIUZMiIjODgGosFhQ==
   dependencies:
-    "@typescript-eslint/types" "8.21.0"
+    "@typescript-eslint/types" "8.23.0"
     eslint-visitor-keys "^4.2.0"
 
 "@xmldom/xmldom@^0.8.8":
@@ -609,10 +609,10 @@ app-builder-bin@5.0.0-alpha.12:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz#2daf82f8badc698e0adcc95ba36af4ff0650dc80"
   integrity sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==
 
-app-builder-lib@26.0.0-alpha.10:
-  version "26.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.0-alpha.10.tgz#3eb3f64ffa5e995595ad61497c5e7a0c2d64b817"
-  integrity sha512-9K3MulGK7j+En4KjH3aq7AzDqe8nn35x7O9l5kwl16nWFdBthcdy1IKsx9CgjMSF+eTNctOZlXwnYiPiGzY+GQ==
+app-builder-lib@26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.0.tgz#726b8b2c058f04f854aba70c7245d48454905980"
+  integrity sha512-vZTt6Nc401IHBHISqspcO9tUF80ddOP5ehh2B4goLefM+zdT75CvuQUuqz7yzRgW16pHLqCvKMws0FbJQfLB5w==
   dependencies:
     "@develar/schema-utils" "~2.6.5"
     "@electron/asar" "3.2.18"
@@ -625,15 +625,15 @@ app-builder-lib@26.0.0-alpha.10:
     "@types/fs-extra" "9.0.13"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "26.0.0-alpha.10"
-    builder-util-runtime "9.3.0-alpha.0"
+    builder-util "26.0.0"
+    builder-util-runtime "9.3.0"
     chromium-pickle-js "^0.2.0"
     config-file-ts "0.2.8-rc1"
     debug "^4.3.4"
     dotenv "^16.4.5"
     dotenv-expand "^11.0.6"
     ejs "^3.1.8"
-    electron-publish "26.0.0-alpha.10"
+    electron-publish "26.0.0"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
     is-ci "^3.0.0"
@@ -784,24 +784,24 @@ buffer@^5.1.0, buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-builder-util-runtime@9.3.0-alpha.0:
-  version "9.3.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.3.0-alpha.0.tgz#c4639ae24a74d2e0f4eb324100af3040300bae62"
-  integrity sha512-EriE6Uf15niqdkyjBOS09OrXlhEV0HKhnATlI9n63vCoisnvvRTQNgoR2MV9vnBmNGhavBPZXPWPItv4QMDVfw==
+builder-util-runtime@9.3.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.3.0.tgz#58d97c279bb8626a10d779e1cf22fea0eb25f5e8"
+  integrity sha512-wR81YIybr41JITLSltwtTsZXkgTwcpBol7LGOyB5A8fKCcZaYLDWgUqDwmsjhlgADD6sGD5ieyzS/5wbL2l/qQ==
   dependencies:
     debug "^4.3.4"
     sax "^1.2.4"
 
-builder-util@26.0.0-alpha.10:
-  version "26.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-26.0.0-alpha.10.tgz#f445a530c28da6e3650b93e92263c06c6f89a2cc"
-  integrity sha512-RMVOAgdd+tzwpyF5C8gx9KjzwdUvkUEubpsHTvb2JwlQnBcyBc6hyVCU2gt2MivQCLbjCOEgsUX1/zHrWDqGfg==
+builder-util@26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-26.0.0.tgz#e5bc122f3e9e94fa2e3afd2e837e81ce9f177359"
+  integrity sha512-iLN4R0UAzSz4MxPmz+6vnXMqaY5BMd2FSNlM9f7eHSRYqZrsoTHCSrd7W4Kr4qFIdUxLlRz3X2npATapXzomIg==
   dependencies:
     "7zip-bin" "~5.2.0"
     "@types/debug" "^4.1.6"
     app-builder-bin "5.0.0-alpha.12"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "9.3.0-alpha.0"
+    builder-util-runtime "9.3.0"
     chalk "^4.1.2"
     cross-spawn "^7.0.6"
     debug "^4.3.4"
@@ -1178,14 +1178,14 @@ dir-compare@^4.2.0:
     minimatch "^3.0.5"
     p-limit "^3.1.0 "
 
-dmg-builder@26.0.0-alpha.10:
-  version "26.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.0-alpha.10.tgz#d4d908922005a0c852d0919a7dd0b8f77d3c4bd0"
-  integrity sha512-RWzCNLLu4dGIvBf8kBzjF/zI5aMOSA149S1V2NgAA4La8f8ghdJAm/DI5crSb2zDijFLyTNmUGTtvU6eHgiZyQ==
+dmg-builder@26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.0.tgz#6dc81be31f7ffe9f8a5fc77ce7f83eba33ae9aa7"
+  integrity sha512-NyyTgm1U56ytpFvuGjj63PYug3v+oYYbPc8e08EiHP6G4TvMwYabmSzFtanfoO1iI7xOljpW/fW7SNCHHElsfw==
   dependencies:
-    app-builder-lib "26.0.0-alpha.10"
-    builder-util "26.0.0-alpha.10"
-    builder-util-runtime "9.3.0-alpha.0"
+    app-builder-lib "26.0.0"
+    builder-util "26.0.0"
+    builder-util-runtime "9.3.0"
     fs-extra "^10.1.0"
     iconv-lite "^0.6.2"
     js-yaml "^4.1.0"
@@ -1232,35 +1232,35 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-builder@^26.0.0-alpha.10:
-  version "26.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.0-alpha.10.tgz#6f629f5f1f3340286af71cabd12d94edc53f15ea"
-  integrity sha512-QTitqOlP5aZ/8zhnxqjRb6BxSR7Kvwv07PoBGeIXADwSPHQhKhZ+S+GRFzUSYQrMTTJLGzUHbnAes6fZ3uThEA==
+electron-builder@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.0.tgz#f5c03b049e3e9b0d3da7737f93bf1a830d1f17bb"
+  integrity sha512-R1ZNTCtwjApiELkE4LTNIF6UkV+FMgyDIjILlsVvFak8Jr60cI9gu4q3lVALYzGBcFyzHKn2RPp6j0gl5kuVow==
   dependencies:
-    app-builder-lib "26.0.0-alpha.10"
-    builder-util "26.0.0-alpha.10"
-    builder-util-runtime "9.3.0-alpha.0"
+    app-builder-lib "26.0.0"
+    builder-util "26.0.0"
+    builder-util-runtime "9.3.0"
     chalk "^4.1.2"
-    dmg-builder "26.0.0-alpha.10"
+    dmg-builder "26.0.0"
     fs-extra "^10.1.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
     simple-update-notifier "2.0.0"
     yargs "^17.6.2"
 
-electron-log@^5.2.4:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.2.4.tgz#6b488d9db80aa3c6f3dc39bcd635fc9d1f79c8af"
-  integrity sha512-iX12WXc5XAaKeHg2QpiFjVwL+S1NVHPFd3V5RXtCmKhpAzXsVQnR3UEc0LovM6p6NkUQxDWnkdkaam9FNUVmCA==
+electron-log@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.3.0.tgz#503a911983db09156965595a7ee9a39f2d9d6384"
+  integrity sha512-ILgbh2k9IKbSaN8NAbQriVteEhmkdLo/e4J1dg+JIBTFzXS/kO8zNRZBh/4YPwIT/zeyxF1jP6Xz8GLsPE2IBQ==
 
-electron-publish@26.0.0-alpha.10:
-  version "26.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.0.0-alpha.10.tgz#16ac95acca2d796ca00c7a90ca27ebf31855f284"
-  integrity sha512-yUkCJD7MLN57d6PJ8PMcBCR35xytA+jHyrOiS/H0hlmTOWq1sXN+tIBylX4h0dD/C6mn75/y5eE156Pe2nccPw==
+electron-publish@26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.0.0.tgz#f37b9babe62885c2ee552af2817bf2048b566637"
+  integrity sha512-0MOeYp1IRDj+jdkWluEVMer8fpc/htwWJZdGQUMbbbhgMnX8AvDdwHuR0UdaPFLDJ076E9YHd2urkeFyLm7PUQ==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "26.0.0-alpha.10"
-    builder-util-runtime "9.3.0-alpha.0"
+    builder-util "26.0.0"
+    builder-util-runtime "9.3.0"
     chalk "^4.1.2"
     form-data "^4.0.0"
     fs-extra "^10.1.0"
@@ -1275,12 +1275,12 @@ electron-store@^8.2.0:
     conf "^10.2.0"
     type-fest "^2.17.0"
 
-electron-updater@^6.4.0-alpha.3:
-  version "6.4.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.4.0-alpha.3.tgz#4c33647c79f7ea1bcd184aac8a0b15d5a2b37cf1"
-  integrity sha512-pqbEqfKVly49UO3QhnRnzghK75BW6v6ZrpW/2vs+ZVVxHmrdwEl1bTjJFQl1LSIBABpBEwT5W9uwf3cKfrD+Bg==
+electron-updater@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.4.0.tgz#f413e5d1cb4fadde451eb7daa585ddb6332e2409"
+  integrity sha512-E2fqL3GrVaXGZm2w95s4kJuPIF633pi5GhEy1/ReOHjDW9h/C0mZ1LXcLq0LsyQ4vyVj9UsdRb4E+Zy/d7RKUw==
   dependencies:
-    builder-util-runtime "9.3.0-alpha.0"
+    builder-util-runtime "9.3.0"
     fs-extra "^10.1.0"
     js-yaml "^4.1.0"
     lazy-val "^1.0.5"
@@ -1289,10 +1289,10 @@ electron-updater@^6.4.0-alpha.3:
     semver "^7.6.3"
     tiny-typed-emitter "^2.1.0"
 
-electron@^34.0.0:
-  version "34.0.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-34.0.0.tgz#30ccedbc02d2f036868b8278960fd0e438ec0e52"
-  integrity sha512-fpaPb0lifoUJ6UJa4Lk8/0B2Ku/xDZWdc1Gkj67jbygTCrvSon0qquju6Ltx1Kz23GRqqlIHXiy9EvrjpY7/Wg==
+electron@^34.1.1:
+  version "34.1.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-34.1.1.tgz#1fc766e406401834fedb9747c4ca58671d9a1e46"
+  integrity sha512-1aDYk9Gsv1/fFeClMrxWGoVMl7uCUgl1pe26BiTnLXmAoqEXCa3f3sCKFWV+cuDzUjQGAZcpkWhGYTgWUSQrLA==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^20.9.0"
@@ -3202,10 +3202,10 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
-ts-api-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.0.0.tgz#b9d7d5f7ec9f736f4d0f09758b8607979044a900"
-  integrity sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==
+ts-api-utils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.0.1.tgz#660729385b625b939aaa58054f45c058f33f10cd"
+  integrity sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==
 
 tslib@^2.1.0, tslib@^2.6.2:
   version "2.7.0"
@@ -3234,14 +3234,14 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript-eslint@^8.21.0:
-  version "8.21.0"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.21.0.tgz#78bdb83a6d771f0312b128297d84a3111885fd08"
-  integrity sha512-txEKYY4XMKwPXxNkN8+AxAdX6iIJAPiJbHE/FpQccs/sxw8Lf26kqwC3cn0xkHlW8kEbLhkhCsjWuMveaY9Rxw==
+typescript-eslint@^8.23.0:
+  version "8.23.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.23.0.tgz#796deb48f040146b68fcc8cb07db68b87219a8d2"
+  integrity sha512-/LBRo3HrXr5LxmrdYSOCvoAMm7p2jNizNfbIpCgvG4HMsnoprRUOce/+8VJ9BDYWW68rqIENE/haVLWPeFZBVQ==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.21.0"
-    "@typescript-eslint/parser" "8.21.0"
-    "@typescript-eslint/utils" "8.21.0"
+    "@typescript-eslint/eslint-plugin" "8.23.0"
+    "@typescript-eslint/parser" "8.23.0"
+    "@typescript-eslint/utils" "8.23.0"
 
 typescript@^5.4.3:
   version "5.5.4"

docs/docs/.vitepress/sidebar.ts

@@ -135,8 +135,12 @@ export const sidebar = [
                         link: "/photos/faq/hidden-and-archive",
                     },
                     {
-                        text: "Machine Learning",
-                        link: "/photos/faq/machine-learning",
+                        text: "Face recognition",
+                        link: "/photos/faq/face-recognition",
+                    },
+                    {
+                        text: "Video streaming",
+                        link: "/photos/faq/video-streaming",
                     },
                 ],
             },

docs/docs/photos/faq/face-recognition.md

@@ -1,10 +1,10 @@
 ---
-title: Machine Learning FAQ
+title: Face recognition
 description:
-    Frequently asked questions about several features of Ente's ML suite
+    Frequently asked questions about Ente's face recognition
 ---
 
-# Machine Learning
+# Face recognition
 
 ## Can I merge or de-merge persons recognized by the app?
 
@@ -19,7 +19,7 @@ instead of typing the name again, tap on the already given name that should now
 be listed.
 
 De-merging a certain grouping can be done by going to the person, pressing
-`review suggestions` and then the top right `history icon`. Now press on the
+`Review suggestions` and then the top right `History icon`. Now press on the
 `minus icon` beside the group you want to de-merge.
 
 ### Desktop
@@ -29,6 +29,16 @@ selecting an existing person, and use the "Review suggestions" sheet to de-merge
 previously merged persons (click the top right history icon on the suggestion
 sheet to see the previous merges, and if necessary, undo them).
 
+## How can I remove an incorrectly grouped face from a person?
+
+On our mobile app, open up the person from the People section, click on the
+three dots to open up overflow menu, and click on Edit. Now you will be
+presented with the list of all photos that were merged to create this person.
+
+You can click on the merged photos and select the photos you think are
+incorrectly grouped (by long-pressing on them) and select "Remove" from the
+action bar that pops up to remove any incorrect faces.
+
 ## How do I change the cover for a recognized person?
 
 ### Mobile

docs/docs/photos/faq/metadata.md

@@ -1,12 +1,11 @@
 ---
 title: Metadata
-description: Handling of metadata, in particular creation dates, in Ente Photos
+description: Handling of metadata in Ente Photos
 ---
 
 # Metadata
 
-This document describes Ente's handling of metadata, in particular photo
-creation dates.
+This document describes Ente's handling of metadata
 
 ## Import
 
@@ -46,7 +45,7 @@ importing that folder into Ente**. This way, we will be able to always correctly
 map, for example, `flower.jpeg` and `flower.json` and show the same date for
 `flower.jpeg` that you would've seen within Google Photos.
 
-### Screenshots
+### File name
 
 In case the photo does not have a date in the Exif data (and it is not a Google
 takeout), for example, for screenshots or Whatsapp forwards, Ente will still try
@@ -57,6 +56,28 @@ and deduce the correct date for the file from the name of the file.
 > This process works great most of the time, but it is inherently based on
 > heuristics and is not exact.
 
+If we are unable to decipher the creation time from these 3 sources, we will set
+the upload time as the photo's creation time.
+
+## Modifications
+
+Ente supports modifications to the following metadata:
+- File name
+- Date & time
+- Location
+
+The first two options are available on both mobile and desktop, while the
+ability to update location is only available within our mobile apps.
+
+### Bulk modifications
+
+You can bulk-edit creation time of photos from our desktop app, by
+multi-selecting items and selecting the "Fix time" option from the action bar.
+
+You can bulk-edit location coordinates of photos from our mobile app, by
+multi-selecting items and selecting the "Edit location" option from the action
+bar.
+
 ## Export
 
 Ente guarantees that you will get back the _exact_ same original photos and

docs/docs/photos/faq/security-and-privacy.md

@@ -47,6 +47,9 @@ availability and durability. Our
 [reliability document](https://ente.io/reliability) provides in-depth
 information about our storage infrastructure and data replication strategies.
 
+In short, we store 3 copies of your data, across 3 different providers, in 3
+different countries. One of them is in an underground fall-out shelter in Paris.
+
 ### How does Ente's encryption compare to industry standards?
 
 Our encryption model goes beyond industry standards. While many services use

docs/docs/photos/faq/subscription.md

@@ -157,6 +157,21 @@ The same applies to monthly plans.
 If you prefer to have this credit refunded to your original payment method,
 please contact support@ente.io, and we'll assist you.
 
+## How can I update my payment method?
+
+You can view and manage your payment method by clicking on the green
+subscription card within the Ente app, and selecting the "Manage payment method"
+button.
+
+You will be able to see all of your previous invoices, with details regarding
+their payment status. In case of failed payments, you will also have an option
+to retry those charges.
+
+## How can I cancel my subscription?
+
+You can cancel your subscription by clicking on the green subscription card
+within the Ente app, and selecting the "Cancel subscription" button.
+
 ## Is there an x GB plan?
 
 We have experimented quite a bit and have found it hard to design a single

docs/docs/photos/faq/video-streaming.md

@@ -0,0 +1,63 @@
+---
+title: Video streaming FAQ
+description:
+    Frequently asked questions about Ente's video streaming feature
+---
+
+# Video streaming
+
+> [!NOTE]
+>
+> Video streaming is available in beta on mobile apps starting v0.9.98.
+
+### How to enable video streaming?
+
+- Open Settings -> General -> Advanced
+- Switch on the toggle for `Video streaming`
+
+### What happens when I enable video streaming?
+
+Enabling video streaming will start processing videos captured in the last 30
+days, generating streams for each. Both local and remote videos will be
+processed, so this may consume bandwidth for downloading of remote files and
+uploading of the generated streams.
+
+### How can I view video streams?
+
+Settings -> Backup > Backup status will show details regarding the processing
+status for videos. Processed videos will have a green play button next to them.
+You can open these videos by tapping on them.
+
+Processed videos will show a `Play stream` button, clicking which will load and
+play the stream.
+
+Clicking on the `Info` icon within the original video will show details about
+the generated stream.
+
+### What is a stream?
+
+Stream is an encrypted HLS file with an `.m3u8` playlist that helps play a video
+with support for seeking **without** downloading the full file.
+
+Currently it converts videos into `720p` with `2mbps` bitrate in `H.264` format.
+The generated stream is single blob (encrypted with AES) while the playlist file
+(`.m3u8`) is another blob (encrypted using XChaCha20).
+
+We cannot read the contents, duration or the number of chunks within the
+generated stream.
+
+### Will streams consume space in my storage?
+
+While this feature is in beta, we will not count the storage consumed by your
+streams against your storage quota. This may change in the future. If it does,
+we will provide an option to opt-in to one of the following:
+1. Original videos only
+2. Compressed streams only
+3. Both
+
+### Something doesn't seem right, what to do?
+
+As video streaming is still in beta, some things might not work correctly.
+Please create a thread within the `#feedback` channel on
+[Discord](https://discord.com/channels/948937918347608085/1121126215995113552)
+or reach out to [support@ente.io](mailto:support@ente.io).

docs/docs/photos/features/background.md

@@ -43,6 +43,10 @@ need to disable this "Optimize battery usage" mode in the system settings for
 Ente if you wish for Ente to automatically back up your photos in the
 background.
 
+On Android versions 15 and later, if an app is in private space and the private 
+space is locked, Android doesn’t allow the app to run any background processes. 
+As a result, background sync will not work.
+
 ### Desktop
 
 In addition to our mobile apps, the background sync also works on our desktop

docs/docs/photos/features/machine-learning.md

@@ -50,5 +50,5 @@ end-to-end encrypted security that we use for syncing your photos.
 Note that the desktop app does not currently support modifying the face
 groupings, that is only supported by the mobile app.
 
-For more information on how to use Machine Learning please check out
-[the FAQ](../faq/machine-learning).
+For more information on how to use Machine Learning for face recognition please
+check out [the FAQ](../faq/face-recognition).

docs/docs/photos/features/trash.md

@@ -10,3 +10,9 @@ automatically deleted from Trash after 30 days. You can manaully select photos
 to permanently delete or completely empty the trash if you wish.
 
 Items in trash are included in your used storage calculation.
+
+## Recovery
+
+If you have deleted items accidentally, you can recover them from Trash by
+selecting these items, and clicking the "Restore" button on the action bar that
+pops up.

docs/docs/photos/troubleshooting/sharing-logs.md

@@ -20,23 +20,25 @@ the logs just make the process a bit faster and easier.
 - Select for the option to _Report a Bug_.
 - Tap on _Report a bug_.
 
+## Desktop and Web
+
+- Open settings (click on the three horizontal lines button located at the top
+  left corner of the screen).
+- Click on the _Help_ option towards the bottom of settings.
+- Click on _View logs_. This will show you the location of the logs on your
+  system (desktop), or download them from the browser onto your computer (web).
+- Go back to settings.
+- Click on _Support_. This will open your email client where you can attach the
+  logs in the email and describe the issue.
+
 ## Desktop
 
-- Click on _Help_ menu at the top of your screen, and select the _View logs_
-  option.
-- Open settings (click on the three horizontal lines button located at the top
-  left corner of the screen).
-- Click on _Support_. This will open your email client where you can attach the
-  logs in the email and describe the issue.
+On the desktop app, you can also directly view the logs on your computer at the
+following locations:
 
-## Web
-
-- Open settings (click on the three horizontal lines button located at the top
-  left corner of the screen).
-- Click on _Debug Logs_ towards the bottom of settings.
-- Click on _Download logs_
-- Click on _Support_. This will open your email client where you can attach the
-  logs in the email and describe the issue.
+- macOS: `~/Library/Logs/ente/ente.log`
+- Linux: `~/.config/ente/logs/ente.log`
+- Windows: `%USERPROFILE%\AppData\Roaming\ente\logs\ente.log`
 
 ## Send email manually
 

infra/staff/src/components/UpdateSubscription.tsx

@@ -22,6 +22,10 @@ interface Subscription {
     originalTransactionID: string;
     expiryTime: number;
     userID: string;
+    attributes: {
+        customerID: string;
+        stripeAccountCountry: string;
+    };
 }
 
 interface UserDataResponse {
@@ -40,6 +44,10 @@ interface FormValues {
     transactionId: string;
     expiryTime: string | Date | null;
     userId: string;
+    attributes: {
+        customerID: string;
+        stripeAccountCountry: string;
+    };
 }
 
 const UpdateSubscription: React.FC<UpdateSubscriptionProps> = ({
@@ -53,6 +61,10 @@ const UpdateSubscription: React.FC<UpdateSubscriptionProps> = ({
         transactionId: "",
         expiryTime: "",
         userId: "",
+        attributes: {
+            "customerID": "",
+            "stripeAccountCountry": ""
+        },
     });
 
     const [isDatePickerOpen, setIsDatePickerOpen] = useState(false);
@@ -95,6 +107,10 @@ const UpdateSubscription: React.FC<UpdateSubscriptionProps> = ({
                         "",
                     expiryTime: expiryTime,
                     userId: userDataResponse.subscription.userID || "",
+                    attributes: {
+                        customerID: userDataResponse.subscription.attributes.customerID || "",
+                        stripeAccountCountry: userDataResponse.subscription.attributes.stripeAccountCountry || ""
+                    }
                 });
             } catch (error) {
                 console.error("Error fetching data:", error);
@@ -156,6 +172,10 @@ const UpdateSubscription: React.FC<UpdateSubscriptionProps> = ({
                 productId: values.productId,
                 paymentProvider: values.provider,
                 transactionId: values.transactionId,
+                attributes: {
+                    customerID: values.attributes.customerID,
+                    stripeAccountCountry: values.attributes.stripeAccountCountry
+                }
             };
 
             try {

mobile/android/app/proguard-rules.pro

@@ -2,3 +2,5 @@
 # To ensure that stack traces is unambiguous
 # https://developer.android.com/studio/build/shrink-code#decode-stack-trace
 -keepattributes LineNumberTable,SourceFile
+
+-keep class org.chromium.net.** { *; }

mobile/android/build.gradle

@@ -12,6 +12,11 @@ allprojects {
             url "${project(':background_fetch').projectDir}/libs"
         }
     }
+    ext {
+        compileSdkVersion   = 34
+        targetSdkVersion    = 34
+        appCompatVersion    = "1.7.0"
+    }
 }
 
 rootProject.buildDir = '../build'

mobile/android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx4608m
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true