Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mob][photos] Revert shared feature flag changes

ashil-pilotd2e803ec6e88
diff --git a/mobile/packages/feature_flag/lib/src/flag_service.dart b/mobile/packages/feature_flag/lib/src/flag_service.dart
index d9c339bea6..0be6be31b3 100644
--- a/mobile/packages/feature_flag/lib/src/flag_service.dart
+++ b/mobile/packages/feature_flag/lib/src/flag_service.dart
@@ -20,28 +20,22 @@ class FlagService {
final SharedPreferences _prefs;
final Dio _enteDio;
- FlagService(this._prefs, this._enteDio, {bool autoRefresh = true}) {
- if (autoRefresh) {
- Future.delayed(const Duration(seconds: 5), () {
- _fetch();
- });
- }
+ FlagService(this._prefs, this._enteDio) {
+ Future.delayed(const Duration(seconds: 5), () {
+ _fetch();
+ });
}
RemoteFlags? _flags;
- String? _flagsJson;
RemoteFlags get flags {
try {
if (!_prefs.containsKey("remote_flags")) {
_fetch().ignore();
}
- final flagsJson = _prefs.getString("remote_flags");
- if (_flags == null || flagsJson != _flagsJson) {
- final flags = RemoteFlags.fromMap(jsonDecode(flagsJson ?? "{}"));
- _flags = flags;
- _flagsJson = flagsJson;
- }
+ _flags ??= RemoteFlags.fromMap(
+ jsonDecode(_prefs.getString("remote_flags") ?? "{}"),
+ );
return _flags!;
} catch (e) {
debugPrint("Failed to get feature flags $e");
@@ -157,60 +151,30 @@ class FlagService {
}
Completer<void>? _fetchCompleter;
- String? _fetchToken;
- int? _fetchUserID;
-
Future<void> _fetch() async {
- final requestToken = _prefs.getString("token");
- final requestUserID = _prefs.getInt(_userIdKey);
- if (requestToken == null) {
+ if (!_prefs.containsKey("token")) {
log("token not found, skip", name: "FlagService");
return;
}
-
- final pendingFetch = _fetchCompleter;
- if (pendingFetch != null) {
- final isSameAccount =
- _fetchToken == requestToken && _fetchUserID == requestUserID;
- await pendingFetch.future;
- if (!isSameAccount && _isCurrentAccount(requestToken, requestUserID)) {
- await _fetch();
- }
+ if (_fetchCompleter != null) {
+ await _fetchCompleter!.future;
return;
}
-
- final fetchCompleter = Completer<void>();
- _fetchCompleter = fetchCompleter;
- _fetchToken = requestToken;
- _fetchUserID = requestUserID;
+ _fetchCompleter = Completer<void>();
try {
log("fetching feature flags", name: "FlagService");
final response = await _enteDio.get("/remote-store/feature-flags");
- if (!_isCurrentAccount(requestToken, requestUserID)) {
- log(
- "discarding feature flags fetched for a stale account",
- name: "FlagService",
- );
- return;
- }
final remoteFlags = RemoteFlags.fromMap(response.data);
- final flagsJson = remoteFlags.toJson();
- await _prefs.setString("remote_flags", flagsJson);
+ await _prefs.setString("remote_flags", remoteFlags.toJson());
_flags = remoteFlags;
- _flagsJson = flagsJson;
} catch (e) {
debugPrint("Failed to sync feature flags $e");
} finally {
+ _fetchCompleter?.complete();
_fetchCompleter = null;
- _fetchToken = null;
- _fetchUserID = null;
- fetchCompleter.complete();
}
}
- bool _isCurrentAccount(String token, int? userID) =>
- _prefs.getString("token") == token && _prefs.getInt(_userIdKey) == userID;
-
Future<void> _updateKeyValue(String key, String value) async {
try {
final response = await _enteDio.post(
@@ -227,10 +191,8 @@ class FlagService {
}
void _updateFlags(RemoteFlags flags) {
- final flagsJson = flags.toJson();
_flags = flags;
- _flagsJson = flagsJson;
- _prefs.setString("remote_flags", flagsJson);
+ _prefs.setString("remote_flags", flags.toJson());
_fetch().ignore();
}