Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions mobile/apps/auth/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ PODS:
- qr_code_scanner (0.2.0):
- Flutter
- MTBBarcodeScanner
- SDWebImage (5.21.2):
- SDWebImage/Core (= 5.21.2)
- SDWebImage/Core (5.21.2)
- SDWebImage (5.21.5):
- SDWebImage/Core (= 5.21.5)
- SDWebImage/Core (5.21.5)
- Sentry/HybridSDK (8.46.0)
- sentry_flutter (8.14.2):
- Flutter
Expand Down Expand Up @@ -255,7 +255,7 @@ SPEC CHECKSUMS:
app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
dir_utils: c668f14c9a72a5087d11c4722cb272de0a87ce10
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
Expand All @@ -281,7 +281,7 @@ SPEC CHECKSUMS:
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
qr_code_scanner: d77f94ecc9abf96d9b9b8fc04ef13f611e5a147a
SDWebImage: 9f177d83116802728e122410fb25ad88f5c7608a
SDWebImage: e9c98383c7572d713c1a0d7dd2783b10599b9838
Sentry: da60d980b197a46db0b35ea12cb8f39af48d8854
sentry_flutter: 27892878729f42701297c628eb90e7c6529f3684
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/auth/lib/core/configuration.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:typed_data';

import 'package:ente_base/models/database.dart';
import 'package:ente_configuration/base_configuration.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:sqflite_common_ffi/sqflite_ffi.dart';
Expand Down
6 changes: 3 additions & 3 deletions mobile/apps/auth/lib/l10n/arb/app_cs.arb
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
"addNew": "Přidat nový",
"selected": "vybrané",
"moveMultipleToTrashMessage": "Opravdu chcete přesunout {count} položku(y) do koše?",
"nSelected": "{count, plural, one {} few {{count} vybráno} many {{count} vybráno}=1{1 vybráno} other{{count} vybráno}}",
"nSelected": "{count, plural, =1{1 vybráno} few {{count} vybráno} many {{count} vybráno} other{{count} vybráno}}",
"@nSelected": {
"description": "Text to indicate number of items selected",
"placeholders": {
Expand All @@ -589,7 +589,7 @@
}
}
},
"pinnedCount": "{count, plural, one {} few {Připnuty {count} položky} many {Připnuto {count} položky}=1{Připnuta 1 položka} other{Připnuto {count} položek}}",
"pinnedCount": "{count, plural, =1{Připnuta 1 položka} few {Připnuty {count} položky} many {Připnuto {count} položky} other{Připnuto {count} položek}}",
"@pinnedCount": {
"description": "Text to show number of items pinned",
"placeholders": {
Expand All @@ -600,7 +600,7 @@
}
}
},
"unpinnedCount": "{count, plural, one {} few {Odepnuly se {count} položky} many {Odepnul se {count} položky}=1{Odepnula se 1 položka} other{Odepnulo se {count} položek}}",
"unpinnedCount": "{count, plural, =1{Odepnula se 1 položka} few {Odepnuly se {count} položky} many {Odepnul se {count} položky} other{Odepnulo se {count} položek}}",
"@unpinnedCount": {
"description": "Text to show number of items unpinned",
"placeholders": {
Expand Down
6 changes: 3 additions & 3 deletions mobile/apps/auth/lib/l10n/arb/app_fr.arb
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@
"addNew": "Ajouter un nouveau",
"selected": "Sélectionné",
"moveMultipleToTrashMessage": "Êtes-vous sûr de vouloir déplacer {count} éléments vers la corbeille ?",
"nSelected": "{count, plural, one {}=1{1 sélectionné} other{{count} sélectionné}}",
"nSelected": "{count, plural, =1{1 sélectionné} other{{count} sélectionné}}",
"@nSelected": {
"description": "Text to indicate number of items selected",
"placeholders": {
Expand All @@ -590,7 +590,7 @@
}
}
},
"pinnedCount": "{count, plural, one {}=1{Épinglé 1 élément} other{Épinglé {count} objets}}",
"pinnedCount": "{count, plural, =1{Épinglé 1 élément} other{Épinglé {count} objets}}",
"@pinnedCount": {
"description": "Text to show number of items pinned",
"placeholders": {
Expand All @@ -601,7 +601,7 @@
}
}
},
"unpinnedCount": "{count, plural, one {}=1{Désépinglé 1 élément} other{Désépinglé {count} objets}}",
"unpinnedCount": "{count, plural, =1{Désépinglé 1 élément} other{Désépinglé {count} objets}}",
"@unpinnedCount": {
"description": "Text to show number of items unpinned",
"placeholders": {
Expand Down
4 changes: 2 additions & 2 deletions mobile/apps/auth/lib/l10n/arb/app_it.arb
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@
"addNew": "Aggiungi nuovo",
"selected": "selezionato",
"moveMultipleToTrashMessage": "Sei sicuro di voler spostare {count} elementi nel cestino?",
"nSelected": "{count, plural, one {}=1{1 selezionato} other{{count} selezionati}}",
"nSelected": "{count, plural, =1{1 selezionato} other{{count} selezionati}}",
"@nSelected": {
"description": "Text to indicate number of items selected",
"placeholders": {
Expand All @@ -588,7 +588,7 @@
}
}
},
"pinnedCount": "{count, plural, one {}=1{1 elemento fissato} other{{count} elementi fissati}}",
"pinnedCount": "{count, plural, =1{1 elemento fissato} other{{count} elementi fissati}}",
"@pinnedCount": {
"description": "Text to show number of items pinned",
"placeholders": {
Expand Down
6 changes: 3 additions & 3 deletions mobile/apps/auth/lib/l10n/arb/app_pl.arb
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@
"addNew": "Dodaj nowy",
"selected": "zaznaczone",
"moveMultipleToTrashMessage": "Czy na pewno chcesz przenieść do kosza elementy: {count}?",
"nSelected": "{count, plural, one {} few {{count} zaznaczone} many {{count} zaznaczonych}=1{1 zaznaczony} other{{count} zaznaczone}}",
"nSelected": "{count, plural, =1{1 zaznaczony} few {{count} zaznaczone} many {{count} zaznaczonych} other{{count} zaznaczone}}",
"@nSelected": {
"description": "Text to indicate number of items selected",
"placeholders": {
Expand All @@ -590,7 +590,7 @@
}
}
},
"pinnedCount": "{count, plural, one {} few {Przypięto {count} elementy} many {Przypięto {count} elementów}=1{Przypięto 1 element} other{Przypięto {count} elementów}}",
"pinnedCount": "{count, plural, =1{Przypięto 1 element} few {Przypięto {count} elementy} many {Przypięto {count} elementów} other{Przypięto {count} elementów}}",
"@pinnedCount": {
"description": "Text to show number of items pinned",
"placeholders": {
Expand All @@ -601,7 +601,7 @@
}
}
},
"unpinnedCount": "{count, plural, one {} few {Odpięto {count} elementy} many {Odpięto {count} elementów}=1{Odpięto 1 element} other{Odpięto {count} elementów}}",
"unpinnedCount": "{count, plural, =1{Odpięto 1 element} few {Odpięto {count} elementy} many {Odpięto {count} elementów} other{Odpięto {count} elementów}}",
"@unpinnedCount": {
"description": "Text to show number of items unpinned",
"placeholders": {
Expand Down
6 changes: 3 additions & 3 deletions mobile/apps/auth/lib/l10n/arb/app_sk.arb
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@
"addNew": "Pridať nový",
"selected": "vybraný",
"moveMultipleToTrashMessage": "Naozaj chcete presunúť {count} položiek(-u/-y) do koša?",
"nSelected": "{count, plural, one {} few {{count} vybraných} many {{count} vybrané}=1{1 vybraná} other{{count} vybraných}}",
"nSelected": "{count, plural, =1{1 vybraná} few {{count} vybraných} many {{count} vybrané} other{{count} vybraných}}",
"@nSelected": {
"description": "Text to indicate number of items selected",
"placeholders": {
Expand All @@ -590,7 +590,7 @@
}
}
},
"pinnedCount": "{count, plural, one {} few {Pripli sa {count} položky} many {Pripli sa {count} položky}=1{Pripla sa 1 položka} other{Priplo sa {count} položiek}}",
"pinnedCount": "{count, plural, =1{Pripla sa 1 položka} few {Pripli sa {count} položky} many {Pripli sa {count} položky} other{Priplo sa {count} položiek}}",
"@pinnedCount": {
"description": "Text to show number of items pinned",
"placeholders": {
Expand All @@ -601,7 +601,7 @@
}
}
},
"unpinnedCount": "{count, plural, one {} few {Odopli sa {count} položky} many {Odopli sa {count} položky}=1{Odopla sa 1 položka} other{Odoplo sa {count} položiek}}",
"unpinnedCount": "{count, plural, =1{Odopla sa 1 položka} few {Odopli sa {count} položky} many {Odopli sa {count} položky} other{Odoplo sa {count} položiek}}",
"@unpinnedCount": {
"description": "Text to show number of items unpinned",
"placeholders": {
Expand Down
6 changes: 3 additions & 3 deletions mobile/apps/auth/lib/l10n/arb/app_sv.arb
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@
"addNew": "Lägg till ny",
"selected": "vald",
"moveMultipleToTrashMessage": "Är du säker på att du vill flytta {count} objekt till papperskorgen?",
"nSelected": "{count, plural, one {}=1{1 vald} other{{count} valda}}",
"nSelected": "{count, plural, =1{1 vald} other{{count} valda}}",
"@nSelected": {
"description": "Text to indicate number of items selected",
"placeholders": {
Expand All @@ -590,7 +590,7 @@
}
}
},
"pinnedCount": "{count, plural, one {}=1{Fäst 1 objekt} other{Fäst {count} objekt}}",
"pinnedCount": "{count, plural, =1{Fäst 1 objekt} other{Fäst {count} objekt}}",
"@pinnedCount": {
"description": "Text to show number of items pinned",
"placeholders": {
Expand All @@ -601,7 +601,7 @@
}
}
},
"unpinnedCount": "{count, plural, one {}=1{Fäst 1 objekt} other{Fäst {count} objekt}}",
"unpinnedCount": "{count, plural, =1{Fäst 1 objekt} other{Fäst {count} objekt}}",
"@unpinnedCount": {
"description": "Text to show number of items unpinned",
"placeholders": {
Expand Down
6 changes: 3 additions & 3 deletions mobile/apps/auth/lib/l10n/arb/app_uk.arb
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@
"addNew": "Додати нову",
"selected": "вибрано",
"moveMultipleToTrashMessage": "Наступну кількість кодів буде переміщено до смітника: {count}. Продовжити?",
"nSelected": "{count, plural, =1 {1 вибраний} one {{count} вибраний} few {{count} вибрані} many {{count} вибраних} other{{count} вибраних}}",
"nSelected": "{count, plural, =1 {1 вибраний} few {{count} вибрані} many {{count} вибраних} other{{count} вибраних}}",
"@nSelected": {
"description": "Text to indicate number of items selected",
"placeholders": {
Expand All @@ -590,7 +590,7 @@
}
}
},
"pinnedCount": "{count, plural, =1 {Закріплено 1 елемент} one {Закріплено {count} елемент} few {Закріплено {count} елементи} many {Закріплено {count} елементів} other{Закріплено {count} елементів}}",
"pinnedCount": "{count, plural, =1 {Закріплено 1 елемент} few {Закріплено {count} елементи} many {Закріплено {count} елементів} other{Закріплено {count} елементів}}",
"@pinnedCount": {
"description": "Text to show number of items pinned",
"placeholders": {
Expand All @@ -601,7 +601,7 @@
}
}
},
"unpinnedCount": "{count, plural, =1 {Відкріплено 1 елемент} one {Відкріплено {count} елемент} few {Відкріплено {count} елементи} many {Відкріплено {count} елементів} other{Відкріплено {count} елементів}}",
"unpinnedCount": "{count, plural, =1 {Відкріплено 1 елемент} few {Відкріплено {count} елементи} many {Відкріплено {count} елементів} other{Відкріплено {count} елементів}}",
"@unpinnedCount": {
"description": "Text to show number of items unpinned",
"placeholders": {
Expand Down
4 changes: 3 additions & 1 deletion mobile/apps/auth/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ import 'package:ente_auth/ui/utils/icon_utils.dart';
import 'package:ente_auth/utils/directory_utils.dart';
import 'package:ente_auth/utils/platform_util.dart';
import 'package:ente_auth/utils/window_protocol_handler.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:ente_crypto_dart_adapter/ente_crypto_dart_adapter.dart';
import 'package:ente_lock_screen/lock_screen_settings.dart';
import 'package:ente_lock_screen/ui/app_lock.dart';
import 'package:ente_lock_screen/ui/lock_screen.dart';
Expand Down Expand Up @@ -71,6 +72,7 @@ Future<void> initSystemTray() async {

void main() async {
WidgetsFlutterBinding.ensureInitialized();
registerCryptoApi(const EnteCryptoDartAdapter());

if (PlatformUtil.isDesktop()) {
await windowManager.ensureInitialized();
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/auth/lib/services/authenticator_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import 'package:ente_auth/models/authenticator/local_auth_entity.dart';
import 'package:ente_auth/services/preference_service.dart';
import 'package:ente_auth/store/authenticator_db.dart';
import 'package:ente_auth/store/offline_authenticator_db.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:ente_events/event_bus.dart';
import 'package:ente_events/models/signed_in_event.dart';
import 'package:flutter/foundation.dart';
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/auth/lib/services/local_backup_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:dir_utils/dir_utils.dart';
import 'package:ente_auth/core/configuration.dart';
import 'package:ente_auth/models/export/ente.dart';
import 'package:ente_auth/store/code_store.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:ente_events/event_bus.dart';
import 'package:ente_events/models/signed_out_event.dart';
import 'package:intl/intl.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import 'package:ente_auth/ui/home_page.dart';
import 'package:ente_auth/ui/settings/common_settings.dart';
import 'package:ente_auth/utils/dialog_util.dart';
import 'package:ente_auth/utils/navigation_util.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:ente_lock_screen/local_authentication_service.dart';
import 'package:flutter/material.dart';

Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/auth/lib/ui/settings/data/export_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import 'package:ente_auth/utils/dialog_util.dart';
import 'package:ente_auth/utils/platform_util.dart';
import 'package:ente_auth/utils/share_utils.dart';
import 'package:ente_auth/utils/toast_util.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:ente_lock_screen/local_authentication_service.dart';
import 'package:file_saver/file_saver.dart';
import 'package:flutter/material.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import 'package:ente_auth/ui/components/models/button_type.dart';
import 'package:ente_auth/ui/settings/data/import/import_success.dart';
import 'package:ente_auth/utils/dialog_util.dart';
import 'package:ente_auth/utils/toast_util.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:file_picker/file_picker.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import 'package:ente_auth/ui/settings/common_settings.dart';
import 'package:ente_auth/utils/dialog_util.dart';
import 'package:ente_auth/utils/navigation_util.dart';
import 'package:ente_auth/utils/toast_util.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:ente_lock_screen/local_authentication_service.dart';
import 'package:ente_lock_screen/lock_screen_settings.dart';
import 'package:ente_lock_screen/ui/lock_screen_options.dart';
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/auth/lib/ui/share/code_share.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import 'package:ente_auth/ui/components/models/button_type.dart';
import 'package:ente_auth/utils/dialog_util.dart';
import 'package:ente_auth/utils/share_utils.dart';
import 'package:ente_auth/utils/totp_util.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:flutter/material.dart';
import 'package:logging/logging.dart';

Expand Down
26 changes: 20 additions & 6 deletions mobile/apps/auth/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,10 @@ packages:
dependency: "direct main"
description:
name: device_info_plus
sha256: "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110"
sha256: "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a"
url: "https://pub.dev"
source: hosted
version: "9.1.2"
version: "11.5.0"
device_info_plus_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -421,15 +421,29 @@ packages:
relative: true
source: path
version: "1.0.0"
ente_crypto_dart:
ente_crypto_api:
dependency: "direct main"
description:
path: "../../packages/ente_crypto_api"
relative: true
source: path
version: "0.0.1"
ente_crypto_dart:
dependency: transitive
description:
path: "."
ref: HEAD
resolved-ref: f91e1545f8263df127762240c4da54a0c42835b2
resolved-ref: dc995b62d6ec5bca3ba47966685b2af3c42235b2
url: "https://github.com/ente-io/ente_crypto_dart.git"
source: git
version: "1.0.0"
ente_crypto_dart_adapter:
dependency: "direct main"
description:
path: "../../packages/ente_crypto_dart_adapter"
relative: true
source: path
version: "0.0.1"
ente_events:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1999,10 +2013,10 @@ packages:
dependency: transitive
description:
name: win32_registry
sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
url: "https://pub.dev"
source: hosted
version: "1.1.5"
version: "2.1.0"
window_manager:
dependency: "direct main"
description:
Expand Down
9 changes: 5 additions & 4 deletions mobile/apps/auth/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
confetti: ^0.8.0
connectivity_plus: ^6.0.5
convert: ^3.1.1
device_info_plus: ^9.1.1
device_info_plus: ^11.5.0
dio: ^5.8.0+1
dir_utils:
path: ../../packages/dir_utils
Expand All @@ -32,9 +32,10 @@ dependencies:
path: ../../packages/base
ente_configuration:
path: ../../packages/configuration
ente_crypto_dart:
git:
url: https://github.com/ente-io/ente_crypto_dart.git
ente_crypto_api:
path: ../../packages/ente_crypto_api
ente_crypto_dart_adapter:
path: ../../packages/ente_crypto_dart_adapter
ente_events:
path: ../../packages/events
ente_lock_screen:
Expand Down
6 changes: 5 additions & 1 deletion mobile/apps/auth/pubspec_overrides.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# melos_managed_dependency_overrides: dir_utils,ente_accounts,ente_base,ente_configuration,ente_events,ente_lock_screen,ente_logging,ente_network,ente_strings,ente_ui,ente_utils
# melos_managed_dependency_overrides: ente_accounts,ente_base,ente_configuration,ente_events,ente_lock_screen,ente_logging,ente_network,ente_strings,ente_ui,ente_utils,dir_utils,ente_crypto_api,ente_crypto_dart_adapter
dependency_overrides:
dir_utils:
path: ../../packages/dir_utils
Expand All @@ -8,6 +8,10 @@ dependency_overrides:
path: ../../packages/base
ente_configuration:
path: ../../packages/configuration
ente_crypto_api:
path: ../../packages/ente_crypto_api
ente_crypto_dart_adapter:
path: ../../packages/ente_crypto_dart_adapter
ente_events:
path: ../../packages/events
ente_lock_screen:
Expand Down
Loading