π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][package] Move feature_flag to packages (#12280)
Aman Rajc3ece920d128
diff --git a/mobile/apps/locker/lib/main.dart b/mobile/apps/locker/lib/main.dartindex fe4c5cc10e..e2e9c83e80 100644--- a/mobile/apps/locker/lib/main.dart+++ b/mobile/apps/locker/lib/main.dart@@ -29,6 +29,7 @@ import 'package:locker/services/configuration.dart';import "package:locker/services/contacts_display_service.dart";import 'package:locker/services/db/locker_db.dart';import 'package:locker/services/favorites_service.dart';+import 'package:locker/services/feature_flag_service.dart';import 'package:locker/services/files/download/service_locator.dart';import 'package:locker/services/files/links/links_client.dart';import 'package:locker/services/files/links/links_service.dart';@@ -181,6 +182,7 @@ Future<void> _init(bool bool, {String? via}) async {await Configuration.instance.init([LockerDB.instance]);await Network.instance.init(Configuration.instance);+ FeatureFlagService.instance.init(preferences);final installSourceService = InstallSourceService(Network.instance.enteDio,app: Configuration.instance.appIdentity.app,diff --git a/mobile/apps/locker/lib/services/feature_flag_service.dart b/mobile/apps/locker/lib/services/feature_flag_service.dartnew file mode 100644index 0000000000..fb28d09121--- /dev/null+++ b/mobile/apps/locker/lib/services/feature_flag_service.dart@@ -0,0 +1,39 @@+import "dart:async";++import "package:ente_events/event_bus.dart";+import "package:ente_events/models/signed_in_event.dart";+import "package:ente_events/models/signed_out_event.dart";+import "package:ente_feature_flag/ente_feature_flag.dart";+import "package:ente_network/network.dart";+import "package:shared_preferences/shared_preferences.dart";++class FeatureFlagService {+ FeatureFlagService._privateConstructor();++ static final instance = FeatureFlagService._privateConstructor();++ late SharedPreferences _preferences;+ late FlagService _flagService;++ bool get internalUser => _flagService.internalUser;++ void init(SharedPreferences preferences) {+ _preferences = preferences;+ _reset();+ Bus.instance.on<SignedInEvent>().listen((_) {+ unawaited(refreshInternalUser());+ });+ Bus.instance.on<SignedOutEvent>().listen((_) {+ _reset();+ });+ }++ Future<bool> refreshInternalUser() async {+ await _flagService.tryRefreshFlags();+ return internalUser;+ }++ void _reset() {+ _flagService = FlagService(_preferences, Network.instance.enteDio);+ }+}diff --git a/mobile/apps/locker/pubspec.yaml b/mobile/apps/locker/pubspec.yamlindex ac904a13d4..5bb5aec1aa 100644--- a/mobile/apps/locker/pubspec.yaml+++ b/mobile/apps/locker/pubspec.yaml@@ -37,6 +37,8 @@ dependencies:path: ../../packages/ente_crypto_dart_adapterente_events:path: ../../packages/events+ ente_feature_flag:+ path: ../../packages/feature_flagente_icons:path: ../../packages/ente_iconsente_install_source:diff --git a/mobile/apps/photos/plugins/ente_feature_flag/.metadata b/mobile/apps/photos/plugins/ente_feature_flag/.metadatadeleted file mode 100644index 9fc7ede54d..0000000000--- a/mobile/apps/photos/plugins/ente_feature_flag/.metadata+++ /dev/null@@ -1,10 +0,0 @@-# This file tracks properties of this Flutter project.-# Used by Flutter tool to assess capabilities and perform upgrades etc.-#-# This file should be version controlled and should not be manually edited.--version:- revision: 0b8abb4724aa590dd0f429683339b1e045a1594d- channel: stable--project_type: plugindiff --git a/mobile/apps/photos/plugins/ente_feature_flag/lib/ente_feature_flag.dart b/mobile/apps/photos/plugins/ente_feature_flag/lib/ente_feature_flag.dartdeleted file mode 100644index 66a7132d8d..0000000000--- a/mobile/apps/photos/plugins/ente_feature_flag/lib/ente_feature_flag.dart+++ /dev/null@@ -1 +0,0 @@-export 'src/service.dart';diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yamlindex 2e30a3a4e2..b8a81d4dfe 100644--- a/mobile/apps/photos/pubspec.yaml+++ b/mobile/apps/photos/pubspec.yaml@@ -47,7 +47,7 @@ dependencies:ente_crypto_api:path: ../../packages/ente_crypto_apiente_feature_flag:- path: plugins/ente_feature_flag+ path: ../../packages/feature_flagente_icons:path: ../../packages/ente_iconsente_install_source:diff --git a/mobile/packages/feature_flag/lib/ente_feature_flag.dart b/mobile/packages/feature_flag/lib/ente_feature_flag.dartnew file mode 100644index 0000000000..a38b6c80d6--- /dev/null+++ b/mobile/packages/feature_flag/lib/ente_feature_flag.dart@@ -0,0 +1 @@+export 'src/flag_service.dart';diff --git a/mobile/apps/photos/plugins/ente_feature_flag/lib/src/service.dart b/mobile/packages/feature_flag/lib/src/flag_service.dartsimilarity index 98%rename from mobile/apps/photos/plugins/ente_feature_flag/lib/src/service.dartrename to mobile/packages/feature_flag/lib/src/flag_service.dartindex c8e441f188..0be6be31b3 100644--- a/mobile/apps/photos/plugins/ente_feature_flag/lib/src/service.dart+++ b/mobile/packages/feature_flag/lib/src/flag_service.dart@@ -1,16 +1,13 @@-// ignore_for_file: always_use_package_imports-import "dart:async";import "dart:convert";import "dart:developer";import "dart:io";import "package:dio/dio.dart";+import "package:ente_feature_flag/src/remote_flags.dart";import "package:flutter/foundation.dart";import "package:shared_preferences/shared_preferences.dart";-import "model.dart";-class FlagService {static const int _commentsFlag = 1 << 1;static const int _videoStreamingFlag = 1 << 3;diff --git a/mobile/apps/photos/plugins/ente_feature_flag/lib/src/model.dart b/mobile/packages/feature_flag/lib/src/remote_flags.dartsimilarity index 100%rename from mobile/apps/photos/plugins/ente_feature_flag/lib/src/model.dartrename to mobile/packages/feature_flag/lib/src/remote_flags.dartdiff --git a/mobile/apps/photos/plugins/ente_feature_flag/pubspec.yaml b/mobile/packages/feature_flag/pubspec.yamlsimilarity index 100%rename from mobile/apps/photos/plugins/ente_feature_flag/pubspec.yamlrename to mobile/packages/feature_flag/pubspec.yamldiff --git a/mobile/pubspec.yaml b/mobile/pubspec.yamlindex cffec16e95..27340720da 100644--- a/mobile/pubspec.yaml+++ b/mobile/pubspec.yaml@@ -10,7 +10,6 @@ workspace:- apps/photos- apps/photos/plugins/ente_cast- apps/photos/plugins/ente_crypto- - apps/photos/plugins/ente_feature_flag- apps/photos/plugins/ente_panorama_viewer- apps/photos/plugins/ente_photos_platform- packages/accounts@@ -30,6 +29,7 @@ workspace:- packages/ente_qr_scanner- packages/ente_screen_brightness- packages/events+ - packages/feature_flag- packages/legacy- packages/local_auth_linux- packages/lock_screen