Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 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
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
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
16 changes: 15 additions & 1 deletion mobile/apps/auth/pubspec.lock
Original file line number Diff line number Diff line change
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
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
7 changes: 4 additions & 3 deletions mobile/apps/auth/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion mobile/apps/locker/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import 'dart:io';

import 'package:adaptive_theme/adaptive_theme.dart';
import 'package:ente_accounts/services/user_service.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_legacy/services/emergency_service.dart";
import 'package:ente_lock_screen/lock_screen_settings.dart';
import 'package:ente_lock_screen/ui/app_lock.dart';
Expand Down Expand Up @@ -42,6 +43,7 @@ final _logger = Logger("main");

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

if (PlatformUtil.isDesktop()) {
await windowManager.ensureInitialized();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'dart:math';
import 'dart:typed_data';

import 'package:dio/dio.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_network/network.dart';
import "package:ente_sharing/collection_sharing_service.dart";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:io';
import 'dart:typed_data';

import 'package:dio/dio.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:ente_network/network.dart';
import 'package:ente_utils/fake_progress.dart';
import 'package:locker/services/configuration.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import "dart:convert";
import "dart:math";
import "dart:typed_data";

import "package:ente_crypto_dart/ente_crypto_dart.dart";
import "package:ente_crypto_api/ente_crypto_api.dart";
import "package:locker/services/collections/collections_service.dart";
import "package:locker/services/configuration.dart";
import "package:locker/services/files/links/links_client.dart";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:convert';

import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
import 'package:ente_network/network.dart';
import 'package:locker/services/collections/collections_service.dart';
import 'package:locker/services/configuration.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:io';
import 'package:collection/collection.dart';
import 'package:dio/dio.dart';
import 'package:ente_accounts/services/user_service.dart';
import 'package:ente_crypto_dart/ente_crypto_dart.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Rename encryptFileWithMD5 call to new API

This file now imports ente_crypto_api, but later invokes CryptoUtil.encryptFileWithMD5. The new API only exposes encryptFileWithMd5, so the locker app will not compile after this change; rename the call (or add a compatibility wrapper) to keep uploads building.

Useful? React with 👍 / 👎.

import 'package:ente_events/event_bus.dart';
import 'package:ente_network/network.dart';
import 'package:flutter/foundation.dart';
Expand Down Expand Up @@ -337,7 +337,7 @@ class FileUploader {
await _checkIfWithinStorageLimit(file);
final encryptedFile = File(encryptedFilePath);

final fileAttributes = await CryptoUtil.encryptFileWithMD5(
final fileAttributes = await CryptoUtil.encryptFileWithMd5(
file.path,
encryptedFilePath,
key: key,
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/locker/lib/services/trash/trash_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:convert';
import 'dart:math';

import 'package:dio/dio.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:ente_network/network.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import "package:ente_accounts/pages/change_email_dialog.dart";
import "package:ente_accounts/pages/delete_account_page.dart";
import "package:ente_accounts/pages/password_entry_page.dart";
import "package:ente_accounts/services/user_service.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_ui/components/alert_bottom_sheet.dart";
import "package:ente_ui/components/buttons/gradient_button.dart";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "package:ente_accounts/models/user_details.dart";
import "package:ente_accounts/pages/request_pwd_verification_page.dart";
import "package:ente_accounts/services/passkey_service.dart";
import "package:ente_accounts/services/user_service.dart";
import "package:ente_crypto_dart/ente_crypto_dart.dart";
import "package:ente_crypto_api/ente_crypto_api.dart";
import "package:ente_lock_screen/auth_util.dart";
import "package:ente_lock_screen/local_authentication_service.dart";
import "package:ente_lock_screen/lock_screen_settings.dart";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "dart:convert";

import "package:ente_crypto_dart/ente_crypto_dart.dart";
import "package:ente_crypto_api/ente_crypto_api.dart";
import "package:ente_ui/components/captioned_text_widget.dart";
import "package:ente_ui/components/menu_item_widget.dart";
import "package:ente_ui/components/toggle_switch_widget.dart";
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/locker/lib/ui/sharing/manage_links_widget.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "dart:convert";

import "package:ente_crypto_dart/ente_crypto_dart.dart";
import "package:ente_crypto_api/ente_crypto_api.dart";
import "package:ente_ui/components/captioned_text_widget.dart";
import "package:ente_ui/components/divider_widget.dart";
import "package:ente_ui/components/menu_item_widget.dart";
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/locker/lib/utils/crypto_helper.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "dart:typed_data";

import "package:ente_crypto_dart/ente_crypto_dart.dart";
import "package:ente_crypto_api/ente_crypto_api.dart";
import "package:locker/services/collections/models/collection.dart";
import "package:locker/services/configuration.dart";

Expand Down
16 changes: 15 additions & 1 deletion mobile/apps/locker/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,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: 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
7 changes: 4 additions & 3 deletions mobile/apps/locker/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,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_legacy:
Expand Down
6 changes: 5 additions & 1 deletion mobile/apps/locker/pubspec_overrides.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# 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,ente_sharing,ente_legacy
# 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,ente_sharing,ente_legacy,ente_crypto_api,ente_crypto_dart_adapter
dependency_overrides:
ente_accounts:
path: ../../packages/accounts
ente_base:
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_legacy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:convert';

import 'package:ente_accounts/ente_accounts.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:ente_lock_screen/local_authentication_service.dart';
import 'package:ente_strings/ente_strings.dart';
import 'package:ente_ui/components/buttons/gradient_button.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "package:dio/dio.dart";
import "package:ente_accounts/ente_accounts.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:ente_strings/ente_strings.dart";
import "package:ente_ui/components/alert_bottom_sheet.dart";
import "package:ente_ui/components/buttons/dynamic_fab.dart";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'dart:typed_data';
import 'package:ente_accounts/ente_accounts.dart';
import 'package:ente_accounts/models/errors.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:ente_strings/ente_strings.dart';
import "package:ente_ui/components/alert_bottom_sheet.dart";
import 'package:ente_ui/components/buttons/dynamic_fab.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import "dart:convert";
import "dart:typed_data";

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:ente_strings/ente_strings.dart";
import "package:ente_ui/components/buttons/dynamic_fab.dart";
import "package:ente_ui/theme/ente_theme.dart";
Expand Down
2 changes: 1 addition & 1 deletion mobile/packages/accounts/lib/services/user_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import 'package:ente_base/models/key_attributes.dart';
import 'package:ente_base/models/key_gen_result.dart';
import 'package:ente_configuration/base_configuration.dart';
import 'package:ente_configuration/constants.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/user_details_changed_event.dart';
import 'package:ente_network/network.dart';
Expand Down
Loading