[auth] Lint fix (#2248)

## Description

## Tests

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -4,11 +4,12 @@ labels: ["triage"]
 body:
     - type: markdown
       attributes:
-          value: >
-              Before opening a new issue, please ensure you are on the latest
-              version (it might've already been fixed), and that you've searched
-              for existing issues (please add you observations as a comment
-              there instead of creating a duplicate).
+          value: |
+              Before opening a new bug report, please ensure
+              1. you are on the latest version (it might've already been fixed),
+              2. you've searched for existing issues (please add your observations as a comment there instead of creating a duplicate).
+
+              If you are self hosting, please create a community [Q&A](https://github.com/ente-io/ente/discussions/categories/q-a) instead.
     - type: textarea
       attributes:
           label: Description
@@ -16,7 +17,8 @@ body:
               Please describe the bug. If possible, also include the steps to
               reproduce the behaviour, and the expected behaviour (sometimes
               bugs are just expectation mismatches, in which case this would be
-              a good fit for Discussions).
+              a good fit for [feature
+              requests](https://github.com/ente-io/ente/discussions/categories/feature-requests)).
       validations:
           required: true
     - type: input

.github/workflows/auth-crowdin-push.yml

@@ -0,0 +1,31 @@
+name: "Push sources to Crowdin (auth)"
+
+on:
+    push:
+        branches: [main]
+        paths:
+            # Run workflow when auth's intl_en.arb is changed
+            - "auth/lib/l10n/arb/app_en.arb"
+            # Or the workflow itself is changed
+            - ".github/workflows/auth-crowdin.yml"
+
+jobs:
+    push-sources-to-crowdin:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Crowdin's action
+              uses: crowdin/github-action@v2
+              with:
+                  base_path: "auth/"
+                  config: "auth/crowdin.yml"
+                  upload_sources: true
+                  upload_translations: false
+                  download_translations: false
+                  project_id: 575169
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/auth-crowdin-sync.yml

@@ -1,17 +1,10 @@
 name: "Sync Crowdin translations (auth)"
 
 on:
-    push:
-        branches: [main]
-        paths:
-            # Run workflow when auth's intl_en.arb is changed
-            - "mobile/lib/l10n/arb/app_en.arb"
-            # Or the workflow itself is changed
-            - ".github/workflows/auth-crowdin.yml"
     schedule:
         # See: [Note: Run workflow on specific days of the week]
-        - cron: "50 1 * * 2,5"
-    # Also allow manually running the workflow
+        - cron: "50 1 * * 2"
+    # Also allow manually running the workflow.
     workflow_dispatch:
 
 jobs:
@@ -23,14 +16,14 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Crowdin's action
-              uses: crowdin/github-action@v1
+              uses: crowdin/github-action@v2
               with:
                   base_path: "auth/"
                   config: "auth/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: true
-                  localization_branch_name: crowdin-translations-auth
+                  localization_branch_name: translations/auth
                   create_pull_request: true
                   skip_untranslated_strings: true
                   pull_request_title: "[auth] New translations"

.github/workflows/auth-lint.yml

@@ -3,13 +3,13 @@ name: "Lint (auth)"
 on:
     # Run on every push to a branch other than main that changes auth/
     push:
-        branches-ignore: [main, "deploy/**"]
+        branches-ignore: [main]
         paths:
             - "auth/**"
             - ".github/workflows/auth-lint.yml"
 
 env:
-    FLUTTER_VERSION: "3.19.3"
+    FLUTTER_VERSION: "3.22.2"
 
 jobs:
     lint:

.github/workflows/auth-release.yml

@@ -17,8 +17,8 @@ name: "Release (auth)"
 # We use a suffix like `-test` to indicate that these are test tags, and that
 # they belong to a pre-release.
 #
-# If you need to do multiple tests, add a +x at the end of the tag. e.g.
-# `auth-v1.2.3-test+1`.
+# If you need to do multiple tests, add a .x at the end of the tag. e.g.
+# `auth-v1.2.3-test.1`.
 #
 # Once the testing is done, also delete the tag(s) please.
 
@@ -29,7 +29,7 @@ on:
             - "auth-v*"
 
 env:
-    FLUTTER_VERSION: "3.19.3"
+    FLUTTER_VERSION: "3.22.2"
 
 jobs:
     build-ubuntu:
@@ -85,29 +85,21 @@ jobs:
             - name: Install dependencies for desktop build
               run: |
                   sudo apt-get update -y
-                  sudo apt-get install -y libsecret-1-dev libsodium-dev libwebkit2gtk-4.0-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm libsqlite3-dev locate appindicator3-0.1 libappindicator3-dev libffi7
-
-            - name: Install appimagetool
-              run: |
-                  wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
-                  chmod +x appimagetool
-                  mv appimagetool /usr/local/bin/
+                  sudo apt-get install -y libsecret-1-dev libsodium-dev libwebkit2gtk-4.0-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config libsqlite3-dev locate appindicator3-0.1 libappindicator3-dev libffi-dev libtiff5
+                  sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
 
             - name: Build desktop app
               run: |
                   flutter config --enable-linux-desktop
                   dart pub global activate flutter_distributor
                   flutter_distributor package --platform=linux --targets=deb --skip-clean
-                  flutter_distributor package --platform=linux --targets=rpm --skip-clean
-                  flutter_distributor package --platform=linux --targets=appimage --skip-clean
                   mv dist/**/*-*-linux.deb artifacts/ente-${{ github.ref_name }}-x86_64.deb
-                  mv dist/**/*-*-linux.rpm artifacts/ente-${{ github.ref_name }}-x86_64.rpm
-                  mv dist/**/*-*-linux.AppImage artifacts/ente-${{ github.ref_name }}-x86_64.AppImage
               env:
                   LIBSODIUM_USE_PKGCONFIG: 1
 
-            - name: Generate checksums
-              run: sha256sum artifacts/ente-* > artifacts/sha256sum
+            - name: Generate checksums and push to artifacts
+              run: |
+                sha256sum artifacts/ente-* > artifacts/sha256sum-apk-deb
 
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
@@ -127,6 +119,61 @@ jobs:
                   releaseFiles: auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
 
+    build-fedora-etc:
+      runs-on: ubuntu-latest
+
+      defaults:
+        run:
+          working-directory: auth
+
+      steps:
+        - name: Checkout code and submodules
+          uses: actions/checkout@v4
+          with:
+            submodules: recursive
+
+        - name: Install Flutter ${{ env.FLUTTER_VERSION  }}
+          uses: subosito/flutter-action@v2
+          with:
+            channel: "stable"
+            flutter-version: ${{ env.FLUTTER_VERSION  }}
+            cache: true
+
+        - name: Create artifacts directory
+          run: mkdir artifacts
+
+        - name: Install dependencies for desktop build
+          run: |
+            sudo apt-get update -y
+            sudo apt-get install -y libsecret-1-dev libsodium-dev libwebkit2gtk-4.0-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff5
+            sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
+
+        - name: Install appimagetool
+          run: |
+            wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+            chmod +x appimagetool
+            mv appimagetool /usr/local/bin/
+
+        - name: Build desktop app
+          run: |
+            flutter config --enable-linux-desktop
+            dart pub global activate flutter_distributor
+            flutter_distributor package --platform=linux --targets=rpm --skip-clean
+            flutter_distributor package --platform=linux --targets=appimage --skip-clean
+            mv dist/**/*-*-linux.rpm artifacts/ente-${{ github.ref_name }}-x86_64.rpm
+            mv dist/**/*-*-linux.AppImage artifacts/ente-${{ github.ref_name }}-x86_64.AppImage
+
+        - name: Generate checksums
+          run: sha256sum artifacts/ente-* >> artifacts/sha256sum-rpm-appimage
+
+        - name: Create a draft GitHub release
+          uses: ncipollo/release-action@v1
+          with:
+            artifacts: "auth/artifacts/*"
+            draft: true
+            allowUpdates: true
+            updateOnlyUnreleased: true
+
     build-windows:
         runs-on: windows-latest
 

.github/workflows/desktop-lint.yml

@@ -0,0 +1,30 @@
+name: "Lint (desktop)"
+
+on:
+    # Run on every push to a branch other than main that changes desktop/
+    push:
+        branches-ignore: [main]
+        paths:
+            - "desktop/**"
+            - ".github/workflows/desktop-lint.yml"
+
+jobs:
+    lint:
+        runs-on: ubuntu-latest
+        defaults:
+            run:
+                working-directory: desktop
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup node and enable yarn caching
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: "yarn"
+                  cache-dependency-path: "desktop/yarn.lock"
+
+            - run: yarn install
+
+            - run: yarn lint

.github/workflows/docs-deploy.yml

@@ -37,11 +37,8 @@ jobs:
               run: yarn build
 
             - name: Publish
-              uses: cloudflare/pages-action@1
+              uses: cloudflare/wrangler-action@v3
               with:
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: help
-                  directory: docs/docs/.vitepress/dist
-                  wranglerVersion: "3"
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=help docs/docs/.vitepress/dist

.github/workflows/docs-verify-build.yml

@@ -6,7 +6,7 @@ name: "Verify build (docs)"
 on:
     # Run on every push to a branch other than main that changes docs/
     push:
-        branches-ignore: [main, "deploy/**"]
+        branches-ignore: [main]
         paths:
             - "docs/**"
             - ".github/workflows/docs-verify-build.yml"

.github/workflows/infra-deploy-staff.yml

@@ -0,0 +1,43 @@
+name: "Deploy (staff)"
+
+on:
+    # Run on every push to main that changes infra/staff/
+    push:
+        branches: [main]
+        paths:
+            - "infra/staff/**"
+            - ".github/workflows/infra-deploy-staff.yml"
+    # Also allow manually running the workflow
+    workflow_dispatch:
+
+jobs:
+    lint:
+        runs-on: ubuntu-latest
+
+        defaults:
+            run:
+                working-directory: infra/staff
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup node and enable yarn caching
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: "yarn"
+                  cache-dependency-path: "infra/staff/yarn.lock"
+
+            - name: Install dependencies
+              run: yarn install
+
+            - name: Build
+              run: yarn build
+
+            - name: Publish
+              uses: cloudflare/wrangler-action@v3
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/staff infra/staff/dist

.github/workflows/infra-lint-staff.yml

@@ -0,0 +1,34 @@
+name: "Lint (staff)"
+
+on:
+    # Run on every push to a branch other than main that changes infra/staff/
+    push:
+        branches-ignore: [main]
+        paths:
+            - "infra/staff/**"
+            - ".github/workflows/infra-deploy-staff.yml"
+
+jobs:
+    deploy:
+        runs-on: ubuntu-latest
+
+        defaults:
+            run:
+                working-directory: infra/staff
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup node and enable yarn caching
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: "yarn"
+                  cache-dependency-path: "infra/staff/yarn.lock"
+
+            - name: Install dependencies
+              run: yarn install
+
+            - name: Lint
+              run: yarn lint

.github/workflows/mobile-crowdin-push.yml

@@ -0,0 +1,31 @@
+name: "Push sources to Crowdin (mobile)"
+
+on:
+    push:
+        branches: [main]
+        paths:
+            # Run workflow when mobiles's intl_en.arb is changed
+            - "mobile/lib/l10n/intl_en.arb"
+            # Or the workflow itself is changed
+            - ".github/workflows/mobile-crowdin.yml"
+
+jobs:
+    push-sources-to-crowdin:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Crowdin's action
+              uses: crowdin/github-action@v2
+              with:
+                  base_path: "mobile/"
+                  config: "mobile/crowdin.yml"
+                  upload_sources: true
+                  upload_translations: false
+                  download_translations: false
+                  project_id: 574741
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/mobile-crowdin-sync.yml

@@ -1,17 +1,10 @@
 name: "Sync Crowdin translations (mobile)"
 
 on:
-    push:
-        branches: [main]
-        paths:
-            # Run workflow when mobiles's intl_en.arb is changed
-            - "mobile/lib/l10n/intl_en.arb"
-            # Or the workflow itself is changed
-            - ".github/workflows/mobile-crowdin.yml"
     schedule:
         # See: [Note: Run workflow on specific days of the week]
-        - cron: "40 1 * * 2,5"
-    # Also allow manually running the workflow
+        - cron: "40 1 * * 2"
+    # Also allow manually running the workflow.
     workflow_dispatch:
 
 jobs:
@@ -23,14 +16,14 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Crowdin's action
-              uses: crowdin/github-action@v1
+              uses: crowdin/github-action@v2
               with:
                   base_path: "mobile/"
                   config: "mobile/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: true
-                  localization_branch_name: crowdin-translations-mobile
+                  localization_branch_name: translations/mobile
                   create_pull_request: true
                   skip_untranslated_strings: true
                   pull_request_title: "[mobile] New translations"

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

@@ -0,0 +1,56 @@
+name: "Internal release (photos)"
+
+on:
+    workflow_dispatch: # Allow manually running the action
+
+env:
+    FLUTTER_VERSION: "3.22.2"
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        defaults:
+            run:
+                working-directory: mobile
+
+        steps:
+            - name: Checkout code and submodules
+              uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+
+            - name: Setup JDK 17
+              uses: actions/setup-java@v1
+              with:
+                  java-version: 17
+
+            - name: Install Flutter ${{ env.FLUTTER_VERSION  }}
+              uses: subosito/flutter-action@v2
+              with:
+                  channel: "stable"
+                  flutter-version: ${{ env.FLUTTER_VERSION  }}
+                  cache: true
+
+            - name: Setup keys
+              uses: timheuer/base64-to-file@v1
+              with:
+                  fileName: "keystore/ente_photos_key.jks"
+                  encodedString: ${{ secrets.SIGNING_KEY_PHOTOS }}
+
+            - name: Build PlayStore AAB
+              run: |
+                  flutter build appbundle --release --flavor playstore
+              env:
+                  SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"
+                  SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
+                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD_PHOTOS }}
+                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD_PHOTOS }}
+
+            - name: Upload AAB to PlayStore
+              uses: r0adkll/upload-google-play@v1
+              with:
+                  serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+                  packageName: io.ente.photos
+                  releaseFiles: mobile/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  track: internal

.github/workflows/mobile-lint.yml

@@ -3,13 +3,14 @@ name: "Lint (mobile)"
 on:
     # Run on every push to a branch other than main that changes mobile/
     push:
-        branches-ignore: [main, f-droid, "deploy/**"]
+        branches-ignore: [main, f-droid]
         paths:
             - "mobile/**"
             - ".github/workflows/mobile-lint.yml"
 
 env:
-    FLUTTER_VERSION: "3.13.4"
+
+    FLUTTER_VERSION: "3.22.2"
 
 jobs:
     lint:

.github/workflows/mobile-release.yml

@@ -9,7 +9,7 @@ on:
             - "photos-v*"
 
 env:
-    FLUTTER_VERSION: "3.13.4"
+    FLUTTER_VERSION: "3.22.2"
 
 jobs:
     build:
@@ -25,6 +25,11 @@ jobs:
               with:
                   submodules: recursive
 
+            - name: Setup JDK 17
+              uses: actions/setup-java@v1
+              with:
+                  java-version: 17
+
             - name: Install Flutter ${{ env.FLUTTER_VERSION  }}
               uses: subosito/flutter-action@v2
               with:

.github/workflows/server-lint.yml

@@ -3,7 +3,7 @@ name: "Lint (server)"
 on:
     # Run on every push to a branch other than main that changes server/
     push:
-        branches-ignore: [main, "deploy/**"]
+        branches-ignore: [main]
         paths:
             - "server/**"
             - ".github/workflows/server-lint.yml"

.github/workflows/server-publish.yml

@@ -32,7 +32,14 @@ jobs:
                   image: server
                   registry: ghcr.io
                   enableBuildKit: true
+                  multiPlatform: true
+                  platform: linux/amd64,linux/arm64
                   buildArgs: GIT_COMMIT=${{ inputs.commit }}
                   tags: ${{ inputs.commit }}, latest
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Tag as server/ghcr
+              run: |
+                  git tag -f server/ghcr
+                  git push -f origin server/ghcr

.github/workflows/web-crowdin-push-both.yml

@@ -0,0 +1,34 @@
+name: "Push Crowdin translations (web)"
+
+# This is a variant of web-crowdin-sync.yml that uploads the translated strings in
+# addition to the source strings.
+#
+# This allows us to change the strings in our source code for an automated
+# refactoring (e.g. renaming a key), and then run this workflow to update the
+# data in Crowdin taking our source code as the source of truth.
+
+on:
+    # Trigger manually, or using
+    # `gh workflow run web-crowdin-push-both.yml --ref <my-branch>`
+    workflow_dispatch:
+
+jobs:
+    push-both-to-crowdin:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Crowdin push
+              uses: crowdin/github-action@v2
+              with:
+                  base_path: "web/"
+                  config: "web/crowdin.yml"
+                  upload_sources: true
+                  upload_translations: true
+                  download_translations: false
+                  project_id: 569613
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/web-crowdin-sync.yml

@@ -5,7 +5,7 @@ on:
         branches: [main]
         paths:
             # Run workflow when web's en-US/translation.json is changed
-            - "web/apps/photos/public/locales/en-US/translation.json"
+            - "web/packages/next/locales/en-US/translation.json"
             # Or the workflow itself is changed
             - ".github/workflows/web-crowdin.yml"
     schedule:
@@ -16,8 +16,8 @@ on:
         # and FRI, this can be set to `2,5`.
         #
         # See also: [Note: Run workflow every 24 hours]
-        - cron: "20 1 * * 2,5"
-    # Also allow manually running the workflow
+        - cron: "20 1 * * 2"
+    # Also allow manually running the workflow.
     workflow_dispatch:
 
 jobs:
@@ -29,14 +29,14 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Crowdin's action
-              uses: crowdin/github-action@v1
+              uses: crowdin/github-action@v2
               with:
                   base_path: "web/"
                   config: "web/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: true
-                  localization_branch_name: crowdin-translations-web
+                  localization_branch_name: translations/web
                   create_pull_request: true
                   skip_untranslated_strings: true
                   pull_request_title: "[web] New translations"

.github/workflows/web-deploy-accounts.yml

@@ -1,43 +0,0 @@
-name: "Deploy (accounts)"
-
-on:
-    push:
-        # Run workflow on pushes to the deploy/accounts
-        branches: [deploy/accounts]
-
-jobs:
-    deploy:
-        runs-on: ubuntu-latest
-
-        defaults:
-            run:
-                working-directory: web
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Setup node and enable yarn caching
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-                  cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
-
-            - name: Install dependencies
-              run: yarn install
-
-            - name: Build accounts
-              run: yarn build:accounts
-
-            - name: Publish accounts
-              uses: cloudflare/pages-action@1
-              with:
-                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: deploy/accounts
-                  directory: web/apps/accounts/out
-                  wranglerVersion: "3"

.github/workflows/web-deploy-auth.yml

@@ -1,43 +0,0 @@
-name: "Deploy (auth)"
-
-on:
-    push:
-        # Run workflow on pushes to the deploy/auth
-        branches: [deploy/auth]
-
-jobs:
-    deploy:
-        runs-on: ubuntu-latest
-
-        defaults:
-            run:
-                working-directory: web
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Setup node and enable yarn caching
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-                  cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
-
-            - name: Install dependencies
-              run: yarn install
-
-            - name: Build auth
-              run: yarn build:auth
-
-            - name: Publish auth
-              uses: cloudflare/pages-action@1
-              with:
-                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: deploy/auth
-                  directory: web/apps/auth/out
-                  wranglerVersion: "3"

.github/workflows/web-deploy-cast.yml

@@ -1,43 +0,0 @@
-name: "Deploy (cast)"
-
-on:
-    push:
-        # Run workflow on pushes to the deploy/cast
-        branches: [deploy/cast]
-
-jobs:
-    deploy:
-        runs-on: ubuntu-latest
-
-        defaults:
-            run:
-                working-directory: web
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Setup node and enable yarn caching
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-                  cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
-
-            - name: Install dependencies
-              run: yarn install
-
-            - name: Build cast
-              run: yarn build:cast
-
-            - name: Publish cast
-              uses: cloudflare/pages-action@1
-              with:
-                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: deploy/cast
-                  directory: web/apps/cast/out
-                  wranglerVersion: "3"

.github/workflows/web-deploy-one.yml

@@ -0,0 +1,61 @@
+name: "Deploy one (web)"
+
+on:
+    workflow_dispatch:
+        inputs:
+            app:
+                description: "App to build and deploy"
+                type: choice
+                required: true
+                default: "photos"
+                options:
+                    - "accounts"
+                    - "auth"
+                    - "cast"
+                    - "payments"
+                    - "photos"
+
+jobs:
+    deploy:
+        runs-on: ubuntu-latest
+
+        defaults:
+            run:
+                working-directory: web
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+
+            - name: Setup node and enable yarn caching
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: "yarn"
+                  cache-dependency-path: "web/yarn.lock"
+
+            - name: Install dependencies
+              run: yarn install
+
+            - name: Build ${{ inputs.app }}
+              run: yarn build:${{ inputs.app }}
+
+            - name: Publish ${{ inputs.app }} to preview
+              uses: cloudflare/wrangler-action@v3
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  # [Note: Wrangler commit-dirty]
+                  #
+                  # Without the --commit-dirty flag, running the wrangler-action
+                  # always prints a warning when used:
+                  #
+                  #     Warning: Your working directory is a git repo and has uncommitted changes
+                  #     To silence this warning, pass in --commit-dirty=true
+                  #
+                  # There is no clear documentation of if passing this is
+                  # harmless, but all indications and in-practice tests seem to
+                  # indicate so.
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/${{ inputs.app }} web/apps/${{ inputs.app }}/out

.github/workflows/web-deploy-payments.yml

@@ -1,43 +0,0 @@
-name: "Deploy (payments)"
-
-on:
-    push:
-        # Run workflow on pushes to the deploy/payments
-        branches: [deploy/payments]
-
-jobs:
-    deploy:
-        runs-on: ubuntu-latest
-
-        defaults:
-            run:
-                working-directory: web
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Setup node and enable yarn caching
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-                  cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
-
-            - name: Install dependencies
-              run: yarn install
-
-            - name: Build payments
-              run: yarn build:payments
-
-            - name: Publish payments
-              uses: cloudflare/pages-action@1
-              with:
-                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: deploy/payments
-                  directory: web/apps/payments/out
-                  wranglerVersion: "3"

.github/workflows/web-deploy-photos.yml

@@ -1,43 +0,0 @@
-name: "Deploy (photos)"
-
-on:
-    push:
-        # Run workflow on pushes to the deploy/photos
-        branches: [deploy/photos]
-
-jobs:
-    deploy:
-        runs-on: ubuntu-latest
-
-        defaults:
-            run:
-                working-directory: web
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Setup node and enable yarn caching
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20
-                  cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
-
-            - name: Install dependencies
-              run: yarn install
-
-            - name: Build photos
-              run: yarn build:photos
-
-            - name: Publish photos
-              uses: cloudflare/pages-action@1
-              with:
-                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: deploy/photos
-                  directory: web/apps/photos/out
-                  wranglerVersion: "3"

.github/workflows/web-deploy-preview.yml

@@ -1,4 +1,4 @@
-name: "Preview (web)"
+name: "Deploy preview (web)"
 
 on:
     workflow_dispatch:
@@ -34,7 +34,7 @@ jobs:
               with:
                   node-version: 20
                   cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
+                  cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
               run: yarn install
@@ -43,11 +43,8 @@ jobs:
               run: yarn build:${{ inputs.app }}
 
             - name: Publish ${{ inputs.app }} to preview
-              uses: cloudflare/pages-action@1
+              uses: cloudflare/wrangler-action@v3
               with:
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: preview
-                  directory: web/apps/${{ inputs.app }}/out
-                  wranglerVersion: "3"
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=preview web/apps/${{ inputs.app }}/out

.github/workflows/web-deploy-staging.yml

@@ -0,0 +1,86 @@
+name: "Deploy staging (web)"
+
+on:
+    schedule:
+        # Run everyday at ~3:00 PM IST
+        #
+        # See: [Note: Run workflow every 24 hours]
+        - cron: "25 9 * * *"
+    # Also allow manually running the workflow
+    workflow_dispatch:
+
+jobs:
+    deploy:
+        runs-on: ubuntu-latest
+
+        defaults:
+            run:
+                working-directory: web
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+
+            - name: Setup node and enable yarn caching
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: "yarn"
+                  cache-dependency-path: "web/yarn.lock"
+
+            - name: Install dependencies
+              run: yarn install
+
+            - name: Build photos
+              run: yarn build:photos
+              env:
+                  NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT: https://albums.ente.sh
+
+            - name: Publish photos
+              uses: cloudflare/wrangler-action@v3
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=n-photos web/apps/photos/out
+
+            - name: Build accounts
+              run: yarn build:accounts
+
+            - name: Publish accounts
+              uses: cloudflare/wrangler-action@v3
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=n-accounts web/apps/accounts/out
+
+            - name: Build auth
+              run: yarn build:auth
+
+            - name: Publish auth
+              uses: cloudflare/wrangler-action@v3
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=n-auth  web/apps/auth/out
+
+            - name: Build cast
+              run: yarn build:cast
+
+            - name: Publish cast
+              uses: cloudflare/wrangler-action@v3
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=n-cast web/apps/cast/out
+
+            - name: Build payments
+              run: yarn build:payments
+
+            - name: Publish payments
+              uses: cloudflare/wrangler-action@v3
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=n-payments web/apps/payments/dist

.github/workflows/web-deploy.yml

@@ -1,17 +1,21 @@
-name: "Nightly (web)"
+name: "Deploy (web)"
 
 on:
     schedule:
         # [Note: Run workflow every 24 hours]
         #
-        # Run every 24 hours - First field is minute, second is hour of the day
-        # This runs 23:15 UTC everyday - 1 and 15 are just arbitrary offset to
-        # avoid scheduling it on the exact hour, as suggested by GitHub.
+        # Run everyday at ~8:00 AM IST (except Sundays).
+        #
+        # First field is minute, second is hour of the day. Last is day of week,
+        # 0 being Sunday.
+        #
+        # Add a few minutes of offset to avoid scheduling on exact hourly
+        # boundaries (recommended by GitHub to avoid congestion).
         #
         # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
         # https://crontab.guru/
         #
-        - cron: "15 23 * * *"
+        - cron: "25 2 * * 1-6"
     # Also allow manually running the workflow
     workflow_dispatch:
 
@@ -34,74 +38,57 @@ jobs:
               with:
                   node-version: 20
                   cache: "yarn"
-                  cache-dependency-path: "docs/yarn.lock"
+                  cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
               run: yarn install
 
+            - name: Build photos
+              run: yarn build:photos
+
+            - name: Publish photos
+              uses: cloudflare/wrangler-action@v3
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/photos web/apps/photos/out
+
             - name: Build accounts
               run: yarn build:accounts
 
             - name: Publish accounts
-              uses: cloudflare/pages-action@1
+              uses: cloudflare/wrangler-action@v3
               with:
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: n-accounts
-                  directory: web/apps/accounts/out
-                  wranglerVersion: "3"
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/accounts web/apps/accounts/out
 
             - name: Build auth
               run: yarn build:auth
 
             - name: Publish auth
-              uses: cloudflare/pages-action@1
+              uses: cloudflare/wrangler-action@v3
               with:
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: n-auth
-                  directory: web/apps/auth/out
-                  wranglerVersion: "3"
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/auth web/apps/auth/out
 
             - name: Build cast
               run: yarn build:cast
 
             - name: Publish cast
-              uses: cloudflare/pages-action@1
+              uses: cloudflare/wrangler-action@v3
               with:
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: n-cast
-                  directory: web/apps/cast/out
-                  wranglerVersion: "3"
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/cast web/apps/cast/out
 
             - name: Build payments
               run: yarn build:payments
 
             - name: Publish payments
-              uses: cloudflare/pages-action@1
+              uses: cloudflare/wrangler-action@v3
               with:
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: n-payments
-                  directory: web/apps/payments/out
-                  wranglerVersion: "3"
-
-            - name: Build photos
-              run: yarn build:photos
-              env:
-                  NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT: https://albums.ente.sh
-
-            - name: Publish photos
-              uses: cloudflare/pages-action@1
-              with:
-                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  projectName: ente
-                  branch: n-photos
-                  directory: web/apps/photos/out
-                  wranglerVersion: "3"
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/payments web/apps/payments/dist

.github/workflows/web-lint.yml

@@ -3,7 +3,7 @@ name: "Lint (web)"
 on:
     # Run on every push to a branch other than main that changes web/
     push:
-        branches-ignore: [main, "deploy/**"]
+        branches-ignore: [main]
         paths:
             - "web/**"
             - ".github/workflows/web-lint.yml"

.gitignore

@@ -1,5 +1,6 @@
-# Let folks use their custom .vscode settings
+# Let folks use their custom editor settings
 .vscode
+.idea
 
 # macOS
 .DS_Store

CONTRIBUTING.md

@@ -12,9 +12,10 @@ There are many ways to contribute, and most of them don't require writing code.
 
 ## Spread the word
 
-This is perhaps the most impactful contribution you can make. Spread the word.
-Online on your favorite social media channels. Offline to your friends and
-family who are looking for a privacy-friendly alternative to big tech.
+This is perhaps the most impactful contribution you can make. [Spread the
+word](https://help.ente.io/photos/features/referral-program/). Online on your
+favorite social media channels. Offline to your friends and family who are
+looking for a privacy-friendly alternative to big tech.
 
 ## Engage with the community
 
@@ -59,7 +60,10 @@ See [docs/](docs/README.md) for how to edit these documents.
 
 ## Code contributions
 
-If you'd like to contribute code, it is best to start small.
+Code is a small aspect of community, and the ways mentioned above are more
+important in helping us. But if you'd _really_ like to contribute code, it is
+best to start small. Consider some well-scoped changes, say like adding more
+[custom icons to auth](auth/docs/adding-icons.md).
 
 Each of the individual product/platform specific directories in this repository
 have instructions on setting up a dev environment and making changes. The issues
@@ -73,7 +77,10 @@ us](https://github.com/ente-io/ente/discussions). Discussing your idea with us
 first ensures that everyone is on the same page before you start working on your
 change.
 
-## Star
+## Leave a review or star
 
 If you haven't already done so, consider [starring this
-repository](https://github.com/ente-io/ente/stargazers).
+repository](https://github.com/ente-io/ente/stargazers) or leaving a review on
+[PlayStore](https://play.google.com/store/apps/details?id=io.ente.auth),
+[AppStore](https://apps.apple.com/us/app/ente-authenticator/id6444121398) or
+[AlternativeTo](https://alternativeto.net/software/ente-authenticator/).

README.md

@@ -60,8 +60,8 @@ Our labour of love. Two years ago, while building Ente Photos, we realized that
 there was no open source end-to-end encrypted authenticator app. We already had
 the building blocks, so we built one.
 
-Ente Auth is currently free. If in the future we convert this to a paid service,
-existing users will be grandfathered in.
+Ente Auth is free, and will remain free forever. If you like the service and
+want to give back, please check out Ente Photos or spread the word.
 
 <br />
 
@@ -70,7 +70,7 @@ existing users will be grandfathered in.
 [<img height="42" src=".github/assets/app-store-badge.svg">](https://apps.apple.com/app/id6444121398)
 [<img height="42" src=".github/assets/play-store-badge.png">](https://play.google.com/store/apps/details?id=io.ente.auth)
 [<img height="42" src=".github/assets/f-droid-badge.png">](https://f-droid.org/packages/io.ente.auth/)
-[<img height="42" src=".github/assets/desktop-badge.png">](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v2)
+[<img height="42" src=".github/assets/desktop-badge.png">](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v3)
 [<img height="42" src=".github/assets/web-badge.svg">](https://auth.ente.io)
 
 </div>

SECURITY.md

@@ -1,51 +1,54 @@
+# Security Policy
+
 Ente believes that working with security researchers across the globe is crucial
 to keeping our users safe. If you believe you've found a security issue in our
-product or service, we encourage you to notify us, by email (security@ente.io)
-or by [filling this
-form](https://github.com/ente-io/ente/security/advisories/new) We welcome
-working with you to resolve the issue promptly. Thanks in advance!
+product or service, we encourage you to notify us by email at security@ente.io
+or by
+[filling out this form](https://github.com/ente-io/ente/security/advisories/new).
+We welcome working with you to resolve the issue promptly. Thanks in advance!
 
 ## Disclosure Policy
 
-- Let us know as soon as possible upon discovery of a potential security issue,
-  and we'll make every effort to quickly resolve the issue.
-- Provide us a reasonable amount of time to resolve the issue before any
-  disclosure to the public or a third-party. We may publicly disclose the issue
-  before resolving it, if appropriate.
-- Make a good faith effort to avoid privacy violations, destruction of data, and
-  interruption or degradation of our service. Only interact with accounts you
-  own or with explicit permission of the account holder.
-- If you would like to encrypt your report, please use the PGP key with long ID
-  `E273695C0403F34F74171932DF6DDDE98EBD2394` (available in the public keyserver
-  pool).
+-   Let us know as soon as possible upon discovery of a potential security
+    issue, and we'll make every effort to quickly resolve the issue.
+-   Provide us with a reasonable amount of time to resolve the issue before any
+    disclosure to the public or a third party. We may publicly disclose the
+    issue before resolving it if appropriate.
+-   Make a good faith effort to avoid privacy violations, destruction of data,
+    and interruption or degradation of our service. Only interact with accounts
+    you own or with the explicit permission of the account holder.
+-   If you would like to encrypt your report, please use the PGP key with long
+    ID `E273695C0403F34F74171932DF6DDDE98EBD2394` (available in the public
+    keyserver pool).
 
 ## In-scope
 
-- Security issues in any current release of Ente's services. Product downloads
-  are available at https://ente.io. Source code is available at
-  https://github.com/ente-io.
+-   Security issues in any current release of Ente's services. Product downloads
+    are available at [https://ente.io](https://ente.io). Source code is
+    available at [https://github.com/ente-io](https://github.com/ente-io).
 
 ## Exclusions
 
-The following bug classes are out-of scope:
+The following bug classes are out of scope:
 
-- Bugs that are already reported on any of [Ente's issue
-  trackers](https://github.com/ente-io), or that we already know of (Note that
-  some of our issue tracking is private)
-- Issues in an upstream software dependency (ex: Flutter, Next.js etc) which are
-  already reported to the upstream maintainer
-- Attacks requiring physical access to a user's device
-- Self-XSS
-- Issues related to software or protocols not under ente's control
-- Vulnerabilities in outdated versions of ente
-- Missing security best practices that do not directly lead to a vulnerability
-- Issues that do not have any impact on the general public
+-   Bugs that are already reported on any of
+    [Ente's issue trackers](https://github.com/ente-io) or that we already know
+    of (note that some of our issue tracking is private).
+-   Issues in an upstream software dependency (e.g., Flutter, Next.js, etc.)
+    that are already reported to the upstream maintainer.
+-   Attacks requiring physical access to a user's device.
+-   Self-XSS.
+-   Issues related to software or protocols not under Ente's control.
+-   Vulnerabilities in outdated versions of Ente.
+-   Missing security best practices that do not directly lead to a
+    vulnerability.
+-   Issues that do not have any impact on the general public.
 
 While researching, we'd like to ask you to refrain from:
 
-- Denial of service
-- Spamming
-- Social engineering (including phishing) of Ente staff or contractors
-- Any physical attempts against Ente property or data centers
+-   Denial of service
+-   Spamming
+-   Social engineering (including phishing) of Ente staff or contractors
+-   Any physical attempts against Ente property or data centers
 
 Thank you for helping keep Ente and our users safe!

auth/README.md

@@ -12,7 +12,7 @@ multi-device sync.
 ### Android
 
 This repository's [GitHub
-releases](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v2)
+releases](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v3)
 contains APKs, built straight from source. These builds keep themselves updated,
 without relying on third party stores.
 
@@ -33,7 +33,7 @@ You can alternatively install the build from PlayStore or F-Droid.
 
 ### Desktop
 
-You can [**download**](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v2)
+You can [**download**](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v3)
 a native desktop app from this repository's GitHub releases. The desktop app
 works on Windows, Linux and macOS.
 
@@ -95,13 +95,10 @@ more, see [docs/adding-icons](docs/adding-icons.md).
 
 ## 💚 Contribute
 
-For more ways to contribute, see [../CONTRIBUTING.md](../CONTRIBUTING.md).
+The best way to support this project is by checking out [Ente
+Photos](../mobile/README.md) or spreading the word.
 
-You can also support us by giving this project a ⭐ star on GitHub or by leaving
-a review on
-[PlayStore](https://play.google.com/store/apps/details?id=io.ente.auth),
-[AppStore](https://apps.apple.com/us/app/ente-authenticator/id6444121398) or
-[AlternativeTo](https://alternativeto.net/software/ente-authenticator/).
+For more ways to contribute, see [../CONTRIBUTING.md](../CONTRIBUTING.md).
 
 ## ⭐️ About
 

auth/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
@@ -32,7 +29,18 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 34
+    namespace "io.ente.auth"
+    compileSdk 34
+    ndkVersion flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -46,6 +54,8 @@ android {
 
     defaultConfig {
         applicationId "io.ente.auth"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 21
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
@@ -105,13 +115,4 @@ flutter {
     source '../..'
 }
 
-dependencies {
-    implementation 'io.sentry:sentry-android:2.0.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.google.guava:guava:28.2-android'
-    implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-}
+dependencies {}

auth/android/app/src/debug/AndroidManifest.xml

@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.ente.auth">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

auth/android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="io.ente.auth">
+          xmlns:tools="http://schemas.android.com/tools">
     <application android:name="${applicationName}"
-                 android:label="auth"
+                 android:label="Auth"
                  android:icon="@mipmap/launcher_icon"
                  android:usesCleartextTraffic="true"
                  android:requestLegacyExternalStorage="true"

auth/android/app/src/main/play/listings/en-US/full_description.txt

@@ -0,0 +1,40 @@
+Ente Auth helps you generate and store 2 step verification (2FA)
+tokens on your mobile devices.
+
+
+FEATURES
+
+- Secure Backups
+Auth provides end-to-end encrypted cloud backups so that you don't have to worry
+about losing your tokens. We use the same protocols Ente Photos uses to encrypt
+and preserve your data.
+
+- Multi Device Synchronization
+Auth will automatically sync the 2FA tokens you add to your account, across all
+your devices. Every new device you sign into will have access to these tokens.
+
+- Web access
+You can access your 2FA code from any web browser by visiting https://auth.ente.io .
+
+- Offline Mode
+Auth generates 2FA tokens offline, so your network connectivity will not get in
+the way of your workflow.
+
+- Import and Export Tokens
+You can add tokens to Auth by one of the following methods: 
+1. Scanning a QR code
+2. Manually entering (copy-pasting) a 2FA secret
+3. Bulk importing from a file that contains a list of codes in the following format:
+
+otpauth://totp/provider.com:you@email.com?secret=YOUR_SECRET
+
+The codes maybe separated by new lines or commas.
+
+You can also export the codes you have added to Auth, to an **unencrypted** text
+file, that adheres to the above format.
+
+
+SUPPORT
+
+If you need help, please reach out to support@ente.io, and a human will get in touch with you.
+If you have feature requests, please create an issue @ https://github.com/ente-io/ente

auth/android/app/src/main/play/listings/en-US/short_description.txt

@@ -0,0 +1 @@
+Auth is a FOSS authenticator app that provides end-to-end encrypted backups for your 2FA secrets.

auth/android/app/src/main/play/listings/en-US/title.txt

@@ -0,0 +1 @@
+Ente Auth

auth/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/ic_launcher_background"/>
+  <background android:drawable="@drawable/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
   <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

auth/android/app/src/main/res/values-night-v31/styles.xml

@@ -4,7 +4,10 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground">#000000</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -15,4 +18,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
+</resources>

auth/android/app/src/main/res/values-night/styles.xml

@@ -7,6 +7,7 @@
         <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.

auth/android/app/src/main/res/values-v31/styles.xml

@@ -4,7 +4,10 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#FFFFFF</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

auth/android/app/src/profile/AndroidManifest.xml

@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.ente.auth">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

auth/android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.22'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -21,6 +8,8 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(':app')
 }
 

auth/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true

auth/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

auth/android/settings.gradle

@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+}
+
+include ":app"

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

@@ -17,11 +17,17 @@
     {
       "title": "AscendEX"
     },
+    {
+      "title": "Bitfinex"
+    },
     {
       "title": "BitMEX"
     },
     {
-      "title": "Bitfinex"
+      "title": "BitSkins"
+    },
+    {
+      "title": "Bitstamp"
     },
     {
       "title": "Bitvavo",
@@ -32,7 +38,10 @@
     },
     {
       "title": "Bloom Host",
-      "slug": "bloom_host"
+      "slug": "bloom_host",
+      "altNames": [
+        "Bloom Host Billing"
+      ]
     },
     {
       "title": "BorgBase",
@@ -51,16 +60,29 @@
     {
       "title": "CERN"
     },
+    {
+      "title": "ChangeNOW"
+    },
     {
       "title": "Channel Island Hosting",
       "slug": "cih",
       "hex": "D14633"
     },
     {
-      "title": "ConfigCat"
+      "title": "Cloudflare"
     },
     {
-      "title": "Cloudflare"
+      "title": "CloudAMQP"
+    },
+    {
+      "title": "ConfigCat",
+      "slug": "configcat"
+    },
+    {
+      "title": "CoinDCX"
+    },
+    {
+      "title": "ConfigCat"
     },
     {
       "title": "Control D",
@@ -80,9 +102,18 @@
     {
       "title": "DEGIRO"
     },
+    {
+      "title": "DirectAdmin"
+    },
     {
       "title": "Discourse"
     },
+    {
+      "title": "DMarket"
+    },
+    {
+      "title": "Doppler"
+    },
     {
       "title": "dus.net",
       "slug": "dusnet"
@@ -117,6 +148,9 @@
     {
       "title": "GitLab"
     },
+    {
+      "title": "GMX"
+    },
     {
       "title": "Google"
     },
@@ -135,21 +169,28 @@
       "slug": "healthchecks"
     },
     {
-      "title": "ING"
+      "title": "Hivelocity"
     },
     {
-      "title": "INWX"
+      "title": "IceDrive",
+      "slug": "Icedrive"
+    },
+    {
+      "title": "ING"
     },
     {
       "title": "Instagram"
     },
     {
-      "title": "IVPN",
-      "slug": "IVPN"
+      "title": "INWX"
     },
     {
-      "title": "IceDrive",
-      "slug": "Icedrive"
+      "title": "Itch.io",
+      "slug": "itch_io"
+    },
+    {
+      "title": "IVPN",
+      "slug": "IVPN"
     },
     {
       "title": "Jagex",
@@ -158,10 +199,6 @@
     {
       "title": "Kagi"
     },
-    {
-      "title": "KPN",
-      "color": "00CC00"
-    },
     {
       "title": "Kick",
       "hex": "53FC19"
@@ -172,6 +209,10 @@
     {
       "title": "Koofr"
     },
+    {
+      "title": "KPN",
+      "color": "00CC00"
+    },
     {
       "title": "Kraken",
       "hex": "5848D5"
@@ -190,6 +231,19 @@
     {
       "title": "Letterboxd"
     },
+    {
+      "title": "Local",
+      "slug": "local_wp",
+      "altNames": [
+        "LocalWP",
+        "Local WP",
+        "Local Wordpress"
+      ]
+    },
+    {
+      "title": "Marketplace.tf",
+      "slug": "marketplacedottf"
+    },
     {
       "title": "Mastodon",
       "altNames": [
@@ -203,7 +257,24 @@
     },
     {
       "title": "Mercado Livre",
-      "slug": "mercado_livre"
+      "slug": "mercado_livre",
+      "altNames": [
+        "Mercado Libre",
+        "MercadoLibre",
+        "MercadoLivre"
+      ]
+    },
+    {
+      "title": "Microsoft"
+    },
+    {
+      "title": "Migros"
+    },
+    {
+      "title": "Mintos"
+    },
+    {
+      "title": "Mozilla"
     },
     {
       "title": "Murena",
@@ -212,19 +283,14 @@
       ],
       "slug": "ecloud"
     },
-    {
-      "title": "Microsoft"
-    },
-    {
-      "title": "Mintos"
-    },
-    {
-      "title": "Mozilla"
-    },
     {
       "title": "MyFRITZ!Net",
       "slug": "myfritz"
     },
+    {
+      "title": "Name.com",
+      "slug": "name_com"
+    },
     {
       "title": "NextDNS"
     },
@@ -241,6 +307,10 @@
     {
       "title": "Notion"
     },
+    {
+      "title": "NuCommunity",
+      "slug": "nucommunity"
+    },
     {
       "title": "NVIDIA"
     },
@@ -294,6 +364,22 @@
     {
       "title": "Proxmox"
     },
+    {
+      "title": "Real-Debrid",
+      "slug": "real_debrid"
+    },
+    {
+      "title": "Registro br",
+      "slug": "registro_br",
+      "altNames": [
+        "Registro br",
+        "registrobr",
+        "Registro.br"
+      ]
+    },
+    {
+      "title": "Render"
+    },
     {
       "title": "Revolt",
       "hex": "858585"
@@ -302,11 +388,18 @@
       "title": "Rockstar Games",
       "slug": "rockstar_games"
     },
+    {
+      "title": "RuneMate",
+      "hex": "2ECC71"
+    },
     {
       "title": "Rust Language Forum",
       "slug": "rust_language_forum",
       "hex": "000000"
     },
+    {
+      "title": "Samsung"
+    },
     {
       "title": "Sendgrid"
     },
@@ -323,6 +416,9 @@
       "title": "Skiff",
       "hex": "EF5A3C"
     },
+    {
+      "title": "Skinport"
+    },
     {
       "title": "Snapchat"
     },
@@ -331,6 +427,9 @@
       "slug": "standardnotes",
       "hex": "2173E6"
     },
+    {
+      "title": "Surfshark"
+    },
     {
       "title": "Synology DSM",
       "slug": "synology_dsm"
@@ -341,7 +440,11 @@
       "hex": "FFFFFF"
     },
     {
-      "title": "Techlore"
+      "title": "Techlore",
+      "altNames": [
+        "Techlore Courses",
+        "Techlore Forums"
+      ]
     },
     {
       "title": "Termius",
@@ -371,10 +474,21 @@
       "title": "Twingate",
       "hex": "858585"
     },
+    {
+      "title": "Twitch",
+      "altNames": [
+        "Twitch.tv",
+        "Twitch tv"
+      ]
+    },
     {
       "title": "Ubisoft",
       "hex": "4285f4"
     },
+    {
+      "title": "Ubuntu One",
+      "slug": "ubuntu_one"
+    },
     {
       "title": "Unity",
       "hex": "858585"
@@ -398,6 +512,13 @@
       "title": "WYZE",
       "slug": "wyze"
     },
+    {
+      "title": "WorkOS",
+      "slug": "workos",
+      "altNames": [
+        "Work OS"
+      ]
+    },
     {
       "title": "X",
       "altNames": [
@@ -412,6 +533,14 @@
         "Яндекс"
       ],
       "slug": "Yandex"
+    },
+    {
+      "title": "YNAB",
+      "altNames": [
+        "You Need A Budget"
+      ],
+      "slug": "ynab",
+      "hex": "3B5EDA"
     }
   ]
 }