π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Clarify account deletion binding module names
Neeraj Guptaf0dc842c6c17
diff --git a/mobile/apps/auth/lib/core/configuration.dart b/mobile/apps/auth/lib/core/configuration.dartindex 6d3a25102c..ea00ef6042 100644--- a/mobile/apps/auth/lib/core/configuration.dart+++ b/mobile/apps/auth/lib/core/configuration.dart@@ -3,8 +3,8 @@ import 'dart:typed_data';import 'package:ente_account_deletion/account_deletion.dart';import 'package:ente_auth/services/authenticated_session.dart';-import 'package:ente_auth/src/rust/third_party/ente_frb_lib/deletion.dart'- as deletion;+import 'package:ente_auth/src/rust/third_party/ente_frb_lib/account_deletion.dart'+ as account_deletion;import 'package:ente_base/models/database.dart';import 'package:ente_configuration/base_configuration.dart';import 'package:ente_crypto_api/ente_crypto_api.dart';@@ -88,18 +88,18 @@ class Configuration extends BaseConfiguration@overrideFuture<AccountDeletionSummary?> getDeletionSummary() =>- deletion.getDeletionSummary(session: authenticatedSession());+ account_deletion.getDeletionSummary(session: authenticatedSession());@overrideFuture<String> getDeleteChallenge() =>- deletion.getDeleteChallenge(session: authenticatedSession());+ account_deletion.getDeleteChallenge(session: authenticatedSession());@overrideFuture<void> deleteAccount({required String encryptedChallenge,required String reason,String? feedback,- }) => deletion.deleteAccount(+ }) => account_deletion.deleteAccount(session: authenticatedSession(),encryptedChallenge: encryptedChallenge,reason: reason,diff --git a/mobile/apps/locker/lib/services/configuration.dart b/mobile/apps/locker/lib/services/configuration.dartindex abc3c92215..5023270160 100644--- a/mobile/apps/locker/lib/services/configuration.dart+++ b/mobile/apps/locker/lib/services/configuration.dart@@ -7,8 +7,8 @@ import 'package:locker/services/authenticated_session.dart';import 'package:locker/services/collections/collections_service.dart';import 'package:locker/services/favorites_service.dart';import 'package:locker/services/files/offline/offline_file_storage.dart';-import 'package:locker/src/rust/third_party/ente_frb_lib/deletion.dart'- as deletion;+import 'package:locker/src/rust/third_party/ente_frb_lib/account_deletion.dart'+ as account_deletion;import 'package:logging/logging.dart';import 'package:shared_preferences/shared_preferences.dart';@@ -50,18 +50,18 @@ class Configuration extends BaseConfiguration@overrideFuture<AccountDeletionSummary?> getDeletionSummary() =>- deletion.getDeletionSummary(session: authenticatedSession());+ account_deletion.getDeletionSummary(session: authenticatedSession());@overrideFuture<String> getDeleteChallenge() =>- deletion.getDeleteChallenge(session: authenticatedSession());+ account_deletion.getDeleteChallenge(session: authenticatedSession());@overrideFuture<void> deleteAccount({required String encryptedChallenge,required String reason,String? feedback,- }) => deletion.deleteAccount(+ }) => account_deletion.deleteAccount(session: authenticatedSession(),encryptedChallenge: encryptedChallenge,reason: reason,diff --git a/mobile/apps/photos/lib/core/configuration.dart b/mobile/apps/photos/lib/core/configuration.dartindex 8a21486063..b8d490ed81 100644--- a/mobile/apps/photos/lib/core/configuration.dart+++ b/mobile/apps/photos/lib/core/configuration.dart@@ -56,8 +56,8 @@ import 'package:photos/services/photos_contacts_service.dart';import 'package:photos/services/search_service.dart';import 'package:photos/services/sync/sync_service.dart';import 'package:photos/services/video_preview_service.dart';-import 'package:photos/src/rust/third_party/ente_frb_lib/deletion.dart'- as deletion;+import 'package:photos/src/rust/third_party/ente_frb_lib/account_deletion.dart'+ as account_deletion;import 'package:photos/utils/validator_util.dart';import 'package:shared_preferences/shared_preferences.dart';import "package:tuple/tuple.dart";@@ -584,18 +584,18 @@ class Configuration implements LockScreenHost, AccountDeletionHost {@overrideFuture<AccountDeletionSummary?> getDeletionSummary() =>- deletion.getDeletionSummary(session: authenticatedSession());+ account_deletion.getDeletionSummary(session: authenticatedSession());@overrideFuture<String> getDeleteChallenge() =>- deletion.getDeleteChallenge(session: authenticatedSession());+ account_deletion.getDeleteChallenge(session: authenticatedSession());@overrideFuture<void> deleteAccount({required String encryptedChallenge,required String reason,String? feedback,- }) => deletion.deleteAccount(+ }) => account_deletion.deleteAccount(session: authenticatedSession(),encryptedChallenge: encryptedChallenge,reason: reason,diff --git a/mobile/packages/account_deletion/lib/account_deletion.dart b/mobile/packages/account_deletion/lib/account_deletion.dartindex 837ddf0a19..de5fd71b27 100644--- a/mobile/packages/account_deletion/lib/account_deletion.dart+++ b/mobile/packages/account_deletion/lib/account_deletion.dart@@ -1,4 +1,4 @@-export 'package:ente_frb/deletion.dart';+export 'package:ente_frb/account_deletion.dart';export 'src/account_deletion_host.dart';export 'src/account_deletion_settings.dart';diff --git a/mobile/packages/account_deletion/lib/src/account_deletion_host.dart b/mobile/packages/account_deletion/lib/src/account_deletion_host.dartindex c8a59b4f6f..e82a435e0e 100644--- a/mobile/packages/account_deletion/lib/src/account_deletion_host.dart+++ b/mobile/packages/account_deletion/lib/src/account_deletion_host.dart@@ -1,4 +1,4 @@-import 'package:ente_frb/deletion.dart';+import 'package:ente_frb/account_deletion.dart';abstract class AccountDeletionHost {Future<AccountDeletionSummary?> getDeletionSummary();diff --git a/mobile/packages/account_deletion/lib/src/ui/delete_account_confirmation_step.dart b/mobile/packages/account_deletion/lib/src/ui/delete_account_confirmation_step.dartindex a806af96e0..7d5f9bbf4a 100644--- a/mobile/packages/account_deletion/lib/src/ui/delete_account_confirmation_step.dart+++ b/mobile/packages/account_deletion/lib/src/ui/delete_account_confirmation_step.dart@@ -1,5 +1,5 @@import 'package:ente_components/ente_components.dart';-import 'package:ente_frb/deletion.dart';+import 'package:ente_frb/account_deletion.dart';import 'package:ente_strings/ente_strings.dart';import 'package:flutter/material.dart';import 'package:hugeicons/hugeicons.dart';diff --git a/mobile/packages/account_deletion/lib/src/ui/delete_account_page.dart b/mobile/packages/account_deletion/lib/src/ui/delete_account_page.dartindex 924e2348e8..22213a668f 100644--- a/mobile/packages/account_deletion/lib/src/ui/delete_account_page.dart+++ b/mobile/packages/account_deletion/lib/src/ui/delete_account_page.dart@@ -5,7 +5,7 @@ import 'package:ente_account_deletion/src/ui/delete_account_bottom_actions.dart'import 'package:ente_account_deletion/src/ui/delete_account_confirmation_step.dart';import 'package:ente_account_deletion/src/ui/delete_account_reason_step.dart';import 'package:ente_components/ente_components.dart';-import 'package:ente_frb/deletion.dart';+import 'package:ente_frb/account_deletion.dart';import 'package:ente_strings/ente_strings.dart';import 'package:flutter/material.dart';import 'package:logging/logging.dart';diff --git a/rust/bindings/frb/lib/src/deletion.rs b/rust/bindings/frb/lib/src/account_deletion.rssimilarity index 100%rename from rust/bindings/frb/lib/src/deletion.rsrename to rust/bindings/frb/lib/src/account_deletion.rsdiff --git a/rust/bindings/frb/lib/src/deletion/types.rs b/rust/bindings/frb/lib/src/account_deletion/types.rssimilarity index 100%rename from rust/bindings/frb/lib/src/deletion/types.rsrename to rust/bindings/frb/lib/src/account_deletion/types.rsdiff --git a/rust/bindings/frb/lib/src/lib.rs b/rust/bindings/frb/lib/src/lib.rsindex 528bc538d8..c50663a5ad 100644--- a/rust/bindings/frb/lib/src/lib.rs+++ b/rust/bindings/frb/lib/src/lib.rs@@ -1,6 +1,6 @@+pub mod account_deletion;#[cfg(feature = "contacts")]pub mod contacts;-pub mod deletion;#[cfg(feature = "legacy")]pub mod legacy;#[cfg(feature = "locker")]diff --git a/rust/bindings/wasm/lib/src/deletion.rs b/rust/bindings/wasm/lib/src/account_deletion.rssimilarity index 100%rename from rust/bindings/wasm/lib/src/deletion.rsrename to rust/bindings/wasm/lib/src/account_deletion.rsdiff --git a/rust/bindings/wasm/lib/src/lib.rs b/rust/bindings/wasm/lib/src/lib.rsindex 8450fdabec..0844392602 100644--- a/rust/bindings/wasm/lib/src/lib.rs+++ b/rust/bindings/wasm/lib/src/lib.rs@@ -1,3 +1,5 @@+#[cfg(feature = "account-deletion")]+pub mod account_deletion;#[cfg(feature = "accounts")]pub mod accounts;#[cfg(feature = "cast")]@@ -8,8 +10,6 @@ pub mod collections;pub mod contacts;#[cfg(feature = "crypto")]pub mod crypto;-#[cfg(feature = "account-deletion")]-pub mod deletion;#[cfg(feature = "legacy")]pub mod legacy;#[cfg(feature = "location")]diff --git a/rust/tools/codegen/src/main.rs b/rust/tools/codegen/src/main.rsindex ef40154f45..1638e41429 100644--- a/rust/tools/codegen/src/main.rs+++ b/rust/tools/codegen/src/main.rs@@ -183,8 +183,8 @@ fn generate_frb(target: FrbTarget) -> Result<(), DynError> {fs::remove_dir_all(&generated_dir)?;}generate_frb_package(&package_dir)?;- for name in ["contacts", "deletion", "legacy"] {- if *app == "auth" && name != "deletion" {+ for name in ["account_deletion", "contacts", "legacy"] {+ if *app == "auth" && name != "account_deletion" {continue;}let types_path = package_dir