diff --git a/.github/assets/github-badge.png b/.github/assets/github-badge.png
deleted file mode 100644
index ef3207c95..000000000
Binary files a/.github/assets/github-badge.png and /dev/null differ
diff --git a/.github/workflows/auth-release.yml b/.github/workflows/auth-release.yml
index 1203bc4a3..cc3e598e3 100644
--- a/.github/workflows/auth-release.yml
+++ b/.github/workflows/auth-release.yml
@@ -85,7 +85,8 @@ 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
+ 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 libffi-dev libtiff5
+ sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
- name: Install appimagetool
run: |
@@ -173,6 +174,9 @@ jobs:
- 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
+
- name: Create a draft GitHub release
uses: ncipollo/release-action@v1
with:
@@ -267,6 +271,9 @@ jobs:
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+ - name: Generate checksums
+ run: shasum -a 256 artifacts/ente-* > artifacts/sha256sum-macos
+
- name: Create a draft GitHub release
uses: ncipollo/release-action@v1
with:
diff --git a/.github/workflows/server-publish.yml b/.github/workflows/server-publish.yml
index 393fa899d..1ba193517 100644
--- a/.github/workflows/server-publish.yml
+++ b/.github/workflows/server-publish.yml
@@ -32,6 +32,8 @@ jobs:
image: server
registry: ghcr.io
enableBuildKit: true
+ multiPlatform: true
+ platform: linux/amd64,linux/arm64,linux/arm/v7
buildArgs: GIT_COMMIT=${{ inputs.commit }}
tags: ${{ inputs.commit }}, latest
username: ${{ github.actor }}
diff --git a/.github/workflows/web-crowdin.yml b/.github/workflows/web-crowdin.yml
index f834e62f3..d98685065 100644
--- a/.github/workflows/web-crowdin.yml
+++ b/.github/workflows/web-crowdin.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:
diff --git a/.github/workflows/web-deploy-accounts.yml b/.github/workflows/web-deploy-accounts.yml
index 8164aea44..61411cac6 100644
--- a/.github/workflows/web-deploy-accounts.yml
+++ b/.github/workflows/web-deploy-accounts.yml
@@ -24,7 +24,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
diff --git a/.github/workflows/web-deploy-auth.yml b/.github/workflows/web-deploy-auth.yml
index 63a56b95b..d195b62f8 100644
--- a/.github/workflows/web-deploy-auth.yml
+++ b/.github/workflows/web-deploy-auth.yml
@@ -24,7 +24,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
diff --git a/.github/workflows/web-deploy-cast.yml b/.github/workflows/web-deploy-cast.yml
index be4861c71..c5bbca954 100644
--- a/.github/workflows/web-deploy-cast.yml
+++ b/.github/workflows/web-deploy-cast.yml
@@ -24,7 +24,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
diff --git a/.github/workflows/web-deploy-payments.yml b/.github/workflows/web-deploy-payments.yml
new file mode 100644
index 000000000..367e1db18
--- /dev/null
+++ b/.github/workflows/web-deploy-payments.yml
@@ -0,0 +1,43 @@
+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: "web/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/dist
+ wranglerVersion: "3"
diff --git a/.github/workflows/web-deploy-photos.yml b/.github/workflows/web-deploy-photos.yml
index 64a88421d..cb3a9db86 100644
--- a/.github/workflows/web-deploy-photos.yml
+++ b/.github/workflows/web-deploy-photos.yml
@@ -24,7 +24,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
diff --git a/.github/workflows/web-deploy-staff.yml b/.github/workflows/web-deploy-staff.yml
new file mode 100644
index 000000000..4d386344d
--- /dev/null
+++ b/.github/workflows/web-deploy-staff.yml
@@ -0,0 +1,48 @@
+name: "Deploy (staff)"
+
+on:
+ # Run on every push to main that changes web/apps/staff/
+ push:
+ branches: [main]
+ paths:
+ - "web/apps/staff/**"
+ - ".github/workflows/web-deploy-staff.yml"
+ # 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 staff
+ run: yarn build:staff
+
+ - name: Publish staff
+ uses: cloudflare/pages-action@1
+ with:
+ accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+ apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+ projectName: ente
+ branch: deploy/staff
+ directory: web/apps/staff/dist
+ wranglerVersion: "3"
diff --git a/.github/workflows/web-nightly.yml b/.github/workflows/web-nightly.yml
index a800a4b73..949738292 100644
--- a/.github/workflows/web-nightly.yml
+++ b/.github/workflows/web-nightly.yml
@@ -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
@@ -78,6 +78,19 @@ jobs:
directory: web/apps/cast/out
wranglerVersion: "3"
+ - 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: n-payments
+ directory: web/apps/payments/dist
+ wranglerVersion: "3"
+
- name: Build photos
run: yarn build:photos
env:
diff --git a/.github/workflows/web-preview.yml b/.github/workflows/web-preview.yml
index 4e86d9a81..8f39c0247 100644
--- a/.github/workflows/web-preview.yml
+++ b/.github/workflows/web-preview.yml
@@ -12,6 +12,7 @@ on:
- "accounts"
- "auth"
- "cast"
+ - "payments"
- "photos"
jobs:
@@ -33,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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5042b6712..857e18fb5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,7 +59,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
diff --git a/README.md b/README.md
index 68632ea3b..88488d11c 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ existing users will be grandfathered in.
[](https://apps.apple.com/app/id6444121398)
[](https://play.google.com/store/apps/details?id=io.ente.auth)
[](https://f-droid.org/packages/io.ente.auth/)
-[](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v2)
+[](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v2)
[](https://auth.ente.io)
diff --git a/auth/README.md b/auth/README.md
index 71ae1f93b..e2e03f023 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -31,14 +31,16 @@ 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)
+a native desktop app from this repository's GitHub releases. The desktop app
+works on Windows, Linux and macOS.
+
### Web
You can view your 2FA codes at [auth.ente.io](https://auth.ente.io). For adding
-or managing your secrets, please use our mobile app.
-
-### Desktop
-
-A native desktop app is coming soon!
+or managing your secrets, please use our mobile or desktop app.
## 🧑💻 Build from source
diff --git a/auth/android/app/src/main/play/listings/en-US/full_description.txt b/auth/android/app/src/main/play/listings/en-US/full_description.txt
new file mode 100644
index 000000000..8f575bda0
--- /dev/null
+++ b/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
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/icon/icon.png b/auth/android/app/src/main/play/listings/en-US/graphics/icon/icon.png
new file mode 100644
index 000000000..043b944f3
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/icon/icon.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/1.png b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/1.png
new file mode 100644
index 000000000..e87d3a124
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/1.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/2.png b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/2.png
new file mode 100644
index 000000000..9a700ea18
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/2.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/3.png b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/3.png
new file mode 100644
index 000000000..64e992821
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/3.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/4.png b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/4.png
new file mode 100644
index 000000000..88d5ec3ad
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/4.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/5.png b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/5.png
new file mode 100644
index 000000000..f2825d0b4
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/5.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/short_description.txt b/auth/android/app/src/main/play/listings/en-US/short_description.txt
new file mode 100644
index 000000000..92b9c58f1
--- /dev/null
+++ b/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.
\ No newline at end of file
diff --git a/auth/android/app/src/main/play/listings/en-US/title.txt b/auth/android/app/src/main/play/listings/en-US/title.txt
new file mode 100644
index 000000000..b052b835d
--- /dev/null
+++ b/auth/android/app/src/main/play/listings/en-US/title.txt
@@ -0,0 +1 @@
+Ente Auth
\ No newline at end of file
diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index b38179e97..3e8f8ce67 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -36,7 +36,9 @@
},
{
"title": "BorgBase",
- "altNames": ["borg"],
+ "altNames": [
+ "borg"
+ ],
"slug": "BorgBase"
},
{
@@ -46,11 +48,17 @@
{
"title": "Bybit"
},
+ {
+ "title": "CERN"
+ },
{
"title": "Channel Island Hosting",
"slug": "cih",
"hex": "D14633"
},
+ {
+ "title": "ConfigCat"
+ },
{
"title": "Cloudflare"
},
@@ -64,7 +72,9 @@
},
{
"title": "DCS",
- "altNames": ["Digital Combat Simulator"],
+ "altNames": [
+ "Digital Combat Simulator"
+ ],
"slug": "dcs"
},
{
@@ -112,9 +122,14 @@
},
{
"title": "Gosuslugi",
- "altNames": ["Госуслуги"],
+ "altNames": [
+ "Госуслуги"
+ ],
"slug": "Gosuslugi"
},
+ {
+ "title": "Habbo"
+ },
{
"title": "Healthchecks.io",
"slug": "healthchecks"
@@ -177,13 +192,24 @@
},
{
"title": "Mastodon",
- "altNames": ["mstdn", "fediscience", "mathstodon", "fosstodon"],
+ "altNames": [
+ "mstdn",
+ "fediscience",
+ "mathstodon",
+ "fosstodon"
+ ],
"slug": "mastodon",
"hex": "6364FF"
},
+ {
+ "title": "Mercado Livre",
+ "slug": "mercado_livre"
+ },
{
"title": "Murena",
- "altNames": ["eCloud"],
+ "altNames": [
+ "eCloud"
+ ],
"slug": "ecloud"
},
{
@@ -281,6 +307,9 @@
"slug": "rust_language_forum",
"hex": "000000"
},
+ {
+ "title": "Sendgrid"
+ },
{
"title": "service-bw"
},
@@ -371,13 +400,18 @@
},
{
"title": "X",
- "altNames": ["twitter"],
+ "altNames": [
+ "twitter"
+ ],
"slug": "x"
},
{
"title": "Yandex",
- "altNames": ["Ya", "Яндекс"],
+ "altNames": [
+ "Ya",
+ "Яндекс"
+ ],
"slug": "Yandex"
}
]
-}
+}
\ No newline at end of file
diff --git a/auth/assets/custom-icons/icons/CERN.svg b/auth/assets/custom-icons/icons/CERN.svg
new file mode 100644
index 000000000..0e4b82e1f
--- /dev/null
+++ b/auth/assets/custom-icons/icons/CERN.svg
@@ -0,0 +1,47 @@
+
+
+
diff --git a/auth/assets/custom-icons/icons/configcat.svg b/auth/assets/custom-icons/icons/configcat.svg
new file mode 100644
index 000000000..cfecd22b0
--- /dev/null
+++ b/auth/assets/custom-icons/icons/configcat.svg
@@ -0,0 +1,9 @@
+
diff --git a/auth/assets/custom-icons/icons/habbo.svg b/auth/assets/custom-icons/icons/habbo.svg
new file mode 100644
index 000000000..746bcdb22
--- /dev/null
+++ b/auth/assets/custom-icons/icons/habbo.svg
@@ -0,0 +1,9 @@
+
diff --git a/auth/assets/custom-icons/icons/mercado_livre.svg b/auth/assets/custom-icons/icons/mercado_livre.svg
new file mode 100644
index 000000000..7f4db5fd5
--- /dev/null
+++ b/auth/assets/custom-icons/icons/mercado_livre.svg
@@ -0,0 +1,9 @@
+
diff --git a/auth/assets/custom-icons/icons/sendgrid.svg b/auth/assets/custom-icons/icons/sendgrid.svg
new file mode 100644
index 000000000..1562adab9
--- /dev/null
+++ b/auth/assets/custom-icons/icons/sendgrid.svg
@@ -0,0 +1,9 @@
+
diff --git a/auth/assets/icon-light-adaptive-fg.png b/auth/assets/generation-icons/icon-light-adaptive-fg.png
similarity index 100%
rename from auth/assets/icon-light-adaptive-fg.png
rename to auth/assets/generation-icons/icon-light-adaptive-fg.png
diff --git a/auth/assets/icon-light.png b/auth/assets/generation-icons/icon-light.png
similarity index 100%
rename from auth/assets/icon-light.png
rename to auth/assets/generation-icons/icon-light.png
diff --git a/auth/assets/icon-light.ico b/auth/assets/icon-light.ico
deleted file mode 100644
index 6f45f522b..000000000
Binary files a/auth/assets/icon-light.ico and /dev/null differ
diff --git a/auth/assets/icons/auth-icon.ico b/auth/assets/icons/auth-icon.ico
new file mode 100644
index 000000000..38bb22bcf
Binary files /dev/null and b/auth/assets/icons/auth-icon.ico differ
diff --git a/auth/assets/icon/auth-icon.png b/auth/assets/icons/auth-icon.png
similarity index 100%
rename from auth/assets/icon/auth-icon.png
rename to auth/assets/icons/auth-icon.png
diff --git a/auth/fastlane/metadata/android/en-US/title.txt b/auth/fastlane/metadata/android/en-US/title.txt
index f1c54762a..257e3ddcc 100644
--- a/auth/fastlane/metadata/android/en-US/title.txt
+++ b/auth/fastlane/metadata/android/en-US/title.txt
@@ -1 +1 @@
-ente Authenticator
\ No newline at end of file
+Ente Authenticator
\ No newline at end of file
diff --git a/auth/fdroid_flutter_icons.yaml b/auth/fdroid_flutter_icons.yaml
index da327160a..0ef87effd 100644
--- a/auth/fdroid_flutter_icons.yaml
+++ b/auth/fdroid_flutter_icons.yaml
@@ -1,6 +1,6 @@
-flutter_icons:
- android: "launcher_icon"
- image_path: "assets/icon-light.png"
- adaptive_icon_foreground: "assets/icon-light-adaptive-fg.png"
- adaptive_icon_background: "#ffffff"
-
+flutter_icons:
+ android: "launcher_icon"
+ image_path: "assets/generation-icons/icon-light.png"
+ adaptive_icon_foreground: "assets/generation-icons/icon-light-adaptive-fg.png"
+ adaptive_icon_background: "#ffffff"
+
diff --git a/auth/ios/Podfile.lock b/auth/ios/Podfile.lock
index aec7e14f0..7d02d123b 100644
--- a/auth/ios/Podfile.lock
+++ b/auth/ios/Podfile.lock
@@ -67,8 +67,6 @@ PODS:
- Toast
- local_auth_darwin (0.0.1):
- Flutter
- - local_auth_ios (0.0.1):
- - Flutter
- move_to_background (0.0.1):
- Flutter
- MTBBarcodeScanner (5.0.11)
@@ -99,8 +97,6 @@ PODS:
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- - smart_auth (0.0.1):
- - Flutter
- sodium_libs (2.2.1):
- Flutter
- sqflite (0.0.3):
@@ -142,7 +138,6 @@ DEPENDENCIES:
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
- local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
- - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
- move_to_background (from `.symlinks/plugins/move_to_background/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
@@ -151,7 +146,6 @@ DEPENDENCIES:
- sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
- share_plus (from `.symlinks/plugins/share_plus/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- - smart_auth (from `.symlinks/plugins/smart_auth/ios`)
- sodium_libs (from `.symlinks/plugins/sodium_libs/ios`)
- sqflite (from `.symlinks/plugins/sqflite/darwin`)
- sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`)
@@ -202,8 +196,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/fluttertoast/ios"
local_auth_darwin:
:path: ".symlinks/plugins/local_auth_darwin/darwin"
- local_auth_ios:
- :path: ".symlinks/plugins/local_auth_ios/ios"
move_to_background:
:path: ".symlinks/plugins/move_to_background/ios"
package_info_plus:
@@ -220,8 +212,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/share_plus/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
- smart_auth:
- :path: ".symlinks/plugins/smart_auth/ios"
sodium_libs:
:path: ".symlinks/plugins/sodium_libs/ios"
sqflite:
@@ -245,11 +235,10 @@ SPEC CHECKSUMS:
flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0
flutter_local_authentication: 1172a4dd88f6306dadce067454e2c4caf07977bb
flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
- flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
+ flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
local_auth_darwin: c7e464000a6a89e952235699e32b329457608d98
- local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
@@ -264,7 +253,6 @@ SPEC CHECKSUMS:
SentryPrivate: d651efb234cf385ec9a1cdd3eff94b5e78a0e0fe
share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
- smart_auth: 4bedbc118723912d0e45a07e8ab34039c19e04f2
sodium_libs: 1faae17af662384acbd13e41867a0008cd2e2318
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
sqlite3: 73b7fc691fdc43277614250e04d183740cb15078
diff --git a/auth/ios/Runner.xcodeproj/project.pbxproj b/auth/ios/Runner.xcodeproj/project.pbxproj
index 4d77182b0..b60012aa8 100644
--- a/auth/ios/Runner.xcodeproj/project.pbxproj
+++ b/auth/ios/Runner.xcodeproj/project.pbxproj
@@ -365,7 +365,7 @@
DEVELOPMENT_TEAM = 6Z68YJY9Q2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- INFOPLIST_KEY_CFBundleDisplayName = auth;
+ INFOPLIST_KEY_CFBundleDisplayName = "Ente Auth";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -439,7 +439,7 @@
DEVELOPMENT_TEAM = 6Z68YJY9Q2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- INFOPLIST_KEY_CFBundleDisplayName = auth;
+ INFOPLIST_KEY_CFBundleDisplayName = "Ente Auth";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -513,7 +513,7 @@
DEVELOPMENT_TEAM = 6Z68YJY9Q2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- INFOPLIST_KEY_CFBundleDisplayName = auth;
+ INFOPLIST_KEY_CFBundleDisplayName = "Ente Auth";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -587,7 +587,7 @@
DEVELOPMENT_TEAM = 6Z68YJY9Q2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- INFOPLIST_KEY_CFBundleDisplayName = auth;
+ INFOPLIST_KEY_CFBundleDisplayName = "Ente Auth";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -661,7 +661,7 @@
DEVELOPMENT_TEAM = 6Z68YJY9Q2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- INFOPLIST_KEY_CFBundleDisplayName = auth;
+ INFOPLIST_KEY_CFBundleDisplayName = "Ente Auth";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
diff --git a/auth/lib/app/view/app.dart b/auth/lib/app/view/app.dart
index 2ca5e4b3e..3bd9d4e73 100644
--- a/auth/lib/app/view/app.dart
+++ b/auth/lib/app/view/app.dart
@@ -18,7 +18,7 @@ import 'package:ente_auth/ui/settings/app_update_dialog.dart';
import 'package:flutter/foundation.dart';
import "package:flutter/material.dart";
import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:system_tray/system_tray.dart';
+import 'package:tray_manager/tray_manager.dart';
import 'package:window_manager/window_manager.dart';
class App extends StatefulWidget {
@@ -34,7 +34,7 @@ class App extends StatefulWidget {
State createState() => _AppState();
}
-class _AppState extends State with WindowListener {
+class _AppState extends State with WindowListener, TrayListener {
late StreamSubscription _signedOutEvent;
late StreamSubscription _signedInEvent;
Locale? locale;
@@ -46,12 +46,17 @@ class _AppState extends State with WindowListener {
Future initWindowManager() async {
windowManager.addListener(this);
- await windowManager.setPreventClose(true);
+ }
+
+ Future initTrayManager() async {
+ trayManager.addListener(this);
}
@override
void initState() {
initWindowManager();
+ initTrayManager();
+
_signedOutEvent = Bus.instance.on().listen((event) {
if (mounted) {
setState(() {});
@@ -85,7 +90,10 @@ class _AppState extends State with WindowListener {
@override
void dispose() {
super.dispose();
+
windowManager.removeListener(this);
+ trayManager.removeListener(this);
+
_signedOutEvent.cancel();
_signedInEvent.cancel();
}
@@ -145,14 +153,44 @@ class _AppState extends State with WindowListener {
};
}
- @override
- void onWindowClose() async {
- final AppWindow appWindow = AppWindow();
- await appWindow.hide();
- }
-
@override
void onWindowResize() {
WindowListenerService.instance.onWindowResize().ignore();
}
+
+ @override
+ void onTrayIconMouseDown() {
+ if (Platform.isWindows) {
+ windowManager.show();
+ } else {
+ trayManager.popUpContextMenu();
+ }
+ }
+
+ @override
+ void onTrayIconRightMouseDown() {
+ if (Platform.isWindows) {
+ trayManager.popUpContextMenu();
+ } else {
+ windowManager.show();
+ }
+ }
+
+ @override
+ void onTrayIconRightMouseUp() {}
+
+ @override
+ void onTrayMenuItemClick(MenuItem menuItem) {
+ switch (menuItem.key) {
+ case 'hide_window':
+ windowManager.hide();
+ break;
+ case 'show_window':
+ windowManager.show();
+ break;
+ case 'exit_app':
+ windowManager.close();
+ break;
+ }
+ }
}
diff --git a/auth/lib/l10n/arb/app_en.arb b/auth/lib/l10n/arb/app_en.arb
index a2f6e77ed..e16a39c79 100644
--- a/auth/lib/l10n/arb/app_en.arb
+++ b/auth/lib/l10n/arb/app_en.arb
@@ -78,14 +78,14 @@
"data": "Data",
"importCodes": "Import codes",
"importTypePlainText": "Plain text",
- "importTypeEnteEncrypted": "ente Encrypted export",
+ "importTypeEnteEncrypted": "Ente Encrypted export",
"passwordForDecryptingExport": "Password to decrypt export",
"passwordEmptyError": "Password can not be empty",
"importFromApp": "Import codes from {appName}",
"importGoogleAuthGuide": "Export your accounts from Google Authenticator to a QR code using the \"Transfer Accounts\" option. Then using another device, scan the QR code.\n\nTip: You can use your laptop's webcam to take a picture of the QR code.",
"importSelectJsonFile": "Select JSON file",
"importSelectAppExport": "Select {appName} export file",
- "importEnteEncGuide": "Select the encrypted JSON file exported from ente",
+ "importEnteEncGuide": "Select the encrypted JSON file exported from Ente",
"importRaivoGuide": "Use the \"Export OTPs to Zip archive\" option in Raivo's Settings.\n\nExtract the zip file and import the JSON file.",
"importBitwardenGuide": "Use the \"Export vault\" option within Bitwarden Tools and import the unencrypted JSON file.",
"importAegisGuide": "Use the \"Export the vault\" option in Aegis's Settings.\n\nIf your vault is encrypted, you will need to enter vault password to decrypt the vault.",
@@ -115,22 +115,22 @@
"copied": "Copied",
"pleaseTryAgain": "Please try again",
"existingUser": "Existing User",
- "newUser": "New to ente",
+ "newUser": "New to Ente",
"delete": "Delete",
"enterYourPasswordHint": "Enter your password",
"forgotPassword": "Forgot password",
"oops": "Oops",
"suggestFeatures": "Suggest features",
"faq": "FAQ",
- "faq_q_1": "How secure is ente Auth?",
- "faq_a_1": "All codes you backup via ente is stored end-to-end encrypted. This means only you can access your codes. Our apps are open source and our cryptography has been externally audited.",
+ "faq_q_1": "How secure is Auth?",
+ "faq_a_1": "All codes you backup via Auth is stored end-to-end encrypted. This means only you can access your codes. Our apps are open source and our cryptography has been externally audited.",
"faq_q_2": "Can I access my codes on desktop?",
"faq_a_2": "You can access your codes on the web @ auth.ente.io.",
"faq_q_3": "How can I delete codes?",
"faq_a_3": "You can delete a code by swiping left on that item.",
"faq_q_4": "How can I support this project?",
"faq_a_4": "You can support the development of this project by subscribing to our Photos app @ ente.io.",
- "faq_q_5": "How can I enable FaceID lock in ente Auth",
+ "faq_q_5": "How can I enable FaceID lock in Auth",
"faq_a_5": "You can enable FaceID lock under Settings → Security → Lockscreen.",
"somethingWentWrongMessage": "Something went wrong, please try again",
"leaveFamily": "Leave family",
@@ -350,7 +350,7 @@
"deleteCodeAuthMessage": "Authenticate to delete code",
"showQRAuthMessage": "Authenticate to show QR code",
"confirmAccountDeleteTitle": "Confirm account deletion",
- "confirmAccountDeleteMessage": "This account is linked to other ente apps, if you use any.\n\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted.",
+ "confirmAccountDeleteMessage": "This account is linked to other Ente apps, if you use any.\n\nYour uploaded data, across all Ente apps, will be scheduled for deletion, and your account will be permanently deleted.",
"androidBiometricHint": "Verify identity",
"@androidBiometricHint": {
"description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
diff --git a/auth/lib/main.dart b/auth/lib/main.dart
index 3514472f5..09b85d8b3 100644
--- a/auth/lib/main.dart
+++ b/auth/lib/main.dart
@@ -31,42 +31,34 @@ import 'package:flutter_displaymode/flutter_displaymode.dart';
import 'package:logging/logging.dart';
import 'package:path_provider/path_provider.dart';
import 'package:privacy_screen/privacy_screen.dart';
-import 'package:system_tray/system_tray.dart';
+import 'package:tray_manager/tray_manager.dart';
import 'package:window_manager/window_manager.dart';
final _logger = Logger("main");
Future initSystemTray() async {
- String path =
- Platform.isWindows ? 'assets/icon-light.ico' : 'assets/icon-light.png';
-
- final AppWindow appWindow = AppWindow();
- final SystemTray systemTray = SystemTray();
-
- // We first init the systray menu
- await systemTray.initSystemTray(
- title: "",
- iconPath: path,
+ String path = Platform.isWindows
+ ? 'assets/icons/auth-icon.ico'
+ : 'assets/icons/auth-icon.png';
+ await trayManager.setIcon(path);
+ Menu menu = Menu(
+ items: [
+ MenuItem(
+ key: 'hide_window',
+ label: 'Hide Window',
+ ),
+ MenuItem(
+ key: 'show_window',
+ label: 'Show Window',
+ ),
+ MenuItem.separator(),
+ MenuItem(
+ key: 'exit_app',
+ label: 'Exit App',
+ ),
+ ],
);
-
- // create context menu
- final show = MenuItem(label: 'Show', onClicked: () => appWindow.show());
- final hide = MenuItem(label: 'Hide', onClicked: () => appWindow.hide());
- final exit = MenuItem(label: 'Exit', onClicked: () => appWindow.close());
-
- // set context menu
- await systemTray.setContextMenu([show, hide, exit]);
-
- const kSystemTrayEventClick = 'leftMouseDown';
- const kSystemTrayEventRightClick = 'rightMouseDown';
- // // handle system tray event
- systemTray.registerSystemTrayEventHandler((eventName) {
- if (eventName == kSystemTrayEventClick) {
- Platform.isWindows ? appWindow.show() : systemTray.popUpContextMenu();
- } else if (eventName == kSystemTrayEventRightClick) {
- Platform.isWindows ? systemTray.popUpContextMenu() : appWindow.show();
- }
- });
+ await trayManager.setContextMenu(menu);
}
void main() async {
diff --git a/auth/lib/ui/code_widget.dart b/auth/lib/ui/code_widget.dart
index 0a74ad1ce..f97e865ec 100644
--- a/auth/lib/ui/code_widget.dart
+++ b/auth/lib/ui/code_widget.dart
@@ -17,8 +17,8 @@ import 'package:ente_auth/utils/dialog_util.dart';
import 'package:ente_auth/utils/platform_util.dart';
import 'package:ente_auth/utils/toast_util.dart';
import 'package:ente_auth/utils/totp_util.dart';
-import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
+import 'package:flutter_context_menu/flutter_context_menu.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:logging/logging.dart';
import 'package:move_to_background/move_to_background.dart';
@@ -86,108 +86,122 @@ class _CodeWidgetState extends State {
final l10n = context.l10n;
return Container(
margin: const EdgeInsets.only(left: 16, right: 16, bottom: 8, top: 8),
- child: Slidable(
- key: ValueKey(widget.code.hashCode),
- endActionPane: ActionPane(
- extentRatio: 0.60,
- motion: const ScrollMotion(),
- children: [
- const SizedBox(
- width: 4,
- ),
- SlidableAction(
- onPressed: _onShowQrPressed,
- backgroundColor: Colors.grey.withOpacity(0.1),
- borderRadius: const BorderRadius.all(Radius.circular(12.0)),
- foregroundColor:
- Theme.of(context).colorScheme.inverseBackgroundColor,
- icon: Icons.qr_code_2_outlined,
- label: "QR",
- padding: const EdgeInsets.only(left: 4, right: 0),
- spacing: 8,
- ),
- const SizedBox(
- width: 4,
- ),
- SlidableAction(
- onPressed: _onEditPressed,
- backgroundColor: Colors.grey.withOpacity(0.1),
- borderRadius: const BorderRadius.all(Radius.circular(12.0)),
- foregroundColor:
- Theme.of(context).colorScheme.inverseBackgroundColor,
- icon: Icons.edit_outlined,
- label: l10n.edit,
- padding: const EdgeInsets.only(left: 4, right: 0),
- spacing: 8,
- ),
- const SizedBox(
- width: 4,
- ),
- SlidableAction(
- onPressed: _onDeletePressed,
- backgroundColor: Colors.grey.withOpacity(0.1),
- borderRadius: const BorderRadius.all(Radius.circular(12.0)),
- foregroundColor: const Color(0xFFFE4A49),
- icon: Icons.delete,
- label: l10n.delete,
- padding: const EdgeInsets.only(left: 0, right: 0),
- spacing: 8,
- ),
- ],
- ),
- child: Builder(
- builder: (context) {
- return RawGestureDetector(
- gestures: {
- PanGestureRecognizer:
- GestureRecognizerFactoryWithHandlers(
- () => PanGestureRecognizer(
- debugOwner: this,
- // This recognizer accepts any button press made with a secondary button.
- allowedButtonsFilter: (int buttons) =>
- buttons & kSecondaryButton != 0,
+ child: Builder(
+ builder: (context) {
+ if (PlatformUtil.isDesktop()) {
+ return ContextMenuRegion(
+ contextMenu: ContextMenu(
+ entries: [
+ MenuItem(
+ label: 'QR',
+ icon: Icons.qr_code_2_outlined,
+ onSelected: () => _onShowQrPressed(null),
),
- (PanGestureRecognizer instance) {
- instance
- ..dragStartBehavior = DragStartBehavior.down
- ..onEnd = (DragEndDetails details) {
- Slidable.of(context)?.openEndActionPane();
- };
- },
- ),
- },
- child: ClipRRect(
- borderRadius: BorderRadius.circular(8),
- child: Container(
- color: Theme.of(context).colorScheme.codeCardBackgroundColor,
- child: Material(
- color: Colors.transparent,
- child: InkWell(
- customBorder: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(10),
- ),
- onTap: () {
- _copyCurrentOTPToClipboard();
- },
- onDoubleTap: isMaskingEnabled
- ? () {
- setState(
- () {
- _hideCode = !_hideCode;
- },
- );
- }
- : null,
- onLongPress: () {
- _copyCurrentOTPToClipboard();
- },
- child: _getCardContents(l10n),
- ),
+ MenuItem(
+ label: l10n.edit,
+ icon: Icons.edit,
+ onSelected: () => _onEditPressed(null),
),
- ),
+ const MenuDivider(),
+ MenuItem(
+ label: l10n.delete,
+ value: "Delete",
+ icon: Icons.delete,
+ onSelected: () => _onDeletePressed(null),
+ ),
+ ],
+ padding: const EdgeInsets.all(8.0),
),
+ child: _clippedCard(l10n),
);
- },
+ }
+
+ return Slidable(
+ key: ValueKey(widget.code.hashCode),
+ endActionPane: ActionPane(
+ extentRatio: 0.60,
+ motion: const ScrollMotion(),
+ children: [
+ const SizedBox(
+ width: 4,
+ ),
+ SlidableAction(
+ onPressed: _onShowQrPressed,
+ backgroundColor: Colors.grey.withOpacity(0.1),
+ borderRadius: const BorderRadius.all(Radius.circular(12.0)),
+ foregroundColor:
+ Theme.of(context).colorScheme.inverseBackgroundColor,
+ icon: Icons.qr_code_2_outlined,
+ label: "QR",
+ padding: const EdgeInsets.only(left: 4, right: 0),
+ spacing: 8,
+ ),
+ const SizedBox(
+ width: 4,
+ ),
+ SlidableAction(
+ onPressed: _onEditPressed,
+ backgroundColor: Colors.grey.withOpacity(0.1),
+ borderRadius: const BorderRadius.all(Radius.circular(12.0)),
+ foregroundColor:
+ Theme.of(context).colorScheme.inverseBackgroundColor,
+ icon: Icons.edit_outlined,
+ label: l10n.edit,
+ padding: const EdgeInsets.only(left: 4, right: 0),
+ spacing: 8,
+ ),
+ const SizedBox(
+ width: 4,
+ ),
+ SlidableAction(
+ onPressed: _onDeletePressed,
+ backgroundColor: Colors.grey.withOpacity(0.1),
+ borderRadius: const BorderRadius.all(Radius.circular(12.0)),
+ foregroundColor: const Color(0xFFFE4A49),
+ icon: Icons.delete,
+ label: l10n.delete,
+ padding: const EdgeInsets.only(left: 0, right: 0),
+ spacing: 8,
+ ),
+ ],
+ ),
+ child: Builder(
+ builder: (context) => _clippedCard(l10n),
+ ),
+ );
+ },
+ ),
+ );
+ }
+
+ Widget _clippedCard(AppLocalizations l10n) {
+ return ClipRRect(
+ borderRadius: BorderRadius.circular(8),
+ child: Container(
+ color: Theme.of(context).colorScheme.codeCardBackgroundColor,
+ child: Material(
+ color: Colors.transparent,
+ child: InkWell(
+ customBorder: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(10),
+ ),
+ onTap: () {
+ _copyCurrentOTPToClipboard();
+ },
+ onDoubleTap: isMaskingEnabled
+ ? () {
+ setState(
+ () {
+ _hideCode = !_hideCode;
+ },
+ );
+ }
+ : null,
+ onLongPress: () {
+ _copyCurrentOTPToClipboard();
+ },
+ child: _getCardContents(l10n),
+ ),
),
),
);
diff --git a/auth/lib/ui/home_page.dart b/auth/lib/ui/home_page.dart
index 76cc8d4dc..ead979d7d 100644
--- a/auth/lib/ui/home_page.dart
+++ b/auth/lib/ui/home_page.dart
@@ -93,12 +93,22 @@ class _HomePageState extends State {
void _applyFilteringAndRefresh() {
if (_searchText.isNotEmpty && _showSearchBox) {
final String val = _searchText.toLowerCase();
- _filteredCodes = _codes
- .where(
- (element) => (element.account.toLowerCase().contains(val) ||
- element.issuer.toLowerCase().contains(val)),
- )
- .toList();
+ // Prioritize issuer match above account for better UX while searching
+ // for a specific TOTP for email providers. Searching for "emailProvider" like (gmail, proton) should
+ // show the email provider first instead of other accounts where protonmail
+ // is the account name.
+ final List issuerMatch = [];
+ final List accountMatch = [];
+
+ for (final Code code in _codes) {
+ if (code.issuer.toLowerCase().contains(val)) {
+ issuerMatch.add(code);
+ } else if (code.account.toLowerCase().contains(val)) {
+ accountMatch.add(code);
+ }
+ }
+ _filteredCodes = issuerMatch;
+ _filteredCodes.addAll(accountMatch);
} else {
_filteredCodes = _codes;
}
@@ -180,7 +190,7 @@ class _HomePageState extends State {
resizeToAvoidBottomInset: false,
appBar: AppBar(
title: !_showSearchBox
- ? const Text('ente Auth')
+ ? const Text('Ente Auth')
: TextField(
autofocus: _searchText.isEmpty,
controller: _textController,
diff --git a/auth/lib/ui/settings/data/import/encrypted_ente_import.dart b/auth/lib/ui/settings/data/import/encrypted_ente_import.dart
index 0cba96056..511c9bbf9 100644
--- a/auth/lib/ui/settings/data/import/encrypted_ente_import.dart
+++ b/auth/lib/ui/settings/data/import/encrypted_ente_import.dart
@@ -24,7 +24,7 @@ Future showEncryptedImportInstruction(BuildContext context) async {
final l10n = context.l10n;
final result = await showDialogWidget(
context: context,
- title: l10n.importFromApp("ente Auth"),
+ title: l10n.importFromApp("Ente Auth"),
body: l10n.importEnteEncGuide,
buttons: [
ButtonWidget(
diff --git a/auth/lib/ui/two_factor_authentication_page.dart b/auth/lib/ui/two_factor_authentication_page.dart
index 58a462286..068f4255d 100644
--- a/auth/lib/ui/two_factor_authentication_page.dart
+++ b/auth/lib/ui/two_factor_authentication_page.dart
@@ -4,8 +4,7 @@ import 'package:ente_auth/services/user_service.dart';
import 'package:ente_auth/ui/lifecycle_event_handler.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-
-import 'package:pinput/pinput.dart';
+import 'package:pinput/pin_put/pin_put.dart';
class TwoFactorAuthenticationPage extends StatefulWidget {
final String sessionID;
@@ -20,6 +19,10 @@ class TwoFactorAuthenticationPage extends StatefulWidget {
class _TwoFactorAuthenticationPageState
extends State {
final _pinController = TextEditingController();
+ final _pinPutDecoration = BoxDecoration(
+ border: Border.all(color: const Color.fromRGBO(45, 194, 98, 1.0)),
+ borderRadius: BorderRadius.circular(15.0),
+ );
String _code = "";
late LifecycleEventHandler _lifecycleEventHandler;
@@ -60,16 +63,6 @@ class _TwoFactorAuthenticationPageState
Widget _getBody() {
final l10n = context.l10n;
- final pinPutDecoration = BoxDecoration(
- border: Border.all(
- color: Theme.of(context)
- .inputDecorationTheme
- .focusedBorder!
- .borderSide
- .color,
- ),
- borderRadius: BorderRadius.circular(15.0),
- );
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.center,
@@ -86,31 +79,32 @@ class _TwoFactorAuthenticationPageState
const Padding(padding: EdgeInsets.all(32)),
Padding(
padding: const EdgeInsets.fromLTRB(40, 0, 40, 0),
- child: Pinput(
- onSubmitted: (String code) {
+ child: PinPut(
+ fieldsCount: 6,
+ onSubmit: (String code) {
_verifyTwoFactorCode(code);
},
- length: 6,
- defaultPinTheme: const PinTheme(),
- submittedPinTheme: PinTheme(
- decoration: pinPutDecoration.copyWith(
- borderRadius: BorderRadius.circular(20.0),
- ),
- ),
- focusedPinTheme: PinTheme(
- decoration: pinPutDecoration,
- ),
- followingPinTheme: PinTheme(
- decoration: pinPutDecoration.copyWith(
- borderRadius: BorderRadius.circular(5.0),
- ),
- ),
onChanged: (String pin) {
setState(() {
_code = pin;
});
},
controller: _pinController,
+ submittedFieldDecoration: _pinPutDecoration.copyWith(
+ borderRadius: BorderRadius.circular(20.0),
+ ),
+ selectedFieldDecoration: _pinPutDecoration,
+ followingFieldDecoration: _pinPutDecoration.copyWith(
+ borderRadius: BorderRadius.circular(5.0),
+ border: Border.all(
+ color: const Color.fromRGBO(45, 194, 98, 0.5),
+ ),
+ ),
+ inputDecoration: const InputDecoration(
+ focusedBorder: InputBorder.none,
+ border: InputBorder.none,
+ counterText: '',
+ ),
autofocus: true,
),
),
diff --git a/auth/lib/utils/auth_util.dart b/auth/lib/utils/auth_util.dart
index b543b4c73..c2d2f5afa 100644
--- a/auth/lib/utils/auth_util.dart
+++ b/auth/lib/utils/auth_util.dart
@@ -5,7 +5,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter_local_authentication/flutter_local_authentication.dart';
import 'package:local_auth/local_auth.dart';
import 'package:local_auth_android/local_auth_android.dart';
-import 'package:local_auth_ios/types/auth_messages_ios.dart';
+import 'package:local_auth_darwin/types/auth_messages_ios.dart';
import 'package:logging/logging.dart';
Future requestAuthentication(BuildContext context, String reason) async {
diff --git a/auth/linux/flutter/generated_plugin_registrant.cc b/auth/linux/flutter/generated_plugin_registrant.cc
index 0bbf397b0..7b1c79935 100644
--- a/auth/linux/flutter/generated_plugin_registrant.cc
+++ b/auth/linux/flutter/generated_plugin_registrant.cc
@@ -13,10 +13,9 @@
#include
#include
#include
-#include
#include
#include
-#include
+#include
#include
#include
@@ -42,18 +41,15 @@ void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) sentry_flutter_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "SentryFlutterPlugin");
sentry_flutter_plugin_register_with_registrar(sentry_flutter_registrar);
- g_autoptr(FlPluginRegistrar) smart_auth_registrar =
- fl_plugin_registry_get_registrar_for_plugin(registry, "SmartAuthPlugin");
- smart_auth_plugin_register_with_registrar(smart_auth_registrar);
g_autoptr(FlPluginRegistrar) sodium_libs_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "SodiumLibsPlugin");
sodium_libs_plugin_register_with_registrar(sodium_libs_registrar);
g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin");
sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar);
- g_autoptr(FlPluginRegistrar) system_tray_registrar =
- fl_plugin_registry_get_registrar_for_plugin(registry, "SystemTrayPlugin");
- system_tray_plugin_register_with_registrar(system_tray_registrar);
+ g_autoptr(FlPluginRegistrar) tray_manager_registrar =
+ fl_plugin_registry_get_registrar_for_plugin(registry, "TrayManagerPlugin");
+ tray_manager_plugin_register_with_registrar(tray_manager_registrar);
g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
diff --git a/auth/linux/flutter/generated_plugins.cmake b/auth/linux/flutter/generated_plugins.cmake
index 0f2c32b0a..45674067d 100644
--- a/auth/linux/flutter/generated_plugins.cmake
+++ b/auth/linux/flutter/generated_plugins.cmake
@@ -10,10 +10,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
gtk
screen_retriever
sentry_flutter
- smart_auth
sodium_libs
sqlite3_flutter_libs
- system_tray
+ tray_manager
url_launcher_linux
window_manager
)
diff --git a/auth/linux/my_application.cc b/auth/linux/my_application.cc
index bf557c528..8a553fec3 100644
--- a/auth/linux/my_application.cc
+++ b/auth/linux/my_application.cc
@@ -53,13 +53,13 @@ static void my_application_activate(GApplication *application)
{
GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
gtk_widget_show(GTK_WIDGET(header_bar));
- gtk_header_bar_set_title(header_bar, "ente Auth");
+ gtk_header_bar_set_title(header_bar, "Ente Auth");
gtk_header_bar_set_show_close_button(header_bar, TRUE);
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
}
else
{
- gtk_window_set_title(window, "ente Auth");
+ gtk_window_set_title(window, "Ente Auth");
}
gtk_window_set_default_size(window, 1280, 720);
diff --git a/auth/linux/packaging/appimage/make_config.yaml b/auth/linux/packaging/appimage/make_config.yaml
index ad9553980..90db9c587 100644
--- a/auth/linux/packaging/appimage/make_config.yaml
+++ b/auth/linux/packaging/appimage/make_config.yaml
@@ -1,26 +1,28 @@
-display_name: Auth
-license: GPLv3
-
-icon: assets/icon/auth-icon.png
-
-keywords:
- - Authentication
- - 2FA
-
-generic_name: ente Auth
-
-categories:
- - Utility
-
-startup_notify: false
-
-# You can specify the shared libraries that you want to bundle with your app
-#
-# flutter_distributor automatically detects the shared libraries that your app
-# depends on, but you can also specify them manually here.
-#
-# The following example shows how to bundle the libcurl library with your app.
-#
-# include:
-# - libcurl.so.4
-include: []
+display_name: Auth
+license: GPLv3
+
+icon: assets/icons/auth-icon.png
+
+keywords:
+ - Authentication
+ - 2FA
+
+generic_name: Ente Auth
+
+categories:
+ - Utility
+
+startup_notify: false
+
+# You can specify the shared libraries that you want to bundle with your app
+#
+# flutter_distributor automatically detects the shared libraries that your app
+# depends on, but you can also specify them manually here.
+#
+# The following example shows how to bundle the libcurl library with your app.
+#
+# include:
+# - libcurl.so.4
+include:
+ - libffi.so.7
+ - libtiff.so.5
diff --git a/auth/linux/packaging/deb/make_config.yaml b/auth/linux/packaging/deb/make_config.yaml
index c5335f15a..93f54e472 100644
--- a/auth/linux/packaging/deb/make_config.yaml
+++ b/auth/linux/packaging/deb/make_config.yaml
@@ -1,34 +1,34 @@
-display_name: Auth
-package_name: auth
-maintainer:
- name: Ente.io Developers
- email: human@ente.io
-priority: optional
-section: x11
-essential: false
-license: GPLv3
-icon: assets/icon/auth-icon.png
-installed_size: 36000
-
-dependencies:
- - libwebkit2gtk-4.0-37
- - libsqlite3-0
- - libsodium23
- - libsecret-1-0
- - libappindicator3-1 | libayatana-appindicator3-1
- - gir1.2-appindicator3-0.1 | gir1.2-ayatanaappindicator3-0.1
- - libayatana-ido3-0.4-0
-
-keywords:
- - Authentication
- - 2FA
-
-generic_name: Ente Authentication
-
-categories:
- - Utility
-
-startup_notify: false
-
-supported_mime_type:
- - x-scheme-handler/ente
+display_name: Auth
+package_name: auth
+maintainer:
+ name: Ente.io Developers
+ email: human@ente.io
+priority: optional
+section: x11
+essential: false
+license: GPLv3
+icon: assets/icons/auth-icon.png
+installed_size: 36000
+
+dependencies:
+ - libwebkit2gtk-4.0-37
+ - libsqlite3-0
+ - libsodium23
+ - libsecret-1-0
+ - libappindicator3-1 | libayatana-appindicator3-1
+ - gir1.2-appindicator3-0.1 | gir1.2-ayatanaappindicator3-0.1
+ - libayatana-ido3-0.4-0
+
+keywords:
+ - Authentication
+ - 2FA
+
+generic_name: Ente Authentication
+
+categories:
+ - Utility
+
+startup_notify: false
+
+supported_mime_type:
+ - x-scheme-handler/ente
diff --git a/auth/linux/packaging/rpm/make_config.yaml b/auth/linux/packaging/rpm/make_config.yaml
index a345da361..5d5f3aab5 100644
--- a/auth/linux/packaging/rpm/make_config.yaml
+++ b/auth/linux/packaging/rpm/make_config.yaml
@@ -1,31 +1,31 @@
-icon: assets/icon/auth-icon.png
-summary: 2FA app with free end-to-end encrypted backup and sync
-group: Application/Utility
-vendor: Ente.io
-packager: Ente.io Developers
-packagerEmail: human@ente.io
-license: GPLv3
-url: https://github.com/ente-io/ente
-
-display_name: Auth
-
-dependencies:
- - libsqlite3x
- - webkit2gtk-4.0
- - libsodium
- - libsecret
- - libappindicator
-
-keywords:
- - Authentication
- - 2FA
-
-generic_name: Ente Authentication
-
-categories:
- - Utility
-
-startup_notify: false
-
-supported_mime_type:
- - x-scheme-handler/ente
+icon: assets/icons/auth-icon.png
+summary: 2FA app with free end-to-end encrypted backup and sync
+group: Application/Utility
+vendor: Ente.io
+packager: Ente.io Developers
+packagerEmail: human@ente.io
+license: GPLv3
+url: https://github.com/ente-io/ente
+
+display_name: Auth
+
+requires:
+ - libsqlite3x
+ - webkit2gtk-4.0
+ - libsodium
+ - libsecret
+ - libappindicator
+
+keywords:
+ - Authentication
+ - 2FA
+
+generic_name: Ente Authentication
+
+categories:
+ - Utility
+
+startup_notify: false
+
+supported_mime_type:
+ - x-scheme-handler/ente
diff --git a/auth/macos/Flutter/GeneratedPluginRegistrant.swift b/auth/macos/Flutter/GeneratedPluginRegistrant.swift
index 509bf6674..5d8c36991 100644
--- a/auth/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/auth/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -20,11 +20,10 @@ import screen_retriever
import sentry_flutter
import share_plus
import shared_preferences_foundation
-import smart_auth
import sodium_libs
import sqflite
import sqlite3_flutter_libs
-import system_tray
+import tray_manager
import url_launcher_macos
import window_manager
@@ -44,11 +43,10 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
SentryFlutterPlugin.register(with: registry.registrar(forPlugin: "SentryFlutterPlugin"))
SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
- SmartAuthPlugin.register(with: registry.registrar(forPlugin: "SmartAuthPlugin"))
SodiumLibsPlugin.register(with: registry.registrar(forPlugin: "SodiumLibsPlugin"))
SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin"))
- SystemTrayPlugin.register(with: registry.registrar(forPlugin: "SystemTrayPlugin"))
+ TrayManagerPlugin.register(with: registry.registrar(forPlugin: "TrayManagerPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
}
diff --git a/auth/macos/Podfile.lock b/auth/macos/Podfile.lock
index 641289552..a5b6eb77c 100644
--- a/auth/macos/Podfile.lock
+++ b/auth/macos/Podfile.lock
@@ -63,7 +63,7 @@ PODS:
- sqlite3/fts5
- sqlite3/perf-threadsafe
- sqlite3/rtree
- - system_tray (0.0.1):
+ - tray_manager (0.0.1):
- FlutterMacOS
- url_launcher_macos (0.0.1):
- FlutterMacOS
@@ -91,7 +91,7 @@ DEPENDENCIES:
- sodium_libs (from `Flutter/ephemeral/.symlinks/plugins/sodium_libs/macos`)
- sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/darwin`)
- sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos`)
- - system_tray (from `Flutter/ephemeral/.symlinks/plugins/system_tray/macos`)
+ - tray_manager (from `Flutter/ephemeral/.symlinks/plugins/tray_manager/macos`)
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
- window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`)
@@ -144,8 +144,8 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/sqflite/darwin
sqlite3_flutter_libs:
:path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos
- system_tray:
- :path: Flutter/ephemeral/.symlinks/plugins/system_tray/macos
+ tray_manager:
+ :path: Flutter/ephemeral/.symlinks/plugins/tray_manager/macos
url_launcher_macos:
:path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
window_manager:
@@ -177,7 +177,7 @@ SPEC CHECKSUMS:
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
sqlite3: 73b7fc691fdc43277614250e04d183740cb15078
sqlite3_flutter_libs: 06a05802529659a272beac4ee1350bfec294f386
- system_tray: e53c972838c69589ff2e77d6d3abfd71332f9e5d
+ tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
diff --git a/auth/macos/Runner.xcodeproj/project.pbxproj b/auth/macos/Runner.xcodeproj/project.pbxproj
index 976b897ad..492f710ad 100644
--- a/auth/macos/Runner.xcodeproj/project.pbxproj
+++ b/auth/macos/Runner.xcodeproj/project.pbxproj
@@ -55,7 +55,7 @@
/* Begin PBXFileReference section */
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; };
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; };
- 33CC10ED2044A3C60003C045 /* ente Auth.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ente Auth.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 33CC10ED2044A3C60003C045 /* Ente Auth.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Ente Auth.app"; sourceTree = BUILT_PRODUCTS_DIR; };
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; };
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; };
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; };
@@ -122,7 +122,7 @@
33CC10EE2044A3C60003C045 /* Products */ = {
isa = PBXGroup;
children = (
- 33CC10ED2044A3C60003C045 /* ente Auth.app */,
+ 33CC10ED2044A3C60003C045 /* Ente Auth.app */,
);
name = Products;
sourceTree = "";
@@ -192,7 +192,7 @@
);
name = Runner;
productName = Runner;
- productReference = 33CC10ED2044A3C60003C045 /* ente Auth.app */;
+ productReference = 33CC10ED2044A3C60003C045 /* Ente Auth.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
diff --git a/auth/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/auth/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index bb73a0d58..7b82ae2ae 100644
--- a/auth/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/auth/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -15,7 +15,7 @@
@@ -31,7 +31,7 @@
@@ -54,7 +54,7 @@
@@ -71,7 +71,7 @@
diff --git a/auth/macos/Runner/Configs/AppInfo.xcconfig b/auth/macos/Runner/Configs/AppInfo.xcconfig
index b716deabf..cb548680b 100644
--- a/auth/macos/Runner/Configs/AppInfo.xcconfig
+++ b/auth/macos/Runner/Configs/AppInfo.xcconfig
@@ -5,7 +5,7 @@
// 'flutter create' template.
// The application's name. By default this is also the title of the Flutter window.
-PRODUCT_NAME = ente Auth
+PRODUCT_NAME = Ente Auth
// The application's bundle identifier
PRODUCT_BUNDLE_IDENTIFIER = io.ente.auth
diff --git a/auth/macos/packaging/dmg/make_config.yaml b/auth/macos/packaging/dmg/make_config.yaml
index 5cbffbec8..30628bef3 100644
--- a/auth/macos/packaging/dmg/make_config.yaml
+++ b/auth/macos/packaging/dmg/make_config.yaml
@@ -1,11 +1,11 @@
-title: Auth
-icon: ../../../assets/icon/auth-icon.png
-contents:
- - x: 448
- y: 344
- type: link
- path: "/Applications"
- - x: 192
- y: 344
- type: file
- path: ente Auth.app
+title: Auth
+icon: ../../../assets/icons/auth-icon.png
+contents:
+ - x: 448
+ y: 344
+ type: link
+ path: "/Applications"
+ - x: 192
+ y: 344
+ type: file
+ path: Ente Auth.app
diff --git a/auth/pubspec.lock b/auth/pubspec.lock
index 66ef40e2a..73b3075cb 100644
--- a/auth/pubspec.lock
+++ b/auth/pubspec.lock
@@ -85,10 +85,10 @@ packages:
dependency: "direct main"
description:
name: bloc
- sha256: f53a110e3b48dcd78136c10daa5d51512443cea5e1348c9d80a320095fa2db9e
+ sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
url: "https://pub.dev"
source: hosted
- version: "8.1.3"
+ version: "8.1.4"
boolean_selector:
dependency: transitive
description:
@@ -133,10 +133,10 @@ packages:
dependency: "direct dev"
description:
name: build_runner
- sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21"
+ sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
url: "https://pub.dev"
source: hosted
- version: "2.4.8"
+ version: "2.4.9"
build_runner_core:
dependency: transitive
description:
@@ -294,7 +294,7 @@ packages:
description:
path: "packages/desktop_webview_window"
ref: HEAD
- resolved-ref: "649302f53451dde9ded4dc1fadfbead2b001fe64"
+ resolved-ref: "8cbbf9cd6efcfee5e0f420a36f7f8e7e64b667a1"
url: "https://github.com/MixinNetwork/flutter-plugins"
source: git
version: "0.2.4"
@@ -318,10 +318,10 @@ packages:
dependency: "direct main"
description:
name: dio
- sha256: "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8"
+ sha256: "0978e9a3e45305a80a7210dbeaf79d6ee8bee33f70c8e542dc654c952070217f"
url: "https://pub.dev"
source: hosted
- version: "5.4.1"
+ version: "5.4.2+1"
dotted_border:
dependency: "direct main"
description:
@@ -347,6 +347,14 @@ packages:
url: "https://github.com/ente-io/ente_crypto_dart.git"
source: git
version: "1.0.0"
+ equatable:
+ dependency: transitive
+ description:
+ name: equatable
+ sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.0.5"
event_bus:
dependency: "direct main"
description:
@@ -399,10 +407,10 @@ packages:
dependency: "direct main"
description:
name: file_picker
- sha256: caa6bc229eab3e32eb2f37b53a5f9d22a6981474afd210c512a7546c1e1a04f6
+ sha256: "1bbf65dd997458a08b531042ec3794112a6c39c07c37ff22113d2e7e4f81d4e4"
url: "https://pub.dev"
source: hosted
- version: "6.2.0"
+ version: "6.2.1"
file_saver:
dependency: "direct main"
description:
@@ -436,10 +444,18 @@ packages:
dependency: "direct main"
description:
name: flutter_bloc
- sha256: "87325da1ac757fcc4813e6b34ed5dd61169973871fdf181d6c2109dd6935ece1"
+ sha256: f0ecf6e6eb955193ca60af2d5ca39565a86b8a142452c5b24d96fb477428f4d2
url: "https://pub.dev"
source: hosted
- version: "8.1.4"
+ version: "8.1.5"
+ flutter_context_menu:
+ dependency: "direct main"
+ description:
+ name: flutter_context_menu
+ sha256: "9f220a8fa0290c68e38000d6d62a0dc4555d490c15a5bd856a6e6d255d81b8dc"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.1.3"
flutter_displaymode:
dependency: "direct main"
description:
@@ -562,10 +578,10 @@ packages:
dependency: "direct main"
description:
name: flutter_native_splash
- sha256: "558f10070f03ee71f850a78f7136ab239a67636a294a44a06b6b7345178edb1e"
+ sha256: edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0
url: "https://pub.dev"
source: hosted
- version: "2.3.10"
+ version: "2.4.0"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
@@ -685,10 +701,10 @@ packages:
dependency: transitive
description:
name: frontend_server_client
- sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+ sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
url: "https://pub.dev"
source: hosted
- version: "3.2.0"
+ version: "4.0.0"
glob:
dependency: transitive
description:
@@ -858,21 +874,13 @@ packages:
source: hosted
version: "1.0.37"
local_auth_darwin:
- dependency: transitive
+ dependency: "direct main"
description:
name: local_auth_darwin
sha256: "33381a15b0de2279523eca694089393bb146baebdce72a404555d03174ebc1e9"
url: "https://pub.dev"
source: hosted
version: "1.2.2"
- local_auth_ios:
- dependency: "direct main"
- description:
- name: local_auth_ios
- sha256: "6dde47dc852bc0c8343cb58e66a46efb16b62eddf389ce103d4dacb0c6c40c71"
- url: "https://pub.dev"
- source: hosted
- version: "1.1.7"
local_auth_platform_interface:
dependency: transitive
description:
@@ -913,6 +921,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.8.0"
+ menu_base:
+ dependency: transitive
+ description:
+ name: menu_base
+ sha256: "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.1.1"
meta:
dependency: transitive
description:
@@ -1093,10 +1109,10 @@ packages:
dependency: "direct main"
description:
name: pinput
- sha256: a92b55ecf9c25d1b9e100af45905385d5bc34fc9b6b04177a9e82cb88fe4d805
+ sha256: "27eb69042f75755bdb6544f6e79a50a6ed09d6e97e2d75c8421744df1e392949"
url: "https://pub.dev"
source: hosted
- version: "3.0.1"
+ version: "1.2.2"
platform:
dependency: transitive
description:
@@ -1229,10 +1245,10 @@ packages:
dependency: transitive
description:
name: share_plus_platform_interface
- sha256: df08bc3a07d01f5ea47b45d03ffcba1fa9cd5370fb44b3f38c70e42cced0f956
+ sha256: "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496"
url: "https://pub.dev"
source: hosted
- version: "3.3.1"
+ version: "3.4.0"
shared_preferences:
dependency: "direct main"
description:
@@ -1305,19 +1321,19 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.4"
+ shortid:
+ dependency: transitive
+ description:
+ name: shortid
+ sha256: d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.1.2"
sky_engine:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
- smart_auth:
- dependency: transitive
- description:
- name: smart_auth
- sha256: a25229b38c02f733d0a4e98d941b42bed91a976cb589e934895e60ccfa674cf6
- url: "https://pub.dev"
- source: hosted
- version: "1.1.1"
sodium:
dependency: transitive
description:
@@ -1330,10 +1346,10 @@ packages:
dependency: transitive
description:
name: sodium_libs
- sha256: "05b9e2de0f850a5315f596379f0c617aa1f938ed5e099126f8919c55499fed46"
+ sha256: f7f6719b7ab3e8512ce7a5ecd7bc8d865482431cdd5a07a46b55b13c152b54e1
url: "https://pub.dev"
source: hosted
- version: "2.2.1"
+ version: "2.2.1+1"
source_gen:
dependency: transitive
description:
@@ -1371,7 +1387,7 @@ packages:
description:
path: sqflite
ref: HEAD
- resolved-ref: "07fb76f37e17a396dd7dcc8fb83b81b3f5b62486"
+ resolved-ref: "075b3e2f81e691a19a500e7ff6db2953de7f83a9"
url: "https://github.com/tekartik/sqflite"
source: git
version: "2.3.2"
@@ -1379,18 +1395,18 @@ packages:
dependency: transitive
description:
name: sqflite_common
- sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5"
+ sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4"
url: "https://pub.dev"
source: hosted
- version: "2.5.3"
+ version: "2.5.4"
sqflite_common_ffi:
dependency: "direct main"
description:
name: sqflite_common_ffi
- sha256: "754927d82de369a6b9e760fb60640aa81da650f35ffd468d5a992814d6022908"
+ sha256: "4d6137c29e930d6e4a8ff373989dd9de7bac12e3bc87bce950f6e844e8ad3bb5"
url: "https://pub.dev"
source: hosted
- version: "2.3.2+1"
+ version: "2.3.3"
sqlite3:
dependency: "direct main"
description:
@@ -1463,14 +1479,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.1.0+1"
- system_tray:
- dependency: "direct main"
- description:
- name: system_tray
- sha256: "1bcc11bc230033be20d7443c29f65f68d67169715a838a1122f20fbff5dd2d19"
- url: "https://pub.dev"
- source: hosted
- version: "0.1.1"
term_glyph:
dependency: transitive
description:
@@ -1503,6 +1511,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.1"
+ tray_manager:
+ dependency: "direct main"
+ description:
+ name: tray_manager
+ sha256: "4ab709d70a4374af172f8c39e018db33a4271265549c6fc9d269a65e5f4b0225"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.2.1"
tuple:
dependency: "direct main"
description:
@@ -1527,14 +1543,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.2.2"
- universal_platform:
- dependency: transitive
- description:
- name: universal_platform
- sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
- url: "https://pub.dev"
- source: hosted
- version: "1.0.0+1"
url_launcher:
dependency: "direct main"
description:
diff --git a/auth/pubspec.yaml b/auth/pubspec.yaml
index 6d76952cd..2ef543aa6 100644
--- a/auth/pubspec.yaml
+++ b/auth/pubspec.yaml
@@ -1,6 +1,6 @@
name: ente_auth
description: ente two-factor authenticator
-version: 2.0.46+246
+version: 2.0.55+255
publish_to: none
environment:
@@ -41,6 +41,7 @@ dependencies:
flutter:
sdk: flutter
flutter_bloc: ^8.0.1
+ flutter_context_menu: ^0.1.3
flutter_displaymode: ^0.6.0
flutter_email_sender: ^6.0.2
flutter_inappwebview: ^6.0.0
@@ -63,9 +64,9 @@ dependencies:
http: ^1.1.0
intl: ^0.18.0
json_annotation: ^4.5.0
- local_auth: ^2.1.7
- local_auth_android: ^1.0.31
- local_auth_ios: ^1.1.3
+ local_auth: ^2.2.0
+ local_auth_android: ^1.0.37
+ local_auth_darwin: ^1.2.2
logging: ^1.0.1
modal_bottom_sheet: ^3.0.0-pre
move_to_background: ^1.0.2
@@ -74,7 +75,7 @@ dependencies:
password_strength: ^0.2.0
path: ^1.8.3
path_provider: ^2.0.11
- pinput: ^3.0.1
+ pinput: ^1.2.2
pointycastle: ^3.7.3
privacy_screen: ^0.0.6
protobuf: ^3.0.0
@@ -93,7 +94,7 @@ dependencies:
sqlite3_flutter_libs: ^0.5.19+1
step_progress_indicator: ^1.0.2
styled_text: ^8.1.0
- system_tray: ^0.1.1
+ tray_manager: ^0.2.1
tuple: ^2.0.0
url_launcher: ^6.1.5
uuid: ^4.2.2
@@ -122,6 +123,7 @@ flutter:
# https://docs:flutter:dev/development/ui/assets-and-images:
assets:
- assets/
+ - assets/icons/
- assets/simple-icons/icons/
- assets/simple-icons/_data/
- assets/custom-icons/icons/
@@ -141,10 +143,10 @@ flutter:
flutter_icons:
android: "launcher_icon"
- adaptive_icon_foreground: "assets/icon-light-adaptive-fg.png"
+ adaptive_icon_foreground: "assets/generation-icons/icon-light-adaptive-fg.png"
adaptive_icon_background: "#ffffff"
ios: true
- image_path: "assets/icon-light.png"
+ image_path: "assets/generation-icons/icon-light.png"
remove_alpha_ios: true
flutter_native_splash:
diff --git a/auth/windows/flutter/generated_plugin_registrant.cc b/auth/windows/flutter/generated_plugin_registrant.cc
index aed85fbff..41d3cd7a3 100644
--- a/auth/windows/flutter/generated_plugin_registrant.cc
+++ b/auth/windows/flutter/generated_plugin_registrant.cc
@@ -16,10 +16,9 @@
#include
#include
#include
-#include
#include
#include
-#include
+#include
#include
#include
@@ -44,14 +43,12 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
registry->GetRegistrarForPlugin("SentryFlutterPlugin"));
SharePlusWindowsPluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
- SmartAuthPluginRegisterWithRegistrar(
- registry->GetRegistrarForPlugin("SmartAuthPlugin"));
SodiumLibsPluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("SodiumLibsPluginCApi"));
Sqlite3FlutterLibsPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin"));
- SystemTrayPluginRegisterWithRegistrar(
- registry->GetRegistrarForPlugin("SystemTrayPlugin"));
+ TrayManagerPluginRegisterWithRegistrar(
+ registry->GetRegistrarForPlugin("TrayManagerPlugin"));
UrlLauncherWindowsRegisterWithRegistrar(
registry->GetRegistrarForPlugin("UrlLauncherWindows"));
WindowManagerPluginRegisterWithRegistrar(
diff --git a/auth/windows/flutter/generated_plugins.cmake b/auth/windows/flutter/generated_plugins.cmake
index 2578d34e2..a2b56b65d 100644
--- a/auth/windows/flutter/generated_plugins.cmake
+++ b/auth/windows/flutter/generated_plugins.cmake
@@ -13,10 +13,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
screen_retriever
sentry_flutter
share_plus
- smart_auth
sodium_libs
sqlite3_flutter_libs
- system_tray
+ tray_manager
url_launcher_windows
window_manager
)
diff --git a/auth/windows/packaging/exe/inno_setup.iss b/auth/windows/packaging/exe/inno_setup.iss
new file mode 100644
index 000000000..5906ecbd0
--- /dev/null
+++ b/auth/windows/packaging/exe/inno_setup.iss
@@ -0,0 +1,64 @@
+[Setup]
+AppId={{APP_ID}}
+AppVersion={{APP_VERSION}}
+AppName={{DISPLAY_NAME}}
+AppPublisher={{PUBLISHER_NAME}}
+AppPublisherURL={{PUBLISHER_URL}}
+AppSupportURL={{PUBLISHER_URL}}
+AppUpdatesURL={{PUBLISHER_URL}}
+DefaultDirName={{INSTALL_DIR_NAME}}
+DisableProgramGroupPage=yes
+OutputDir=.
+OutputBaseFilename={{OUTPUT_BASE_FILENAME}}
+Compression=lzma
+SolidCompression=yes
+SetupIconFile={{SETUP_ICON_FILE}}
+WizardStyle=modern
+;PrivilegesRequired={{PRIVILEGES_REQUIRED}}
+PrivilegesRequiredOverridesAllowed=dialog
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
+UninstallDisplayIcon={app}\auth.exe
+
+[Languages]
+{% for locale in LOCALES %}
+{% if locale == 'en' %}Name: "english"; MessagesFile: "compiler:Default.isl"{% endif %}
+{% if locale == 'hy' %}Name: "armenian"; MessagesFile: "compiler:Languages\\Armenian.isl"{% endif %}
+{% if locale == 'bg' %}Name: "bulgarian"; MessagesFile: "compiler:Languages\\Bulgarian.isl"{% endif %}
+{% if locale == 'ca' %}Name: "catalan"; MessagesFile: "compiler:Languages\\Catalan.isl"{% endif %}
+{% if locale == 'zh' %}Name: "chinesesimplified"; MessagesFile: "compiler:Languages\\ChineseSimplified.isl"{% endif %}
+{% if locale == 'co' %}Name: "corsican"; MessagesFile: "compiler:Languages\\Corsican.isl"{% endif %}
+{% if locale == 'cs' %}Name: "czech"; MessagesFile: "compiler:Languages\\Czech.isl"{% endif %}
+{% if locale == 'da' %}Name: "danish"; MessagesFile: "compiler:Languages\\Danish.isl"{% endif %}
+{% if locale == 'nl' %}Name: "dutch"; MessagesFile: "compiler:Languages\\Dutch.isl"{% endif %}
+{% if locale == 'fi' %}Name: "finnish"; MessagesFile: "compiler:Languages\\Finnish.isl"{% endif %}
+{% if locale == 'fr' %}Name: "french"; MessagesFile: "compiler:Languages\\French.isl"{% endif %}
+{% if locale == 'de' %}Name: "german"; MessagesFile: "compiler:Languages\\German.isl"{% endif %}
+{% if locale == 'he' %}Name: "hebrew"; MessagesFile: "compiler:Languages\\Hebrew.isl"{% endif %}
+{% if locale == 'is' %}Name: "icelandic"; MessagesFile: "compiler:Languages\\Icelandic.isl"{% endif %}
+{% if locale == 'it' %}Name: "italian"; MessagesFile: "compiler:Languages\\Italian.isl"{% endif %}
+{% if locale == 'ja' %}Name: "japanese"; MessagesFile: "compiler:Languages\\Japanese.isl"{% endif %}
+{% if locale == 'no' %}Name: "norwegian"; MessagesFile: "compiler:Languages\\Norwegian.isl"{% endif %}
+{% if locale == 'pl' %}Name: "polish"; MessagesFile: "compiler:Languages\\Polish.isl"{% endif %}
+{% if locale == 'pt' %}Name: "portuguese"; MessagesFile: "compiler:Languages\\Portuguese.isl"{% endif %}
+{% if locale == 'ru' %}Name: "russian"; MessagesFile: "compiler:Languages\\Russian.isl"{% endif %}
+{% if locale == 'sk' %}Name: "slovak"; MessagesFile: "compiler:Languages\\Slovak.isl"{% endif %}
+{% if locale == 'sl' %}Name: "slovenian"; MessagesFile: "compiler:Languages\\Slovenian.isl"{% endif %}
+{% if locale == 'es' %}Name: "spanish"; MessagesFile: "compiler:Languages\\Spanish.isl"{% endif %}
+{% if locale == 'tr' %}Name: "turkish"; MessagesFile: "compiler:Languages\\Turkish.isl"{% endif %}
+{% if locale == 'uk' %}Name: "ukrainian"; MessagesFile: "compiler:Languages\\Ukrainian.isl"{% endif %}
+{% endfor %}
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: {% if CREATE_DESKTOP_ICON != true %}unchecked{% else %}checkedonce{% endif %}
+Name: "launchAtStartup"; Description: "{cm:AutoStartProgram,{{DISPLAY_NAME}}}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: {% if LAUNCH_AT_STARTUP != true %}unchecked{% else %}checkedonce{% endif %}
+[Files]
+Source: "{{SOURCE_DIR}}\\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\\{{DISPLAY_NAME}}"; Filename: "{app}\\{{EXECUTABLE_NAME}}"
+Name: "{autodesktop}\\{{DISPLAY_NAME}}"; Filename: "{app}\\{{EXECUTABLE_NAME}}"; Tasks: desktopicon
+Name: "{userstartup}\\{{DISPLAY_NAME}}"; Filename: "{app}\\{{EXECUTABLE_NAME}}"; WorkingDir: "{app}"; Tasks: launchAtStartup
+[Run]
+Filename: "{app}\\{{EXECUTABLE_NAME}}"; Description: "{cm:LaunchProgram,{{DISPLAY_NAME}}}"; Flags: {% if PRIVILEGES_REQUIRED == 'admin' %}runascurrentuser{% endif %} nowait postinstall skipifsilent
diff --git a/auth/windows/packaging/exe/make_config.yaml b/auth/windows/packaging/exe/make_config.yaml
index 35b973292..378d2d4d8 100644
--- a/auth/windows/packaging/exe/make_config.yaml
+++ b/auth/windows/packaging/exe/make_config.yaml
@@ -1,8 +1,10 @@
-app_id: 9E5F0C93-96A3-4DA9-AE52-1AA6339851FC
-publisher: ente.io
-publisher_url: https://github.com/ente-io/ente
-display_name: ente Auth
-create_desktop_icon: true
-install_dir_name: enteauth
-locales:
- - en
+app_id: 9E5F0C93-96A3-4DA9-AE52-1AA6339851FC
+publisher: ente.io
+publisher_url: https://github.com/ente-io/ente
+display_name: Ente Auth
+create_desktop_icon: false
+install_dir_name: "{autopf}\\Ente Auth"
+setup_icon_file: ../../assets/icons/auth-icon.ico
+script_template: inno_setup.iss
+locales:
+ - en
diff --git a/auth/windows/runner/Runner.rc b/auth/windows/runner/Runner.rc
index ecf6f65d3..398fdf68b 100644
--- a/auth/windows/runner/Runner.rc
+++ b/auth/windows/runner/Runner.rc
@@ -90,12 +90,12 @@ BEGIN
BLOCK "040904e4"
BEGIN
VALUE "CompanyName", "Ente Technologies, Inc." "\0"
- VALUE "FileDescription", "ente Auth" "\0"
+ VALUE "FileDescription", "Ente Auth" "\0"
VALUE "FileVersion", VERSION_AS_STRING "\0"
- VALUE "InternalName", "ente Auth" "\0"
+ VALUE "InternalName", "Ente Auth" "\0"
VALUE "LegalCopyright", "Copyright (C) 2024 Ente Technologies, Inc.. All rights reserved." "\0"
VALUE "OriginalFilename", "auth.exe" "\0"
- VALUE "ProductName", "ente Auth" "\0"
+ VALUE "ProductName", "Ente Auth" "\0"
VALUE "ProductVersion", VERSION_AS_STRING "\0"
END
END
diff --git a/auth/windows/runner/main.cpp b/auth/windows/runner/main.cpp
index 546bc77e6..11751936c 100644
--- a/auth/windows/runner/main.cpp
+++ b/auth/windows/runner/main.cpp
@@ -49,7 +49,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
_In_ wchar_t *command_line, _In_ int show_command)
{
// [app_links]
- if (SendAppLinkToInstance(L"ente Auth"))
+ if (SendAppLinkToInstance(L"Ente Auth"))
{
return EXIT_SUCCESS;
}
@@ -74,7 +74,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
FlutterWindow window(project);
Win32Window::Point origin(10, 10);
Win32Window::Size size(1280, 720);
- if (!window.Create(L"ente Auth", origin, size))
+ if (!window.Create(L"Ente Auth", origin, size))
{
return EXIT_FAILURE;
}
diff --git a/cli/internal/api/file_type.go b/cli/internal/api/file_type.go
index f241f8fe5..93a23b7b0 100644
--- a/cli/internal/api/file_type.go
+++ b/cli/internal/api/file_type.go
@@ -18,6 +18,10 @@ type File struct {
Info *FileInfo `json:"info,omitempty"`
}
+func (f File) IsRemovedFromAlbum() bool {
+ return f.IsDeleted || f.File.EncryptedData == "-"
+}
+
// FileInfo has information about storage used by the file & it's metadata(future)
type FileInfo struct {
FileSize int64 `json:"fileSize,omitempty"`
diff --git a/cli/internal/crypto/crypto.go b/cli/internal/crypto/crypto.go
index 83200896b..11868c0ba 100644
--- a/cli/internal/crypto/crypto.go
+++ b/cli/internal/crypto/crypto.go
@@ -98,7 +98,8 @@ func DecryptChaChaBase64(data string, key []byte, nonce string) (string, []byte,
// Decode data from base64
dataBytes, err := base64.StdEncoding.DecodeString(data)
if err != nil {
- return "", nil, fmt.Errorf("invalid data: %v", err)
+ // safe to log the encrypted data
+ return "", nil, fmt.Errorf("invalid base64 data %s: %v", data, err)
}
// Decode nonce from base64
nonceBytes, err := base64.StdEncoding.DecodeString(nonce)
diff --git a/cli/main.go b/cli/main.go
index 157c11fd8..d62cdcffa 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -15,7 +15,7 @@ import (
"strings"
)
-var AppVersion = "0.1.12"
+var AppVersion = "0.1.13"
func main() {
cliDBPath, err := GetCLIConfigPath()
diff --git a/cli/pkg/mapper/photo.go b/cli/pkg/mapper/photo.go
index fa55ffae5..ac16f44f7 100644
--- a/cli/pkg/mapper/photo.go
+++ b/cli/pkg/mapper/photo.go
@@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"errors"
+ "fmt"
"github.com/ente-io/cli/internal/api"
eCrypto "github.com/ente-io/cli/internal/crypto"
"github.com/ente-io/cli/pkg/model"
@@ -41,7 +42,7 @@ func MapCollectionToAlbum(ctx context.Context, collection api.Collection, holder
if collection.MagicMetadata != nil {
_, encodedJsonBytes, err := eCrypto.DecryptChaChaBase64(collection.MagicMetadata.Data, collectionKey, collection.MagicMetadata.Header)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to decrypt magic metadata for collection %d: %w", collection.ID, err)
}
err = json.Unmarshal(encodedJsonBytes, &album.PrivateMeta)
if err != nil {
@@ -51,28 +52,28 @@ func MapCollectionToAlbum(ctx context.Context, collection api.Collection, holder
if collection.PublicMagicMetadata != nil {
_, encodedJsonBytes, err := eCrypto.DecryptChaChaBase64(collection.PublicMagicMetadata.Data, collectionKey, collection.PublicMagicMetadata.Header)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to decrypt public magic metadata for collection %d: %w", collection.ID, err)
}
err = json.Unmarshal(encodedJsonBytes, &album.PublicMeta)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to unmarshal public magic metadata for collection %d: %w", collection.ID, err)
}
}
if album.IsShared && collection.SharedMagicMetadata != nil {
_, encodedJsonBytes, err := eCrypto.DecryptChaChaBase64(collection.SharedMagicMetadata.Data, collectionKey, collection.SharedMagicMetadata.Header)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to decrypt shared magic metadata for collection %d: %w", collection.ID, err)
}
err = json.Unmarshal(encodedJsonBytes, &album.SharedMeta)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to unmarshal shared magic metadata for collection %d: %w", collection.ID, err)
}
}
return &album, nil
}
func MapApiFileToPhotoFile(ctx context.Context, album model.RemoteAlbum, file api.File, holder *secrets.KeyHolder) (*model.RemoteFile, error) {
- if file.IsDeleted {
+ if file.IsRemovedFromAlbum() {
return nil, errors.New("file is deleted")
}
albumKey := album.AlbumKey.MustDecrypt(holder.DeviceKey)
@@ -99,7 +100,7 @@ func MapApiFileToPhotoFile(ctx context.Context, album model.RemoteAlbum, file ap
if file.Metadata.DecryptionHeader != "" {
_, encodedJsonBytes, err := eCrypto.DecryptChaChaBase64(file.Metadata.EncryptedData, fileKey, file.Metadata.DecryptionHeader)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to decrypt metadata for file %d: %w", file.ID, err)
}
err = json.Unmarshal(encodedJsonBytes, &photoFile.Metadata)
if err != nil {
@@ -109,7 +110,7 @@ func MapApiFileToPhotoFile(ctx context.Context, album model.RemoteAlbum, file ap
if file.MagicMetadata != nil {
_, encodedJsonBytes, err := eCrypto.DecryptChaChaBase64(file.MagicMetadata.Data, fileKey, file.MagicMetadata.Header)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to decrypt magic metadata for file %d: %w", file.ID, err)
}
err = json.Unmarshal(encodedJsonBytes, &photoFile.PrivateMetadata)
if err != nil {
@@ -119,7 +120,7 @@ func MapApiFileToPhotoFile(ctx context.Context, album model.RemoteAlbum, file ap
if file.PubicMagicMetadata != nil {
_, encodedJsonBytes, err := eCrypto.DecryptChaChaBase64(file.PubicMagicMetadata.Data, fileKey, file.PubicMagicMetadata.Header)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to decrypt public magic metadata for file %d: %w", file.ID, err)
}
err = json.Unmarshal(encodedJsonBytes, &photoFile.PublicMetadata)
if err != nil {
diff --git a/cli/pkg/remote_sync.go b/cli/pkg/remote_sync.go
index a37a4a58c..5ca149d71 100644
--- a/cli/pkg/remote_sync.go
+++ b/cli/pkg/remote_sync.go
@@ -87,16 +87,16 @@ func (c *ClICtrl) fetchRemoteFiles(ctx context.Context) error {
if file.UpdationTime > maxUpdated {
maxUpdated = file.UpdationTime
}
- if isFirstSync && file.IsDeleted {
+ if isFirstSync && file.IsRemovedFromAlbum() {
// on first sync, no need to sync delete markers
continue
}
- albumEntry := model.AlbumFileEntry{AlbumID: album.ID, FileID: file.ID, IsDeleted: file.IsDeleted, SyncedLocally: false}
+ albumEntry := model.AlbumFileEntry{AlbumID: album.ID, FileID: file.ID, IsDeleted: file.IsRemovedFromAlbum(), SyncedLocally: false}
putErr := c.UpsertAlbumEntry(ctx, &albumEntry)
if putErr != nil {
return putErr
}
- if file.IsDeleted {
+ if file.IsRemovedFromAlbum() {
continue
}
photoFile, err := mapper.MapApiFileToPhotoFile(ctx, album, file, c.KeyHolder)
diff --git a/desktop/.eslintrc.js b/desktop/.eslintrc.js
index 491d9aed3..a47eb483f 100644
--- a/desktop/.eslintrc.js
+++ b/desktop/.eslintrc.js
@@ -7,11 +7,6 @@ module.exports = {
// "plugin:@typescript-eslint/strict-type-checked",
// "plugin:@typescript-eslint/stylistic-type-checked",
],
- /* Temporarily disable some rules
- Enhancement: Remove me */
- rules: {
- "no-unused-vars": "off",
- },
/* Temporarily add a global
Enhancement: Remove me */
globals: {
diff --git a/desktop/build/ggmlclip-linux b/desktop/build/ggmlclip-linux
deleted file mode 100755
index 4c160b039..000000000
Binary files a/desktop/build/ggmlclip-linux and /dev/null differ
diff --git a/desktop/build/ggmlclip-mac b/desktop/build/ggmlclip-mac
deleted file mode 100755
index db7c4f249..000000000
Binary files a/desktop/build/ggmlclip-mac and /dev/null differ
diff --git a/desktop/build/ggmlclip-windows.exe b/desktop/build/ggmlclip-windows.exe
deleted file mode 100755
index 1e197dfe8..000000000
Binary files a/desktop/build/ggmlclip-windows.exe and /dev/null differ
diff --git a/desktop/build/msvcp140d.dll b/desktop/build/msvcp140d.dll
deleted file mode 100644
index 358e18663..000000000
Binary files a/desktop/build/msvcp140d.dll and /dev/null differ
diff --git a/desktop/build/ucrtbased.dll b/desktop/build/ucrtbased.dll
deleted file mode 100644
index 78cfcfeeb..000000000
Binary files a/desktop/build/ucrtbased.dll and /dev/null differ
diff --git a/desktop/build/vcruntime140_1d.dll b/desktop/build/vcruntime140_1d.dll
deleted file mode 100644
index 700cf5f75..000000000
Binary files a/desktop/build/vcruntime140_1d.dll and /dev/null differ
diff --git a/desktop/build/vcruntime140d.dll b/desktop/build/vcruntime140d.dll
deleted file mode 100644
index 8b5425e0f..000000000
Binary files a/desktop/build/vcruntime140d.dll and /dev/null differ
diff --git a/desktop/docs/dependencies.md b/desktop/docs/dependencies.md
index cf38fe121..5c1b07744 100644
--- a/desktop/docs/dependencies.md
+++ b/desktop/docs/dependencies.md
@@ -61,15 +61,15 @@ Electron process. This allows us to directly use the output produced by
### Others
-* [any-shell-escape](https://github.com/boazy/any-shell-escape) is for
- escaping shell commands before we execute them (e.g. say when invoking the
- embedded ffmpeg CLI).
+- [any-shell-escape](https://github.com/boazy/any-shell-escape) is for
+ escaping shell commands before we execute them (e.g. say when invoking the
+ embedded ffmpeg CLI).
-* [auto-launch](https://github.com/Teamwork/node-auto-launch) is for
- automatically starting our app on login, if the user so wishes.
+- [auto-launch](https://github.com/Teamwork/node-auto-launch) is for
+ automatically starting our app on login, if the user so wishes.
-* [electron-store](https://github.com/sindresorhus/electron-store) is used for
- persisting user preferences and other arbitrary data.
+- [electron-store](https://github.com/sindresorhus/electron-store) is used for
+ persisting user preferences and other arbitrary data.
## Dev
@@ -79,12 +79,12 @@ are similar to that in the web code.
Some extra ones specific to the code here are:
-* [concurrently](https://github.com/open-cli-tools/concurrently) for spawning
- parallel tasks when we do `yarn dev`.
+- [concurrently](https://github.com/open-cli-tools/concurrently) for spawning
+ parallel tasks when we do `yarn dev`.
-* [shx](https://github.com/shelljs/shx) for providing a portable way to use Unix
- commands in our `package.json` scripts. This allows us to use the same
- commands (like `ln`) across different platforms like Linux and Windows.
+- [shx](https://github.com/shelljs/shx) for providing a portable way to use
+ Unix commands in our `package.json` scripts. This allows us to use the same
+ commands (like `ln`) across different platforms like Linux and Windows.
## Functionality
@@ -111,11 +111,11 @@ watcher for the watch folders functionality.
### AI/ML
-* [onnxruntime-node](https://github.com/Microsoft/onnxruntime)
-* html-entities is used by the bundled clip-bpe-ts.
-* GGML binaries are bundled
-* We also use [jpeg-js](https://github.com/jpeg-js/jpeg-js#readme) for
- conversion of all images to JPEG before processing.
+- [onnxruntime-node](https://github.com/Microsoft/onnxruntime) is used for
+ natural language searches based on CLIP.
+- html-entities is used by the bundled clip-bpe-ts tokenizer.
+- [jpeg-js](https://github.com/jpeg-js/jpeg-js#readme) is used for decoding
+ JPEG data into raw RGB bytes before passing it to ONNX.
## ZIP
diff --git a/desktop/docs/dev.md b/desktop/docs/dev.md
index af459e555..507438fdc 100644
--- a/desktop/docs/dev.md
+++ b/desktop/docs/dev.md
@@ -31,7 +31,7 @@ are built against `electron`'s packaged `node` version. We use
to rebuild those modules automatically after each `yarn install` by invoking it
in as the `postinstall` step in our package.json.
-### lint and lint-fix
+### lint, lint-fix
Use `yarn lint` to check that your code formatting is as expected, and that
there are no linter errors. Use `yarn lint-fix` to try and automatically fix the
diff --git a/desktop/electron-builder.yml b/desktop/electron-builder.yml
index 9189c3435..4fdfc4f55 100644
--- a/desktop/electron-builder.yml
+++ b/desktop/electron-builder.yml
@@ -19,7 +19,6 @@ mac:
arch: [universal]
category: public.app-category.photography
hardenedRuntime: true
- x64ArchFiles: Contents/Resources/ggmlclip-mac
afterSign: electron-builder-notarize
extraFiles:
- from: build
diff --git a/desktop/src/api/electronStore.ts b/desktop/src/api/electronStore.ts
deleted file mode 100644
index 2ee74953d..000000000
--- a/desktop/src/api/electronStore.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { logError } from "../main/log";
-import { keysStore } from "../stores/keys.store";
-import { safeStorageStore } from "../stores/safeStorage.store";
-import { uploadStatusStore } from "../stores/upload.store";
-import { watchStore } from "../stores/watch.store";
-
-export const clearElectronStore = () => {
- try {
- uploadStatusStore.clear();
- keysStore.clear();
- safeStorageStore.clear();
- watchStore.clear();
- } catch (e) {
- logError(e, "error while clearing electron store");
- throw e;
- }
-};
diff --git a/desktop/src/api/safeStorage.ts b/desktop/src/api/safeStorage.ts
deleted file mode 100644
index e3d674951..000000000
--- a/desktop/src/api/safeStorage.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { safeStorage } from "electron/main";
-import { logError } from "../main/log";
-import { safeStorageStore } from "../stores/safeStorage.store";
-
-export async function setEncryptionKey(encryptionKey: string) {
- try {
- const encryptedKey: Buffer =
- await safeStorage.encryptString(encryptionKey);
- const b64EncryptedKey = Buffer.from(encryptedKey).toString("base64");
- safeStorageStore.set("encryptionKey", b64EncryptedKey);
- } catch (e) {
- logError(e, "setEncryptionKey failed");
- throw e;
- }
-}
-
-export async function getEncryptionKey(): Promise {
- try {
- const b64EncryptedKey = safeStorageStore.get("encryptionKey");
- if (b64EncryptedKey) {
- const keyBuffer = Buffer.from(b64EncryptedKey, "base64");
- return await safeStorage.decryptString(keyBuffer);
- }
- } catch (e) {
- logError(e, "getEncryptionKey failed");
- throw e;
- }
-}
diff --git a/desktop/src/api/upload.ts b/desktop/src/api/upload.ts
deleted file mode 100644
index 24d0283ff..000000000
--- a/desktop/src/api/upload.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { getElectronFile } from "../services/fs";
-import {
- getElectronFilesFromGoogleZip,
- getSavedFilePaths,
-} from "../services/upload";
-import { uploadStatusStore } from "../stores/upload.store";
-import { ElectronFile, FILE_PATH_TYPE } from "../types/ipc";
-
-export const getPendingUploads = async () => {
- const filePaths = getSavedFilePaths(FILE_PATH_TYPE.FILES);
- const zipPaths = getSavedFilePaths(FILE_PATH_TYPE.ZIPS);
- const collectionName = uploadStatusStore.get("collectionName");
-
- let files: ElectronFile[] = [];
- let type: FILE_PATH_TYPE;
- if (zipPaths.length) {
- type = FILE_PATH_TYPE.ZIPS;
- for (const zipPath of zipPaths) {
- files = [
- ...files,
- ...(await getElectronFilesFromGoogleZip(zipPath)),
- ];
- }
- const pendingFilePaths = new Set(filePaths);
- files = files.filter((file) => pendingFilePaths.has(file.path));
- } else if (filePaths.length) {
- type = FILE_PATH_TYPE.FILES;
- files = await Promise.all(filePaths.map(getElectronFile));
- }
- return {
- files,
- collectionName,
- type,
- };
-};
-
-export {
- getElectronFilesFromGoogleZip,
- setToUploadCollection,
- setToUploadFiles,
-} from "../services/upload";
diff --git a/desktop/src/constants/errors.ts b/desktop/src/constants/errors.ts
deleted file mode 100644
index e6225ecf6..000000000
--- a/desktop/src/constants/errors.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * [Note: Custom errors across Electron/Renderer boundary]
- *
- * We need to use the `message` field to disambiguate between errors thrown by
- * the main process when invoked from the renderer process. This is because:
- *
- * > Errors thrown throw `handle` in the main process are not transparent as
- * > they are serialized and only the `message` property from the original error
- * > is provided to the renderer process.
- * >
- * > - https://www.electronjs.org/docs/latest/tutorial/ipc
- * >
- * > Ref: https://github.com/electron/electron/issues/24427
- */
-export const CustomErrors = {
- WINDOWS_NATIVE_IMAGE_PROCESSING_NOT_SUPPORTED:
- "Windows native image processing is not supported",
- INVALID_OS: (os: string) => `Invalid OS - ${os}`,
- WAIT_TIME_EXCEEDED: "Wait time exceeded",
- UNSUPPORTED_PLATFORM: (platform: string, arch: string) =>
- `Unsupported platform - ${platform} ${arch}`,
- MODEL_DOWNLOAD_PENDING:
- "Model download pending, skipping clip search request",
- INVALID_FILE_PATH: "Invalid file path",
- INVALID_CLIP_MODEL: (model: string) => `Invalid Clip model - ${model}`,
-};
diff --git a/desktop/src/main.ts b/desktop/src/main.ts
index 4383fa73f..b1e89b40c 100644
--- a/desktop/src/main.ts
+++ b/desktop/src/main.ts
@@ -12,6 +12,7 @@ import { app, BrowserWindow, Menu } from "electron/main";
import serveNextAt from "next-electron-server";
import { existsSync } from "node:fs";
import fs from "node:fs/promises";
+import os from "node:os";
import path from "node:path";
import {
addAllowOriginHeader,
@@ -19,7 +20,6 @@ import {
handleDockIconHideOnAutoLaunch,
handleDownloads,
handleExternalLinks,
- logStartupBanner,
setupMacWindowOnDockIconClick,
setupTrayItem,
} from "./main/init";
@@ -27,7 +27,7 @@ import { attachFSWatchIPCHandlers, attachIPCHandlers } from "./main/ipc";
import log, { initLogging } from "./main/log";
import { createApplicationMenu } from "./main/menu";
import { isDev } from "./main/util";
-import { setupAutoUpdater } from "./services/appUpdater";
+import { setupAutoUpdater } from "./services/app-update";
import { initWatcher } from "./services/chokidar";
let appIsQuitting = false;
@@ -72,6 +72,21 @@ const setupRendererServer = () => {
serveNextAt(rendererURL);
};
+/**
+ * Log a standard startup banner.
+ *
+ * This helps us identify app starts and other environment details in the logs.
+ */
+const logStartupBanner = () => {
+ const version = isDev ? "dev" : app.getVersion();
+ log.info(`Starting ente-photos-desktop ${version}`);
+
+ const platform = process.platform;
+ const osRelease = os.release();
+ const systemVersion = process.getSystemVersion();
+ log.info("Running on", { platform, osRelease, systemVersion });
+};
+
function enableSharedArrayBufferSupport() {
app.commandLine.appendSwitch("enable-features", "SharedArrayBuffer");
}
@@ -126,12 +141,13 @@ const deleteLegacyDiskCacheDirIfExists = async () => {
}
};
-function setupAppEventEmitter(mainWindow: BrowserWindow) {
- // fire event when mainWindow is in foreground
- mainWindow.on("focus", () => {
- mainWindow.webContents.send("app-in-foreground");
- });
-}
+const attachEventHandlers = (mainWindow: BrowserWindow) => {
+ // Let ipcRenderer know when mainWindow is in the foreground so that it can
+ // in turn inform the renderer process.
+ mainWindow.on("focus", () =>
+ mainWindow.webContents.send("mainWindowFocus"),
+ );
+};
const main = () => {
const gotTheLock = app.requestSingleInstanceLock();
@@ -144,6 +160,7 @@ const main = () => {
initLogging();
setupRendererServer();
+ logStartupBanner();
handleDockIconHideOnAutoLaunch();
increaseDiskCache();
enableSharedArrayBufferSupport();
@@ -163,7 +180,6 @@ const main = () => {
//
// Note that some Electron APIs can only be used after this event occurs.
app.on("ready", async () => {
- logStartupBanner();
mainWindow = await createWindow();
const watcher = initWatcher(mainWindow);
setupTrayItem(mainWindow);
@@ -175,13 +191,13 @@ const main = () => {
handleDownloads(mainWindow);
handleExternalLinks(mainWindow);
addAllowOriginHeader(mainWindow);
- setupAppEventEmitter(mainWindow);
+ attachEventHandlers(mainWindow);
try {
deleteLegacyDiskCacheDirIfExists();
} catch (e) {
// Log but otherwise ignore errors during non-critical startup
- // actions
+ // actions.
log.error("Ignoring startup error", e);
}
});
diff --git a/desktop/src/main/init.ts b/desktop/src/main/init.ts
index 0e94232aa..7f454f2e6 100644
--- a/desktop/src/main/init.ts
+++ b/desktop/src/main/init.ts
@@ -1,6 +1,5 @@
import { app, BrowserWindow, nativeImage, Tray } from "electron";
import { existsSync } from "node:fs";
-import os from "node:os";
import path from "node:path";
import { isAppQuitting, rendererURL } from "../main";
import autoLauncher from "../services/autoLauncher";
@@ -77,8 +76,6 @@ export const createWindow = async () => {
return mainWindow;
};
-export async function handleUpdates(mainWindow: BrowserWindow) {}
-
export const setupTrayItem = (mainWindow: BrowserWindow) => {
const iconName = isPlatform("mac")
? "taskbar-icon-Template.png"
@@ -149,16 +146,6 @@ export async function handleDockIconHideOnAutoLaunch() {
}
}
-export function logStartupBanner() {
- const version = isDev ? "dev" : app.getVersion();
- log.info(`Hello from ente-photos-desktop ${version}`);
-
- const platform = process.platform;
- const osRelease = os.release();
- const systemVersion = process.getSystemVersion();
- log.info("Running on", { platform, osRelease, systemVersion });
-}
-
function lowerCaseHeaders(responseHeaders: Record) {
const headers: Record = {};
for (const key of Object.keys(responseHeaders)) {
diff --git a/desktop/src/main/ipc.ts b/desktop/src/main/ipc.ts
index be9798186..ecb3e2010 100644
--- a/desktop/src/main/ipc.ts
+++ b/desktop/src/main/ipc.ts
@@ -10,30 +10,30 @@
import type { FSWatcher } from "chokidar";
import { ipcMain } from "electron/main";
-import { clearElectronStore } from "../api/electronStore";
-import { getEncryptionKey, setEncryptionKey } from "../api/safeStorage";
-import {
- getElectronFilesFromGoogleZip,
- getPendingUploads,
- setToUploadCollection,
- setToUploadFiles,
-} from "../api/upload";
import {
appVersion,
- muteUpdateNotification,
skipAppUpdate,
updateAndRestart,
-} from "../services/appUpdater";
-import {
- computeImageEmbedding,
- computeTextEmbedding,
-} from "../services/clipService";
+ updateOnNextRestart,
+} from "../services/app-update";
+import { clipImageEmbedding, clipTextEmbedding } from "../services/clip";
import { runFFmpegCmd } from "../services/ffmpeg";
import { getDirFiles } from "../services/fs";
import {
convertToJPEG,
generateImageThumbnail,
} from "../services/imageProcessor";
+import {
+ clearStores,
+ encryptionKey,
+ saveEncryptionKey,
+} from "../services/store";
+import {
+ getElectronFilesFromGoogleZip,
+ getPendingUploads,
+ setToUploadCollection,
+ setToUploadFiles,
+} from "../services/upload";
import {
addWatchMapping,
getWatchMappings,
@@ -41,12 +41,7 @@ import {
updateWatchMappingIgnoredFiles,
updateWatchMappingSyncedFiles,
} from "../services/watch";
-import type {
- ElectronFile,
- FILE_PATH_TYPE,
- Model,
- WatchMapping,
-} from "../types/ipc";
+import type { ElectronFile, FILE_PATH_TYPE, WatchMapping } from "../types/ipc";
import {
selectDirectory,
showUploadDirsDialog,
@@ -91,35 +86,33 @@ export const attachIPCHandlers = () => {
// - General
- ipcMain.handle("appVersion", (_) => appVersion());
+ ipcMain.handle("appVersion", () => appVersion());
ipcMain.handle("openDirectory", (_, dirPath) => openDirectory(dirPath));
- ipcMain.handle("openLogDirectory", (_) => openLogDirectory());
+ ipcMain.handle("openLogDirectory", () => openLogDirectory());
// See [Note: Catching exception during .send/.on]
ipcMain.on("logToDisk", (_, message) => logToDisk(message));
- ipcMain.on("clear-electron-store", (_) => {
- clearElectronStore();
- });
+ ipcMain.on("clearStores", () => clearStores());
- ipcMain.handle("setEncryptionKey", (_, encryptionKey) =>
- setEncryptionKey(encryptionKey),
+ ipcMain.handle("saveEncryptionKey", (_, encryptionKey) =>
+ saveEncryptionKey(encryptionKey),
);
- ipcMain.handle("getEncryptionKey", (_) => getEncryptionKey());
+ ipcMain.handle("encryptionKey", () => encryptionKey());
// - App update
- ipcMain.on("update-and-restart", (_) => updateAndRestart());
+ ipcMain.on("updateAndRestart", () => updateAndRestart());
- ipcMain.on("skip-app-update", (_, version) => skipAppUpdate(version));
-
- ipcMain.on("mute-update-notification", (_, version) =>
- muteUpdateNotification(version),
+ ipcMain.on("updateOnNextRestart", (_, version) =>
+ updateOnNextRestart(version),
);
+ ipcMain.on("skipAppUpdate", (_, version) => skipAppUpdate(version));
+
// - Conversion
ipcMain.handle("convertToJPEG", (_, fileData, filename) =>
@@ -145,25 +138,23 @@ export const attachIPCHandlers = () => {
// - ML
- ipcMain.handle(
- "computeImageEmbedding",
- (_, model: Model, imageData: Uint8Array) =>
- computeImageEmbedding(model, imageData),
+ ipcMain.handle("clipImageEmbedding", (_, jpegImageData: Uint8Array) =>
+ clipImageEmbedding(jpegImageData),
);
- ipcMain.handle("computeTextEmbedding", (_, model: Model, text: string) =>
- computeTextEmbedding(model, text),
+ ipcMain.handle("clipTextEmbedding", (_, text: string) =>
+ clipTextEmbedding(text),
);
// - File selection
- ipcMain.handle("selectDirectory", (_) => selectDirectory());
+ ipcMain.handle("selectDirectory", () => selectDirectory());
- ipcMain.handle("showUploadFilesDialog", (_) => showUploadFilesDialog());
+ ipcMain.handle("showUploadFilesDialog", () => showUploadFilesDialog());
- ipcMain.handle("showUploadDirsDialog", (_) => showUploadDirsDialog());
+ ipcMain.handle("showUploadDirsDialog", () => showUploadDirsDialog());
- ipcMain.handle("showUploadZipDialog", (_) => showUploadZipDialog());
+ ipcMain.handle("showUploadZipDialog", () => showUploadZipDialog());
// - FS
@@ -177,12 +168,12 @@ export const attachIPCHandlers = () => {
ipcMain.handle(
"saveStreamToDisk",
- (_, path: string, fileStream: ReadableStream) =>
+ (_, path: string, fileStream: ReadableStream) =>
saveStreamToDisk(path, fileStream),
);
- ipcMain.handle("saveFileToDisk", (_, path: string, file: any) =>
- saveFileToDisk(path, file),
+ ipcMain.handle("saveFileToDisk", (_, path: string, contents: string) =>
+ saveFileToDisk(path, contents),
);
ipcMain.handle("readTextFile", (_, path: string) => readTextFile(path));
@@ -203,7 +194,7 @@ export const attachIPCHandlers = () => {
// - Upload
- ipcMain.handle("getPendingUploads", (_) => getPendingUploads());
+ ipcMain.handle("getPendingUploads", () => getPendingUploads());
ipcMain.handle(
"setToUploadFiles",
@@ -252,7 +243,7 @@ export const attachFSWatchIPCHandlers = (watcher: FSWatcher) => {
removeWatchMapping(watcher, folderPath),
);
- ipcMain.handle("getWatchMappings", (_) => getWatchMappings());
+ ipcMain.handle("getWatchMappings", () => getWatchMappings());
ipcMain.handle(
"updateWatchMappingSyncedFiles",
diff --git a/desktop/src/main/log.ts b/desktop/src/main/log.ts
index 8787a530d..d43161fea 100644
--- a/desktop/src/main/log.ts
+++ b/desktop/src/main/log.ts
@@ -15,10 +15,20 @@ import { isDev } from "./util";
*/
export const initLogging = () => {
log.transports.file.fileName = "ente.log";
- log.transports.file.maxSize = 50 * 1024 * 1024; // 50MB;
+ log.transports.file.maxSize = 50 * 1024 * 1024; // 50 MB
log.transports.file.format = "[{y}-{m}-{d}T{h}:{i}:{s}{z}] {text}";
log.transports.console.level = false;
+
+ // Log unhandled errors and promise rejections.
+ log.errorHandler.startCatching({
+ onError: ({ error, errorName }) => {
+ logError(errorName, error);
+ // Prevent the default electron-log actions (e.g. showing a dialog)
+ // from getting triggered.
+ return false;
+ },
+ });
};
/**
@@ -31,25 +41,7 @@ export const logToDisk = (message: string) => {
log.info(`[rndr] ${message}`);
};
-export const logError = logErrorSentry;
-
-/** Deprecated, but no alternative yet */
-export function logErrorSentry(
- error: any,
- msg: string,
- info?: Record,
-) {
- logToDisk(
- `error: ${error?.name} ${error?.message} ${
- error?.stack
- } msg: ${msg} info: ${JSON.stringify(info)}`,
- );
- if (isDev) {
- console.log(error, { msg, info });
- }
-}
-
-const logError1 = (message: string, e?: unknown) => {
+const logError = (message: string, e?: unknown) => {
if (!e) {
logError_(message);
return;
@@ -78,11 +70,14 @@ const logInfo = (...params: any[]) => {
.map((p) => (typeof p == "string" ? p : util.inspect(p)))
.join(" ");
log.info(`[main] ${message}`);
- if (isDev) console.log(message);
+ if (isDev) console.log(`[info] ${message}`);
};
const logDebug = (param: () => any) => {
- if (isDev) console.log(`[debug] ${util.inspect(param())}`);
+ if (isDev) {
+ const p = param();
+ console.log(`[debug] ${typeof p == "string" ? p : util.inspect(p)}`);
+ }
};
/**
@@ -98,12 +93,13 @@ export default {
* Log an error message with an optional associated error object.
*
* {@link e} is generally expected to be an `instanceof Error` but it can be
- * any arbitrary object that we obtain, say, when in a try-catch handler.
+ * any arbitrary object that we obtain, say, when in a try-catch handler (in
+ * JavaScript any arbitrary value can be thrown).
*
* The log is written to disk. In development builds, the log is also
- * printed to the (Node.js process') console.
+ * printed to the main (Node.js) process console.
*/
- error: logError1,
+ error: logError,
/**
* Log a message.
*
@@ -111,7 +107,7 @@ export default {
* arbitrary number of arbitrary parameters that it then serializes.
*
* The log is written to disk. In development builds, the log is also
- * printed to the (Node.js process') console.
+ * printed to the main (Node.js) process console.
*/
info: logInfo,
/**
@@ -121,11 +117,11 @@ export default {
* function to call to get the log message instead of directly taking the
* message. The provided function will only be called in development builds.
*
- * The function can return an arbitrary value which is serialied before
+ * The function can return an arbitrary value which is serialized before
* being logged.
*
- * This log is not written to disk. It is printed to the (Node.js process')
- * console only on development builds.
+ * This log is NOT written to disk. And it is printed to the main (Node.js)
+ * process console, but only on development builds.
*/
debug: logDebug,
};
diff --git a/desktop/src/main/menu.ts b/desktop/src/main/menu.ts
index 658932961..c6ac1688a 100644
--- a/desktop/src/main/menu.ts
+++ b/desktop/src/main/menu.ts
@@ -6,7 +6,7 @@ import {
shell,
} from "electron";
import { setIsAppQuitting } from "../main";
-import { forceCheckForUpdateAndNotify } from "../services/appUpdater";
+import { forceCheckForAppUpdates } from "../services/app-update";
import autoLauncher from "../services/autoLauncher";
import {
getHideDockIconPreference,
@@ -26,8 +26,7 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
const macOSOnly = (options: MenuItemConstructorOptions[]) =>
process.platform == "darwin" ? options : [];
- const handleCheckForUpdates = () =>
- forceCheckForUpdateAndNotify(mainWindow);
+ const handleCheckForUpdates = () => forceCheckForAppUpdates(mainWindow);
const handleViewChangelog = () =>
shell.openExternal(
diff --git a/desktop/src/preload.ts b/desktop/src/preload.ts
index 4b171e28e..07736502b 100644
--- a/desktop/src/preload.ts
+++ b/desktop/src/preload.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
/**
* @file The preload script
*
@@ -31,9 +32,9 @@
* and when changing one of them, remember to see if the other two also need
* changing:
*
- * - [renderer] web/packages/shared/electron/types.ts contains docs
- * - [preload] desktop/src/preload.ts ↕︎
- * - [main] desktop/src/main/ipc.ts contains impl
+ * - [renderer] web/packages/next/types/electron.ts contains docs
+ * - [preload] desktop/src/preload.ts ↕︎
+ * - [main] desktop/src/main/ipc.ts contains impl
*/
import { contextBridge, ipcRenderer } from "electron/renderer";
@@ -44,7 +45,6 @@ import type {
AppUpdateInfo,
ElectronFile,
FILE_PATH_TYPE,
- Model,
WatchMapping,
} from "./types/ipc";
@@ -52,60 +52,55 @@ import type {
const appVersion = (): Promise => ipcRenderer.invoke("appVersion");
+const logToDisk = (message: string): void =>
+ ipcRenderer.send("logToDisk", message);
+
const openDirectory = (dirPath: string): Promise =>
- ipcRenderer.invoke("openDirectory");
+ ipcRenderer.invoke("openDirectory", dirPath);
const openLogDirectory = (): Promise =>
ipcRenderer.invoke("openLogDirectory");
-const logToDisk = (message: string): void =>
- ipcRenderer.send("logToDisk", message);
+const clearStores = () => ipcRenderer.send("clearStores");
+
+const encryptionKey = (): Promise =>
+ ipcRenderer.invoke("encryptionKey");
+
+const saveEncryptionKey = (encryptionKey: string): Promise =>
+ ipcRenderer.invoke("saveEncryptionKey", encryptionKey);
+
+const onMainWindowFocus = (cb?: () => void) => {
+ ipcRenderer.removeAllListeners("mainWindowFocus");
+ if (cb) ipcRenderer.on("mainWindowFocus", cb);
+};
+
+// - App update
+
+const onAppUpdateAvailable = (
+ cb?: ((updateInfo: AppUpdateInfo) => void) | undefined,
+) => {
+ ipcRenderer.removeAllListeners("appUpdateAvailable");
+ if (cb) {
+ ipcRenderer.on("appUpdateAvailable", (_, updateInfo: AppUpdateInfo) =>
+ cb(updateInfo),
+ );
+ }
+};
+
+const updateAndRestart = () => ipcRenderer.send("updateAndRestart");
+
+const updateOnNextRestart = (version: string) =>
+ ipcRenderer.send("updateOnNextRestart", version);
+
+const skipAppUpdate = (version: string) => {
+ ipcRenderer.send("skipAppUpdate", version);
+};
const fsExists = (path: string): Promise =>
ipcRenderer.invoke("fsExists", path);
// - AUDIT below this
-const registerForegroundEventListener = (onForeground: () => void) => {
- ipcRenderer.removeAllListeners("app-in-foreground");
- ipcRenderer.on("app-in-foreground", () => {
- onForeground();
- });
-};
-
-const clearElectronStore = () => {
- ipcRenderer.send("clear-electron-store");
-};
-
-const setEncryptionKey = (encryptionKey: string): Promise =>
- ipcRenderer.invoke("setEncryptionKey", encryptionKey);
-
-const getEncryptionKey = (): Promise =>
- ipcRenderer.invoke("getEncryptionKey");
-
-// - App update
-
-const registerUpdateEventListener = (
- showUpdateDialog: (updateInfo: AppUpdateInfo) => void,
-) => {
- ipcRenderer.removeAllListeners("show-update-dialog");
- ipcRenderer.on("show-update-dialog", (_, updateInfo: AppUpdateInfo) => {
- showUpdateDialog(updateInfo);
- });
-};
-
-const updateAndRestart = () => {
- ipcRenderer.send("update-and-restart");
-};
-
-const skipAppUpdate = (version: string) => {
- ipcRenderer.send("skip-app-update", version);
-};
-
-const muteUpdateNotification = (version: string) => {
- ipcRenderer.send("mute-update-notification", version);
-};
-
// - Conversion
const convertToJPEG = (
@@ -142,17 +137,11 @@ const runFFmpegCmd = (
// - ML
-const computeImageEmbedding = (
- model: Model,
- imageData: Uint8Array,
-): Promise =>
- ipcRenderer.invoke("computeImageEmbedding", model, imageData);
+const clipImageEmbedding = (jpegImageData: Uint8Array): Promise =>
+ ipcRenderer.invoke("clipImageEmbedding", jpegImageData);
-const computeTextEmbedding = (
- model: Model,
- text: string,
-): Promise =>
- ipcRenderer.invoke("computeTextEmbedding", model, text);
+const clipTextEmbedding = (text: string): Promise =>
+ ipcRenderer.invoke("clipTextEmbedding", text);
// - File selection
@@ -228,11 +217,11 @@ const checkExistsAndCreateDir = (dirPath: string): Promise =>
const saveStreamToDisk = (
path: string,
- fileStream: ReadableStream,
+ fileStream: ReadableStream,
): Promise => ipcRenderer.invoke("saveStreamToDisk", path, fileStream);
-const saveFileToDisk = (path: string, file: any): Promise =>
- ipcRenderer.invoke("saveFileToDisk", path, file);
+const saveFileToDisk = (path: string, contents: string): Promise =>
+ ipcRenderer.invoke("saveFileToDisk", path, contents);
const readTextFile = (path: string): Promise =>
ipcRenderer.invoke("readTextFile", path);
@@ -308,24 +297,22 @@ const getDirFiles = (dirPath: string): Promise =>
//
// The copy itself is relatively fast, but the problem with transfering large
// amounts of data is potentially running out of memory during the copy.
-contextBridge.exposeInMainWorld("ElectronAPIs", {
+contextBridge.exposeInMainWorld("electron", {
// - General
appVersion,
- openDirectory,
- registerForegroundEventListener,
- clearElectronStore,
- getEncryptionKey,
- setEncryptionKey,
-
- // - Logging
- openLogDirectory,
logToDisk,
+ openDirectory,
+ openLogDirectory,
+ clearStores,
+ encryptionKey,
+ saveEncryptionKey,
+ onMainWindowFocus,
// - App update
+ onAppUpdateAvailable,
updateAndRestart,
+ updateOnNextRestart,
skipAppUpdate,
- muteUpdateNotification,
- registerUpdateEventListener,
// - Conversion
convertToJPEG,
@@ -333,8 +320,8 @@ contextBridge.exposeInMainWorld("ElectronAPIs", {
runFFmpegCmd,
// - ML
- computeImageEmbedding,
- computeTextEmbedding,
+ clipImageEmbedding,
+ clipTextEmbedding,
// - File selection
selectDirectory,
diff --git a/desktop/src/services/app-update.ts b/desktop/src/services/app-update.ts
new file mode 100644
index 000000000..ec592095e
--- /dev/null
+++ b/desktop/src/services/app-update.ts
@@ -0,0 +1,98 @@
+import { compareVersions } from "compare-versions";
+import { app, BrowserWindow } from "electron";
+import { default as electronLog } from "electron-log";
+import { autoUpdater } from "electron-updater";
+import { setIsAppQuitting, setIsUpdateAvailable } from "../main";
+import log from "../main/log";
+import { userPreferencesStore } from "../stores/user-preferences";
+import { AppUpdateInfo } from "../types/ipc";
+
+export const setupAutoUpdater = (mainWindow: BrowserWindow) => {
+ autoUpdater.logger = electronLog;
+ autoUpdater.autoDownload = false;
+
+ const oneDay = 1 * 24 * 60 * 60 * 1000;
+ setInterval(() => checkForUpdatesAndNotify(mainWindow), oneDay);
+ checkForUpdatesAndNotify(mainWindow);
+};
+
+/**
+ * Check for app update check ignoring any previously saved skips / mutes.
+ */
+export const forceCheckForAppUpdates = (mainWindow: BrowserWindow) => {
+ userPreferencesStore.delete("skipAppVersion");
+ userPreferencesStore.delete("muteUpdateNotificationVersion");
+ checkForUpdatesAndNotify(mainWindow);
+};
+
+const checkForUpdatesAndNotify = async (mainWindow: BrowserWindow) => {
+ try {
+ const { updateInfo } = await autoUpdater.checkForUpdates();
+ const { version } = updateInfo;
+
+ log.debug(() => `Checking for updates found version ${version}`);
+
+ if (compareVersions(version, app.getVersion()) <= 0) {
+ log.debug(() => "Skipping update, already at latest version");
+ return;
+ }
+
+ if (version === userPreferencesStore.get("skipAppVersion")) {
+ log.info(`User chose to skip version ${version}`);
+ return;
+ }
+
+ const mutedVersion = userPreferencesStore.get(
+ "muteUpdateNotificationVersion",
+ );
+ if (version === mutedVersion) {
+ log.info(
+ `User has muted update notifications for version ${version}`,
+ );
+ return;
+ }
+
+ const showUpdateDialog = (updateInfo: AppUpdateInfo) =>
+ mainWindow.webContents.send("appUpdateAvailable", updateInfo);
+
+ log.debug(() => "Attempting auto update");
+ autoUpdater.downloadUpdate();
+
+ let timeout: NodeJS.Timeout;
+ const fiveMinutes = 5 * 60 * 1000;
+ autoUpdater.on("update-downloaded", () => {
+ timeout = setTimeout(
+ () => showUpdateDialog({ autoUpdatable: true, version }),
+ fiveMinutes,
+ );
+ });
+ autoUpdater.on("error", (error) => {
+ clearTimeout(timeout);
+ log.error("Auto update failed", error);
+ showUpdateDialog({ autoUpdatable: false, version });
+ });
+
+ setIsUpdateAvailable(true);
+ } catch (e) {
+ log.error("checkForUpdateAndNotify failed", e);
+ }
+};
+
+/**
+ * Return the version of the desktop app
+ *
+ * The return value is of the form `v1.2.3`.
+ */
+export const appVersion = () => `v${app.getVersion()}`;
+
+export const updateAndRestart = () => {
+ log.info("Restarting the app to apply update");
+ setIsAppQuitting(true);
+ autoUpdater.quitAndInstall();
+};
+
+export const updateOnNextRestart = (version: string) =>
+ userPreferencesStore.set("muteUpdateNotificationVersion", version);
+
+export const skipAppUpdate = (version: string) =>
+ userPreferencesStore.set("skipAppVersion", version);
diff --git a/desktop/src/services/appUpdater.ts b/desktop/src/services/appUpdater.ts
deleted file mode 100644
index 98db606a4..000000000
--- a/desktop/src/services/appUpdater.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import { compareVersions } from "compare-versions";
-import { app, BrowserWindow } from "electron";
-import { default as ElectronLog, default as log } from "electron-log";
-import { autoUpdater } from "electron-updater";
-import { setIsAppQuitting, setIsUpdateAvailable } from "../main";
-import { logErrorSentry } from "../main/log";
-import { AppUpdateInfo } from "../types/ipc";
-import {
- clearMuteUpdateNotificationVersion,
- clearSkipAppVersion,
- getMuteUpdateNotificationVersion,
- getSkipAppVersion,
- setMuteUpdateNotificationVersion,
- setSkipAppVersion,
-} from "./userPreference";
-
-const FIVE_MIN_IN_MICROSECOND = 5 * 60 * 1000;
-const ONE_DAY_IN_MICROSECOND = 1 * 24 * 60 * 60 * 1000;
-
-export function setupAutoUpdater(mainWindow: BrowserWindow) {
- autoUpdater.logger = log;
- autoUpdater.autoDownload = false;
- checkForUpdateAndNotify(mainWindow);
- setInterval(
- () => checkForUpdateAndNotify(mainWindow),
- ONE_DAY_IN_MICROSECOND,
- );
-}
-
-export function forceCheckForUpdateAndNotify(mainWindow: BrowserWindow) {
- try {
- clearSkipAppVersion();
- clearMuteUpdateNotificationVersion();
- checkForUpdateAndNotify(mainWindow);
- } catch (e) {
- logErrorSentry(e, "forceCheckForUpdateAndNotify failed");
- }
-}
-
-async function checkForUpdateAndNotify(mainWindow: BrowserWindow) {
- try {
- log.debug("checkForUpdateAndNotify called");
- const updateCheckResult = await autoUpdater.checkForUpdates();
- log.debug("update version", updateCheckResult.updateInfo.version);
- if (
- compareVersions(
- updateCheckResult.updateInfo.version,
- app.getVersion(),
- ) <= 0
- ) {
- log.debug("already at latest version");
- return;
- }
- const skipAppVersion = getSkipAppVersion();
- if (
- skipAppVersion &&
- updateCheckResult.updateInfo.version === skipAppVersion
- ) {
- log.info(
- "user chose to skip version ",
- updateCheckResult.updateInfo.version,
- );
- return;
- }
-
- let timeout: NodeJS.Timeout;
- log.debug("attempting auto update");
- autoUpdater.downloadUpdate();
- const muteUpdateNotificationVersion =
- getMuteUpdateNotificationVersion();
- if (
- muteUpdateNotificationVersion &&
- updateCheckResult.updateInfo.version ===
- muteUpdateNotificationVersion
- ) {
- log.info(
- "user chose to mute update notification for version ",
- updateCheckResult.updateInfo.version,
- );
- return;
- }
- autoUpdater.on("update-downloaded", () => {
- timeout = setTimeout(
- () =>
- showUpdateDialog(mainWindow, {
- autoUpdatable: true,
- version: updateCheckResult.updateInfo.version,
- }),
- FIVE_MIN_IN_MICROSECOND,
- );
- });
- autoUpdater.on("error", (error) => {
- clearTimeout(timeout);
- logErrorSentry(error, "auto update failed");
- showUpdateDialog(mainWindow, {
- autoUpdatable: false,
- version: updateCheckResult.updateInfo.version,
- });
- });
-
- setIsUpdateAvailable(true);
- } catch (e) {
- logErrorSentry(e, "checkForUpdateAndNotify failed");
- }
-}
-
-export function updateAndRestart() {
- ElectronLog.log("user quit the app");
- setIsAppQuitting(true);
- autoUpdater.quitAndInstall();
-}
-
-/**
- * Return the version of the desktop app
- *
- * The return value is of the form `v1.2.3`.
- */
-export const appVersion = () => `v${app.getVersion()}`;
-
-export function skipAppUpdate(version: string) {
- setSkipAppVersion(version);
-}
-
-export function muteUpdateNotification(version: string) {
- setMuteUpdateNotificationVersion(version);
-}
-
-function showUpdateDialog(
- mainWindow: BrowserWindow,
- updateInfo: AppUpdateInfo,
-) {
- mainWindow.webContents.send("show-update-dialog", updateInfo);
-}
diff --git a/desktop/src/services/chokidar.ts b/desktop/src/services/chokidar.ts
index 57a0e504e..cef386ea3 100644
--- a/desktop/src/services/chokidar.ts
+++ b/desktop/src/services/chokidar.ts
@@ -1,7 +1,7 @@
import chokidar from "chokidar";
import { BrowserWindow } from "electron";
import path from "path";
-import { logError } from "../main/log";
+import log from "../main/log";
import { getWatchMappings } from "../services/watch";
import { getElectronFile } from "./fs";
@@ -38,7 +38,7 @@ export function initWatcher(mainWindow: BrowserWindow) {
);
})
.on("error", (error) => {
- logError(error, "error while watching files");
+ log.error("Error while watching files", error);
});
return watcher;
diff --git a/desktop/src/services/clip.ts b/desktop/src/services/clip.ts
new file mode 100644
index 000000000..5de05e601
--- /dev/null
+++ b/desktop/src/services/clip.ts
@@ -0,0 +1,288 @@
+/**
+ * @file Compute CLIP embeddings
+ *
+ * @see `web/apps/photos/src/services/clip-service.ts` for more details. This
+ * file implements the Node.js implementation of the actual embedding
+ * computation. By doing it in the Node.js layer, we can use the binary ONNX
+ * runtimes which are 10-20x faster than the WASM based web ones.
+ *
+ * The embeddings are computed using ONNX runtime. The model itself is not
+ * shipped with the app but is downloaded on demand.
+ */
+import { app, net } from "electron/main";
+import { existsSync } from "fs";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { writeStream } from "../main/fs";
+import log from "../main/log";
+import { CustomErrors } from "../types/ipc";
+import Tokenizer from "../utils/clip-bpe-ts/mod";
+import { generateTempFilePath } from "../utils/temp";
+import { deleteTempFile } from "./ffmpeg";
+const jpeg = require("jpeg-js");
+const ort = require("onnxruntime-node");
+
+const textModelName = "clip-text-vit-32-uint8.onnx";
+const textModelByteSize = 64173509; // 61.2 MB
+
+const imageModelName = "clip-image-vit-32-float32.onnx";
+const imageModelByteSize = 351468764; // 335.2 MB
+
+/** Return the path where the given {@link modelName} is meant to be saved */
+const modelSavePath = (modelName: string) =>
+ path.join(app.getPath("userData"), "models", modelName);
+
+const downloadModel = async (saveLocation: string, name: string) => {
+ // `mkdir -p` the directory where we want to save the model.
+ const saveDir = path.dirname(saveLocation);
+ await fs.mkdir(saveDir, { recursive: true });
+ // Download
+ log.info(`Downloading CLIP model from ${name}`);
+ const url = `https://models.ente.io/${name}`;
+ const res = await net.fetch(url);
+ if (!res.ok) throw new Error(`Failed to fetch ${url}: HTTP ${res.status}`);
+ // Save
+ await writeStream(saveLocation, res.body);
+ log.info(`Downloaded CLIP model ${name}`);
+};
+
+let activeImageModelDownload: Promise | undefined;
+
+const imageModelPathDownloadingIfNeeded = async () => {
+ try {
+ const modelPath = modelSavePath(imageModelName);
+ if (activeImageModelDownload) {
+ log.info("Waiting for CLIP image model download to finish");
+ await activeImageModelDownload;
+ } else {
+ if (!existsSync(modelPath)) {
+ log.info("CLIP image model not found, downloading");
+ activeImageModelDownload = downloadModel(
+ modelPath,
+ imageModelName,
+ );
+ await activeImageModelDownload;
+ } else {
+ const localFileSize = (await fs.stat(modelPath)).size;
+ if (localFileSize !== imageModelByteSize) {
+ log.error(
+ `CLIP image model size ${localFileSize} does not match the expected size, downloading again`,
+ );
+ activeImageModelDownload = downloadModel(
+ modelPath,
+ imageModelName,
+ );
+ await activeImageModelDownload;
+ }
+ }
+ }
+ return modelPath;
+ } finally {
+ activeImageModelDownload = undefined;
+ }
+};
+
+let textModelDownloadInProgress = false;
+
+const textModelPathDownloadingIfNeeded = async () => {
+ if (textModelDownloadInProgress)
+ throw Error(CustomErrors.MODEL_DOWNLOAD_PENDING);
+
+ const modelPath = modelSavePath(textModelName);
+ if (!existsSync(modelPath)) {
+ log.info("CLIP text model not found, downloading");
+ textModelDownloadInProgress = true;
+ downloadModel(modelPath, textModelName)
+ .catch((e) => {
+ // log but otherwise ignore
+ log.error("CLIP text model download failed", e);
+ })
+ .finally(() => {
+ textModelDownloadInProgress = false;
+ });
+ throw Error(CustomErrors.MODEL_DOWNLOAD_PENDING);
+ } else {
+ const localFileSize = (await fs.stat(modelPath)).size;
+ if (localFileSize !== textModelByteSize) {
+ log.error(
+ `CLIP text model size ${localFileSize} does not match the expected size, downloading again`,
+ );
+ textModelDownloadInProgress = true;
+ downloadModel(modelPath, textModelName)
+ .catch((e) => {
+ // log but otherwise ignore
+ log.error("CLIP text model download failed", e);
+ })
+ .finally(() => {
+ textModelDownloadInProgress = false;
+ });
+ throw Error(CustomErrors.MODEL_DOWNLOAD_PENDING);
+ }
+ }
+
+ return modelPath;
+};
+
+const createInferenceSession = async (modelPath: string) => {
+ return await ort.InferenceSession.create(modelPath, {
+ intraOpNumThreads: 1,
+ enableCpuMemArena: false,
+ });
+};
+
+let imageSessionPromise: Promise | undefined;
+
+const onnxImageSession = async () => {
+ if (!imageSessionPromise) {
+ imageSessionPromise = (async () => {
+ const modelPath = await imageModelPathDownloadingIfNeeded();
+ return createInferenceSession(modelPath);
+ })();
+ }
+ return imageSessionPromise;
+};
+
+let _textSession: any = null;
+
+const onnxTextSession = async () => {
+ if (!_textSession) {
+ const modelPath = await textModelPathDownloadingIfNeeded();
+ _textSession = await createInferenceSession(modelPath);
+ }
+ return _textSession;
+};
+
+export const clipImageEmbedding = async (jpegImageData: Uint8Array) => {
+ const tempFilePath = await generateTempFilePath("");
+ const imageStream = new Response(jpegImageData.buffer).body;
+ await writeStream(tempFilePath, imageStream);
+ try {
+ return await clipImageEmbedding_(tempFilePath);
+ } finally {
+ await deleteTempFile(tempFilePath);
+ }
+};
+
+const clipImageEmbedding_ = async (jpegFilePath: string) => {
+ const imageSession = await onnxImageSession();
+ const t1 = Date.now();
+ const rgbData = await getRGBData(jpegFilePath);
+ const feeds = {
+ input: new ort.Tensor("float32", rgbData, [1, 3, 224, 224]),
+ };
+ const t2 = Date.now();
+ const results = await imageSession.run(feeds);
+ log.debug(
+ () =>
+ `CLIP image embedding took ${Date.now() - t1} ms (prep: ${t2 - t1} ms, inference: ${Date.now() - t2} ms)`,
+ );
+ const imageEmbedding = results["output"].data; // Float32Array
+ return normalizeEmbedding(imageEmbedding);
+};
+
+const getRGBData = async (jpegFilePath: string) => {
+ const jpegData = await fs.readFile(jpegFilePath);
+ const rawImageData = jpeg.decode(jpegData, {
+ useTArray: true,
+ formatAsRGBA: false,
+ });
+
+ const nx: number = rawImageData.width;
+ const ny: number = rawImageData.height;
+ const inputImage: Uint8Array = rawImageData.data;
+
+ const nx2: number = 224;
+ const ny2: number = 224;
+ const totalSize: number = 3 * nx2 * ny2;
+
+ const result: number[] = Array(totalSize).fill(0);
+ const scale: number = Math.max(nx, ny) / 224;
+
+ const nx3: number = Math.round(nx / scale);
+ const ny3: number = Math.round(ny / scale);
+
+ const mean: number[] = [0.48145466, 0.4578275, 0.40821073];
+ const std: number[] = [0.26862954, 0.26130258, 0.27577711];
+
+ for (let y = 0; y < ny3; y++) {
+ for (let x = 0; x < nx3; x++) {
+ for (let c = 0; c < 3; c++) {
+ // Linear interpolation
+ const sx: number = (x + 0.5) * scale - 0.5;
+ const sy: number = (y + 0.5) * scale - 0.5;
+
+ const x0: number = Math.max(0, Math.floor(sx));
+ const y0: number = Math.max(0, Math.floor(sy));
+
+ const x1: number = Math.min(x0 + 1, nx - 1);
+ const y1: number = Math.min(y0 + 1, ny - 1);
+
+ const dx: number = sx - x0;
+ const dy: number = sy - y0;
+
+ const j00: number = 3 * (y0 * nx + x0) + c;
+ const j01: number = 3 * (y0 * nx + x1) + c;
+ const j10: number = 3 * (y1 * nx + x0) + c;
+ const j11: number = 3 * (y1 * nx + x1) + c;
+
+ const v00: number = inputImage[j00];
+ const v01: number = inputImage[j01];
+ const v10: number = inputImage[j10];
+ const v11: number = inputImage[j11];
+
+ const v0: number = v00 * (1 - dx) + v01 * dx;
+ const v1: number = v10 * (1 - dx) + v11 * dx;
+
+ const v: number = v0 * (1 - dy) + v1 * dy;
+
+ const v2: number = Math.min(Math.max(Math.round(v), 0), 255);
+
+ // createTensorWithDataList is dumb compared to reshape and
+ // hence has to be given with one channel after another
+ const i: number = y * nx3 + x + (c % 3) * 224 * 224;
+
+ result[i] = (v2 / 255 - mean[c]) / std[c];
+ }
+ }
+ }
+
+ return result;
+};
+
+const normalizeEmbedding = (embedding: Float32Array) => {
+ let normalization = 0;
+ for (let index = 0; index < embedding.length; index++) {
+ normalization += embedding[index] * embedding[index];
+ }
+ const sqrtNormalization = Math.sqrt(normalization);
+ for (let index = 0; index < embedding.length; index++) {
+ embedding[index] = embedding[index] / sqrtNormalization;
+ }
+ return embedding;
+};
+
+let _tokenizer: Tokenizer = null;
+const getTokenizer = () => {
+ if (!_tokenizer) {
+ _tokenizer = new Tokenizer();
+ }
+ return _tokenizer;
+};
+
+export const clipTextEmbedding = async (text: string) => {
+ const imageSession = await onnxTextSession();
+ const t1 = Date.now();
+ const tokenizer = getTokenizer();
+ const tokenizedText = Int32Array.from(tokenizer.encodeForCLIP(text));
+ const feeds = {
+ input: new ort.Tensor("int32", tokenizedText, [1, 77]),
+ };
+ const t2 = Date.now();
+ const results = await imageSession.run(feeds);
+ log.debug(
+ () =>
+ `CLIP text embedding took ${Date.now() - t1} ms (prep: ${t2 - t1} ms, inference: ${Date.now() - t2} ms)`,
+ );
+ const textEmbedding = results["output"].data;
+ return normalizeEmbedding(textEmbedding);
+};
diff --git a/desktop/src/services/clipService.ts b/desktop/src/services/clipService.ts
deleted file mode 100644
index 41e559a9b..000000000
--- a/desktop/src/services/clipService.ts
+++ /dev/null
@@ -1,506 +0,0 @@
-import { app, net } from "electron/main";
-import { existsSync } from "fs";
-import fs from "node:fs/promises";
-import path from "node:path";
-import { CustomErrors } from "../constants/errors";
-import { writeStream } from "../main/fs";
-import log, { logErrorSentry } from "../main/log";
-import { execAsync, isDev } from "../main/util";
-import { Model } from "../types/ipc";
-import Tokenizer from "../utils/clip-bpe-ts/mod";
-import { getPlatform } from "../utils/common/platform";
-import { generateTempFilePath } from "../utils/temp";
-import { deleteTempFile } from "./ffmpeg";
-const jpeg = require("jpeg-js");
-
-const CLIP_MODEL_PATH_PLACEHOLDER = "CLIP_MODEL";
-const GGMLCLIP_PATH_PLACEHOLDER = "GGML_PATH";
-const INPUT_PATH_PLACEHOLDER = "INPUT";
-
-const IMAGE_EMBEDDING_EXTRACT_CMD: string[] = [
- GGMLCLIP_PATH_PLACEHOLDER,
- "-mv",
- CLIP_MODEL_PATH_PLACEHOLDER,
- "--image",
- INPUT_PATH_PLACEHOLDER,
-];
-
-const TEXT_EMBEDDING_EXTRACT_CMD: string[] = [
- GGMLCLIP_PATH_PLACEHOLDER,
- "-mt",
- CLIP_MODEL_PATH_PLACEHOLDER,
- "--text",
- INPUT_PATH_PLACEHOLDER,
-];
-const ort = require("onnxruntime-node");
-
-const TEXT_MODEL_DOWNLOAD_URL = {
- ggml: "https://models.ente.io/clip-vit-base-patch32_ggml-text-model-f16.gguf",
- onnx: "https://models.ente.io/clip-text-vit-32-uint8.onnx",
-};
-const IMAGE_MODEL_DOWNLOAD_URL = {
- ggml: "https://models.ente.io/clip-vit-base-patch32_ggml-vision-model-f16.gguf",
- onnx: "https://models.ente.io/clip-image-vit-32-float32.onnx",
-};
-
-const TEXT_MODEL_NAME = {
- ggml: "clip-vit-base-patch32_ggml-text-model-f16.gguf",
- onnx: "clip-text-vit-32-uint8.onnx",
-};
-const IMAGE_MODEL_NAME = {
- ggml: "clip-vit-base-patch32_ggml-vision-model-f16.gguf",
- onnx: "clip-image-vit-32-float32.onnx",
-};
-
-const IMAGE_MODEL_SIZE_IN_BYTES = {
- ggml: 175957504, // 167.8 MB
- onnx: 351468764, // 335.2 MB
-};
-const TEXT_MODEL_SIZE_IN_BYTES = {
- ggml: 127853440, // 121.9 MB,
- onnx: 64173509, // 61.2 MB
-};
-
-/** Return the path where the given {@link modelName} is meant to be saved */
-const getModelSavePath = (modelName: string) =>
- path.join(app.getPath("userData"), "models", modelName);
-
-async function downloadModel(saveLocation: string, url: string) {
- // confirm that the save location exists
- const saveDir = path.dirname(saveLocation);
- await fs.mkdir(saveDir, { recursive: true });
- log.info("downloading clip model");
- const res = await net.fetch(url);
- if (!res.ok) throw new Error(`Failed to fetch ${url}: HTTP ${res.status}`);
- await writeStream(saveLocation, res.body);
- log.info("clip model downloaded");
-}
-
-let imageModelDownloadInProgress: Promise = null;
-
-export async function getClipImageModelPath(type: "ggml" | "onnx") {
- try {
- const modelSavePath = getModelSavePath(IMAGE_MODEL_NAME[type]);
- if (imageModelDownloadInProgress) {
- log.info("waiting for image model download to finish");
- await imageModelDownloadInProgress;
- } else {
- if (!existsSync(modelSavePath)) {
- log.info("clip image model not found, downloading");
- imageModelDownloadInProgress = downloadModel(
- modelSavePath,
- IMAGE_MODEL_DOWNLOAD_URL[type],
- );
- await imageModelDownloadInProgress;
- } else {
- const localFileSize = (await fs.stat(modelSavePath)).size;
- if (localFileSize !== IMAGE_MODEL_SIZE_IN_BYTES[type]) {
- log.info(
- `clip image model size mismatch, downloading again got: ${localFileSize}`,
- );
- imageModelDownloadInProgress = downloadModel(
- modelSavePath,
- IMAGE_MODEL_DOWNLOAD_URL[type],
- );
- await imageModelDownloadInProgress;
- }
- }
- }
- return modelSavePath;
- } finally {
- imageModelDownloadInProgress = null;
- }
-}
-
-let textModelDownloadInProgress: boolean = false;
-
-export async function getClipTextModelPath(type: "ggml" | "onnx") {
- const modelSavePath = getModelSavePath(TEXT_MODEL_NAME[type]);
- if (textModelDownloadInProgress) {
- throw Error(CustomErrors.MODEL_DOWNLOAD_PENDING);
- } else {
- if (!existsSync(modelSavePath)) {
- log.info("clip text model not found, downloading");
- textModelDownloadInProgress = true;
- downloadModel(modelSavePath, TEXT_MODEL_DOWNLOAD_URL[type])
- .catch(() => {
- // ignore
- })
- .finally(() => {
- textModelDownloadInProgress = false;
- });
- throw Error(CustomErrors.MODEL_DOWNLOAD_PENDING);
- } else {
- const localFileSize = (await fs.stat(modelSavePath)).size;
- if (localFileSize !== TEXT_MODEL_SIZE_IN_BYTES[type]) {
- log.info(
- `clip text model size mismatch, downloading again got: ${localFileSize}`,
- );
- textModelDownloadInProgress = true;
- downloadModel(modelSavePath, TEXT_MODEL_DOWNLOAD_URL[type])
- .catch(() => {
- // ignore
- })
- .finally(() => {
- textModelDownloadInProgress = false;
- });
- throw Error(CustomErrors.MODEL_DOWNLOAD_PENDING);
- }
- }
- }
- return modelSavePath;
-}
-
-function getGGMLClipPath() {
- return isDev
- ? path.join("./build", `ggmlclip-${getPlatform()}`)
- : path.join(process.resourcesPath, `ggmlclip-${getPlatform()}`);
-}
-
-async function createOnnxSession(modelPath: string) {
- return await ort.InferenceSession.create(modelPath, {
- intraOpNumThreads: 1,
- enableCpuMemArena: false,
- });
-}
-
-let onnxImageSessionPromise: Promise = null;
-
-async function getOnnxImageSession() {
- if (!onnxImageSessionPromise) {
- onnxImageSessionPromise = (async () => {
- const clipModelPath = await getClipImageModelPath("onnx");
- return createOnnxSession(clipModelPath);
- })();
- }
- return onnxImageSessionPromise;
-}
-
-let onnxTextSession: any = null;
-
-async function getOnnxTextSession() {
- if (!onnxTextSession) {
- const clipModelPath = await getClipTextModelPath("onnx");
- onnxTextSession = await createOnnxSession(clipModelPath);
- }
- return onnxTextSession;
-}
-
-let tokenizer: Tokenizer = null;
-function getTokenizer() {
- if (!tokenizer) {
- tokenizer = new Tokenizer();
- }
- return tokenizer;
-}
-
-export const computeImageEmbedding = async (
- model: Model,
- imageData: Uint8Array,
-): Promise => {
- let tempInputFilePath = null;
- try {
- tempInputFilePath = await generateTempFilePath("");
- const imageStream = new Response(imageData.buffer).body;
- await writeStream(tempInputFilePath, imageStream);
- const embedding = await computeImageEmbedding_(
- model,
- tempInputFilePath,
- );
- return embedding;
- } catch (err) {
- if (isExecError(err)) {
- const parsedExecError = parseExecError(err);
- throw Error(parsedExecError);
- } else {
- throw err;
- }
- } finally {
- if (tempInputFilePath) {
- await deleteTempFile(tempInputFilePath);
- }
- }
-};
-
-const isExecError = (err: any) => {
- return err.message.includes("Command failed:");
-};
-
-const parseExecError = (err: any) => {
- const errMessage = err.message;
- if (errMessage.includes("Bad CPU type in executable")) {
- return CustomErrors.UNSUPPORTED_PLATFORM(
- process.platform,
- process.arch,
- );
- } else {
- return errMessage;
- }
-};
-
-async function computeImageEmbedding_(
- model: Model,
- inputFilePath: string,
-): Promise {
- if (!existsSync(inputFilePath)) {
- throw Error(CustomErrors.INVALID_FILE_PATH);
- }
- if (model === Model.GGML_CLIP) {
- return await computeGGMLImageEmbedding(inputFilePath);
- } else if (model === Model.ONNX_CLIP) {
- return await computeONNXImageEmbedding(inputFilePath);
- } else {
- throw Error(CustomErrors.INVALID_CLIP_MODEL(model));
- }
-}
-
-export async function computeGGMLImageEmbedding(
- inputFilePath: string,
-): Promise {
- try {
- const clipModelPath = await getClipImageModelPath("ggml");
- const ggmlclipPath = getGGMLClipPath();
- const cmd = IMAGE_EMBEDDING_EXTRACT_CMD.map((cmdPart) => {
- if (cmdPart === GGMLCLIP_PATH_PLACEHOLDER) {
- return ggmlclipPath;
- } else if (cmdPart === CLIP_MODEL_PATH_PLACEHOLDER) {
- return clipModelPath;
- } else if (cmdPart === INPUT_PATH_PLACEHOLDER) {
- return inputFilePath;
- } else {
- return cmdPart;
- }
- });
-
- const { stdout } = await execAsync(cmd);
- // parse stdout and return embedding
- // get the last line of stdout
- const lines = stdout.split("\n");
- const lastLine = lines[lines.length - 1];
- const embedding = JSON.parse(lastLine);
- const embeddingArray = new Float32Array(embedding);
- return embeddingArray;
- } catch (err) {
- log.error("Failed to compute GGML image embedding", err);
- throw err;
- }
-}
-
-export async function computeONNXImageEmbedding(
- inputFilePath: string,
-): Promise {
- try {
- const imageSession = await getOnnxImageSession();
- const t1 = Date.now();
- const rgbData = await getRGBData(inputFilePath);
- const feeds = {
- input: new ort.Tensor("float32", rgbData, [1, 3, 224, 224]),
- };
- const t2 = Date.now();
- const results = await imageSession.run(feeds);
- log.info(
- `onnx image embedding time: ${Date.now() - t1} ms (prep:${
- t2 - t1
- } ms, extraction: ${Date.now() - t2} ms)`,
- );
- const imageEmbedding = results["output"].data; // Float32Array
- return normalizeEmbedding(imageEmbedding);
- } catch (err) {
- log.error("Failed to compute ONNX image embedding", err);
- throw err;
- }
-}
-
-export async function computeTextEmbedding(
- model: Model,
- text: string,
-): Promise {
- try {
- const embedding = computeTextEmbedding_(model, text);
- return embedding;
- } catch (err) {
- if (isExecError(err)) {
- const parsedExecError = parseExecError(err);
- throw Error(parsedExecError);
- } else {
- throw err;
- }
- }
-}
-
-async function computeTextEmbedding_(
- model: Model,
- text: string,
-): Promise {
- if (model === Model.GGML_CLIP) {
- return await computeGGMLTextEmbedding(text);
- } else {
- return await computeONNXTextEmbedding(text);
- }
-}
-
-export async function computeGGMLTextEmbedding(
- text: string,
-): Promise {
- try {
- const clipModelPath = await getClipTextModelPath("ggml");
- const ggmlclipPath = getGGMLClipPath();
- const cmd = TEXT_EMBEDDING_EXTRACT_CMD.map((cmdPart) => {
- if (cmdPart === GGMLCLIP_PATH_PLACEHOLDER) {
- return ggmlclipPath;
- } else if (cmdPart === CLIP_MODEL_PATH_PLACEHOLDER) {
- return clipModelPath;
- } else if (cmdPart === INPUT_PATH_PLACEHOLDER) {
- return text;
- } else {
- return cmdPart;
- }
- });
-
- const { stdout } = await execAsync(cmd);
- // parse stdout and return embedding
- // get the last line of stdout
- const lines = stdout.split("\n");
- const lastLine = lines[lines.length - 1];
- const embedding = JSON.parse(lastLine);
- const embeddingArray = new Float32Array(embedding);
- return embeddingArray;
- } catch (err) {
- if (err.message === CustomErrors.MODEL_DOWNLOAD_PENDING) {
- log.info(CustomErrors.MODEL_DOWNLOAD_PENDING);
- } else {
- log.error("Failed to compute GGML text embedding", err);
- }
- throw err;
- }
-}
-
-export async function computeONNXTextEmbedding(
- text: string,
-): Promise {
- try {
- const imageSession = await getOnnxTextSession();
- const t1 = Date.now();
- const tokenizer = getTokenizer();
- const tokenizedText = Int32Array.from(tokenizer.encodeForCLIP(text));
- const feeds = {
- input: new ort.Tensor("int32", tokenizedText, [1, 77]),
- };
- const t2 = Date.now();
- const results = await imageSession.run(feeds);
- log.info(
- `onnx text embedding time: ${Date.now() - t1} ms (prep:${
- t2 - t1
- } ms, extraction: ${Date.now() - t2} ms)`,
- );
- const textEmbedding = results["output"].data; // Float32Array
- return normalizeEmbedding(textEmbedding);
- } catch (err) {
- if (err.message === CustomErrors.MODEL_DOWNLOAD_PENDING) {
- log.info(CustomErrors.MODEL_DOWNLOAD_PENDING);
- } else {
- logErrorSentry(err, "Error in computeONNXTextEmbedding");
- }
- throw err;
- }
-}
-
-async function getRGBData(inputFilePath: string) {
- const jpegData = await fs.readFile(inputFilePath);
- let rawImageData;
- try {
- rawImageData = jpeg.decode(jpegData, {
- useTArray: true,
- formatAsRGBA: false,
- });
- } catch (err) {
- logErrorSentry(err, "JPEG decode error");
- throw err;
- }
-
- const nx: number = rawImageData.width;
- const ny: number = rawImageData.height;
- const inputImage: Uint8Array = rawImageData.data;
-
- const nx2: number = 224;
- const ny2: number = 224;
- const totalSize: number = 3 * nx2 * ny2;
-
- const result: number[] = Array(totalSize).fill(0);
- const scale: number = Math.max(nx, ny) / 224;
-
- const nx3: number = Math.round(nx / scale);
- const ny3: number = Math.round(ny / scale);
-
- const mean: number[] = [0.48145466, 0.4578275, 0.40821073];
- const std: number[] = [0.26862954, 0.26130258, 0.27577711];
-
- for (let y = 0; y < ny3; y++) {
- for (let x = 0; x < nx3; x++) {
- for (let c = 0; c < 3; c++) {
- // linear interpolation
- const sx: number = (x + 0.5) * scale - 0.5;
- const sy: number = (y + 0.5) * scale - 0.5;
-
- const x0: number = Math.max(0, Math.floor(sx));
- const y0: number = Math.max(0, Math.floor(sy));
-
- const x1: number = Math.min(x0 + 1, nx - 1);
- const y1: number = Math.min(y0 + 1, ny - 1);
-
- const dx: number = sx - x0;
- const dy: number = sy - y0;
-
- const j00: number = 3 * (y0 * nx + x0) + c;
- const j01: number = 3 * (y0 * nx + x1) + c;
- const j10: number = 3 * (y1 * nx + x0) + c;
- const j11: number = 3 * (y1 * nx + x1) + c;
-
- const v00: number = inputImage[j00];
- const v01: number = inputImage[j01];
- const v10: number = inputImage[j10];
- const v11: number = inputImage[j11];
-
- const v0: number = v00 * (1 - dx) + v01 * dx;
- const v1: number = v10 * (1 - dx) + v11 * dx;
-
- const v: number = v0 * (1 - dy) + v1 * dy;
-
- const v2: number = Math.min(Math.max(Math.round(v), 0), 255);
-
- // createTensorWithDataList is dump compared to reshape and hence has to be given with one channel after another
- const i: number = y * nx3 + x + (c % 3) * 224 * 224;
-
- result[i] = (v2 / 255 - mean[c]) / std[c];
- }
- }
- }
-
- return result;
-}
-
-export const computeClipMatchScore = async (
- imageEmbedding: Float32Array,
- textEmbedding: Float32Array,
-) => {
- if (imageEmbedding.length !== textEmbedding.length) {
- throw Error("imageEmbedding and textEmbedding length mismatch");
- }
- let score = 0;
- for (let index = 0; index < imageEmbedding.length; index++) {
- score += imageEmbedding[index] * textEmbedding[index];
- }
- return score;
-};
-
-export const normalizeEmbedding = (embedding: Float32Array) => {
- let normalization = 0;
- for (let index = 0; index < embedding.length; index++) {
- normalization += embedding[index] * embedding[index];
- }
- const sqrtNormalization = Math.sqrt(normalization);
- for (let index = 0; index < embedding.length; index++) {
- embedding[index] = embedding[index] / sqrtNormalization;
- }
- return embedding;
-};
diff --git a/desktop/src/services/ffmpeg.ts b/desktop/src/services/ffmpeg.ts
index ddb3361cf..468034046 100644
--- a/desktop/src/services/ffmpeg.ts
+++ b/desktop/src/services/ffmpeg.ts
@@ -1,7 +1,6 @@
import pathToFfmpeg from "ffmpeg-static";
import { existsSync } from "node:fs";
import fs from "node:fs/promises";
-import { CustomErrors } from "../constants/errors";
import { writeStream } from "../main/fs";
import log from "../main/log";
import { execAsync } from "../main/util";
@@ -146,7 +145,7 @@ const promiseWithTimeout = async (
} = { current: null };
const rejectOnTimeout = new Promise((_, reject) => {
timeoutRef.current = setTimeout(
- () => reject(Error(CustomErrors.WAIT_TIME_EXCEEDED)),
+ () => reject(new Error("Operation timed out")),
timeout,
);
});
diff --git a/desktop/src/services/fs.ts b/desktop/src/services/fs.ts
index d36317720..5a8fb265c 100644
--- a/desktop/src/services/fs.ts
+++ b/desktop/src/services/fs.ts
@@ -2,7 +2,7 @@ import StreamZip from "node-stream-zip";
import { existsSync } from "node:fs";
import fs from "node:fs/promises";
import path from "node:path";
-import { logError } from "../main/log";
+import log from "../main/log";
import { ElectronFile } from "../types/ipc";
const FILE_STREAM_CHUNK_SIZE: number = 4 * 1024 * 1024;
@@ -115,7 +115,9 @@ export const getZipFileStream = async (
const inProgress = {
current: false,
};
+ // eslint-disable-next-line no-unused-vars
let resolveObj: (value?: any) => void = null;
+ // eslint-disable-next-line no-unused-vars
let rejectObj: (reason?: any) => void = null;
stream.on("readable", () => {
try {
@@ -179,7 +181,7 @@ export const getZipFileStream = async (
controller.close();
}
} catch (e) {
- logError(e, "readableStream pull failed");
+ log.error("Failed to pull from readableStream", e);
controller.close();
}
},
diff --git a/desktop/src/services/imageProcessor.ts b/desktop/src/services/imageProcessor.ts
index f6a567f8c..8f81ba287 100644
--- a/desktop/src/services/imageProcessor.ts
+++ b/desktop/src/services/imageProcessor.ts
@@ -1,11 +1,10 @@
import { existsSync } from "fs";
import fs from "node:fs/promises";
import path from "path";
-import { CustomErrors } from "../constants/errors";
import { writeStream } from "../main/fs";
-import { logError, logErrorSentry } from "../main/log";
+import log from "../main/log";
import { execAsync, isDev } from "../main/util";
-import { ElectronFile } from "../types/ipc";
+import { CustomErrors, ElectronFile } from "../types/ipc";
import { isPlatform } from "../utils/common/platform";
import { generateTempFilePath } from "../utils/temp";
import { deleteTempFile } from "./ffmpeg";
@@ -103,18 +102,21 @@ async function convertToJPEG_(
return new Uint8Array(await fs.readFile(tempOutputFilePath));
} catch (e) {
- logErrorSentry(e, "failed to convert heic");
+ log.error("Failed to convert HEIC", e);
throw e;
} finally {
try {
await fs.rm(tempInputFilePath, { force: true });
} catch (e) {
- logErrorSentry(e, "failed to remove tempInputFile");
+ log.error(`Failed to remove tempInputFile ${tempInputFilePath}`, e);
}
try {
await fs.rm(tempOutputFilePath, { force: true });
} catch (e) {
- logErrorSentry(e, "failed to remove tempOutputFile");
+ log.error(
+ `Failed to remove tempOutputFile ${tempOutputFilePath}`,
+ e,
+ );
}
}
}
@@ -150,7 +152,7 @@ function constructConvertCommand(
},
);
} else {
- throw Error(CustomErrors.INVALID_OS(process.platform));
+ throw new Error(`Unsupported OS ${process.platform}`);
}
return convertCmd;
}
@@ -187,7 +189,7 @@ export async function generateImageThumbnail(
try {
await deleteTempFile(inputFilePath);
} catch (e) {
- logError(e, "failed to deleteTempFile");
+ log.error(`Failed to deleteTempFile ${inputFilePath}`, e);
}
}
}
@@ -217,13 +219,16 @@ async function generateImageThumbnail_(
} while (thumbnail.length > maxSize && quality > MIN_QUALITY);
return thumbnail;
} catch (e) {
- logErrorSentry(e, "generate image thumbnail failed");
+ log.error("Failed to generate image thumbnail", e);
throw e;
} finally {
try {
await fs.rm(tempOutputFilePath, { force: true });
} catch (e) {
- logErrorSentry(e, "failed to remove tempOutputFile");
+ log.error(
+ `Failed to remove tempOutputFile ${tempOutputFilePath}`,
+ e,
+ );
}
}
}
@@ -283,7 +288,7 @@ function constructThumbnailGenerationCommand(
return cmdPart;
});
} else {
- throw Error(CustomErrors.INVALID_OS(process.platform));
+ throw new Error(`Unsupported OS ${process.platform}`);
}
return thumbnailGenerationCmd;
}
diff --git a/desktop/src/services/store.ts b/desktop/src/services/store.ts
new file mode 100644
index 000000000..a484080f5
--- /dev/null
+++ b/desktop/src/services/store.ts
@@ -0,0 +1,25 @@
+import { safeStorage } from "electron/main";
+import { keysStore } from "../stores/keys.store";
+import { safeStorageStore } from "../stores/safeStorage.store";
+import { uploadStatusStore } from "../stores/upload.store";
+import { watchStore } from "../stores/watch.store";
+
+export const clearStores = () => {
+ uploadStatusStore.clear();
+ keysStore.clear();
+ safeStorageStore.clear();
+ watchStore.clear();
+};
+
+export const saveEncryptionKey = async (encryptionKey: string) => {
+ const encryptedKey: Buffer = await safeStorage.encryptString(encryptionKey);
+ const b64EncryptedKey = Buffer.from(encryptedKey).toString("base64");
+ safeStorageStore.set("encryptionKey", b64EncryptedKey);
+};
+
+export const encryptionKey = async (): Promise => {
+ const b64EncryptedKey = safeStorageStore.get("encryptionKey");
+ if (!b64EncryptedKey) return undefined;
+ const keyBuffer = Buffer.from(b64EncryptedKey, "base64");
+ return await safeStorage.decryptString(keyBuffer);
+};
diff --git a/desktop/src/services/upload.ts b/desktop/src/services/upload.ts
index 2fc56fef5..ae51e8218 100644
--- a/desktop/src/services/upload.ts
+++ b/desktop/src/services/upload.ts
@@ -1,10 +1,39 @@
import StreamZip from "node-stream-zip";
import path from "path";
+import { getElectronFile } from "../services/fs";
import { uploadStatusStore } from "../stores/upload.store";
import { ElectronFile, FILE_PATH_TYPE } from "../types/ipc";
import { FILE_PATH_KEYS } from "../types/main";
import { getValidPaths, getZipFileStream } from "./fs";
+export const getPendingUploads = async () => {
+ const filePaths = getSavedFilePaths(FILE_PATH_TYPE.FILES);
+ const zipPaths = getSavedFilePaths(FILE_PATH_TYPE.ZIPS);
+ const collectionName = uploadStatusStore.get("collectionName");
+
+ let files: ElectronFile[] = [];
+ let type: FILE_PATH_TYPE;
+ if (zipPaths.length) {
+ type = FILE_PATH_TYPE.ZIPS;
+ for (const zipPath of zipPaths) {
+ files = [
+ ...files,
+ ...(await getElectronFilesFromGoogleZip(zipPath)),
+ ];
+ }
+ const pendingFilePaths = new Set(filePaths);
+ files = files.filter((file) => pendingFilePaths.has(file.path));
+ } else if (filePaths.length) {
+ type = FILE_PATH_TYPE.FILES;
+ files = await Promise.all(filePaths.map(getElectronFile));
+ }
+ return {
+ files,
+ collectionName,
+ type,
+ };
+};
+
export const getSavedFilePaths = (type: FILE_PATH_TYPE) => {
const paths =
getValidPaths(
diff --git a/desktop/src/services/userPreference.ts b/desktop/src/services/userPreference.ts
index 8074ee4de..c20657aa9 100644
--- a/desktop/src/services/userPreference.ts
+++ b/desktop/src/services/userPreference.ts
@@ -1,4 +1,4 @@
-import { userPreferencesStore } from "../stores/userPreferences.store";
+import { userPreferencesStore } from "../stores/user-preferences";
export function getHideDockIconPreference() {
return userPreferencesStore.get("hideDockIcon");
@@ -7,27 +7,3 @@ export function getHideDockIconPreference() {
export function setHideDockIconPreference(shouldHideDockIcon: boolean) {
userPreferencesStore.set("hideDockIcon", shouldHideDockIcon);
}
-
-export function getSkipAppVersion() {
- return userPreferencesStore.get("skipAppVersion");
-}
-
-export function setSkipAppVersion(version: string) {
- userPreferencesStore.set("skipAppVersion", version);
-}
-
-export function getMuteUpdateNotificationVersion() {
- return userPreferencesStore.get("muteUpdateNotificationVersion");
-}
-
-export function setMuteUpdateNotificationVersion(version: string) {
- userPreferencesStore.set("muteUpdateNotificationVersion", version);
-}
-
-export function clearSkipAppVersion() {
- userPreferencesStore.delete("skipAppVersion");
-}
-
-export function clearMuteUpdateNotificationVersion() {
- userPreferencesStore.delete("muteUpdateNotificationVersion");
-}
diff --git a/desktop/src/stores/userPreferences.store.ts b/desktop/src/stores/user-preferences.ts
similarity index 63%
rename from desktop/src/stores/userPreferences.store.ts
rename to desktop/src/stores/user-preferences.ts
index 9545b1261..396e7a86c 100644
--- a/desktop/src/stores/userPreferences.store.ts
+++ b/desktop/src/stores/user-preferences.ts
@@ -1,7 +1,12 @@
import Store, { Schema } from "electron-store";
-import type { UserPreferencesType } from "../types/main";
-const userPreferencesSchema: Schema = {
+interface UserPreferencesSchema {
+ hideDockIcon: boolean;
+ skipAppVersion?: string;
+ muteUpdateNotificationVersion?: string;
+}
+
+const userPreferencesSchema: Schema = {
hideDockIcon: {
type: "boolean",
},
diff --git a/desktop/src/types/any-shell-escape.d.ts b/desktop/src/types/any-shell-escape.d.ts
index 4172cdb1e..b8777d2ae 100644
--- a/desktop/src/types/any-shell-escape.d.ts
+++ b/desktop/src/types/any-shell-escape.d.ts
@@ -19,6 +19,7 @@
* curl -v -H "Location;" -H "User-Agent: FooBar's so-called ""Browser""" "http://www.daveeddy.com/?name=dave&age=24"
Which is suitable for being executed by the shell.
*/
+/* eslint-disable no-unused-vars */
declare module "any-shell-escape" {
declare const shellescape: (args: readonly string | string[]) => string;
export default shellescape;
diff --git a/desktop/src/types/ipc.ts b/desktop/src/types/ipc.ts
index 93586f29a..3dba231f2 100644
--- a/desktop/src/types/ipc.ts
+++ b/desktop/src/types/ipc.ts
@@ -4,6 +4,32 @@
* This file is manually kept in sync with the renderer code.
* See [Note: types.ts <-> preload.ts <-> ipc.ts]
*/
+
+/**
+ * Errors that have special semantics on the web side.
+ *
+ * [Note: Custom errors across Electron/Renderer boundary]
+ *
+ * We need to use the `message` field to disambiguate between errors thrown by
+ * the main process when invoked from the renderer process. This is because:
+ *
+ * > Errors thrown throw `handle` in the main process are not transparent as
+ * > they are serialized and only the `message` property from the original error
+ * > is provided to the renderer process.
+ * >
+ * > - https://www.electronjs.org/docs/latest/tutorial/ipc
+ * >
+ * > Ref: https://github.com/electron/electron/issues/24427
+ */
+export const CustomErrors = {
+ WINDOWS_NATIVE_IMAGE_PROCESSING_NOT_SUPPORTED:
+ "Windows native image processing is not supported",
+ UNSUPPORTED_PLATFORM: (platform: string, arch: string) =>
+ `Unsupported platform - ${platform} ${arch}`,
+ MODEL_DOWNLOAD_PENDING:
+ "Model download pending, skipping clip search request",
+};
+
/**
* Deprecated - Use File + webUtils.getPathForFile instead
*
@@ -45,6 +71,7 @@ export interface WatchStoreType {
}
export enum FILE_PATH_TYPE {
+ /* eslint-disable no-unused-vars */
FILES = "files",
ZIPS = "zips",
}
@@ -53,8 +80,3 @@ export interface AppUpdateInfo {
autoUpdatable: boolean;
version: string;
}
-
-export enum Model {
- GGML_CLIP = "ggml-clip",
- ONNX_CLIP = "onnx-clip",
-}
diff --git a/desktop/src/types/main.ts b/desktop/src/types/main.ts
index 98d04ec6e..546749c54 100644
--- a/desktop/src/types/main.ts
+++ b/desktop/src/types/main.ts
@@ -18,6 +18,7 @@ export interface KeysStoreType {
};
}
+/* eslint-disable no-unused-vars */
export const FILE_PATH_KEYS: {
[k in FILE_PATH_TYPE]: keyof UploadStoreType;
} = {
@@ -28,9 +29,3 @@ export const FILE_PATH_KEYS: {
export interface SafeStorageStoreType {
encryptionKey: string;
}
-
-export interface UserPreferencesType {
- hideDockIcon: boolean;
- skipAppVersion: string;
- muteUpdateNotificationVersion: string;
-}
diff --git a/docs/docs/.vitepress/sidebar.ts b/docs/docs/.vitepress/sidebar.ts
index b7c3946a2..927f12b9d 100644
--- a/docs/docs/.vitepress/sidebar.ts
+++ b/docs/docs/.vitepress/sidebar.ts
@@ -202,6 +202,10 @@ export const sidebar = [
{
text: "Troubleshooting",
items: [
+ {
+ text: "Uploads",
+ link: "/self-hosting/troubleshooting/uploads",
+ },
{
text: "Yarn",
link: "/self-hosting/troubleshooting/yarn",
@@ -219,80 +223,3 @@ export const sidebar = [
link: "/about/contribute",
},
];
-
-function sidebarOld() {
- return [
- {
- text: "Welcome",
- items: [
- {
- text: "Features",
- collapsed: true,
- items: [
- {
- text: "Family Plan",
- link: "/photos/features/family-plan",
- },
- { text: "Albums", link: "/photos/features/albums" },
- { text: "Archive", link: "/photos/features/archive" },
- { text: "Hidden", link: "/photos/features/hidden" },
- { text: "Map", link: "/photos/features/map" },
- {
- text: "Location Tags",
- link: "/photos/features/location",
- },
- {
- text: "Collect Photos",
- link: "/photos/features/collect",
- },
- {
- text: "Public links",
- link: "/photos/features/public-links",
- },
- {
- text: "Quick link",
- link: "/photos/features/quick-link",
- },
- {
- text: "Watch folder",
- link: "/photos/features/watch-folders",
- },
- { text: "Trash", link: "/photos/features/trash" },
- {
- text: "Uncategorized",
- link: "/photos/features/uncategorized",
- },
- {
- text: "Referral Plan",
- link: "/photos/features/referral",
- },
- {
- text: "Live & Motion Photos",
- link: "/photos/features/live-photos",
- },
- { text: "Cast", link: "/photos/features/cast" },
- ],
- },
- {
- text: "Troubleshoot",
- collapsed: true,
- link: "/photos/troubleshooting/files-not-uploading",
- items: [
- {
- text: "Files not uploading",
- link: "/photos/troubleshooting/files-not-uploading",
- },
- {
- text: "Failed to play video",
- link: "/photos/troubleshooting/video-not-playing",
- },
- {
- text: "Report bug",
- link: "/photos/troubleshooting/report-bug",
- },
- ],
- },
- ],
- },
- ];
-}
diff --git a/docs/docs/auth/migration-guides/authy/index.md b/docs/docs/auth/migration-guides/authy/index.md
index 268d7e4f7..48ce3965d 100644
--- a/docs/docs/auth/migration-guides/authy/index.md
+++ b/docs/docs/auth/migration-guides/authy/index.md
@@ -10,7 +10,7 @@ A guide written by Green, an ente.io lover
> [!WARNING]
>
> Authy will soon be dropping support for its desktop apps in the near future.
-> If you are looking to switch to ente Authenticator from Authy, I heavily
+> If you are looking to switch to Ente Authenticator from Authy, I heavily
> recommend you export your codes as soon as you can.
---
@@ -19,7 +19,7 @@ Migrating from Authy can be tiring, as you cannot export your 2FA codes through
the app, meaning that you would have to reconfigure 2FA for all of your accounts
for your new 2FA authenticator. However, easier ways exist to export your codes
out of Authy. This guide will cover two of the most used methods for mograting
-from Authy to ente Authenticator.
+from Authy to Ente Authenticator.
> [!CAUTION]
>
@@ -39,7 +39,7 @@ hard (and rather technical) parts of the process.
One way to export is to
[use this tool by Neeraj](https://github.com/ua741/authy-export/releases/tag/v0.0.4)
-to simplify the process and skip directly to importing to ente Authenticator.
+to simplify the process and skip directly to importing to Ente Authenticator.
To export from Authy, download the tool for your specific OS, then type the
following in your terminal:
@@ -72,7 +72,7 @@ For Windows:
```
This will generate a text file called `authy_codes.txt`, which contains your
-Authy codes in ente's plaintext export format. You can now import this to ente
+Authy codes in Ente's plaintext export format. You can now import this to Ente
Authenticator!
## Method 2: Use gboudreau's GitHub guide
@@ -89,23 +89,23 @@ To export your data, please follow
This will create a JSON file called `authy-to-bitwarden-export.json`, which
contains your Authy codes in Bitwarden's export format. You can now import this
-to ente Authenticator!
+to Ente Authenticator!
### Method 2.1: If the export worked, but the import didn't
> [!NOTE]
>
> This is intended only for users who successfully exported their codes using
-> the guide in method 2, but could not import it to ente Authenticator for
+> the guide in method 2, but could not import it to Ente Authenticator for
> whatever reason. If the import was successful, or you haven't tried to import
> the codes yet, ignore this section.
>
> If the export itself failed, try using
> [**method 1**](#method-1-use-neerajs-export-tool) instead.
-Usually, you should be able to import Bitwarden exports directly into ente
+Usually, you should be able to import Bitwarden exports directly into Ente
Authenticator. In case this didn't work for whatever reason, I've written a
-program in Python that converts the JSON file into a TXT file that ente
+program in Python that converts the JSON file into a TXT file that Ente
Authenticator can use, so you can try importing using plain text import instead.
You can download my program
@@ -140,18 +140,18 @@ To run the Python program, open it in your IDE and run the program, or open your
terminal and type `python3 authy_to_ente.py` (MacOS/Linux, or any other OS that
uses bash) or `py -3 authy_to_ente.py` (Windows). Once you run it, a new TXT
file called `auth_codes.txt` will be generated. You can now import your data to
-ente Authenticator!
+Ente Authenticator!
---
You should now have a TXT file (method 1, method 2.1) or a JSON file (method 2)
-that countains your TOTP secrets, which can now be imported into ente
+that countains your TOTP secrets, which can now be imported into Ente
Authenticator. To import your codes, please follow one of the steps below,
depending on which method you used to export your codes.
-## Importing to ente Authenticator (Method 1, method 2.1)
+## Importing to Ente Authenticator (Method 1, method 2.1)
-1. Copy the TXT file to one of your devices with ente Authenticator.
+1. Copy the TXT file to one of your devices with Ente Authenticator.
2. Log in to your account (if you haven't already), or press "Use without
backups".
3. Open the navigation menu (hamburger button on the top left), then press
@@ -159,9 +159,9 @@ depending on which method you used to export your codes.
4. Select the "Plain text" option.
5. Select the TXT file that was made earlier.
-## Importing to ente Authenticator (Method 2)
+## Importing to Ente Authenticator (Method 2)
-1. Copy the JSON file to one of your devices with ente Authenticator.
+1. Copy the JSON file to one of your devices with Ente Authenticator.
2. Log in to your account (if you haven't already), or press "Use without
backups".
3. Open the navigation menu (hamburger button on the top left), then press
@@ -172,7 +172,7 @@ depending on which method you used to export your codes.
If this didn't work, refer to
[**method 2.1**](#method-21-if-the-export-worked-but-the-import-didnt).
-And that's it! You have now successfully migrated from Authy to ente
+And that's it! You have now successfully migrated from Authy to Ente
Authenticator.
Now that your secrets are safely stored, I recommend you delete the unencrypted
diff --git a/docs/docs/photos/faq/export.md b/docs/docs/photos/faq/export.md
index f0a4c71f1..303fa830c 100644
--- a/docs/docs/photos/faq/export.md
+++ b/docs/docs/photos/faq/export.md
@@ -12,12 +12,20 @@ in a local drive or NAS of your choice. This way, you can use Ente in your day
to day use, but will have an additional guarantee that a copy of your original
photos and videos are always available in normal directories and files.
-* You can use [Ente's CLI](https://github.com/ente-io/ente/tree/main/cli#export)
- to export your data in a cron job to a location of your choice. The exports
- are incremental, and will also gracefully handle interruptions.
+- You can use
+ [Ente's CLI](https://github.com/ente-io/ente/tree/main/cli#export) to export
+ your data in a cron job to a location of your choice. The exports are
+ incremental, and will also gracefully handle interruptions.
-* Similarly, you can use Ente's [desktop app](https://ente.io/download/desktop)
- to export your data to a folder of your choice. The desktop app also supports
- "continuous" exports, where it will automatically export new items in the
- background without you needing to run any other cron jobs. See
- [migration/export](/photos/migration/export/) for more details.
+- Similarly, you can use Ente's
+ [desktop app](https://ente.io/download/desktop) to export your data to a
+ folder of your choice. The desktop app also supports "continuous" exports,
+ where it will automatically export new items in the background without you
+ needing to run any other cron jobs. See
+ [migration/export](/photos/migration/export/) for more details.
+
+## Does the exported data from Ente photos preserve the same folder and album structure as in the app?
+
+When you export your data for local backup, it will maintain the exact structure
+how you have set up within Ente. The exported data will reflect the same photos
+and album structure intact.
diff --git a/docs/docs/photos/faq/general.md b/docs/docs/photos/faq/general.md
index 65d548a2d..0be4e4c01 100644
--- a/docs/docs/photos/faq/general.md
+++ b/docs/docs/photos/faq/general.md
@@ -74,3 +74,38 @@ If you would like to fund the development of this project, please consider
## How do I pronounce ente?
It's like cafe 😊. kaf-_ay_. en-_tay_.
+
+## Does Ente apply compression to uploaded photos?
+
+Ente does not apply compression to uploaded photos. The file size of your photos
+in Ente will be similar to the original file sizes you have.
+
+## Can I add photos from a shared album to albums that I created in Ente?
+
+Currently, Ente does not support adding photos from a shared album to your
+personal albums. If you want to include photos from a shared album in your own
+albums, you will need to ask the owner of the photos to add them to your album.
+
+## How do I ensure that the Ente desktop app stays up to date on my system?
+
+Ente desktop includes an auto-update feature, ensuring that whenever updates are
+deployed, the app will automatically download and install them. You don't need
+to manually update the software.
+
+## Can I sync a folder containing multiple subfolders, each representing an album?
+
+Yes, when you drag and drop the folder onto the desktop app, the app will detect
+the multiple folders and prompt you to choose whether you want to create a
+single album or separate albums for each folder.
+
+## What is the difference between **Magic** and **Content** search results on the desktop?
+
+**Magic** is where you can search for long queries. Like, "baby in red dress",
+or "dog playing at the beach".
+
+**Content** is where you can search for single-words. Like, "car" or "pizza".
+
+## How do I identify which files experienced upload issues within the desktop app?
+
+Check the sections within the upload progress bar for "Failed Uploads," "Ignored
+Uploads," and "Unsuccessful Uploads."
diff --git a/docs/docs/photos/faq/subscription.md b/docs/docs/photos/faq/subscription.md
index 58eb1857a..53cc63471 100644
--- a/docs/docs/photos/faq/subscription.md
+++ b/docs/docs/photos/faq/subscription.md
@@ -156,3 +156,9 @@ Sorry, since we're building a business that does not involve monetization of
user data, we have to charge to remain sustainable.
We do offer a generous free trial for you to experience the product.
+
+## Will I need to pay for Ente Auth after my Ente Photos free plan expires?
+
+No, you will not need to pay for Ente Auth after your Ente Photos free plan
+expires. Ente Auth is completely free to use, and the expiration of your Ente
+Photos free plan will not impact your ability to access or use Ente Auth.
diff --git a/docs/docs/photos/migration/export/export-1.png b/docs/docs/photos/migration/export/export-1.png
index e00bd49c5..49f03b28c 100644
Binary files a/docs/docs/photos/migration/export/export-1.png and b/docs/docs/photos/migration/export/export-1.png differ
diff --git a/docs/docs/photos/migration/export/export-2.png b/docs/docs/photos/migration/export/export-2.png
index cfef40bb3..f181a2422 100644
Binary files a/docs/docs/photos/migration/export/export-2.png and b/docs/docs/photos/migration/export/export-2.png differ
diff --git a/docs/docs/photos/migration/export/export-3.png b/docs/docs/photos/migration/export/export-3.png
index 0434ffdb6..3df2a5660 100644
Binary files a/docs/docs/photos/migration/export/export-3.png and b/docs/docs/photos/migration/export/export-3.png differ
diff --git a/docs/docs/photos/migration/export/export-4.png b/docs/docs/photos/migration/export/export-4.png
index 2a5d16d59..e8abcf0f2 100644
Binary files a/docs/docs/photos/migration/export/export-4.png and b/docs/docs/photos/migration/export/export-4.png differ
diff --git a/docs/docs/photos/migration/export/export-5.png b/docs/docs/photos/migration/export/export-5.png
new file mode 100644
index 000000000..aa939e566
Binary files /dev/null and b/docs/docs/photos/migration/export/export-5.png differ
diff --git a/docs/docs/photos/migration/export/index.md b/docs/docs/photos/migration/export/index.md
index 014e2e898..51b347d01 100644
--- a/docs/docs/photos/migration/export/index.md
+++ b/docs/docs/photos/migration/export/index.md
@@ -11,37 +11,59 @@ videos you have uploaded to Ente.
1. Sign in to [our desktop app](https://ente.io/download/desktop), if you
haven't done so already.
-2. Open the side bar, and select the option to **export data**.
+ 
+
+2. Open the side bar, and select the option to **Export Data**.
-3. Select the destination folder and click on **start**.
+3. Choose the destination folder by clicking on three dots icon.
- 
+
-4. Wait for the export to get completed.
+{width=400px}
- 
+
-5. Later on if you wish to sync newer files that were uploaded since the last
- time you exported, simply select **export data** again and click on
- **resync**.
+4. Select the folder and then click on **Start**
- 
+
+
+{width=400px}
+
+
6. In case your download gets interrupted, Ente will resume from where it left
- off. Simply select **export data** again and click on **resync**.
+ off. Simply select **Export Data** again and click on **Resync**.
-7. **Sync continuously** : You can utilize Continuous Sync to eliminate manual
- exports each time new photos are added to Ente. This feature automatically
- detects new files and runs exports accordingly, It also ensures that exported
- data reflects the latest album states with new files, moves, and deletions.
+
+
+### Sync continuously
+
+You can switch on the toggle to **Sync continuously** to eliminate manual
+exports each time new photos are added to Ente. This feature automatically
+detects new files and runs exports accordingly. It also ensures that exported
+data reflects the latest album states with new files, moves, and deletions.
+
+
+
+---
If you run into any issues during your data export, please reach out to
[support@ente.io](mailto:support@ente.io) and we will be happy to help you!
Note that we also provide a [CLI
tool](https://github.com/ente-io/ente/tree/main/cli#export) to export your data.
-Some more details are in this [FAQ entry](/photos/faq/export).
+Please find more details [here](/photos/faq/export).
diff --git a/docs/docs/photos/migration/export/sign-in.png b/docs/docs/photos/migration/export/sign-in.png
new file mode 100644
index 000000000..4a9fa4a23
Binary files /dev/null and b/docs/docs/photos/migration/export/sign-in.png differ
diff --git a/docs/docs/self-hosting/guides/admin.md b/docs/docs/self-hosting/guides/admin.md
index 91ea4d0f8..92f52a91f 100644
--- a/docs/docs/self-hosting/guides/admin.md
+++ b/docs/docs/self-hosting/guides/admin.md
@@ -24,18 +24,32 @@ and subsequently increase the
[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md)
using the CLI.
-For the admin actions, you can create `server/museum.yaml`, and whitelist add
-the admin userID `internal.admins`. See
-[local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml#L211C1-L232C1)
+For security purposes, we need to whitelist the user IDs that can perform admin
+actions on the server. To do this,
+
+- Create a `museum.yaml` in the directory where you're starting museum from.
+ For example, if you're running using `docker compose up`, then this file
+ should be in the same directory as `compose.yaml` (generally,
+ `server/museum.yaml`).
+
+ > Docker might've created an empty `museum.yaml` _directory_ on your machine
+ > previously. If so, delete that empty directory and create a new file named
+ > `museum.yaml`.
+
+- In this `museum.yaml` we can add overrides over the default configuration.
+
+For whitelisting the admin userIDs we need to define an `internal.admins`. See
+the "internal" section in
+[local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml)
in the server source code for details about how to define this.
-```yaml
-....
-internal:
- admins:
- # - 1580559962386440
+Here is an example. Suppose we wanted to whitelist a user with ID
+`1580559962386440`, we can create the following `museum.yaml`
-....
+```yaml
+internal:
+ admins:
+ - 1580559962386440
```
You can use
diff --git a/docs/docs/self-hosting/guides/custom-server/index.md b/docs/docs/self-hosting/guides/custom-server/index.md
index 7f7ba50fa..bf695af30 100644
--- a/docs/docs/self-hosting/guides/custom-server/index.md
+++ b/docs/docs/self-hosting/guides/custom-server/index.md
@@ -18,11 +18,6 @@ configure the endpoint the app should be connecting to.
-> [!IMPORTANT]
->
-> This is only supported by the Ente Auth app currently. We'll add this same
-> functionality to the Ente Photos app soon.
-
## CLI
> [!NOTE]
diff --git a/docs/docs/self-hosting/index.md b/docs/docs/self-hosting/index.md
index c1ae7075e..14f9ba4dd 100644
--- a/docs/docs/self-hosting/index.md
+++ b/docs/docs/self-hosting/index.md
@@ -26,8 +26,8 @@ docker compose up --build
> [!TIP]
>
-> You can also use a pre-built Docker image from `ghcr.io/ente-io/server` ([More
-> info](https://github.com/ente-io/ente/blob/main/server/docs/docker.md))
+> You can also use a pre-built Docker image from `ghcr.io/ente-io/server`
+> ([More info](https://github.com/ente-io/ente/blob/main/server/docs/docker.md))
Then in a separate terminal, you can run (e.g) the web client
diff --git a/docs/docs/self-hosting/troubleshooting/uploads.md b/docs/docs/self-hosting/troubleshooting/uploads.md
new file mode 100644
index 000000000..4f7273e94
--- /dev/null
+++ b/docs/docs/self-hosting/troubleshooting/uploads.md
@@ -0,0 +1,13 @@
+---
+title: Uploads failing
+description: Fixing upload errors when trying to self host Ente
+---
+
+# Uploads failing
+
+If uploads to your self-hosted server are failing, make sure that
+`credentials.yaml` has `yourserverip:3200` for all three minio locations.
+
+By default it is `localhost:3200`, and it needs to be changed to an IP that is
+accessible from both where you are running the Ente clients (e.g. the mobile
+app) and also from within the Docker compose cluster.
diff --git a/infra/services/listmonk/README.md b/infra/services/listmonk/README.md
new file mode 100644
index 000000000..e94c676cd
--- /dev/null
+++ b/infra/services/listmonk/README.md
@@ -0,0 +1,54 @@
+# Listmonk
+
+We use [Listmonk](https://listmonk.app/) to manage our mailing lists.
+
+- Museum lets Listmonk know about new users and account deletion (this allows
+ Listmonk to create corresponding accounts).
+
+- Subsequently, Listmonk handles user subscription / unsubscription etc
+ (Listmonk stores its data in an external Postgres).
+
+## Installing
+
+Install [nginx](../nginx/README.md).
+
+Add Listmonk's configuration.
+
+```sh
+sudo mkdir -p /root/listmonk
+sudo tee /root/listmonk/config.toml
+```
+
+Add the service definition and nginx configuration.
+
+```sh
+scp services/listmonk/listmonk.* :
+
+sudo mv listmonk.service /etc/systemd/system/
+sudo mv listmonk.nginx.conf /root/nginx/conf.d
+```
+
+> The very first time we ran Listmonk, at this point we also needed to get it to
+> install the tables it needs in the Postgres DB. For this, we used the
+> `initialize-db.sh` script.
+>
+> ```sh
+> scp services/listmonk/initialize-db.sh :
+>
+> sudo sh initialize-db.sh
+> rm initialize-db.sh
+> ```
+
+Tell systemd to pick up new service definitions, enable the unit (so that it
+automatically starts on boot), and start it this time around.
+
+```sh
+sudo systemctl daemon-reload
+sudo systemctl enable --now listmonk
+```
+
+Tell nginx to pick up the new configuration.
+
+```sh
+sudo systemctl reload nginx
+```
diff --git a/infra/services/listmonk/initialize-db.sh b/infra/services/listmonk/initialize-db.sh
new file mode 100755
index 000000000..576c607a9
--- /dev/null
+++ b/infra/services/listmonk/initialize-db.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# This script needs to be manually run the once (and only once) before starting
+# Listmonk for the first time. It uses the provided credentials to initialize
+# its database.
+
+set -o errexit
+set -o xtrace
+
+docker pull listmonk/listmonk
+
+docker run -it --rm --name listmonk \
+ -v /root/listmonk/config.toml:/listmonk/config.toml:ro \
+ listmonk/listmonk ./listmonk --install
diff --git a/infra/services/listmonk/listmonk.nginx.conf b/infra/services/listmonk/listmonk.nginx.conf
new file mode 100644
index 000000000..783c28a8a
--- /dev/null
+++ b/infra/services/listmonk/listmonk.nginx.conf
@@ -0,0 +1,26 @@
+# This file gets loaded in a top level http block by the default nginx.conf
+# See infra/services/nginx/README.md for more details.
+
+server {
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
+ ssl_certificate /etc/ssl/certs/cert.pem;
+ ssl_certificate_key /etc/ssl/private/key.pem;
+
+ server_name lists.ente.io;
+
+ location / {
+ proxy_pass http://host.docker.internal:9000;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+
+ # Use HTTP/1.1 when talking to upstream
+ # Also, while not necessary (AFAIK), also allow websockets.
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+ }
+}
diff --git a/infra/services/listmonk/listmonk.service b/infra/services/listmonk/listmonk.service
new file mode 100644
index 000000000..bf45bbaf6
--- /dev/null
+++ b/infra/services/listmonk/listmonk.service
@@ -0,0 +1,19 @@
+[Unit]
+Documentation=https://listmonk.app/docs/installation/
+Requires=docker.service
+After=docker.service
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+ExecStartPre=docker pull listmonk/listmonk
+ExecStartPre=-docker stop listmonk
+ExecStartPre=-docker rm listmonk
+ExecStartPre=-docker run --rm --name listmonk \
+ -v /root/listmonk/config.toml:/listmonk/config.toml:ro \
+ listmonk/listmonk ./listmonk --upgrade --yes
+ExecStart=docker run --name listmonk \
+ -p 9000:9000 \
+ -v /root/listmonk/config.toml:/listmonk/config.toml:ro \
+ listmonk/listmonk
diff --git a/infra/services/nginx/README.md b/infra/services/nginx/README.md
index 7239a5610..c6d0d56ef 100644
--- a/infra/services/nginx/README.md
+++ b/infra/services/nginx/README.md
@@ -62,3 +62,12 @@ We can see this in the default configuration of nginx:
This is a [handy tool](https://nginx-playground.wizardzines.com) to check the
syntax of the configuration files. Alternatively, you can run `docker exec nginx
nginx -t` on the instance to ask nginx to check the configuration.
+
+## Updating configuration
+
+Nginx configuration files can be changed without needing to restart anything.
+
+1. Update the configuration file at `/root/nginx/conf.d/museum.conf`
+2. Verify that there are no errors in the configuration by using `sudo docker
+ exec nginx nginx -t`.
+3. Ask nginx to reload the configuration `sudo systemctl reload nginx`.
diff --git a/infra/services/nginx/nginx.service b/infra/services/nginx/nginx.service
index e14e7840d..4951c5e75 100644
--- a/infra/services/nginx/nginx.service
+++ b/infra/services/nginx/nginx.service
@@ -16,5 +16,6 @@ ExecStart=docker run --name nginx \
-v /root/nginx/cert.pem:/etc/ssl/certs/cert.pem:ro \
-v /root/nginx/key.pem:/etc/ssl/private/key.pem:ro \
-v /root/nginx/conf.d:/etc/nginx/conf.d:ro \
+ --log-opt max-size=1g \
nginx
ExecReload=docker exec nginx nginx -s reload
diff --git a/infra/services/status/uptime-kuma.nginx.conf b/infra/services/status/uptime-kuma.nginx.conf
index c45c7b660..a67f5e101 100644
--- a/infra/services/status/uptime-kuma.nginx.conf
+++ b/infra/services/status/uptime-kuma.nginx.conf
@@ -2,8 +2,9 @@
# See infra/services/nginx/README.md for more details.
server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ http2 on;
ssl_certificate /etc/ssl/certs/cert.pem;
ssl_certificate_key /etc/ssl/private/key.pem;
diff --git a/mobile/CHANGELOG.md b/mobile/CHANGELOG.md
index a4b33abdf..167b65b6e 100644
--- a/mobile/CHANGELOG.md
+++ b/mobile/CHANGELOG.md
@@ -1,6 +1,6 @@
# CHANGELOG
-## v0.8.72
+## v0.8.73
### Added
* #### Share an Album to Multiple Contacts at Once
@@ -9,7 +9,7 @@
* #### Bug Fixes and Performance Improvements
- Many a bugs were squashed in this release. If you run into any, please write to team@ente.io, or let us know on Discord! 🙏
+ Many a bugs were squashed in this release and have improved performance on app start. If you run into any bugs, please write to team@ente.io, or let us know on Discord! 🙏
## v0.8.67
diff --git a/mobile/android/app/src/main/play/listings/de/full_description.txt b/mobile/android/app/src/main/play/listings/de/full_description.txt
new file mode 100644
index 000000000..4d963c1d7
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/de/full_description.txt
@@ -0,0 +1,36 @@
+ente ist eine einfache App, um Ihre Fotos und Videos automatisch zu sichern und zu organisieren.
+
+Wenn Sie auf der Suche nach einer datenschutzfreundlichen Alternative zu Google Fotos sind, sind Sie an der richtigen Stelle. Mit Ente werden Ihre Fotos Ende-zu-Ende-verschlüsselt gespeichert (e2ee). Dies bedeutet, dass nur Sie sie sehen können.
+
+Ihre Fotos werden verschlüsselt (e2ee) zwischen allen Geräten synchronisiert.
+
+ente ermöglicht es, deine Alben simpel & schnell mit deinen Geliebten zu teilen. Sie können öffentlich einsehbare Links teilen, sodass andere sogar ohne einen Account oder eine App Ihr Album sehen und darin zusammenarbeiten können, indem sie Fotos hinzufügen.
+
+Ihre verschlüsselten Daten werden an 3 verschiedenen Orten gespeichert, unter anderem in einem Schutzbunker in Paris. Wir nehmen die Erhaltung der Nachwelt ernst und machen es Ihnen leicht, dafür zu sorgen, dass Ihre Erinnerungen Sie überdauern.
+
+Wir sind hier, um die sicherste Foto-App aller Zeiten zu entwickeln, begleite uns auf unserem Weg!
+
+FEATURES
+- Sicherungen in Originalqualität, weil jeder Pixel zählt
+- Familien-Abos, damit Sie den Speicherplatz mit Ihrer Familie teilen können
+- Kollaborative Alben, sodass Sie nach einer Reise Fotos sammeln können
+- Geteilte Ordner für den Fall, dass Ihr Partner Ihre "Kamera" Klicks genießen soll
+- Album-Links, die mit einem Passwort geschützt werden können
+- Möglichkeit, Speicherplatz freizugeben, indem bereits gesicherte Daten auf dem Gerät entfernt werden
+- Menschlicher Support, denn Sie sind es wert
+- Beschreibungen, damit Sie Ihre Erinnerungen beschriften und leicht wiederfinden können
+- Foto-Editor, um Ihren Fotos den Feinschliff zu verpassen
+- Favorisieren, verstecken und erleben Sie Ihre Erinnerungen, denn sie sind kostbar
+- Ein-Klick-Import von Google, Apple, Ihrer Festplatte und mehr
+- Dunkles Theme, weil Ihre Fotos darin gut aussehen
+- 2FA, 3FA, biometrische Authentifizierung
+- und noch VIELES mehr!
+
+BERECHTIGUNGEN
+Diese können unter folgendem Link überprüft werden: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+PREIS
+Wir bieten keine lebenslang kostenlosen Abonnements an, da es für uns wichtig ist, einen nachhaltigen Service anzubieten. Wir bieten jedoch bezahlbare Abonemments an, welche auch mit der Familie geteilt werden können. Mehr Informationen sind auf ente.io zu finden.
+
+SUPPORT
+Wir sind stolz darauf, einen persönlichen Support anzubieten. Falls Sie ein Abonnement besitzen, können Sie sich mit Ihrem Anliegen via E-Mail an team@ente.io wenden und erhalten eine Antwort innerhalb von 24 Stunden.
diff --git a/mobile/android/app/src/main/play/listings/de/short_description.txt b/mobile/android/app/src/main/play/listings/de/short_description.txt
new file mode 100644
index 000000000..1727dbd99
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/de/short_description.txt
@@ -0,0 +1 @@
+ente ist eine Ende-zu-Ende-verschlüsselte Fotospeicher-App
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/de/title.txt b/mobile/android/app/src/main/play/listings/de/title.txt
new file mode 100644
index 000000000..d4fb292dc
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/de/title.txt
@@ -0,0 +1 @@
+ente - verschlüsselter Fotospeicher
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/en-US/full_description.txt b/mobile/android/app/src/main/play/listings/en-US/full_description.txt
new file mode 100644
index 000000000..8994a789c
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/en-US/full_description.txt
@@ -0,0 +1,36 @@
+Ente is a simple app to backup and share your photos and videos.
+
+If you've been looking for a privacy-friendly alternative to Google Photos, you've come to the right place. With Ente, they are stored end-to-end encrypted (e2ee). This means that only you can view them.
+
+We have open-source apps across Android, iOS, web and desktop, and your photos will seamlessly sync between all of them in an end-to-end encrypted (e2ee) manner.
+
+Ente also makes it simple to share your albums with your loved ones, even if they aren't on Ente. You can share publicly viewable links, where they can view your album and collaborate by adding photos to it, even without an account or app.
+
+Your encrypted data is replicated to 3 different locations, including a fall-out shelter in Paris. We take posterity seriously and make it easy to ensure that your memories outlive you.
+
+We are here to make the safest photos app ever, come join our journey!
+
+FEATURES
+- Original quality backups, because every pixel is important
+- Family plans, so you can share storage with your family
+- Collaborative albums, so you can pool together photos after a trip
+- Shared folders, in case you want your partner to enjoy your "Camera" clicks
+- Album links, that can be protected with a password
+- Ability to free up space, by removing files that have been safely backed up
+- Human support, because you're worth it
+- Descriptions, so you can caption your memories and find them easily
+- Image editor, to add finishing touches
+- Favorite, hide and relive your memories, for they are precious
+- One-click import from Google, Apple, your hard drive and more
+- Dark theme, because your photos look good in it
+- 2FA, 3FA, biometric auth
+- and a LOT more!
+
+PERMISSIONS
+Ente requests for certain permissions to serve the purpose of a photo storage provider, which can be reviewed here: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+PRICING
+We don't offer forever free plans, because it is important to us that we remain sustainable and withstand the test of time. Instead we offer affordable plans that you can freely share with your family. You can find more information at ente.io.
+
+SUPPORT
+We take pride in offering human support. If you are our paid customer, you can reach out to team@ente.io and expect a response from our team within 24 hours.
diff --git a/mobile/android/app/src/main/play/listings/en-US/graphics/icon/icon.png b/mobile/android/app/src/main/play/listings/en-US/graphics/icon/icon.png
new file mode 100644
index 000000000..8b32155bb
Binary files /dev/null and b/mobile/android/app/src/main/play/listings/en-US/graphics/icon/icon.png differ
diff --git a/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/1.png b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/1.png
new file mode 100644
index 000000000..7cab0bfe4
Binary files /dev/null and b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/1.png differ
diff --git a/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/2.png b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/2.png
new file mode 100644
index 000000000..15e875465
Binary files /dev/null and b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/2.png differ
diff --git a/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/3.png b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/3.png
new file mode 100644
index 000000000..91fb9da73
Binary files /dev/null and b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/3.png differ
diff --git a/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/4.png b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/4.png
new file mode 100644
index 000000000..cd47572c9
Binary files /dev/null and b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/4.png differ
diff --git a/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/5.png b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/5.png
new file mode 100644
index 000000000..4e5ca0bad
Binary files /dev/null and b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/5.png differ
diff --git a/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/6.png b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/6.png
new file mode 100644
index 000000000..39cfa966d
Binary files /dev/null and b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/6.png differ
diff --git a/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/7.png b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/7.png
new file mode 100644
index 000000000..0b4422657
Binary files /dev/null and b/mobile/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/7.png differ
diff --git a/mobile/android/app/src/main/play/listings/en-US/short_description.txt b/mobile/android/app/src/main/play/listings/en-US/short_description.txt
new file mode 100644
index 000000000..c52324aba
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/en-US/short_description.txt
@@ -0,0 +1 @@
+Ente Photos is an open source photos app, that provides end-to-end encrypted backups for your photos and videos.
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/en-US/title.txt b/mobile/android/app/src/main/play/listings/en-US/title.txt
new file mode 100644
index 000000000..4991e74e6
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/en-US/title.txt
@@ -0,0 +1 @@
+Ente Photos - Open source, end-to-end encrypted alternative to Google Photos
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/es/full_description.txt b/mobile/android/app/src/main/play/listings/es/full_description.txt
new file mode 100644
index 000000000..8c0667934
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/es/full_description.txt
@@ -0,0 +1,36 @@
+ente es una aplicación simple para hacer copias de seguridad y compartir tus fotos y videos.
+
+Si has estado buscando una alternativa a Google Photos que sea amigable con la privacidad, has llegado al lugar correcto. Con Ente, se almacenan cifradas de extremo a extremo (e2ee). Esto significa que solo tú puedes verlas.
+
+Tenemos aplicaciones en Android, iOS, web y escritorio, y tus fotos se sincronizarán perfectamente entre todos tus dispositivos encriptadas de extremo a extremo (e2ee).
+
+ente también hace fácil compartir tus álbumes con tus seres queridos, incluso si no están en ente. Puedes compartir enlaces visibles públicamente, donde pueden ver tu álbum y colaborar añadiendo fotos a él, incluso sin una cuenta o aplicación.
+
+Sus datos cifrados se replican en 3 ubicaciones diferentes, incluyendo un bunker en París. Nos tomamos la posteridad en serio y facilitamos que sus recuerdos sobrevivan a usted.
+
+Estamos aquí para hacer la aplicación de fotos más segura jamás creada, ¡únete a nuestro viaje!
+
+CARACTERÍSTICAS
+- Copias de seguridad con la calidad original, porque cada pixel es importante
+- Planes familiares, para que puedas compartir el almacenamiento con tu familia
+- Álbumes colaborativos, para que puedas juntar fotos después de un viaje
+- Carpetas compartidas, por si quieres que tu pareja disfrute de tus fotos
+- Enlaces al álbum, que se pueden proteger con una contraseña
+- Capacidad para liberar espacio, eliminando archivos de los que ya tienes una copia de seguridad
+- Apoyo humano, porque tú lo vales
+- Descripciones, para que puedas encontrar tus recuerdos fácilmente
+- Editor de imagen, para añadir retoques finales
+- Marca como favoritos, oculta y revive tus recuerdos, porque son preciosos
+- Importa en un click desde Google, Apple, tu disco duro y más
+- Tema oscuro, porque tus fotos quedan bien con él
+- 2FA, 3FA, autenticación biométrica
+- ¡Y mucho más!
+
+PERMISOS
+ente solicita ciertos permisos para servir al propósito de un proveedor de almacenamiento de fotos, que puede ser revisado aquí: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+PRECIOS
+No ofrecemos planes gratis para siempre, porque es importante para nosotros seguir siendo sostenibles y resistir a la prueba del tiempo. En su lugar, ofrecemos planes asequibles que puedes compartir libremente con tu familia. Puedes encontrar más información en ente.io.
+
+SOPORTE
+Estamos orgullosos de ofrecer apoyo humano. Si eres un cliente de pago, puedes contactar con team@ente.io y esperar una respuesta de nuestro equipo en 24 horas.
diff --git a/mobile/android/app/src/main/play/listings/es/short_description.txt b/mobile/android/app/src/main/play/listings/es/short_description.txt
new file mode 100644
index 000000000..34195beef
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/es/short_description.txt
@@ -0,0 +1 @@
+ente es una aplicación de almacenamiento de fotos cifrado de extremo a extremo
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/es/title.txt b/mobile/android/app/src/main/play/listings/es/title.txt
new file mode 100644
index 000000000..f27fb3c2d
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/es/title.txt
@@ -0,0 +1 @@
+ente - almacenamiento de fotos encriptado
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/fr/full_description.txt b/mobile/android/app/src/main/play/listings/fr/full_description.txt
new file mode 100644
index 000000000..f94e467af
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/fr/full_description.txt
@@ -0,0 +1,36 @@
+entre est une application simple qui permet de sauvegarder et partager vos photos et vidéos.
+
+Si vous êtes à la recherche d'une alternative à Google Photos respectueuse de la vie privée, vous êtes au bon endroit. Avec ente, ils sont stockés chiffrés de bout-en-bout (e2ee). Cela signifie que vous-seul pouvez les voir.
+
+Nous avons des applications sur Android, iOS, Web et Ordinateur, et vos photos seront synchronisées de manière transparente entre tous vos appareils chiffrée de bout en bout (e2ee).
+
+ente vous permet également de partager vos albums avec vos proches, même s'ils ne sont pas sur ente. Vous pouvez partager des liens visibles publiquement, où ils peuvent voir votre album et collaborer en y ajoutant des photos, même sans compte ou application.
+
+Vos données chiffrées sont répliqué à 3 endroits différents, dont un abri antiatomique à Paris. Nous prenons la postérité au sérieux et facilitons la conservation de vos souvenirs.
+
+Nous sommes là pour faire l'application photo la plus sûre de tous les temps, rejoignez-nous !
+
+CARACTÉRISTIQUES
+- Sauvegardes de qualité originales, car chaque pixel est important
+- Abonnement familiaux, pour que vous puissiez partager l'espace de stockage avec votre famille
+- Albums collaboratifs, pour que vous puissiez regrouper des photos après un voyage
+- Dossiers partagés, si vous voulez que votre partenaire profite de vos clichés
+- Liens ves les albums qui peuvent être protégés par un mot de passe
+- Possibilité de libérer de l'espace en supprimant les fichiers qui ont été sauvegardés en toute sécurité
+- Support humain, car vous en valez la peine
+- Descriptions, afin que vous puissiez légender vos souvenirs et les retrouver facilement
+- Éditeur d'images, pour ajouter des touches de finition
+- Favoriser, cacher et revivre vos souvenirs, car ils sont précieux
+- Importation en un clic depuis Google, Apple, votre disque dur et plus encore
+- Thème sombre, parce que vos photos y sont jolies
+- 2FA, 3FA, authentification biométrique
+- et beaucoup de choses encore !
+
+PERMISSIONS
+ente sollicite diverses autorisations dans le but de fonctionner en tant que service de stockage de photos, et ces autorisations sont détaillées ici : https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+PRIX
+Nous ne proposons pas d'abonnement gratuits pour toujours, car il est important pour nous de rester durables et de résister à l'épreuve du temps. Au lieu de cela, nous vous proposons des abonnements abordables que vous pouvez partager librement avec votre famille. Vous pouvez trouver plus d'informations sur ente.io.
+
+ASSISTANCE
+Nous sommes fiers d'offrir un support humain. Si vous êtes un abonné, vous pouvez contacter team@ente.io et vous recevrez une réponse de notre équipe dans les 24 heures.
diff --git a/mobile/android/app/src/main/play/listings/fr/short_description.txt b/mobile/android/app/src/main/play/listings/fr/short_description.txt
new file mode 100644
index 000000000..0cac8bdcf
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/fr/short_description.txt
@@ -0,0 +1 @@
+ente est une application de stockage de photos chiffrées de bout en bout
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/fr/title.txt b/mobile/android/app/src/main/play/listings/fr/title.txt
new file mode 100644
index 000000000..0a5c07f18
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/fr/title.txt
@@ -0,0 +1 @@
+ente - stockage de photos chiffré
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/he/full_description.txt b/mobile/android/app/src/main/play/listings/he/full_description.txt
new file mode 100644
index 000000000..21719b771
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/he/full_description.txt
@@ -0,0 +1,36 @@
+האפליקציה Ente היא אפליקציה פשוטה לגיבוי ושיתוף של התמונות והסרטונים שלך.
+
+אם חיפשת אלטרנטיבה ידידותית לפרטיות לGoogle Photos, הגעת למקום הנכון. עם Ente, התמונות והסרטונים מאוחסנים בצורה מאובטחת באמצעות הצפנה קצה-אל-קצה (e2ee). זה אומר שרק אתה יכול לצפות בהם.
+
+יש לנו אפלקציות קוד פתוח זמינות לAndroid, iOS, רשת ולמחשב, וכל התמונות שלך ייסתנכרנו באופן חלק בין כולם באופן מאובטח על ידי הצפנה קצה-אל-קצה (e2ee).
+
+ente גם מקל על שיתוף האלבומים שלך עם קרובך, גם אם הם אינם ב-ente. תוכל לשתף קישורים שניתן לצפות בהם בצורה פומבית, שבאמצעותם יתאפשר להם לצפות באלבום שלך ולשתף פעולה על ידי הוספת תמונות אליו, גם בלי חשבון או האפליקציה.
+
+הנתונים המוצפנים שלך מאוחסנים ב3 מקומות שונים, כולל מקלט גרעיני בפריז. אנחנו מתייחסים ברצינות לעתידות ומקלים עליך לוודא שזכרונותיך ישרדו אחרייך.
+
+הגענו לכאן כדי ליצור את היישומון לתמונות המאובטח ביותר אי פעם, הצטרפו אלינו למסע!
+
+מאפיינים
+- גיבויים באיכות המקורית, כי כל פיקסל חשוב
+- תוכניות משפחתיות, כך שתוכלו לשתף אחסון עם המשפחה שלכם
+- אלבומים משותפים, כך שתוכל לאגד יחד תמונות אחרי טיול
+- תיקיות משותפות, במקרה ותרצה שהבן זוג שלך יהנה מהקליקים של ה"מצלמה" שלך
+- קישורי אלבום, המאובטחים בעזרת סיסמא
+- יכולת לשחרר מקום, על ידי הסרת קבצים שכבר גובו באופן מאובטח
+- תמיכה אנושית, כי אתה שווה את זה
+- תיאורים, כך שתוכל לתאר את הזכרונות שלך ולמצוא אותם בקלות
+- עורך תמונות, להוסיף למראה הסופי
+- סמן כמועדפים, הסתר ולחזור על זכרונות שלך, כי הם יקרים ללבך
+- ייבוא בלחיצה אחת מ-Google, Apple, הכונן הקשיח שלך ועוד
+- ערכת נושא כהה, כי התמונות שלך נראות יפות בה
+- 2FA, 3FA, אימות ביומטרי
+- ועוד הרבה יותר!
+
+הרשאות
+ente מבקש הרשאות מסוימות כדי לספק שירותי אחסון תמונות, וניתן לסקור אותן כאן: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+מחיר
+אנחנו לא מציעים תוכניות בחינם לתמיד, משום שזה חשוב לנו להיות עמידים ולעמוד במבחן הזמן. במקום זאת אנחנו מציעים תוכניות במחיר סביר כדי שתוכל לשתף באופן חופשי עם המשפחה שלך. ניתן למצוא עוד מידע ב-ente.io.
+
+תמיכה
+אנחנו גאים להציע תמיכה אנושית. אם אתה לקום משלם, אתה יכול לפנות אלינו בכתובת team@ente.io ולצפות לתשובה תוך 24 שעות.
diff --git a/mobile/android/app/src/main/play/listings/he/short_description.txt b/mobile/android/app/src/main/play/listings/he/short_description.txt
new file mode 100644
index 000000000..ed7d1d09e
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/he/short_description.txt
@@ -0,0 +1 @@
+ente הוא אפליקציה לאחסון תמונות המשתמשת בהצפנה קצה-אל-קצה
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/he/title.txt b/mobile/android/app/src/main/play/listings/he/title.txt
new file mode 100644
index 000000000..f0f3c6173
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/he/title.txt
@@ -0,0 +1 @@
+ente - אחסון תמונות באופן מוצפן
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/it/full_description.txt b/mobile/android/app/src/main/play/listings/it/full_description.txt
new file mode 100644
index 000000000..9da92c97a
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/it/full_description.txt
@@ -0,0 +1,36 @@
+ente è una semplice app per il backup e la condivisione di foto e video.
+
+Se siete alla ricerca di un'alternativa rispettosa della privacy a Google Photos, siete nel posto giusto. Con ente, sono memorizzati con crittografia end-to-end (e2ee). Questo significa che solo tu puoi vederli.
+
+Abbiamo applicazioni open-source su Android, iOS, web e desktop, e le tue foto saranno sincronizzate tra tutti i dispositivi utilizzando la crittografia end-to-end (e2ee).
+
+ente rende anche semplice condividere i tuoi album con i tuoi cari, anche se non sono utenti ente. Puoi condividere link visualizzabili pubblicamente, dove possono visualizzare il tuo album e collaborare aggiungendo le foto, anche senza un account o un'app installata.
+
+I tuoi dati crittografati vengono replicati in 3 luoghi diversi, tra cui un rifugio antiatomico a Parigi. I tuoi ricordi continueranno a vivere anche quando non ci sarai più.
+
+Siamo qui per creare l'app per la gestione di foto e video più sicura di sempre, unisciti al nostro viaggio!
+
+CARATTERISTICHE
+- Backup di qualità originale, perché ogni pixel è importante
+- Piani famiglia, in modo da poter condividere lo spazio disponibile con la tua famiglia
+- Album collaborativi, per poter mettere insieme le foto dopo un viaggio
+- Cartelle condivise, nel caso in cui desideri condividere le tue foto subito con il tuo o la tua partner
+- Collegamenti di album, che possono essere anche protetti con una password
+- Possibilità di liberare spazio, rimuovendo i file che sono stati salvati in modo sicuro
+- Supporto umano, perché ne vale la pena
+- Descrizioni, in modo da poter descrivere i tuoi ricordi e trovarli facilmente
+- Editor di immagini, per ritocchi finali
+- Preferiti, nascondi e rivivi i tuoi ricordi, perché sono preziosi
+- Importa da Google, Apple o dal tuo hard disk con un semplice clic
+- Tema scuro, per valorizzare le tue foto
+- 2FA, 3FA, Autenticazione biometrica
+- e molto altro ancora!
+
+PERMESSI
+ente richiede alcune autorizzazioni per servire lo scopo di un provider di storage fotografico, che può essere esaminato qui: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+PREZZO
+Non offriamo piani gratuiti per sempre, perché per noi è importante rimanere sostenibili e resistere alla prova del tempo. Offriamo invece piani accessibili che si possono condividere liberamente con la propria famiglia. Puoi trovare maggiori informazioni su ente.io.
+
+SUPPORTO
+Siamo orgogliosi di offrire supporto umano. Se sei un nostro cliente a pagamento, puoi contattare team@ente.io e aspettarti una risposta dal nostro team entro 24 ore.
diff --git a/mobile/android/app/src/main/play/listings/it/short_description.txt b/mobile/android/app/src/main/play/listings/it/short_description.txt
new file mode 100644
index 000000000..77ac8a007
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/it/short_description.txt
@@ -0,0 +1 @@
+ente è un'applicazione di archiviazione foto e video crittografata end-to-end
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/it/title.txt b/mobile/android/app/src/main/play/listings/it/title.txt
new file mode 100644
index 000000000..63874fc7f
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/it/title.txt
@@ -0,0 +1 @@
+ente - archivio fotografico crittografato
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/nl/full_description.txt b/mobile/android/app/src/main/play/listings/nl/full_description.txt
new file mode 100644
index 000000000..80c925263
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/nl/full_description.txt
@@ -0,0 +1,36 @@
+ente is een eenvoudige app om jouw foto's en video's automatisch te back-uppen en delen.
+
+Als je op zoek bent naar een privacy-vriendelijk alternatief voor Google Photos, dan ben je hier op de juiste plaats. Bij ente worden ze end-to-end encrypted (e2ee). Dit betekent dat alleen jij ze kunt bekijken.
+
+We hebben open-source apps op Android, iOS, web en Desktop, en je foto's zullen naadloos synchroniseren tussen al je apparaten op een end-to-end versleutelde (e2ee) manier.
+
+ente maakt het ook simpeler om album te delen met je dierbaren, zelfs als die ente niet gebruiken. Je kunt openbaar zichtbare links delen, waar anderen jouw album kunnen bekijken en er foto's aan toe kunnen voegen, zelfs zonder account of app.
+
+Jouw versleutelde gegevens worden drievoudig opgeslagen op meerdere locaties, waaronder een kernbunker in Parijs. Wij nemen opslag voor de lange termijn serieus, en zorgen ervoor dat je herinneringen minstens je hele leven bewaard worden.
+
+Ons doel is om de veiligste foto app ooit te maken, sluit je bij ons aan!
+
+FUNCTIES
+- Backups van originele kwaliteit, omdat elke pixel belangrijk is
+- Familieplannen, zodat je de opslag kunt delen met je familie
+- Gezamenlijke albums, zodat je foto's kunt samenvoegen na een reis
+- Gedeelde mappen, voor het geval je jouw partner wilt laten meegenieten van jouw "Camera" klikjes
+- Album links, die met een wachtwoord beschermd kunnen worden
+- Mogelijkheid om ruimte vrij te maken op je apparaat, door bestanden die veilig zijn geback-upt te verwijderen
+- Menselijke klantenservice, omdat je het waard bent
+- Beschrijvingen, zodat je je herinneringen kunt bijhouden en ze gemakkelijk kunt vinden
+- Fotobewerker om de laatste finishing touches toe te voegen
+- Favorieten, verbergen en herleven van je herinneringen, want ze zijn kostbaar
+- Met één klik importeren vanuit Google, Apple, je harde schijf en meer
+- Donker thema, omdat je foto's er goed in uit zien
+- 2FA, 3FA, biometrische authenticatie
+- en nog veel meer!
+
+TOESTEMMINGEN
+ente heeft bepaalde machtigingen nodig om uw foto's op te slaan, die hier bekeken kunnen worden: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+PRIJZEN
+We bieden geen oneindig gratis plannen aan, omdat het voor ons belangrijk is dat we duurzaam blijven en de tand des tijds weerstaan. In plaats daarvan bieden we betaalbare plannen aan die je vrij kunt delen met je familie. Je kunt meer informatie vinden op ente.io.
+
+KLANTENSERVICE
+Wij zijn trots op het bieden van menselijke klantenservice. Als je een betaalde klant bent, kun je contact opnemen met team@ente.io en binnen 24 uur een antwoord van ons verwachten.
diff --git a/mobile/android/app/src/main/play/listings/nl/short_description.txt b/mobile/android/app/src/main/play/listings/nl/short_description.txt
new file mode 100644
index 000000000..9590ece8f
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/nl/short_description.txt
@@ -0,0 +1 @@
+ente is een end-to-end versteutelde app voor foto opslag
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/nl/title.txt b/mobile/android/app/src/main/play/listings/nl/title.txt
new file mode 100644
index 000000000..a73acd5c4
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/nl/title.txt
@@ -0,0 +1 @@
+ente - versleutelde foto opslag
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/pl/short_description.txt b/mobile/android/app/src/main/play/listings/pl/short_description.txt
new file mode 100644
index 000000000..94bf61a49
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/pl/short_description.txt
@@ -0,0 +1 @@
+ente to w pełni szyfrowana aplikacja do przechowywania zdjęć
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/pl/title.txt b/mobile/android/app/src/main/play/listings/pl/title.txt
new file mode 100644
index 000000000..ad4bb83f3
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/pl/title.txt
@@ -0,0 +1 @@
+ente - szyfrowane przechowywanie zdjęć
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/pt/full_description.txt b/mobile/android/app/src/main/play/listings/pt/full_description.txt
new file mode 100644
index 000000000..8e6bc4833
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/pt/full_description.txt
@@ -0,0 +1,36 @@
+ente é um aplicativo simples para fazer backup e compartilhar suas fotos e vídeos.
+
+Se você está procurando uma alternativa ao Google Fotos com foco em privacidade, você veio ao lugar certo. Com ente, eles são armazenados com criptografia de ponta a ponta (e2ee). Isso significa que só você pode vê-los.
+
+Temos aplicativos de código aberto em todas as plataformas, Android, iOS, web e desktop, e suas fotos irão sincronizar perfeitamente entre todas elas de forma criptografada (e2ee).
+
+ente também torna simples compartilhar seus álbuns com seus entes queridos, mesmo que eles não estejam no ente. Você pode compartilhar links para visualização pública, onde eles podem visualizar seu álbum e colaborar adicionando fotos a ele, mesmo sem uma conta ou app.
+
+Seus dados criptografados são replicados em 3 locais diferentes, incluindo um abrigo avançado em Paris. Levamos a sério a nossa postura e fazemos com que seja fácil garantir que suas memórias vivam.
+
+Estamos aqui para se tornar o app de fotos mais seguro de todos, venha entrar em nossa jornada!
+
+RECURSOS
+- Cópia de qualidade original, porque cada pixel é importante
+- Planos de família, para que você possa compartilhar o armazenamento com sua família
+- Álbuns colaborativos, para que você possa agrupar fotos após uma corrida
+- Pastas compartilhadas, caso você queira que seu parceiro aproveite seus cliques da "Câmera"
+- Links de álbuns, que podem ser protegidos com uma senha e definidos para expirar
+- Capacidade de liberar espaço, removendo arquivos que foram salvos com segurança
+- Suporte humano, porque você vale a pena
+- Descrições, para que você possa captar suas memórias e encontrá-las facilmente
+- Editor de imagens, para adicionar toques finais
+- Favoritar, esconder e reviver suas memórias, pois elas são preciosas
+- Importar com um clique do Google, Apple, seu disco rígido e muito mais
+- Tema escuro, porque suas fotos parecem bem nele
+- 2FA, 3FA, Autenticação biométrica
+- e MUITO MAIS!
+
+PERMISSÕES
+ente solicita certas permissões para servir o propósito de um provedor de armazenamento de fotos, que pode ser revisado aqui: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+PREÇO
+Não oferecemos planos gratuitos para sempre, porque é importante para nós que permaneçamos sustentáveis e resistamos à prova do tempo. Em vez disso, oferecemos planos acessíveis que você pode compartilhar livremente com sua família. Você pode encontrar mais informações em ente.io.
+
+SUPORTE
+Temos orgulho em oferecer apoio humano. Se você é nosso cliente pago, você pode entrar em contato com o team@ente.io e esperar uma resposta da nossa equipe dentro de 24 horas.
diff --git a/mobile/android/app/src/main/play/listings/pt/short_description.txt b/mobile/android/app/src/main/play/listings/pt/short_description.txt
new file mode 100644
index 000000000..59c457c0e
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/pt/short_description.txt
@@ -0,0 +1 @@
+ente é um aplicativo de armazenamento de fotos criptografado de ponta a ponta
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/pt/title.txt b/mobile/android/app/src/main/play/listings/pt/title.txt
new file mode 100644
index 000000000..dc953a866
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/pt/title.txt
@@ -0,0 +1 @@
+ente - armazenamento criptografado de fotos
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/ru/full_description.txt b/mobile/android/app/src/main/play/listings/ru/full_description.txt
new file mode 100644
index 000000000..567f5a947
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/ru/full_description.txt
@@ -0,0 +1,36 @@
+ente - это простое приложение для резервного копирования и отправки ваших фотографий и видео.
+
+Если вы ищете подходящую для вас альтернативу Гугл Фото, то вы попали в нужное место. В Ente, они хранятся в сквозном шифровании (e2ee). Это означает то, что только вы можете их просматривать.
+
+У нас есть приложения с открытым исходным кодом на всех платформах, и ваши фотографии будут беспрепятственно синхронизироваться со всеми вашими устройствами с помощью сквозного шифрования (e2ee).
+
+ente также делает так, что делится альбомами со своими близкими становиться невероятно легко, даже если они не зарегистрированы в ente. Вы можете поделиться ссылками публичного доступа, где они могут просматривать ваш альбом и совместно с вами добавлять фотографии в него даже без учетной записи или приложения.
+
+Ваши зашифрованные данные воспроизводятся в 3‑х разных местах, включая скрытое убежище в Париже. Мы серьезно относимся к потомству и легко сделаем так, что ваши воспоминания переживут и вас.
+
+Мы здесь, чтобы сделать самое безопасное приложение для хранения фотографий, присоединяйтесь к нашему путешествию!
+
+ОСОБЕННОСТИ
+- Оригинальное качество резервных копий, потому что важен каждый пиксел
+- Семейные планы, чтобы вы могли делиться хранилищем с вашей семьей
+- Групповые альбомы, что бы вы могли объединить фотографии после поездки
+- Общие папки, если вы хотите, чтобы ваш партнер наслаждался кликами вашей "Камеры"
+- Ссылки для альбома, которые могут быть защищены паролем
+- Возможность освободить место путем удаления файлов, которые были безопасно сохранены
+- Поддержка с живыми людьми, потому что вы заслуживаете лучшего
+- Описания, так что вы можете добавить надпись на свои воспоминания и легко найти их
+- Редактор изображений, для добавления финальных штрихов
+- Избранное, скрывать и доверять вашим воспоминаниям, потому что они драгоценны
+- Импорт в один клик из Google, Apple, вашего жесткого диска и многого другого
+- Темная тема, потому что в ней хорошо выглядят ваши фотографии
+- 2ФА, 3ФА, биометрическая аутентификация
+- и ещё МНОГОЕ другое!
+
+РАЗРЕШЕНИЯ
+ente просит разрешения на использование хранилища фотографий, которые можно рассмотреть здесь: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+ЦЕНА
+Мы не предлагаем бесконечные бесплатные планы, потому что для нас важно оставаться устойчивыми и выдерживать испытание временем. Вместо этого мы предлагаем доступные по цене планы, которыми вы можете свободно делиться с вашей семьей. Дополнительную информацию можно найти на сайте ente.io.
+
+ПОДДЕРЖКА
+Мы гордимся тем, что предлагаем поддержку с живыми людьми. Если вы являетесь нашим платным клиентом, вы можете связаться по электронному адресу team@ente.io и получить ответ от нашей команды в течение 24 часов.
diff --git a/mobile/android/app/src/main/play/listings/ru/short_description.txt b/mobile/android/app/src/main/play/listings/ru/short_description.txt
new file mode 100644
index 000000000..e2bb8133f
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/ru/short_description.txt
@@ -0,0 +1 @@
+ente - это приложение для хранения фотографий с помощью сквозного шифрования
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/ru/title.txt b/mobile/android/app/src/main/play/listings/ru/title.txt
new file mode 100644
index 000000000..e1e217065
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/ru/title.txt
@@ -0,0 +1 @@
+ente - хранилище фотографий со сквозным шифрованием
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/zh/full_description.txt b/mobile/android/app/src/main/play/listings/zh/full_description.txt
new file mode 100644
index 000000000..2fffa8a0c
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/zh/full_description.txt
@@ -0,0 +1,36 @@
+ente 是一个简单的应用程序来备份和分享您的照片和视频。
+
+如果你一直在寻找一个隐私友好的Google Photos替代品，那么你就来对地方了。 使用 Ente，它们以端到端加密 (e2ee) 的方式存储。 这意味着只有您可以查看它们。 使用 Ente，它们以端到端加密 (e2ee) 的方式存储。 这意味着只有您可以查看它们。
+
+我们在Android、iOS、web 和桌面上有开源应用， 和您的照片将以端到端加密方式 (e2ee) 无缝同步。
+
+ente也使分享相册给自己的爱人、亲人变得轻而易举，即使他们可能并不使用ente。 您可以分享可公开查看的链接，使他们可以查看您的相册，并通过添加照片来协作而不需要注册账户或下载app。 您可以共享公开可见的链接，他们可以在其中查看您的相册并通过向其中添加照片进行协作，即使没有账户或应用程序也是如此。
+
+您的加密数据已复制到三个不同的地点，包括巴黎的一个安全屋。 我们认真对待子孙后代，并确保您的回忆比您长寿。 我们认真对待子孙后代，并确保您的回忆比您长寿。
+
+我们来这里是为了打造有史以来最安全的照片应用，来和我们一起前行！
+
+特点
+- 原始质量备份，因为每个像素都是重要的
+- 家庭计划，您可以与家人共享存储
+- 协作相册，您可以在旅行后将照片汇集在一起。
+- 共享文件夹，如果您想让您的伙伴享受您的每一次快门
+- 可以用密码保护相册链接
+- 能够通过移除已经安全备份的文件释放空间
+- 实人支持与协助，因为你值得这一切。
+- 添加描述，这样您可以描述您的回忆并在未来轻松地找到它们
+- 图像编辑器，完成收尾工作
+- 收藏、隐藏和恢复您的回忆，因为它们是宝贵的
+- 一键从谷歌、苹果、您的硬盘或更多的介质导入
+- 黑暗主题，因为您的照片在其中看着不错
+- 2FA，3FA，生物识别认证
+- 还有更多特色待你发现！
+
+权限
+ente需要特定权限以执行作为图像存储提供商的职责，相关内容可以在此链接查阅：https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+价格
+我们不会提供永久免费计划，因为我们必须保持可持续性，经受住时间的考验。 相反，我们向您提供了价格实惠、可自由分享的订阅计划。 您可以在 ente.io 找到更多信息。 相反，我们向您提供了价格实惠、可自由分享的订阅计划。 您可以在 ente.io 找到更多信息。 相反，我们向您提供了价格实惠、可自由分享的订阅计划。 您可以在 ente.io 找到更多信息。
+
+支持
+我们对提供真人支持感到自豪。 我们对提供真人支持感到自豪。 如果您是我们的付费客户，您可以联系 team@ente.io 并在24小时内收到来自我们团队的回复。
diff --git a/mobile/android/app/src/main/play/listings/zh/short_description.txt b/mobile/android/app/src/main/play/listings/zh/short_description.txt
new file mode 100644
index 000000000..f03d1a37f
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/zh/short_description.txt
@@ -0,0 +1 @@
+ente 是一个端到端加密的照片存储应用
\ No newline at end of file
diff --git a/mobile/android/app/src/main/play/listings/zh/title.txt b/mobile/android/app/src/main/play/listings/zh/title.txt
new file mode 100644
index 000000000..a976869b1
--- /dev/null
+++ b/mobile/android/app/src/main/play/listings/zh/title.txt
@@ -0,0 +1 @@
+ente - 加密照片存储
\ No newline at end of file
diff --git a/mobile/fastlane/metadata/android/tr/full_description.txt b/mobile/fastlane/metadata/android/tr/full_description.txt
new file mode 100644
index 000000000..2362583f6
--- /dev/null
+++ b/mobile/fastlane/metadata/android/tr/full_description.txt
@@ -0,0 +1,36 @@
+ente, fotoğraflarınızı ve videolarınızı yedeklemek ve paylaşmak için basit bir uygulamadır.
+
+Google Fotoğraflar'a gizlilik dostu bir alternatif arıyorsanız doğru yere geldiniz. Ente ile uçtan uca şifrelenmiş olarak (e2ee) saklanırlar. Bu, onları yalnızca sizin görebileceğiniz anlamına gelir.
+
+Android, iOS, web ve masaüstünde açık kaynaklı uygulamalarımız var ve fotoğraflarınız bunların tümü arasında uçtan uca şifrelenmiş (e2ee) şekilde sorunsuz bir şekilde senkronize edilecek.
+
+ente ayrıca, ente'de olmasalar bile albümlerinizi sevdiklerinizle paylaşmanızı da kolaylaştırır. Bir hesap veya uygulama olmadan bile albümünüzü görüntüleyebilecekleri ve albüme fotoğraf ekleyerek ortak çalışabilecekleri, herkese açık olarak görüntülenebilen bağlantıları paylaşabilirsiniz.
+
+Şifrelenmiş verileriniz, Paris'teki bir serpinti sığınağı da dahil olmak üzere birden fazla yerde depolanır. Gelecek nesilleri ciddiye alıyor ve anılarınızın sizden daha uzun yaşamasını sağlamayı kolaylaştırıyoruz.
+
+Şimdiye kadarki en güvenli fotoğraf uygulamasını yapmak için buradayız, gelin yolculuğumuza katılın!
+
+✨ÖZELLİKLER
+- Orijinal kalitede yedekler, çünkü her piksel önemlidir
+- Aile planları, böylece depolama alanını ailenizle paylaşabilirsiniz
+- Seyahatten sonra fotoğrafları bir araya toplayabilmeniz için ortak albümler
+- Partnerinizin "Kamera" tıklamalarınızın keyfini çıkarmasını istemeniz durumunda paylaşılan klasörler
+- Parola ile korunabilen ve süresi dolacak şekilde ayarlanabilen albüm bağlantıları
+- Güvenli bir şekilde yedeklenmiş dosyaları kaldırarak alan boşaltma yeteneği
+- İnsan desteği, çünkü sen buna değersin
+- Açıklamalar, böylece anılarınıza başlık yazabilir ve onları kolayca bulabilirsiniz
+- Son rötuşları eklemek için görüntü düzenleyici
+- Favori, sakla ve anılarını yeniden yaşa, çünkü onlar değerlidir
+- Google, Apple, sabit diskiniz ve daha fazlasından tek tıkla içe aktarma
+- Koyu tema, çünkü fotoğraflarınız bu temada güzel görünüyor
+- 2FA, 3FA, biyometrik kimlik doğrulama
+- ve çok daha fazlası!
+
+İZİNLER
+bir fotoğraf depolama sağlayıcısının amacına hizmet etmek için belirli izinlere yönelik taleplerde bulunulabilir; bu izinler burada incelenebilir: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md
+
+FİYATLANDIRMA
+Sonsuza kadar ücretsiz planlar sunmuyoruz, çünkü sürdürülebilir kalmamız ve zamanın testine dayanmamız bizim için önemli. Bunun yerine, ailenizle özgürce paylaşabileceğiniz uygun fiyatlı planlar sunuyoruz. Daha fazla bilgiyi ente.io adresinde bulabilirsiniz.
+
+🙋DESTEK
+İnsan desteği sunmaktan gurur duyuyoruz. Ücretli müşterimiz iseniz team@ente.io adresine ulaşabilir ve ekibimizden 24 saat içinde yanıt bekleyebilirsiniz.
diff --git a/mobile/fastlane/metadata/android/tr/short_description.txt b/mobile/fastlane/metadata/android/tr/short_description.txt
new file mode 100644
index 000000000..8995ef366
--- /dev/null
+++ b/mobile/fastlane/metadata/android/tr/short_description.txt
@@ -0,0 +1 @@
+ente uçtan uca şifrelenmiş bir fotoğraf depolama uygulamasıdır
\ No newline at end of file
diff --git a/mobile/fastlane/metadata/android/tr/title.txt b/mobile/fastlane/metadata/android/tr/title.txt
new file mode 100644
index 000000000..85355d495
--- /dev/null
+++ b/mobile/fastlane/metadata/android/tr/title.txt
@@ -0,0 +1 @@
+ente - şifrelenmiş depolama sistemi
\ No newline at end of file
diff --git a/mobile/fastlane/metadata/ios/ru/name.txt b/mobile/fastlane/metadata/ios/ru/name.txt
index 45bf4920f..44e95b9fc 100644
--- a/mobile/fastlane/metadata/ios/ru/name.txt
+++ b/mobile/fastlane/metadata/ios/ru/name.txt
@@ -1 +1 @@
-ente Фото
+ente фотографии
diff --git a/mobile/fastlane/metadata/ios/ru/subtitle.txt b/mobile/fastlane/metadata/ios/ru/subtitle.txt
index a995d09ed..990f6a1af 100644
--- a/mobile/fastlane/metadata/ios/ru/subtitle.txt
+++ b/mobile/fastlane/metadata/ios/ru/subtitle.txt
@@ -1 +1 @@
-Система зашифрованного хранения фотографий
+Зашифрованное хранилище фотографий
diff --git a/mobile/fastlane/metadata/ios/tr/description.txt b/mobile/fastlane/metadata/ios/tr/description.txt
new file mode 100644
index 000000000..9ee96f277
--- /dev/null
+++ b/mobile/fastlane/metadata/ios/tr/description.txt
@@ -0,0 +1,33 @@
+Ente, fotoğraflarınızı ve videolarınızı yedekleyip paylaşmanızı sağlayan kullanimi kolay bir uygulamadır.
+
+Anılarınızı saklamak için gizlilik dostu bir alternatif arıyorsanız, doğru yere geldiniz. Ente ile uçtan uca şifrelenmiş olarak (e2ee) saklanırlar. Bu, onları yalnızca sizin görebileceğiniz anlamına gelir.
+
+Android, iOS, web ve Masaüstünde uygulamalarımız var ve fotoğraflarınız tüm cihazlarınız arasında uçtan uca şifrelenmiş (e2ee) bir şekilde sorunsuz bir şekilde senkronize edilecek.
+
+Ente, albümlerinizi sevdiklerinizle paylaşmanızı da kolaylaştırıyor. Bunları uçtan uca şifrelenmiş olarak doğrudan diğer Ente kullanıcılarıyla paylaşabilir veya herkese açık olarak görüntülenebilir bağlantılarla paylaşabilirsiniz.
+
+Şifrelenmiş verileriniz, Paris'teki bir serpinti sığınağı da dahil olmak üzere birden fazla yerde depolanır. Gelecek nesilleri ciddiye alıyor ve anılarınızın sizden daha uzun yaşamasını sağlamayı kolaylaştırıyoruz.
+
+Şimdiye kadarki en güvenli fotoğraf uygulamasını yapmak için buradayız, gelin yolculuğumuza katılın!
+
+✨ÖZELLİKLER
+- Orijinal kalitede yedekler, çünkü her piksel önemlidir
+- Aile planları, böylece depolama alanını ailenizle paylaşabilirsiniz
+- Partnerinizin "Kamera" tıklamalarınızın keyfini çıkarmasını istemeniz durumunda paylaşılan klasörler
+- Parola ile korunabilen ve süresi dolacak şekilde ayarlanabilen albüm bağlantıları
+- Güvenli bir şekilde yedeklenmiş dosyaları kaldırarak alan boşaltma yeteneği
+- Son rötuşları eklemek için görüntü düzenleyici
+- Favori, sakla ve anılarını yeniden yaşa, çünkü onlar değerlidir
+- Tüm büyük depolama sağlayıcılarından tek tıklamayla içe aktarma
+- Koyu tema, çünkü fotoğraflarınız bu temada güzel görünüyor
+- 2FA, 3FA, biyometrik kimlik doğrulama
+- ve çok daha fazlası!
+
+FİYATLANDIRMA
+Sonsuza kadar ücretsiz planlar sunmuyoruz, çünkü sürdürülebilir kalmamız ve zamanın testine dayanmamız bizim için önemli. Bunun yerine, ailenizle özgürce paylaşabileceğiniz uygun fiyatlı planlar sunuyoruz. Daha fazla bilgiyi ente.io adresinde bulabilirsiniz.
+
+🙋DESTEK
+İnsan desteği sunmaktan gurur duyuyoruz. Ücretli müşterimiz iseniz team@ente.io adresine ulaşabilir ve ekibimizden 24 saat içinde yanıt bekleyebilirsiniz.
+
+ŞARTLAR
+https://ente.io/terms
diff --git a/mobile/fastlane/metadata/ios/tr/keywords.txt b/mobile/fastlane/metadata/ios/tr/keywords.txt
new file mode 100644
index 000000000..4e9f74bd7
--- /dev/null
+++ b/mobile/fastlane/metadata/ios/tr/keywords.txt
@@ -0,0 +1 @@
+fotoğraflar,fotoğrafçılık,aile,gizlilik,bulut,yedekleme,videolar,fotoğraf,şifreleme,depolama,albüm,alternatif
diff --git a/mobile/fastlane/metadata/ios/tr/name.txt b/mobile/fastlane/metadata/ios/tr/name.txt
new file mode 100644
index 000000000..04e5a9c01
--- /dev/null
+++ b/mobile/fastlane/metadata/ios/tr/name.txt
@@ -0,0 +1 @@
+ente fotoğraf uygulaması
diff --git a/mobile/fastlane/metadata/ios/tr/subtitle.txt b/mobile/fastlane/metadata/ios/tr/subtitle.txt
new file mode 100644
index 000000000..cbc438b5f
--- /dev/null
+++ b/mobile/fastlane/metadata/ios/tr/subtitle.txt
@@ -0,0 +1 @@
+Şifrelenmiş depolama sistemi
diff --git a/mobile/fastlane/metadata/playstore/tr/full_description.txt b/mobile/fastlane/metadata/playstore/tr/full_description.txt
new file mode 100644
index 000000000..b13229830
--- /dev/null
+++ b/mobile/fastlane/metadata/playstore/tr/full_description.txt
@@ -0,0 +1,30 @@
+Ente, fotoğraflarınızı ve videolarınızı yedekleyip paylaşmanızı sağlayan kullanimi kolay bir uygulamadır.
+
+Anılarınızı saklamak için gizlilik dostu bir alternatif arıyorsanız, doğru yere geldiniz. Ente ile uçtan uca şifrelenmiş olarak (e2ee) saklanırlar. Bu, onları yalnızca sizin görüntüleyebileceğiniz anlamına gelir.
+
+Android, iOS, web ve Masaüstünde uygulamalarımız var ve fotoğraflarınız tüm cihazlarınız arasında uçtan uca şifrelenmiş (e2ee) bir şekilde sorunsuz bir şekilde senkronize edilecek.
+
+Ente, albümlerinizi sevdiklerinizle paylaşmanızı da kolaylaştırıyor. Bunları uçtan uca şifrelenmiş olarak doğrudan diğer Ente kullanıcılarıyla paylaşabilir veya herkese açık olarak görüntülenebilir bağlantılarla paylaşabilirsiniz.
+
+Şifrelenmiş verileriniz, Paris'teki bir serpinti sığınağı da dahil olmak üzere birden fazla yerde depolanır. Gelecek nesilleri ciddiye alıyor ve anılarınızın sizden daha uzun yaşamasını sağlamayı kolaylaştırıyoruz.
+
+Şimdiye kadarki en güvenli fotoğraf uygulamasını yapmak için buradayız, gelin yolculuğumuza katılın!
+
+✨ÖZELLİKLER
+- Orijinal kalitede yedekler, çünkü her piksel önemlidir
+- Aile planları, böylece depolama alanını ailenizle paylaşabilirsiniz
+- Partnerinizin "Kamera" tıklamalarınızın keyfini çıkarmasını istemeniz durumunda paylaşılan klasörler
+- Parola ile korunabilen ve süresi dolacak şekilde ayarlanabilen albüm bağlantıları
+- Güvenli bir şekilde yedeklenmiş dosyaları kaldırarak alan boşaltma yeteneği
+- Son rötuşları eklemek için görüntü düzenleyici
+- Favori, sakla ve anılarını yeniden yaşa, çünkü onlar değerlidir
+- Google, Apple, sabit diskiniz ve daha fazlasından tek tıkla içe aktarma
+- Koyu tema, çünkü fotoğraflarınız bu temada güzel görünüyor
+- 2FA, 3FA, biyometrik kimlik doğrulama
+- ve çok daha fazlası!
+
+💲 FİYATLANDIRMA
+Sonsuza kadar ücretsiz planlar sunmuyoruz, çünkü sürdürülebilir kalmamız ve zamanın testine dayanmamız bizim için önemli. Bunun yerine, ailenizle özgürce paylaşabileceğiniz uygun fiyatlı planlar sunuyoruz. Daha fazla bilgiyi ente.io adresinde bulabilirsiniz.
+
+🙋DESTEK
+İnsan desteği sunmaktan gurur duyuyoruz. Ücretli müşterimiz iseniz team@ente.io adresine ulaşabilir ve ekibimizden 24 saat içinde yanıt bekleyebilirsiniz.
\ No newline at end of file
diff --git a/mobile/fastlane/metadata/playstore/tr/short_description.txt b/mobile/fastlane/metadata/playstore/tr/short_description.txt
new file mode 100644
index 000000000..009cb00bf
--- /dev/null
+++ b/mobile/fastlane/metadata/playstore/tr/short_description.txt
@@ -0,0 +1 @@
+Şifreli fotoğraf depolama - fotoğraflarınızı ve videolarınızı yedekleyin, düzenleyin ve paylaşın
\ No newline at end of file
diff --git a/mobile/integration_test/app_init_test.dart b/mobile/integration_test/app_init_test.dart
new file mode 100644
index 000000000..e3313670c
--- /dev/null
+++ b/mobile/integration_test/app_init_test.dart
@@ -0,0 +1,130 @@
+import "dart:async";
+
+import "package:flutter/material.dart";
+import "package:flutter_test/flutter_test.dart";
+import "package:integration_test/integration_test.dart";
+import "package:logging/logging.dart";
+import "package:photos/main.dart" as app;
+
+void main() {
+ group("App init test", () {
+ final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+ binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.fullyLive;
+ testWidgets("App init test", semanticsEnabled: false, (tester) async {
+ // https://github.com/flutter/flutter/issues/89749#issuecomment-1029965407
+ tester.testTextInput.register();
+
+ await runZonedGuarded(
+ () async {
+ bool skipLogin = false;
+
+ ///Ignore exceptions thrown by the app for the test to pass
+ WidgetsFlutterBinding.ensureInitialized();
+ FlutterError.onError = (FlutterErrorDetails errorDetails) {
+ FlutterError.dumpErrorToConsole(errorDetails);
+ };
+
+ await binding.traceAction(
+ () async {
+ app.main();
+
+ await tester.pumpAndSettle(const Duration(seconds: 1));
+
+ await dismissUpdateAppDialog(tester);
+
+ final signInButton = find.byKey(const ValueKey("signInButton"));
+ skipLogin = !tester.any(signInButton);
+
+ if (!skipLogin) {
+ await tester.tap(signInButton);
+ await tester.pumpAndSettle();
+ final emailInputField = find.byType(TextFormField);
+ final logInButton = find.byKey(const ValueKey("logInButton"));
+ //Fill email id here
+ await tester.enterText(emailInputField, "*enter email here*");
+ await tester.pumpAndSettle(const Duration(seconds: 1));
+ await tester.tap(logInButton);
+ await tester.pumpAndSettle(const Duration(seconds: 3));
+ final passwordInputField =
+ find.byKey(const ValueKey("passwordInputField"));
+ final verifyPasswordButton =
+ find.byKey(const ValueKey("verifyPasswordButton"));
+ //Fill password here
+ await tester.enterText(
+ passwordInputField,
+ "*enter password here*",
+ );
+ await tester.pumpAndSettle(const Duration(seconds: 1));
+ await tester.tap(verifyPasswordButton);
+ await tester.pumpAndSettle();
+
+ await tester.pumpAndSettle(const Duration(seconds: 1));
+ await dismissUpdateAppDialog(tester);
+
+ //Grant permission to access photos. Must manually click the system dialog.
+ final grantPermissionButton =
+ find.byKey(const ValueKey("grantPermissionButton"));
+ await tester.tap(grantPermissionButton);
+ await tester.pumpAndSettle(const Duration(seconds: 1));
+ await tester.pumpAndSettle(const Duration(seconds: 3));
+
+ //Automatically skips backup
+ final skipBackupButton =
+ find.byKey(const ValueKey("skipBackupButton"));
+ await tester.tap(skipBackupButton);
+ await tester.pumpAndSettle(const Duration(seconds: 2));
+ }
+ },
+ reportKey: "app_init_summary",
+ );
+ },
+ (error, stack) {
+ Logger("app_init_test").info(error, stack);
+ },
+ );
+ });
+ });
+}
+
+Future dismissUpdateAppDialog(WidgetTester tester) async {
+ await tester.tapAt(const Offset(0, 0));
+ await tester.pumpAndSettle();
+}
+
+
+///Use this widget as floating action buttom in HomeWidget so that frames
+///are built and rendered continuously so that timeline trace has continuous
+///data. Change the duraiton in `_startTimer()` to control the duraiton of
+///test on app init.
+
+// class TempWidget extends StatefulWidget {
+// const TempWidget({super.key});
+
+// @override
+// TempWidgetState createState() => TempWidgetState();
+// }
+
+// class TempWidgetState extends State {
+// bool _isLoading = true;
+
+// @override
+// void initState() {
+// super.initState();
+// _startTimer();
+// }
+
+// void _startTimer() {
+// Future.delayed(const Duration(seconds: 20), () {
+// setState(() {
+// _isLoading = false;
+// });
+// });
+// }
+
+// @override
+// Widget build(BuildContext context) {
+// return _isLoading
+// ? const CircularProgressIndicator()
+// : const SizedBox.shrink();
+// }
+// }
\ No newline at end of file
diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 46aa7d86b..f8d2c3ad7 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -1,8 +1,11 @@
PODS:
- - background_fetch (1.2.1):
+ - background_fetch (1.3.2):
- Flutter
- battery_info (0.0.1):
- Flutter
+ - bonsoir_darwin (3.0.0):
+ - Flutter
+ - FlutterMacOS
- connectivity_plus (0.0.1):
- Flutter
- ReachabilitySwift
@@ -10,38 +13,38 @@ PODS:
- Flutter
- file_saver (0.0.1):
- Flutter
- - Firebase/CoreOnly (10.18.0):
- - FirebaseCore (= 10.18.0)
- - Firebase/Messaging (10.18.0):
+ - Firebase/CoreOnly (10.22.0):
+ - FirebaseCore (= 10.22.0)
+ - Firebase/Messaging (10.22.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 10.22.0)
- firebase_core (2.29.0):
- Firebase/CoreOnly (= 10.22.0)
- Flutter
- - firebase_messaging (14.7.10):
- - Firebase/Messaging (= 10.18.0)
+ - firebase_messaging (14.7.19):
+ - Firebase/Messaging (= 10.22.0)
- firebase_core
- Flutter
- - FirebaseCore (10.18.0):
+ - FirebaseCore (10.22.0):
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.12)
- GoogleUtilities/Logger (~> 7.12)
- - FirebaseCoreInternal (10.21.0):
+ - FirebaseCoreInternal (10.24.0):
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- - FirebaseInstallations (10.21.0):
+ - FirebaseInstallations (10.24.0):
- FirebaseCore (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- PromisesObjC (~> 2.1)
- - FirebaseMessaging (10.18.0):
+ - FirebaseMessaging (10.22.0):
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- - GoogleDataTransport (~> 9.2)
+ - GoogleDataTransport (~> 9.3)
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/Reachability (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- - nanopb (< 2.30910.0, >= 2.30908.0)
+ - nanopb (< 2.30911.0, >= 2.30908.0)
- fk_user_agent (2.0.0):
- Flutter
- Flutter (1.0.0)
@@ -70,27 +73,35 @@ PODS:
- fluttertoast (0.0.2):
- Flutter
- Toast
- - GoogleDataTransport (9.3.0):
+ - GoogleDataTransport (9.4.1):
- GoogleUtilities/Environment (~> 7.7)
- - nanopb (< 2.30910.0, >= 2.30908.0)
+ - nanopb (< 2.30911.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2)
- - GoogleUtilities/AppDelegateSwizzler (7.12.0):
+ - GoogleUtilities/AppDelegateSwizzler (7.13.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- - GoogleUtilities/Environment (7.12.0):
+ - GoogleUtilities/Privacy
+ - GoogleUtilities/Environment (7.13.0):
+ - GoogleUtilities/Privacy
- PromisesObjC (< 3.0, >= 1.2)
- - GoogleUtilities/Logger (7.12.0):
+ - GoogleUtilities/Logger (7.13.0):
- GoogleUtilities/Environment
- - GoogleUtilities/Network (7.12.0):
+ - GoogleUtilities/Privacy
+ - GoogleUtilities/Network (7.13.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
+ - GoogleUtilities/Privacy
- GoogleUtilities/Reachability
- - "GoogleUtilities/NSData+zlib (7.12.0)"
- - GoogleUtilities/Reachability (7.12.0):
+ - "GoogleUtilities/NSData+zlib (7.13.0)":
+ - GoogleUtilities/Privacy
+ - GoogleUtilities/Privacy (7.13.0)
+ - GoogleUtilities/Reachability (7.13.0):
- GoogleUtilities/Logger
- - GoogleUtilities/UserDefaults (7.12.0):
+ - GoogleUtilities/Privacy
+ - GoogleUtilities/UserDefaults (7.13.0):
- GoogleUtilities/Logger
+ - GoogleUtilities/Privacy
- home_widget (0.0.1):
- Flutter
- image_editor_common (1.0.0):
@@ -114,6 +125,8 @@ PODS:
- libwebp/sharpyuv (1.3.2)
- libwebp/webp (1.3.2):
- libwebp/sharpyuv
+ - local_auth_darwin (0.0.1):
+ - Flutter
- local_auth_ios (0.0.1):
- Flutter
- Mantle (2.2.0):
@@ -131,11 +144,11 @@ PODS:
- Flutter
- move_to_background (0.0.1):
- Flutter
- - nanopb (2.30909.1):
- - nanopb/decode (= 2.30909.1)
- - nanopb/encode (= 2.30909.1)
- - nanopb/decode (2.30909.1)
- - nanopb/encode (2.30909.1)
+ - nanopb (2.30910.0):
+ - nanopb/decode (= 2.30910.0)
+ - nanopb/encode (= 2.30910.0)
+ - nanopb/decode (2.30910.0)
+ - nanopb/encode (2.30910.0)
- onnxruntime (0.0.1):
- Flutter
- onnxruntime-objc (= 1.15.1)
@@ -152,28 +165,30 @@ PODS:
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
+ - permission_handler_apple (9.3.0):
+ - Flutter
- photo_manager (2.0.0):
- Flutter
- FlutterMacOS
- - PromisesObjC (2.3.1)
- - ReachabilitySwift (5.0.0)
- - receive_sharing_intent (1.6.7):
+ - PromisesObjC (2.4.0)
+ - ReachabilitySwift (5.2.1)
+ - receive_sharing_intent (1.6.8):
- Flutter
- screen_brightness_ios (0.1.0):
- Flutter
- - SDWebImage (5.18.11):
- - SDWebImage/Core (= 5.18.11)
- - SDWebImage/Core (5.18.11)
+ - SDWebImage (5.19.1):
+ - SDWebImage/Core (= 5.19.1)
+ - SDWebImage/Core (5.19.1)
- SDWebImageWebPCoder (0.14.5):
- libwebp (~> 1.0)
- SDWebImage/Core (~> 5.17)
- - Sentry/HybridSDK (8.18.0):
- - SentryPrivate (= 8.18.0)
- - sentry_flutter (0.0.1):
+ - Sentry/HybridSDK (8.21.0):
+ - SentryPrivate (= 8.21.0)
+ - sentry_flutter (7.19.0):
- Flutter
- FlutterMacOS
- - Sentry/HybridSDK (= 8.18.0)
- - SentryPrivate (8.18.0)
+ - Sentry/HybridSDK (= 8.21.0)
+ - SentryPrivate (8.21.0)
- share_plus (0.0.1):
- Flutter
- shared_preferences_foundation (0.0.1):
@@ -193,11 +208,11 @@ PODS:
- sqlite3/common
- sqlite3_flutter_libs (0.0.1):
- Flutter
- - sqlite3 (~> 3.45.0)
+ - sqlite3 (~> 3.45.1)
- sqlite3/fts5
- sqlite3/perf-threadsafe
- sqlite3/rtree
- - Toast (4.1.0)
+ - Toast (4.1.1)
- uni_links (0.0.1):
- Flutter
- url_launcher_ios (0.0.1):
@@ -216,6 +231,7 @@ PODS:
DEPENDENCIES:
- background_fetch (from `.symlinks/plugins/background_fetch/ios`)
- battery_info (from `.symlinks/plugins/battery_info/ios`)
+ - bonsoir_darwin (from `.symlinks/plugins/bonsoir_darwin/darwin`)
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- file_saver (from `.symlinks/plugins/file_saver/ios`)
@@ -236,6 +252,7 @@ DEPENDENCIES:
- in_app_purchase_storekit (from `.symlinks/plugins/in_app_purchase_storekit/darwin`)
- integration_test (from `.symlinks/plugins/integration_test/ios`)
- isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`)
+ - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
- local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
- media_extension (from `.symlinks/plugins/media_extension/ios`)
- media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
@@ -247,6 +264,7 @@ DEPENDENCIES:
- open_mail_app (from `.symlinks/plugins/open_mail_app/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+ - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
- photo_manager (from `.symlinks/plugins/photo_manager/ios`)
- receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
- screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
@@ -291,6 +309,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/background_fetch/ios"
battery_info:
:path: ".symlinks/plugins/battery_info/ios"
+ bonsoir_darwin:
+ :path: ".symlinks/plugins/bonsoir_darwin/darwin"
connectivity_plus:
:path: ".symlinks/plugins/connectivity_plus/ios"
device_info_plus:
@@ -331,6 +351,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/integration_test/ios"
isar_flutter_libs:
:path: ".symlinks/plugins/isar_flutter_libs/ios"
+ local_auth_darwin:
+ :path: ".symlinks/plugins/local_auth_darwin/darwin"
local_auth_ios:
:path: ".symlinks/plugins/local_auth_ios/ios"
media_extension:
@@ -353,6 +375,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/package_info_plus/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
+ permission_handler_apple:
+ :path: ".symlinks/plugins/permission_handler_apple/ios"
photo_manager:
:path: ".symlinks/plugins/photo_manager/ios"
receive_sharing_intent:
@@ -383,9 +407,10 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/wakelock_plus/ios"
SPEC CHECKSUMS:
- background_fetch: 896944864b038d2837fc750d470e9841e1e6a363
+ background_fetch: 2319bf7e18237b4b269430b7f14d177c0df09c5a
battery_info: 09f5c9ee65394f2291c8c6227bedff345b8a730c
- connectivity_plus: 53efb943fc2882c8512d84c45707bcabc4c36076
+ bonsoir_darwin: 127bdc632fdc154ae2f277a4d5c86a6212bc75be
+ connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
Firebase: 797fd7297b7e1be954432743a0b3f90038e45a71
@@ -396,7 +421,7 @@ SPEC CHECKSUMS:
FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e
FirebaseMessaging: 9f71037fd9db3376a4caa54e5a3949d1027b4b6e
fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545
- Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+ Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf
@@ -405,15 +430,16 @@ SPEC CHECKSUMS:
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
- GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
- GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
+ GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
+ GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
image_editor_common: d6f6644ae4a6de80481e89fe6d0a8c49e30b4b43
- in_app_purchase_storekit: 9e9931234f0adcf71ae323f8c83785b96030edf1
+ in_app_purchase_storekit: 0e4b3c2e43ba1e1281f4f46dd71b0593ce529892
integration_test: 13825b8a9334a850581300559b8839134b124670
isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
- local_auth_ios: 1ba1475238daa33a6ffa2a29242558437be435ac
+ local_auth_darwin: c7e464000a6a89e952235699e32b329457608d98
+ local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
media_extension: 6d30dc1431ebaa63f43c397c37917b1a0a597a4c
media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
@@ -421,7 +447,7 @@ SPEC CHECKSUMS:
media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
motionphoto: d4a432b8c8f22fb3ad966258597c0103c9c5ff16
move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
- nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
+ nanopb: 438bc412db1928dac798aa6fd75726007be04262
onnxruntime: e9346181d75b8dea8733bdae512a22c298962e00
onnxruntime-c: ebdcfd8650bcbd10121c125262f99dea681b92a3
onnxruntime-objc: ae7acec7a3d03eaf072d340afed7a35635c1c2a6
@@ -429,25 +455,26 @@ SPEC CHECKSUMS:
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+ permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
- PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
- ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
- receive_sharing_intent: 9ca20ae908f83c36ddaaaa8c9bd30ce4700495e8
+ PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+ ReachabilitySwift: 5ae15e16814b5f9ef568963fb2c87aeb49158c66
+ receive_sharing_intent: 6837b01768e567fe8562182397bf43d63d8c6437
screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
- SDWebImage: a3ba0b8faac7228c3c8eadd1a55c9c9fe5e16457
+ SDWebImage: 40b0b4053e36c660a764958bff99eed16610acbb
SDWebImageWebPCoder: c94f09adbca681822edad9e532ac752db713eabf
Sentry: ebc12276bd17613a114ab359074096b6b3725203
sentry_flutter: 88ebea3f595b0bc16acc5bedacafe6d60c12dcd5
SentryPrivate: d651efb234cf385ec9a1cdd3eff94b5e78a0e0fe
- share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+ share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
sqlite3: 73b7fc691fdc43277614250e04d183740cb15078
- sqlite3_flutter_libs: aeb4d37509853dfa79d9b59386a2dac5dd079428
- Toast: ec33c32b8688982cecc6348adeae667c1b9938da
+ sqlite3_flutter_libs: af0e8fe9bce48abddd1ffdbbf839db0302d72d80
+ Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
- url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
- video_player_avfoundation: e9e6f9cae7d7a6d9b43519b0aab382bca60fcfd1
+ url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
+ video_player_avfoundation: 2b4384f3b157206b5e150a0083cdc0c905d260d3
video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index bb053d999..72c5ef5cf 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -174,6 +174,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
ABF2FD2FD606DC6DD54BD9AB /* [CP] Embed Pods Frameworks */,
+ F5BF2E85B889CF8483C26F35 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -292,6 +293,7 @@
"${BUILT_PRODUCTS_DIR}/Toast/Toast.framework",
"${BUILT_PRODUCTS_DIR}/background_fetch/background_fetch.framework",
"${BUILT_PRODUCTS_DIR}/battery_info/battery_info.framework",
+ "${BUILT_PRODUCTS_DIR}/bonsoir_darwin/bonsoir_darwin.framework",
"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
"${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework",
"${BUILT_PRODUCTS_DIR}/file_saver/file_saver.framework",
@@ -310,6 +312,7 @@
"${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework",
"${BUILT_PRODUCTS_DIR}/isar_flutter_libs/isar_flutter_libs.framework",
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
+ "${BUILT_PRODUCTS_DIR}/local_auth_darwin/local_auth_darwin.framework",
"${BUILT_PRODUCTS_DIR}/local_auth_ios/local_auth_ios.framework",
"${BUILT_PRODUCTS_DIR}/media_extension/media_extension.framework",
"${BUILT_PRODUCTS_DIR}/media_kit_libs_ios_video/media_kit_libs_ios_video.framework",
@@ -374,6 +377,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/background_fetch.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/battery_info.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/bonsoir_darwin.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_saver.framework",
@@ -392,6 +396,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/isar_flutter_libs.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth_darwin.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/media_extension.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/media_kit_libs_ios_video.framework",
@@ -464,6 +469,24 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
+ F5BF2E85B889CF8483C26F35 /* [CP] Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
+ "${PODS_CONFIGURATION_BUILD_DIR}/permission_handler_apple/permission_handler_apple_privacy.bundle",
+ );
+ name = "[CP] Copy Pods Resources";
+ outputPaths = (
+ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/permission_handler_apple_privacy.bundle",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
diff --git a/mobile/lib/core/configuration.dart b/mobile/lib/core/configuration.dart
index cd6b5156e..cde766b1e 100644
--- a/mobile/lib/core/configuration.dart
+++ b/mobile/lib/core/configuration.dart
@@ -16,6 +16,7 @@ import 'package:photos/db/files_db.dart';
import 'package:photos/db/memories_db.dart';
import 'package:photos/db/trash_db.dart';
import 'package:photos/db/upload_locks_db.dart';
+import "package:photos/events/endpoint_updated_event.dart";
import 'package:photos/events/signed_in_event.dart';
import 'package:photos/events/user_logged_out_event.dart';
import 'package:photos/models/key_attributes.dart';
@@ -69,6 +70,7 @@ class Configuration {
static const hasSelectedAllFoldersForBackupKey =
"has_selected_all_folders_for_backup";
static const anonymousUserIDKey = "anonymous_user_id";
+ static const endPointKey = "endpoint";
final kTempFolderDeletionTimeBuffer = const Duration(hours: 6).inMicroseconds;
@@ -390,7 +392,12 @@ class Configuration {
}
String getHttpEndpoint() {
- return endpoint;
+ return _preferences.getString(endPointKey) ?? endpoint;
+ }
+
+ Future setHttpEndpoint(String endpoint) async {
+ await _preferences.setString(endPointKey, endpoint);
+ Bus.instance.fire(EndpointUpdatedEvent());
}
String? getToken() {
diff --git a/mobile/lib/core/errors.dart b/mobile/lib/core/errors.dart
index a7d616b92..d39f6f027 100644
--- a/mobile/lib/core/errors.dart
+++ b/mobile/lib/core/errors.dart
@@ -79,3 +79,5 @@ class LoginKeyDerivationError extends Error {}
class SrpSetupNotCompleteError extends Error {}
class SharingNotPermittedForFreeAccountsError extends Error {}
+
+class NoMediaLocationAccessError extends Error {}
diff --git a/mobile/lib/core/network/ente_interceptor.dart b/mobile/lib/core/network/ente_interceptor.dart
index 5eb8d16d5..676fe94cb 100644
--- a/mobile/lib/core/network/ente_interceptor.dart
+++ b/mobile/lib/core/network/ente_interceptor.dart
@@ -1,14 +1,12 @@
import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:photos/core/configuration.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import 'package:uuid/uuid.dart';
class EnteRequestInterceptor extends Interceptor {
- final SharedPreferences _preferences;
final String enteEndpoint;
- EnteRequestInterceptor(this._preferences, this.enteEndpoint);
+ EnteRequestInterceptor(this.enteEndpoint);
@override
void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
@@ -20,7 +18,7 @@ class EnteRequestInterceptor extends Interceptor {
}
// ignore: prefer_const_constructors
options.headers.putIfAbsent("x-request-id", () => Uuid().v4().toString());
- final String? tokenValue = _preferences.getString(Configuration.tokenKey);
+ final String? tokenValue = Configuration.instance.getToken();
if (tokenValue != null) {
options.headers.putIfAbsent("X-Auth-Token", () => tokenValue);
}
diff --git a/mobile/lib/core/network/network.dart b/mobile/lib/core/network/network.dart
index b3930ddaf..076fb2584 100644
--- a/mobile/lib/core/network/network.dart
+++ b/mobile/lib/core/network/network.dart
@@ -3,26 +3,21 @@ import 'dart:io';
import 'package:dio/dio.dart';
import 'package:fk_user_agent/fk_user_agent.dart';
import 'package:package_info_plus/package_info_plus.dart';
-import 'package:photos/core/constants.dart';
+import "package:photos/core/configuration.dart";
+import "package:photos/core/event_bus.dart";
import 'package:photos/core/network/ente_interceptor.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import "package:photos/events/endpoint_updated_event.dart";
int kConnectTimeout = 15000;
class NetworkClient {
- // apiEndpoint points to the Ente server's API endpoint
- static const apiEndpoint = String.fromEnvironment(
- "endpoint",
- defaultValue: kDefaultProductionEndpoint,
- );
-
late Dio _dio;
late Dio _enteDio;
Future init() async {
await FkUserAgent.init();
final packageInfo = await PackageInfo.fromPlatform();
- final preferences = await SharedPreferences.getInstance();
+ final endpoint = Configuration.instance.getHttpEndpoint();
_dio = Dio(
BaseOptions(
connectTimeout: kConnectTimeout,
@@ -35,7 +30,7 @@ class NetworkClient {
);
_enteDio = Dio(
BaseOptions(
- baseUrl: apiEndpoint,
+ baseUrl: endpoint,
connectTimeout: kConnectTimeout,
headers: {
HttpHeaders.userAgentHeader: FkUserAgent.userAgent,
@@ -44,7 +39,18 @@ class NetworkClient {
},
),
);
- _enteDio.interceptors.add(EnteRequestInterceptor(preferences, apiEndpoint));
+ _setupInterceptors(endpoint);
+
+ Bus.instance.on().listen((event) {
+ final endpoint = Configuration.instance.getHttpEndpoint();
+ _enteDio.options.baseUrl = endpoint;
+ _setupInterceptors(endpoint);
+ });
+ }
+
+ void _setupInterceptors(String endpoint) {
+ _enteDio.interceptors.clear();
+ _enteDio.interceptors.add(EnteRequestInterceptor(endpoint));
}
NetworkClient._privateConstructor();
diff --git a/mobile/lib/db/file_updation_db.dart b/mobile/lib/db/file_updation_db.dart
index 6496b71ed..426cc7a52 100644
--- a/mobile/lib/db/file_updation_db.dart
+++ b/mobile/lib/db/file_updation_db.dart
@@ -15,6 +15,7 @@ class FileUpdationDB {
static const columnLocalID = 'local_id';
static const columnReason = 'reason';
static const livePhotoCheck = 'livePhotoCheck';
+ static const androidMissingGPS = 'androidMissingGPS';
static const modificationTimeUpdated = 'modificationTimeUpdated';
diff --git a/mobile/lib/db/files_db.dart b/mobile/lib/db/files_db.dart
index 39ff83210..202faaaad 100644
--- a/mobile/lib/db/files_db.dart
+++ b/mobile/lib/db/files_db.dart
@@ -1,5 +1,6 @@
import "dart:io";
+import "package:computer/computer.dart";
import 'package:flutter/foundation.dart';
import 'package:logging/logging.dart';
import 'package:path/path.dart';
@@ -16,6 +17,7 @@ import 'package:photos/utils/file_uploader_util.dart';
import 'package:sqflite/sqflite.dart';
import 'package:sqflite_migration/sqflite_migration.dart';
import 'package:sqlite3/sqlite3.dart' as sqlite3;
+import 'package:sqlite_async/sqlite_async.dart' as sqlite_async;
class FilesDB {
/*
@@ -102,6 +104,7 @@ class FilesDB {
// only have a single app-wide reference to the database
static Future? _dbFuture;
static Future? _ffiDBFuture;
+ static Future? _sqliteAsyncDBFuture;
Future get database async {
// lazily instantiate the db the first time it is accessed
@@ -114,6 +117,11 @@ class FilesDB {
return _ffiDBFuture!;
}
+ Future get sqliteAsyncDB async {
+ _sqliteAsyncDBFuture ??= _initSqliteAsyncDatabase();
+ return _sqliteAsyncDBFuture!;
+ }
+
// this opens the database (and creates it if it doesn't exist)
Future _initDatabase() async {
final Directory documentsDirectory =
@@ -131,6 +139,14 @@ class FilesDB {
return sqlite3.sqlite3.open(path);
}
+ Future _initSqliteAsyncDatabase() async {
+ final Directory documentsDirectory =
+ await getApplicationDocumentsDirectory();
+ final String path = join(documentsDirectory.path, _databaseName);
+ _logger.info("DB path " + path);
+ return sqlite_async.SqliteDatabase(path: path);
+ }
+
// SQL code to create the database table
static List createTable(String tableName) {
return [
@@ -557,31 +573,34 @@ class FilesDB {
bool applyOwnerCheck = false,
}) async {
final stopWatch = EnteWatch('getAllPendingOrUploadedFiles')..start();
- late String whereQuery;
- late List? whereArgs;
+ final order = (asc ?? false ? 'ASC' : 'DESC');
+
+ late String query;
+ late List? args;
if (applyOwnerCheck) {
- whereQuery = '$columnCreationTime >= ? AND $columnCreationTime <= ? '
+ query =
+ 'SELECT * FROM $filesTable WHERE $columnCreationTime >= ? AND $columnCreationTime <= ? '
'AND ($columnOwnerID IS NULL OR $columnOwnerID = ?) '
'AND ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1)'
- ' AND $columnMMdVisibility = ?';
- whereArgs = [startTime, endTime, ownerID, visibility];
+ ' AND $columnMMdVisibility = ? ORDER BY $columnCreationTime $order, $columnModificationTime $order';
+
+ args = [startTime, endTime, ownerID, visibility];
} else {
- whereQuery =
- '$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1)'
- ' AND $columnMMdVisibility = ?';
- whereArgs = [startTime, endTime, visibility];
+ query =
+ 'SELECT * FROM $filesTable WHERE $columnCreationTime >= ? AND $columnCreationTime <= ? '
+ 'AND ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1)'
+ ' AND $columnMMdVisibility = ? ORDER BY $columnCreationTime $order, $columnModificationTime $order';
+ args = [startTime, endTime, visibility];
}
- final db = await instance.database;
- final order = (asc ?? false ? 'ASC' : 'DESC');
- final results = await db.query(
- filesTable,
- where: whereQuery,
- whereArgs: whereArgs,
- orderBy:
- '$columnCreationTime ' + order + ', $columnModificationTime ' + order,
- limit: limit,
- );
+ if (limit != null) {
+ query += ' LIMIT ?';
+ args.add(limit);
+ }
+
+ final db = await instance.sqliteAsyncDB;
+ final results = await db.getAll(query, args);
+ _logger.info("message");
stopWatch.log('queryDone');
final files = convertToFiles(results);
stopWatch.log('convertDone');
@@ -593,23 +612,25 @@ class FilesDB {
Future getAllLocalAndUploadedFiles(
int startTime,
- int endTime,
- int ownerID, {
+ int endTime, {
int? limit,
bool? asc,
required DBFilterOptions filterOptions,
}) async {
- final db = await instance.database;
+ final db = await instance.sqliteAsyncDB;
final order = (asc ?? false ? 'ASC' : 'DESC');
- final results = await db.query(
- filesTable,
- where:
- '$columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnMMdVisibility IS NULL OR $columnMMdVisibility = ?)'
- ' AND ($columnLocalID IS NOT NULL OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))',
- whereArgs: [startTime, endTime, visibleVisibility],
- orderBy:
- '$columnCreationTime ' + order + ', $columnModificationTime ' + order,
- limit: limit,
+ final args = [startTime, endTime, visibleVisibility];
+ String query =
+ 'SELECT * FROM $filesTable WHERE $columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnMMdVisibility IS NULL OR $columnMMdVisibility = ?)'
+ ' AND ($columnLocalID IS NOT NULL OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))'
+ ' ORDER BY $columnCreationTime $order, $columnModificationTime $order';
+ if (limit != null) {
+ query += ' LIMIT ?';
+ args.add(limit);
+ }
+ final results = await db.getAll(
+ query,
+ args,
);
final files = convertToFiles(results);
final List filteredFiles =
@@ -642,19 +663,18 @@ class FilesDB {
bool? asc,
int visibility = visibleVisibility,
}) async {
- final db = await instance.database;
+ final db = await instance.sqliteAsyncDB;
final order = (asc ?? false ? 'ASC' : 'DESC');
- const String whereClause =
- '$columnCollectionID = ? AND $columnCreationTime >= ? AND $columnCreationTime <= ?';
- final List
](https://apps.apple.com/app/id6444121398)
[
](https://play.google.com/store/apps/details?id=io.ente.auth)
[
](https://f-droid.org/packages/io.ente.auth/)
-[
](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v2)
+[
](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v2)
[
](https://auth.ente.io)
diff --git a/auth/README.md b/auth/README.md
index 71ae1f93b..e2e03f023 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -31,14 +31,16 @@ 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)
+a native desktop app from this repository's GitHub releases. The desktop app
+works on Windows, Linux and macOS.
+
### Web
You can view your 2FA codes at [auth.ente.io](https://auth.ente.io). For adding
-or managing your secrets, please use our mobile app.
-
-### Desktop
-
-A native desktop app is coming soon!
+or managing your secrets, please use our mobile or desktop app.
## 🧑💻 Build from source
diff --git a/auth/android/app/src/main/play/listings/en-US/full_description.txt b/auth/android/app/src/main/play/listings/en-US/full_description.txt
new file mode 100644
index 000000000..8f575bda0
--- /dev/null
+++ b/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
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/icon/icon.png b/auth/android/app/src/main/play/listings/en-US/graphics/icon/icon.png
new file mode 100644
index 000000000..043b944f3
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/icon/icon.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/1.png b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/1.png
new file mode 100644
index 000000000..e87d3a124
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/1.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/2.png b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/2.png
new file mode 100644
index 000000000..9a700ea18
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/2.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/3.png b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/3.png
new file mode 100644
index 000000000..64e992821
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/3.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/4.png b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/4.png
new file mode 100644
index 000000000..88d5ec3ad
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/4.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/5.png b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/5.png
new file mode 100644
index 000000000..f2825d0b4
Binary files /dev/null and b/auth/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/5.png differ
diff --git a/auth/android/app/src/main/play/listings/en-US/short_description.txt b/auth/android/app/src/main/play/listings/en-US/short_description.txt
new file mode 100644
index 000000000..92b9c58f1
--- /dev/null
+++ b/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.
\ No newline at end of file
diff --git a/auth/android/app/src/main/play/listings/en-US/title.txt b/auth/android/app/src/main/play/listings/en-US/title.txt
new file mode 100644
index 000000000..b052b835d
--- /dev/null
+++ b/auth/android/app/src/main/play/listings/en-US/title.txt
@@ -0,0 +1 @@
+Ente Auth
\ No newline at end of file
diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index b38179e97..3e8f8ce67 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -36,7 +36,9 @@
},
{
"title": "BorgBase",
- "altNames": ["borg"],
+ "altNames": [
+ "borg"
+ ],
"slug": "BorgBase"
},
{
@@ -46,11 +48,17 @@
{
"title": "Bybit"
},
+ {
+ "title": "CERN"
+ },
{
"title": "Channel Island Hosting",
"slug": "cih",
"hex": "D14633"
},
+ {
+ "title": "ConfigCat"
+ },
{
"title": "Cloudflare"
},
@@ -64,7 +72,9 @@
},
{
"title": "DCS",
- "altNames": ["Digital Combat Simulator"],
+ "altNames": [
+ "Digital Combat Simulator"
+ ],
"slug": "dcs"
},
{
@@ -112,9 +122,14 @@
},
{
"title": "Gosuslugi",
- "altNames": ["Госуслуги"],
+ "altNames": [
+ "Госуслуги"
+ ],
"slug": "Gosuslugi"
},
+ {
+ "title": "Habbo"
+ },
{
"title": "Healthchecks.io",
"slug": "healthchecks"
@@ -177,13 +192,24 @@
},
{
"title": "Mastodon",
- "altNames": ["mstdn", "fediscience", "mathstodon", "fosstodon"],
+ "altNames": [
+ "mstdn",
+ "fediscience",
+ "mathstodon",
+ "fosstodon"
+ ],
"slug": "mastodon",
"hex": "6364FF"
},
+ {
+ "title": "Mercado Livre",
+ "slug": "mercado_livre"
+ },
{
"title": "Murena",
- "altNames": ["eCloud"],
+ "altNames": [
+ "eCloud"
+ ],
"slug": "ecloud"
},
{
@@ -281,6 +307,9 @@
"slug": "rust_language_forum",
"hex": "000000"
},
+ {
+ "title": "Sendgrid"
+ },
{
"title": "service-bw"
},
@@ -371,13 +400,18 @@
},
{
"title": "X",
- "altNames": ["twitter"],
+ "altNames": [
+ "twitter"
+ ],
"slug": "x"
},
{
"title": "Yandex",
- "altNames": ["Ya", "Яндекс"],
+ "altNames": [
+ "Ya",
+ "Яндекс"
+ ],
"slug": "Yandex"
}
]
-}
+}
\ No newline at end of file
diff --git a/auth/assets/custom-icons/icons/CERN.svg b/auth/assets/custom-icons/icons/CERN.svg
new file mode 100644
index 000000000..0e4b82e1f
--- /dev/null
+++ b/auth/assets/custom-icons/icons/CERN.svg
@@ -0,0 +1,47 @@
+
+
+
diff --git a/auth/assets/custom-icons/icons/configcat.svg b/auth/assets/custom-icons/icons/configcat.svg
new file mode 100644
index 000000000..cfecd22b0
--- /dev/null
+++ b/auth/assets/custom-icons/icons/configcat.svg
@@ -0,0 +1,9 @@
+
diff --git a/auth/assets/custom-icons/icons/habbo.svg b/auth/assets/custom-icons/icons/habbo.svg
new file mode 100644
index 000000000..746bcdb22
--- /dev/null
+++ b/auth/assets/custom-icons/icons/habbo.svg
@@ -0,0 +1,9 @@
+
diff --git a/auth/assets/custom-icons/icons/mercado_livre.svg b/auth/assets/custom-icons/icons/mercado_livre.svg
new file mode 100644
index 000000000..7f4db5fd5
--- /dev/null
+++ b/auth/assets/custom-icons/icons/mercado_livre.svg
@@ -0,0 +1,9 @@
+
diff --git a/auth/assets/custom-icons/icons/sendgrid.svg b/auth/assets/custom-icons/icons/sendgrid.svg
new file mode 100644
index 000000000..1562adab9
--- /dev/null
+++ b/auth/assets/custom-icons/icons/sendgrid.svg
@@ -0,0 +1,9 @@
+
diff --git a/auth/assets/icon-light-adaptive-fg.png b/auth/assets/generation-icons/icon-light-adaptive-fg.png
similarity index 100%
rename from auth/assets/icon-light-adaptive-fg.png
rename to auth/assets/generation-icons/icon-light-adaptive-fg.png
diff --git a/auth/assets/icon-light.png b/auth/assets/generation-icons/icon-light.png
similarity index 100%
rename from auth/assets/icon-light.png
rename to auth/assets/generation-icons/icon-light.png
diff --git a/auth/assets/icon-light.ico b/auth/assets/icon-light.ico
deleted file mode 100644
index 6f45f522b..000000000
Binary files a/auth/assets/icon-light.ico and /dev/null differ
diff --git a/auth/assets/icons/auth-icon.ico b/auth/assets/icons/auth-icon.ico
new file mode 100644
index 000000000..38bb22bcf
Binary files /dev/null and b/auth/assets/icons/auth-icon.ico differ
diff --git a/auth/assets/icon/auth-icon.png b/auth/assets/icons/auth-icon.png
similarity index 100%
rename from auth/assets/icon/auth-icon.png
rename to auth/assets/icons/auth-icon.png
diff --git a/auth/fastlane/metadata/android/en-US/title.txt b/auth/fastlane/metadata/android/en-US/title.txt
index f1c54762a..257e3ddcc 100644
--- a/auth/fastlane/metadata/android/en-US/title.txt
+++ b/auth/fastlane/metadata/android/en-US/title.txt
@@ -1 +1 @@
-ente Authenticator
\ No newline at end of file
+Ente Authenticator
\ No newline at end of file
diff --git a/auth/fdroid_flutter_icons.yaml b/auth/fdroid_flutter_icons.yaml
index da327160a..0ef87effd 100644
--- a/auth/fdroid_flutter_icons.yaml
+++ b/auth/fdroid_flutter_icons.yaml
@@ -1,6 +1,6 @@
-flutter_icons:
- android: "launcher_icon"
- image_path: "assets/icon-light.png"
- adaptive_icon_foreground: "assets/icon-light-adaptive-fg.png"
- adaptive_icon_background: "#ffffff"
-
+flutter_icons:
+ android: "launcher_icon"
+ image_path: "assets/generation-icons/icon-light.png"
+ adaptive_icon_foreground: "assets/generation-icons/icon-light-adaptive-fg.png"
+ adaptive_icon_background: "#ffffff"
+
diff --git a/auth/ios/Podfile.lock b/auth/ios/Podfile.lock
index aec7e14f0..7d02d123b 100644
--- a/auth/ios/Podfile.lock
+++ b/auth/ios/Podfile.lock
@@ -67,8 +67,6 @@ PODS:
- Toast
- local_auth_darwin (0.0.1):
- Flutter
- - local_auth_ios (0.0.1):
- - Flutter
- move_to_background (0.0.1):
- Flutter
- MTBBarcodeScanner (5.0.11)
@@ -99,8 +97,6 @@ PODS:
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- - smart_auth (0.0.1):
- - Flutter
- sodium_libs (2.2.1):
- Flutter
- sqflite (0.0.3):
@@ -142,7 +138,6 @@ DEPENDENCIES:
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
- local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
- - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
- move_to_background (from `.symlinks/plugins/move_to_background/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
@@ -151,7 +146,6 @@ DEPENDENCIES:
- sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
- share_plus (from `.symlinks/plugins/share_plus/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- - smart_auth (from `.symlinks/plugins/smart_auth/ios`)
- sodium_libs (from `.symlinks/plugins/sodium_libs/ios`)
- sqflite (from `.symlinks/plugins/sqflite/darwin`)
- sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`)
@@ -202,8 +196,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/fluttertoast/ios"
local_auth_darwin:
:path: ".symlinks/plugins/local_auth_darwin/darwin"
- local_auth_ios:
- :path: ".symlinks/plugins/local_auth_ios/ios"
move_to_background:
:path: ".symlinks/plugins/move_to_background/ios"
package_info_plus:
@@ -220,8 +212,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/share_plus/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
- smart_auth:
- :path: ".symlinks/plugins/smart_auth/ios"
sodium_libs:
:path: ".symlinks/plugins/sodium_libs/ios"
sqflite:
@@ -245,11 +235,10 @@ SPEC CHECKSUMS:
flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0
flutter_local_authentication: 1172a4dd88f6306dadce067454e2c4caf07977bb
flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
- flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
+ flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
local_auth_darwin: c7e464000a6a89e952235699e32b329457608d98
- local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
@@ -264,7 +253,6 @@ SPEC CHECKSUMS:
SentryPrivate: d651efb234cf385ec9a1cdd3eff94b5e78a0e0fe
share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
- smart_auth: 4bedbc118723912d0e45a07e8ab34039c19e04f2
sodium_libs: 1faae17af662384acbd13e41867a0008cd2e2318
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
sqlite3: 73b7fc691fdc43277614250e04d183740cb15078
diff --git a/auth/ios/Runner.xcodeproj/project.pbxproj b/auth/ios/Runner.xcodeproj/project.pbxproj
index 4d77182b0..b60012aa8 100644
--- a/auth/ios/Runner.xcodeproj/project.pbxproj
+++ b/auth/ios/Runner.xcodeproj/project.pbxproj
@@ -365,7 +365,7 @@
DEVELOPMENT_TEAM = 6Z68YJY9Q2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- INFOPLIST_KEY_CFBundleDisplayName = auth;
+ INFOPLIST_KEY_CFBundleDisplayName = "Ente Auth";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -439,7 +439,7 @@
DEVELOPMENT_TEAM = 6Z68YJY9Q2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- INFOPLIST_KEY_CFBundleDisplayName = auth;
+ INFOPLIST_KEY_CFBundleDisplayName = "Ente Auth";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -513,7 +513,7 @@
DEVELOPMENT_TEAM = 6Z68YJY9Q2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- INFOPLIST_KEY_CFBundleDisplayName = auth;
+ INFOPLIST_KEY_CFBundleDisplayName = "Ente Auth";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -587,7 +587,7 @@
DEVELOPMENT_TEAM = 6Z68YJY9Q2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- INFOPLIST_KEY_CFBundleDisplayName = auth;
+ INFOPLIST_KEY_CFBundleDisplayName = "Ente Auth";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -661,7 +661,7 @@
DEVELOPMENT_TEAM = 6Z68YJY9Q2;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- INFOPLIST_KEY_CFBundleDisplayName = auth;
+ INFOPLIST_KEY_CFBundleDisplayName = "Ente Auth";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
diff --git a/auth/lib/app/view/app.dart b/auth/lib/app/view/app.dart
index 2ca5e4b3e..3bd9d4e73 100644
--- a/auth/lib/app/view/app.dart
+++ b/auth/lib/app/view/app.dart
@@ -18,7 +18,7 @@ import 'package:ente_auth/ui/settings/app_update_dialog.dart';
import 'package:flutter/foundation.dart';
import "package:flutter/material.dart";
import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:system_tray/system_tray.dart';
+import 'package:tray_manager/tray_manager.dart';
import 'package:window_manager/window_manager.dart';
class App extends StatefulWidget {
@@ -34,7 +34,7 @@ class App extends StatefulWidget {
State