More crash logging

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,22 +1,39 @@
 name: Report a bug
-description: Things that were working earlier but don't anymore
+description: For regressions only (things that were working earlier)
 labels: []
 body:
     - type: markdown
       attributes:
           value: |
-              **Checklist**
-              1. You've searched existing [issues](https://github.com/search?q=repo%3Aente-io%2Fente+&type=issues) and [discussions](https://github.com/search?q=repo%3Aente-io%2Fente+&type=discussions)
-              2. It was working earlier (otherwise use [enhancements](https://github.com/ente-io/ente/discussions/categories/enhancements))
-              3. It is not about self hosting (for those use [this](https://github.com/ente-io/ente/discussions/categories/q-a))
+              Before opening a new issue, **please** ensure
+              1. You are on the latest version,
+              2. You've searched for existing issues,
+              3. It was working earlier (otherwise use [this](https://github.com/ente-io/ente/discussions/categories/enhancements))
+              4. It is not about self hosting (otherwise use [this](https://github.com/ente-io/ente/discussions/categories/q-a))
     - type: textarea
       attributes:
           label: Description
+          description: >
+              Describe the bug and steps to reproduce the behaviour, and how it
+              differs from the previously working behaviour.
+      validations:
+          required: true
     - type: input
       attributes:
           label: Version
           description: The version can be seen at the bottom of settings.
           placeholder: e.g. v1.2.3
+    - type: input
+      attributes:
+          label: Last working version
+          description: >
+              The version where things were last known to be working. It is fine
+              if you don't remember the exact version (mention roughly then),
+              but **if there just isn't a last working version, then please file
+              it as an
+              [enhancement](https://github.com/ente-io/ente/discussions/categories/enhancements))**
+              (where the community upvotes can be used to help prioritize).
+          placeholder: e.g. v1.2.3
     - type: dropdown
       attributes:
           label: What product are you using?

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

@@ -5,7 +5,7 @@ on:
         branches: [main]
         paths:
             # Run workflow when auth's intl_en.arb is changed
-            - "mobile/apps/auth/lib/l10n/arb/app_en.arb"
+            - "auth/lib/l10n/arb/app_en.arb"
             # Or the workflow itself is changed
             - ".github/workflows/auth-crowdin.yml"
 
@@ -24,8 +24,8 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "mobile/apps/auth/"
-                  config: "mobile/apps/auth/crowdin.yml"
+                  base_path: "auth/"
+                  config: "auth/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: false

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

@@ -23,8 +23,8 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "mobile/apps/auth/"
-                  config: "mobile/apps/auth/crowdin.yml"
+                  base_path: "auth/"
+                  config: "auth/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: true

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

@@ -4,7 +4,7 @@ on:
     workflow_dispatch: # Allow manually running the action
 
 env:
-    FLUTTER_VERSION: "3.32.8"
+    FLUTTER_VERSION: "3.24.3"
 
 permissions:
     contents: write
@@ -15,7 +15,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: mobile/apps/auth
+                working-directory: auth
 
         steps:
             - name: Checkout code and submodules
@@ -55,7 +55,7 @@ jobs:
               with:
                   serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
                   packageName: io.ente.auth
-                  releaseFiles: mobile/apps/auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  releaseFiles: auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
 
             - name: Notify Discord

.github/workflows/auth-lint.yml

@@ -4,11 +4,11 @@ on:
     # Run on every pull request (open or push to it) that changes auth/
     pull_request:
         paths:
-            - "mobile/apps/auth/**"
+            - "auth/**"
             - ".github/workflows/auth-lint.yml"
 
 env:
-    FLUTTER_VERSION: "3.32.8"
+    FLUTTER_VERSION: "3.24.3"
 
 permissions:
     contents: read
@@ -18,7 +18,7 @@ jobs:
         runs-on: ubuntu-latest
         defaults:
             run:
-                working-directory: mobile/apps/auth
+                working-directory: auth
         steps:
             - name: Checkout code and submodules
               uses: actions/checkout@v4

.github/workflows/auth-release.yml

@@ -29,7 +29,7 @@ on:
             - "auth-v*"
 
 env:
-    FLUTTER_VERSION: "3.32.8"
+    FLUTTER_VERSION: "3.24.3"
 
 permissions:
     contents: write
@@ -40,7 +40,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: mobile/apps/auth
+                working-directory: auth
 
         steps:
             - name: Checkout code and submodules
@@ -98,7 +98,7 @@ jobs:
 
             - name: Install appimagetool
               run: |
-                  wget -O appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+                  wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
                   chmod +x appimagetool
                   mv appimagetool /usr/local/bin/
 
@@ -124,7 +124,7 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "mobile/apps/auth/artifacts/*"
+                  artifacts: "auth/artifacts/*"
                   draft: true
                   allowUpdates: true
                   updateOnlyUnreleased: true
@@ -136,7 +136,7 @@ jobs:
               with:
                   serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
                   packageName: io.ente.auth
-                  releaseFiles: mobile/apps/auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  releaseFiles: auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
 
     build-windows:
@@ -145,7 +145,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: mobile/apps/auth
+                working-directory: auth
 
         steps:
             - name: Checkout code and submodules
@@ -185,8 +185,8 @@ jobs:
                 trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
                 certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
                 files: |
-                      ${{ github.workspace }}/mobile/apps/auth/artifacts/ente-${{ github.ref_name }}-installer.exe
-                      ${{ github.workspace }}/mobile/apps/auth/ente-${{ github.ref_name }}-windows/auth.exe
+                      ${{ github.workspace }}/auth/artifacts/ente-${{ github.ref_name }}-installer.exe
+                      ${{ github.workspace }}/auth/ente-${{ github.ref_name }}-windows/auth.exe
                 file-digest: SHA256
                 timestamp-rfc3161: http://timestamp.acs.microsoft.com
                 timestamp-digest: SHA256  
@@ -201,7 +201,7 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "mobile/apps/auth/artifacts/*"
+                  artifacts: "auth/artifacts/*"
                   draft: true
                   allowUpdates: true
                   updateOnlyUnreleased: true
@@ -211,7 +211,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: mobile/apps/auth
+                working-directory: auth
 
         steps:
             - name: Checkout code and submodules
@@ -298,7 +298,7 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "mobile/apps/auth/artifacts/*"
+                  artifacts: "auth/artifacts/*"
                   draft: true
                   allowUpdates: true
                   updateOnlyUnreleased: true

.github/workflows/auth-win-sign.yml

@@ -0,0 +1,70 @@
+name: "Windows build & Sign (auth)"
+
+
+on:
+    workflow_dispatch: # Allow manually running the action
+
+env:
+    FLUTTER_VERSION: "3.24.3"
+
+permissions:
+    contents: write
+
+jobs:
+    build-windows:
+        runs-on: windows-latest
+        environment: "auth-win-build"
+
+        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: Build Windows installer
+              run: |
+                  flutter config --enable-windows-desktop
+                  # dart pub global activate flutter_distributor
+                  dart pub global activate --source git https://github.com/ente-io/flutter_distributor_fork --git-ref develop --git-path packages/flutter_distributor
+                  make innoinstall
+                  flutter_distributor package --platform=windows --targets=exe --skip-clean
+                  mv dist/**/*-windows-setup.exe artifacts/ente-${{ github.ref_name }}-installer.exe
+
+            - name: Retain Windows EXE and DLLs
+              run: cp -r build/windows/x64/runner/Release ente-${{ github.ref_name }}-windows
+
+            - name: Sign files with Trusted Signing
+              uses: azure/trusted-signing-action@v0
+              with:
+                azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+                azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+                azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+                endpoint: ${{ secrets.AZURE_ENDPOINT }}
+                trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
+                certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
+                files: |
+                      ${{ github.workspace }}/auth/artifacts/ente-${{ github.ref_name }}-installer.exe
+                      ${{ github.workspace }}/auth/ente-${{ github.ref_name }}-windows/auth.exe
+                file-digest: SHA256
+                timestamp-rfc3161: http://timestamp.acs.microsoft.com
+                timestamp-digest: SHA256  
+
+            - name: Zip Windows EXE and DLLs
+              run: tar.exe -a -c -f artifacts/ente-${{ github.ref_name }}-windows.zip ente-${{ github.ref_name }}-windows
+
+            - name: Generate checksums
+              run: sha256sum artifacts/ente-* > artifacts/sha256sum-windows

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

@@ -5,7 +5,7 @@ on:
         branches: [main]
         paths:
             # Run workflow when mobiles's intl_en.arb is changed
-            - "mobile/apps/photos/lib/l10n/intl_en.arb"
+            - "mobile/lib/l10n/intl_en.arb"
             # Or the workflow itself is changed
             - ".github/workflows/mobile-crowdin.yml"
 
@@ -24,8 +24,8 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "mobile/apps/photos/"
-                  config: "mobile/apps/photos/crowdin.yml"
+                  base_path: "mobile/"
+                  config: "mobile/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: false

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

@@ -1,4 +1,4 @@
-name: "Sync Crowdin translations (mobile/photos)"
+name: "Sync Crowdin translations (mobile)"
 
 on:
     schedule:
@@ -23,14 +23,14 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "mobile/apps/photos/"
-                  config: "mobile/apps/photos/crowdin.yml"
+                  base_path: "mobile/"
+                  config: "mobile/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: true
                   localization_branch_name: translations/mobile
                   create_pull_request: true
-                  pull_request_title: "[mobile/photos] New translations"
+                  pull_request_title: "[mobile] New translations"
                   pull_request_body: "New translations from [Crowdin](https://crowdin.com/project/ente-photos-app)"
                   pull_request_base_branch_name: "main"
                   project_id: 574741

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

@@ -1,179 +0,0 @@
-name: "Internal release (photos)"
-
-on:
-    schedule:
-        # Runs daily at 12:30 UTC (6:00 PM IST)
-        - cron: "30 12 * * *"
-    workflow_dispatch: # Allow manual trigger
-
-env:
-    FLUTTER_VERSION: "3.32.8"
-    RUST_VERSION: "1.86.0"
-
-permissions:
-    contents: read
-
-jobs:
-    build:
-        runs-on: ubuntu-latest
-
-        defaults:
-            run:
-                working-directory: mobile/apps/photos
-
-        steps:
-            - name: Checkout code and submodules
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Free up disk space
-              run: |
-                  echo "Initial disk usage:"
-                  df -h /
-                  # Get available space in KB
-                  INITIAL=$(df / | awk 'NR==2 {print $4}')
-                  
-                  echo -e "\n=== Removing .NET SDK (~20-25GB) ==="
-                  BEFORE=$(df / | awk 'NR==2 {print $4}')
-                  START=$(date +%s)
-                  sudo rm -rf /usr/share/dotnet
-                  END=$(date +%s)
-                  AFTER=$(df / | awk 'NR==2 {print $4}')
-                  FREED=$(( (AFTER - BEFORE) / 1048576 ))  # Convert KB to GB
-                  echo "Time: $((END-START))s | Freed: ${FREED}GB"
-                  
-                  echo -e "\n=== Removing cached tools (~5-10GB) ==="
-                  BEFORE=$(df / | awk 'NR==2 {print $4}')
-                  START=$(date +%s)
-                  sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-                  END=$(date +%s)
-                  AFTER=$(df / | awk 'NR==2 {print $4}')
-                  FREED=$(( (AFTER - BEFORE) / 1048576 ))
-                  echo "Time: $((END-START))s | Freed: ${FREED}GB"
-                  
-                  echo -e "\n=== Final Summary ==="
-                  FINAL=$(df / | awk 'NR==2 {print $4}')
-                  TOTAL_FREED=$(( (FINAL - INITIAL) / 1048576 ))
-                  echo "Total space freed: ${TOTAL_FREED}GB"
-                  echo "Final disk usage:"
-                  df -h /
-
-            - 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: Install Flutter Rust Bridge
-              run: cargo install flutter_rust_bridge_codegen
-
-            - name: Generate Rust bindings
-              run: flutter_rust_bridge_codegen generate
-
-            - name: Increment version code for build
-              run: |
-                  CURRENT_VERSION=$(grep '^version:' pubspec.yaml | sed 's/version: //')
-                  VERSION_NAME=$(echo $CURRENT_VERSION | cut -d'+' -f1)
-                  CURRENT_BUILD=$(echo $CURRENT_VERSION | cut -d'+' -f2)
-                  NEW_BUILD=$((CURRENT_BUILD + ${{ github.run_number }}))
-                  NEW_VERSION="${VERSION_NAME}+${NEW_BUILD}"
-
-                  sed -i "s/^version: .*/version: $NEW_VERSION/" pubspec.yaml
-                  echo "Building with version ${NEW_VERSION}"
-                  
-                  # Store version for later use
-                  echo "NEW_VERSION=${NEW_VERSION}" >> $GITHUB_ENV
-
-            - name: Prepare and validate changelog for Play Store
-              run: |
-                  mkdir -p whatsnew
-                  CHANGELOG_FILE="scripts/store_changes.txt"
-                  DISCORD_FILE="scripts/internal_changes.txt"
-                  OUTPUT_FILE="whatsnew/whatsnew-en-US"
-
-                  # Use provided changelog or fallback
-                  if [ -f "$CHANGELOG_FILE" ]; then
-                          head -c 500 "$CHANGELOG_FILE" > "$OUTPUT_FILE"
-                  else
-                          echo "Bug fixes and improvements" > "$OUTPUT_FILE"
-                  fi
-
-                  # Validate: file exists
-                  if [ ! -s "$OUTPUT_FILE" ]; then
-                          echo "❌ Changelog is empty."
-                          exit 1
-                  fi
-
-                  # Validate: <= 500 chars
-                  LENGTH=$(wc -m < "$OUTPUT_FILE")
-                  if [ "$LENGTH" -gt 500 ]; then
-                          echo "❌ Changelog exceeds 500 characters ($LENGTH)."
-                          exit 1
-                  fi
-
-                  # Validate: no markdown or HTML
-                  if grep -Eq '[\*\_\<\>\[\]\(\)]' "$OUTPUT_FILE"; then
-                          echo "❌ Changelog contains markdown/HTML formatting."
-                          exit 1
-                  fi
-
-                  echo "✅ Changelog valid:"
-                  cat "$OUTPUT_FILE"
-                  
-                  # Store changelog for Play Store (with escaped newlines)
-                  CHANGELOG_PLAYSTORE=$(cat "$OUTPUT_FILE" | sed ':a;N;$!ba;s/\n/\\n/g' | sed 's/"/\\"/g')
-                  echo "CHANGELOG=${CHANGELOG_PLAYSTORE}" >> $GITHUB_ENV
-                  
-                  # Store changelog for Discord (with proper newlines)
-                  CHANGELOG_DISCORD=$(cat "$DISCORD_FILE" | sed 's/"/\\"/g')
-                  echo "CHANGELOG_DISCORD<<EOF" >> $GITHUB_ENV
-                  echo "$CHANGELOG_DISCORD" >> $GITHUB_ENV
-                  echo "EOF" >> $GITHUB_ENV
-
-            - 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 --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 }}
-                  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/apps/photos/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
-                  track: internal
-                  whatsNewDirectory: mobile/apps/photos/whatsnew
-                  mappingFile: mobile/apps/photos/build/app/outputs/mapping/playstoreRelease/mapping.txt
-
-            - name: Notify Discord
-              uses: sarisia/actions-status-discord@v1
-              with:
-                  webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
-                  nodetail: true
-                  title: "🏆 Daily release Photos v${{ env.NEW_VERSION }} (Branch: ${{ github.ref_name }})"
-                  description: |
-                      **Version:** ${{ env.NEW_VERSION }}
-                      **Flutter:** ${{ env.FLUTTER_VERSION }}
-                      **Commit:** [${{ github.sha }}](${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }})
-                      **Download:** [Play Store](https://play.google.com/store/apps/details?id=io.ente.photos)
-
-                      **Changes:**
-                      ${{ env.CHANGELOG_DISCORD }}
-                  color: 0x00ff00

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

@@ -0,0 +1,77 @@
+name: "Internal release (photos)"
+
+on:
+    workflow_dispatch: # Allow manually running the action
+
+env:
+    FLUTTER_VERSION: "3.24.3"
+    RUST_VERSION: "1.85.1"
+
+permissions:
+    contents: write
+
+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: Install Rust ${{ env.RUST_VERSION }}
+              uses: dtolnay/rust-toolchain@master
+              with:
+                toolchain: ${{ env.RUST_VERSION }}
+
+            - name: Install Flutter Rust Bridge
+              run: cargo install flutter_rust_bridge_codegen
+
+            - 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 --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 }}
+                  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
+
+            - 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-internal-release.yml

@@ -0,0 +1,68 @@
+name: "Internal release (photos)"
+
+on:
+    workflow_dispatch: # Allow manually running the action
+
+env:
+    FLUTTER_VERSION: "3.24.3"
+
+permissions:
+    contents: write
+
+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 --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 }}
+                  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
+
+            - name: Notify Discord
+              uses: sarisia/actions-status-discord@v1
+              with:
+                  webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
+                  nodetail: true
+                  title: "🏆 Internal release Photos (Branch: ${{ github.ref_name }})"
+                  description: "[Download](https://play.google.com/store/apps/details?id=io.ente.photos)"
+                  color: 0x00ff00

.github/workflows/mobile-lint.yml

@@ -4,12 +4,11 @@ on:
     # Run on every pull request (open or push to it) that changes mobile/
     pull_request:
         paths:
-            - "mobile/apps/photos/**"
+            - "mobile/**"
             - ".github/workflows/mobile-lint.yml"
 
 env:
-    FLUTTER_VERSION: "3.32.8"
-    RUST_VERSION: "1.86.0"
+    FLUTTER_VERSION: "3.24.3"
 
 permissions:
     contents: read
@@ -19,7 +18,7 @@ jobs:
         runs-on: ubuntu-latest
         defaults:
             run:
-                working-directory: mobile/apps/photos
+                working-directory: mobile
         steps:
             - name: Checkout code and submodules
               uses: actions/checkout@v4
@@ -32,18 +31,7 @@ jobs:
                   channel: "stable"
                   flutter-version: ${{ env.FLUTTER_VERSION  }}
                   cache: true
-                  
+
             - run: flutter pub get
-                  
-            - name: Install Rust ${{ env.RUST_VERSION }}
-              uses: dtolnay/rust-toolchain@master
-              with:
-                  toolchain: ${{ env.RUST_VERSION }}
-                  
-            - name: Install Flutter Rust Bridge
-              run: cargo install flutter_rust_bridge_codegen
-              
-            - name: Generate Rust bindings
-              run: flutter_rust_bridge_codegen generate
 
             - run: flutter analyze --no-fatal-infos

.github/workflows/mobile-release.yml

@@ -9,7 +9,7 @@ on:
             - "photos-v*"
 
 env:
-    FLUTTER_VERSION: "3.32.8"
+    FLUTTER_VERSION: "3.24.3"
 
 permissions:
     contents: write
@@ -20,7 +20,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: mobile/apps/photos
+                working-directory: mobile
 
         steps:
             - name: Checkout code and submodules
@@ -28,38 +28,6 @@ jobs:
               with:
                   submodules: recursive
 
-            - name: Free up disk space
-              run: |
-                  echo "Initial disk usage:"
-                  df -h /
-                  # Get available space in KB
-                  INITIAL=$(df / | awk 'NR==2 {print $4}')
-                  
-                  echo -e "\n=== Removing .NET SDK (~20-25GB) ==="
-                  BEFORE=$(df / | awk 'NR==2 {print $4}')
-                  START=$(date +%s)
-                  sudo rm -rf /usr/share/dotnet
-                  END=$(date +%s)
-                  AFTER=$(df / | awk 'NR==2 {print $4}')
-                  FREED=$(( (AFTER - BEFORE) / 1048576 ))  # Convert KB to GB
-                  echo "Time: $((END-START))s | Freed: ${FREED}GB"
-                  
-                  echo -e "\n=== Removing cached tools (~5-10GB) ==="
-                  BEFORE=$(df / | awk 'NR==2 {print $4}')
-                  START=$(date +%s)
-                  sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-                  END=$(date +%s)
-                  AFTER=$(df / | awk 'NR==2 {print $4}')
-                  FREED=$(( (AFTER - BEFORE) / 1048576 ))
-                  echo "Time: $((END-START))s | Freed: ${FREED}GB"
-                  
-                  echo -e "\n=== Final Summary ==="
-                  FINAL=$(df / | awk 'NR==2 {print $4}')
-                  TOTAL_FREED=$(( (FINAL - INITIAL) / 1048576 ))
-                  echo "Total space freed: ${TOTAL_FREED}GB"
-                  echo "Final disk usage:"
-                  df -h /
-
             - name: Setup JDK 17
               uses: actions/setup-java@v1
               with:
@@ -72,12 +40,6 @@ jobs:
                   flutter-version: ${{ env.FLUTTER_VERSION  }}
                   cache: true
 
-            - name: Install Flutter Rust Bridge
-              run: cargo install flutter_rust_bridge_codegen
-
-            - name: Generate Rust bindings
-              run: flutter_rust_bridge_codegen generate
-
             - name: Setup keys
               uses: timheuer/base64-to-file@v1
               with:
@@ -100,5 +62,5 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "mobile/apps/photos/build/app/outputs/flutter-apk/ente-${{ github.ref_name }}.apk,mobile/apps/photos/build/app/outputs/flutter-apk/sha256sum"
+                  artifacts: "mobile/build/app/outputs/flutter-apk/ente-${{ github.ref_name }}.apk,mobile/build/app/outputs/flutter-apk/sha256sum"
                   draft: true

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

@@ -1,126 +0,0 @@
-name: "Internal Release V2 (photos)"
-
-on:
-  workflow_dispatch: # Manual trigger only
-
-env:
-  FLUTTER_VERSION: "3.32.8"
-  ANDROID_KEYSTORE_PATH: "keystore/ente_photos_key.jks"
-
-jobs:
-  build:
-    runs-on: macos-latest # Required for iOS builds
-    environment: "ios-build"
-    permissions:
-      contents: write
-
-    defaults:
-      run:
-        working-directory: mobile/apps/photos
-
-    steps:
-      # Common Setup
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Setup JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-
-      - name: Install Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-          cache: true
-
-      # Android Build 
-      - name: Setup Android signing key
-        uses: timheuer/base64-to-file@v1
-        with:
-          fileName: ${{ env.ANDROID_KEYSTORE_PATH }}
-          encodedString: ${{ secrets.SIGNING_KEY_PHOTOS }}
-
-      # - name: Build Android AAB
-      #   run: |
-      #     flutter build appbundle \
-      #       --dart-define=cronetHttpNoPlay=true \
-      #       --release \
-      #       --flavor playstore
-      #   env:
-      #     SIGNING_KEY_PATH: ${{ env.ANDROID_KEYSTORE_PATH }}
-      #     SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
-      #     SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD_PHOTOS }}
-      #     SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD_PHOTOS }}
-
-      # iOS Build (new secure implementation)
-      - name: Install fastlane
-        run: gem install fastlane
-      
-      - name: Create ExportOptions.plist
-        run: |
-          cat <<EOF > ios/ExportOptions.plist
-          <?xml version="1.0" encoding="UTF-8"?>
-          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-          <plist version="1.0">
-          <dict>
-              <key>method</key>
-              <string>app-store</string>
-              <key>teamID</key>
-              <string>${{ secrets.IOS_TEAM_ID }}</string>
-          </dict>
-          </plist>
-          EOF
-
-      - name: Setup App Store Connect API Key
-        run: |
-          echo '${{ secrets.IOS_API_KEY }}' > api_key.json
-          chmod 600 api_key.json
-
-      - name: Build iOS IPA
-        run: |
-          flutter build ipa \
-            --release \
-            --export-options-plist=ExportOptions.plist \
-            --dart-define=cronetHttpNoPlay=true
-        env:
-          SIGNING_TEAM_ID: ${{ secrets.IOS_TEAM_ID }}
-
-      # Uploads
-      # - name: Upload to Play Store
-      #   uses: r0adkll/upload-google-play@v1
-      #   with:
-      #     serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-      #     packageName: io.ente.photos
-      #     releaseFiles: build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
-      #     track: internal
-
-      - name: Upload to TestFlight
-        run: |
-          fastlane pilot upload \
-            --api_key_path api_key.json \
-            --ipa "build/ios/ipa/Ente Photos.ipa" \
-            --skip_waiting_for_build_processing \
-            --apple_id ${{ secrets.IOS_APPLE_ID }} \
-            --app_identifier "io.ente.photos"
-        env:
-          APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.IOS_API_KEY_ID }}
-          APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.IOS_ISSUER_ID }}
-          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.IOS_APP_SPECIFIC_PASSWORD }}
-
-      - name: Clean sensitive files
-        run: |
-          rm -f api_key.json
-          rm -f ${{ env.ANDROID_KEYSTORE_PATH }}
-
-      - name: Notify Discord
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
-          title: "🚀 Dual Platform Release Uploaded"
-          description: |
-            **Android**: [Play Store Internal](https://play.google.com/store/apps/details?id=io.ente.photos)
-            **iOS**: TestFlight build processing
-          color: 0x00ff00

.github/workflows/rust-lint.yml

@@ -1,44 +0,0 @@
-name: "Lint (rust)"
-
-on:
-    # Run on every pull request (open or push to it) that changes rust/
-    pull_request:
-        paths:
-            - "rust/**"
-            - ".github/workflows/rust-lint.yml"
-
-permissions:
-    contents: read
-
-# Cancel in-progress lint runs when a new commit is pushed.
-concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}
-    cancel-in-progress: true
-
-env:
-    RUSTFLAGS: -D warnings
-
-jobs:
-    lint:
-        runs-on: ubuntu-latest
-        defaults:
-            run:
-                working-directory: rust
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-
-            - name: Cache
-              uses: actions/cache@v4
-              with:
-                  path: |
-                      ~/.cargo/registry
-                      ~/.cargo/git
-                      target
-                  key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-            - run: cargo fmt --check
-
-            - run: cargo clippy --all-targets --all-features
-
-            - run: cargo build

.github/workflows/web-deploy.yml

@@ -54,18 +54,6 @@ jobs:
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
                   command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/photos web/apps/photos/out
 
-            - name: Build custom-albums
-              run: yarn build:photos
-              env:
-                  NEXT_PUBLIC_ENTE_ONLY_SERVE_ALBUMS_APP: 1
-
-            - name: Publish custom-albums
-              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/custom-albums web/apps/photos/out
-
             - name: Build accounts
               run: yarn build:accounts
 
@@ -105,13 +93,3 @@ jobs:
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
                   command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/payments web/apps/payments/dist
-
-            - name: Build locker
-              run: yarn build:locker
-
-            - name: Publish locker
-              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/locker web/apps/locker/out

.gitmodules

@@ -3,9 +3,9 @@
 	url = https://github.com/ente-io/sentry-dart.git
 	branch = sentry_flutter_ente
 [submodule "auth/flutter"]
-	path = mobile/apps/auth/flutter
+	path = auth/flutter
 	url = https://github.com/flutter/flutter.git
 	branch = stable
 [submodule "auth/assets/simple-icons"]
-	path = mobile/apps/auth/assets/simple-icons
+	path = auth/assets/simple-icons
 	url = https://github.com/simple-icons/simple-icons.git

CONTRIBUTING.md

@@ -1,42 +1,54 @@
 # Contributing
 
-- [Spread the word](#spread-the-word)
-- [Engage with the community](#engage-with-the-community)
-- [Translate](#translate)
-- [Document](#document)
+First and foremost, thank you for your interest in contributing to Ente 🙏
+
+There are many ways to contribute, and most of them don't require writing code.
+
+* [Spread the word](#spread-the-word)
+* [Engage with the community](#engage-with-the-community)
+* [Translate](#translate)
+* [Document](#document)
+
 
 ## Spread the word
 
-**This is 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.
+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
 
-Just hang around, enjoy the vibe. The Ente community — the people who are building Ente, and the people who are using Ente — hang out at various places depending on their proclivity:
+Just hang around, enjoy the vibe. Answer someone's query on our
+[Discord](https://discord.gg/z2YVKkycX3), or pile on in the sporadic #off-topic
+rants there. Chuckle (or wince!) at our [Twitter](https://twitter.com/enteio)
+memes. Suggest a new feature in our [Github
+Discussions](https://github.com/ente-io/ente/discussions/new?category=enhancements),
+or upvote the existing ones that you feel we should focus on first. Provide your
+opinion on existing threads.
 
-- [Discord](https://discord.ente.io)
-- [Mastodon](https://fosstodon.org/@ente)
-- [X / Twitter](https://twitter.com/enteio)
-- [Github Discussions](https://github.com/ente-io/ente/discussions)
-
-Just being around might seem a small thing, but it provides us energy. Knowing that there is a community of people who care for what we are building, **who want us to do better**.
+These might seem like small things, but it provides us energy. Knowing that
+there is a community of people who care for what we are building.
 
 ## Translate
 
-Visit our Crowdin projects to help with translations:
+If you're interested in helping out with translation, please visit our Crowdin
+projects to get started:
+
+| Project  |  |
+| ------------- | ------------- |
+| [Auth](https://crowdin.com/project/ente-authenticator-app)  | [![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app)  |
+| [Photos](https://crowdin.com/project/ente-photos-app)  | [![Crowdin](https://badges.crowdin.net/ente-photos-app/localized.svg)](https://crowdin.com/project/ente-photos-app)  |
+| [Photos Web / Desktop](https://crowdin.com/project/ente-photos-web)  | [![Crowdin](https://badges.crowdin.net/ente-photos-web/localized.svg)](https://crowdin.com/project/ente-photos-web)  |
 
-| Project                                                             |                                                                                                                                   |
-| ------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
-| [Auth](https://crowdin.com/project/ente-authenticator-app)          | [![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app) |
-| [Photos](https://crowdin.com/project/ente-photos-app)               | [![Crowdin](https://badges.crowdin.net/ente-photos-app/localized.svg)](https://crowdin.com/project/ente-photos-app)               |
-| [Photos Web / Desktop](https://crowdin.com/project/ente-photos-web) | [![Crowdin](https://badges.crowdin.net/ente-photos-web/localized.svg)](https://crowdin.com/project/ente-photos-web)               |
 
 If your language is not listed for translation, please [create a GitHub
 issue](https://github.com/ente-io/ente/issues/new?title=Request+for+New+Language+Translation&body=Language+name%3A+%0AProject%3A+auth%2Fphotos%2Fboth)
 to have it added. It is okay to have partial translations. Once ~90% of the
 strings in a language get translated, we will start surfacing it in the apps.
 
+Thank you for your support.
+
 ## Document
 
 The help guides and FAQs for users of Ente products are also open source, and
@@ -48,9 +60,25 @@ 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. Consider some well-scoped changes, say like adding more [custom icons to auth](mobile/apps/auth/docs/adding-icons.md), or fixing a specific bug.
+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).
 
-Code that changes the behaviour of the product might not get merged, at least not initially. The PR can serve as a discussion bed, but you might find it easier to just start a discussion instead, or post your perspective in the (likely) existing thread about the behaviour change or new feature you wish for.
+Each of the individual product/platform specific directories in this repository
+have instructions on setting up a dev environment.
+
+For anything beyond trivial bug fixes, please use
+[discussions](https://github.com/ente-io/ente/discussions) instead of performing
+code changes directly.
+
+> [!TIP]
+>
+> Please remember that code is a important, but small, part of the overall big
+> picture that makes a product a joy to use. Something that's easy in code is
+> not necessarily the right choice for the product as a whole. So we'll repeat -
+> there are other ways to contribute than code that we'd request you to
+> consider.
 
 ## Leave a review or star
 

auth/.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.24.3"
+}

auth/.gitignore

@@ -44,5 +44,4 @@ android/key.properties
 dist/
 
 # FVM Version Cache
-.fvm/
-lib/l10n/arb/*.dart
+.fvm/

auth/README.md

@@ -19,16 +19,16 @@ without relying on third party stores.
 You can alternatively install the build from PlayStore or F-Droid.
 
 <a href="https://play.google.com/store/apps/details?id=io.ente.auth">
-  <img height="59" src="../../../.github/assets/play-store-badge.png">
+  <img height="59" src="../.github/assets/play-store-badge.png">
 </a>
 <a href="https://f-droid.org/packages/io.ente.auth/">
-  <img height="59" src="../../../.github/assets/f-droid-badge.png">
+  <img height="59" src="../.github/assets/f-droid-badge.png">
 </a>
 
 ### iOS / Apple Silicon macOS
 
 <a href="https://apps.apple.com/us/app/ente-authenticator/id6444121398">
-  <img height="59" src="../../../.github/assets/app-store-badge.svg">
+  <img height="59" src="../.github/assets/app-store-badge.svg">
 </a>
 
 ### Desktop
@@ -44,7 +44,7 @@ or managing your secrets, please use our mobile or desktop app.
 
 ## 🧑‍💻 Build from source
 
-1. [Install Flutter v3.32.8](https://flutter.dev/docs/get-started/install).
+1. [Install Flutter](https://flutter.dev/docs/get-started/install)
 
 2. Pull in all submodules with `git submodule update --init --recursive`
 
@@ -73,7 +73,7 @@ If the code you're working needs to modify user facing strings, see
 ## 🔩 Architecture
 
 The architecture that powers end-to-end encrypted storage and sync of your
-tokens has been documented [here](architecture/README.md).
+tokens has been documented [here](../architecture/README.md).
 
 ## 🌍 Translate
 
@@ -98,7 +98,7 @@ more, see [docs/adding-icons](docs/adding-icons.md).
 The best way to support this project is by checking out [Ente
 Photos](../mobile/README.md) or spreading the word.
 
-For more ways to contribute, see [../../../CONTRIBUTING.md](../../../CONTRIBUTING.md).
+For more ways to contribute, see [../CONTRIBUTING.md](../CONTRIBUTING.md).
 
 ## Certificate Fingerprints
 
@@ -113,4 +113,4 @@ apksigner verify --print-certs <path_to_apk>
 ## ⭐️ About
 
 To know more about Ente and the ways to get in touch or seek help, see [our main
-README](../../../README.md) or visit [ente.io](https://ente.io).
+README](../README.md) or visit [ente.io](https://ente.io).

auth/android/app/build.gradle

@@ -30,13 +30,10 @@ if (keystorePropertiesFile.exists()) {
 
 android {
     namespace "io.ente.auth"
-    compileSdk 36
+    compileSdk 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        // Flag to enable support for the new language APIs
-        coreLibraryDesugaringEnabled true
-        // Sets Java compatibility to Java 8
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -59,8 +56,8 @@ android {
         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 22
-        targetSdkVersion 35
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -118,7 +115,4 @@ flutter {
     source '../..'
 }
 
-dependencies {
-    // For AGP 7.4+
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
-}
+dependencies {}