mirror of
https://gitlab.com/famedly/fluffychat.git
synced 2024-11-14 16:09:31 +01:00
refactor: Remove legacy store
This commit is contained in:
parent
b2ba999c72
commit
518fc5a657
@ -1,10 +1,7 @@
|
|||||||
import 'dart:core';
|
import 'dart:core';
|
||||||
|
|
||||||
import 'package:matrix/matrix.dart';
|
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
import 'legacy_famedlysdk_store.dart' as legacy;
|
|
||||||
|
|
||||||
class Store {
|
class Store {
|
||||||
SharedPreferences? _prefs;
|
SharedPreferences? _prefs;
|
||||||
|
|
||||||
@ -14,25 +11,11 @@ class Store {
|
|||||||
|
|
||||||
Future<String?> getItem(String key) async {
|
Future<String?> getItem(String key) async {
|
||||||
await _setupLocalStorage();
|
await _setupLocalStorage();
|
||||||
final legacyVal = await legacy.Store().getItem(key);
|
|
||||||
if (legacyVal != null) {
|
|
||||||
Logs().d('Found legacy preference for $key');
|
|
||||||
await setItem(key, legacyVal);
|
|
||||||
legacy.Store().deleteItem(key);
|
|
||||||
return legacyVal;
|
|
||||||
}
|
|
||||||
return _prefs!.getString(key);
|
return _prefs!.getString(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<bool> getItemBool(String key, [bool? defaultValue]) async {
|
Future<bool> getItemBool(String key, [bool? defaultValue]) async {
|
||||||
await _setupLocalStorage();
|
await _setupLocalStorage();
|
||||||
final legacyVal = await legacy.Store().getItemBool(key);
|
|
||||||
if (legacyVal != null) {
|
|
||||||
Logs().d('Found legacy preference for $key');
|
|
||||||
await setItemBool(key, legacyVal);
|
|
||||||
legacy.Store().deleteItem(key);
|
|
||||||
return legacyVal;
|
|
||||||
}
|
|
||||||
return _prefs!.getBool(key) ?? defaultValue ?? true;
|
return _prefs!.getBool(key) ?? defaultValue ?? true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,108 +0,0 @@
|
|||||||
import 'dart:async';
|
|
||||||
import 'dart:core';
|
|
||||||
|
|
||||||
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
|
||||||
import 'package:localstorage/localstorage.dart';
|
|
||||||
import 'package:path_provider/path_provider.dart';
|
|
||||||
|
|
||||||
import 'package:fluffychat/utils/platform_infos.dart';
|
|
||||||
|
|
||||||
// see https://github.com/mogol/flutter_secure_storage/issues/161#issuecomment-704578453
|
|
||||||
class AsyncMutex {
|
|
||||||
Completer<void>? _completer;
|
|
||||||
|
|
||||||
Future<void> lock() async {
|
|
||||||
while (_completer != null) {
|
|
||||||
await _completer!.future;
|
|
||||||
}
|
|
||||||
|
|
||||||
_completer = Completer<void>();
|
|
||||||
}
|
|
||||||
|
|
||||||
void unlock() {
|
|
||||||
assert(_completer != null);
|
|
||||||
final completer = _completer!;
|
|
||||||
_completer = null;
|
|
||||||
completer.complete();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class Store {
|
|
||||||
LocalStorage? storage;
|
|
||||||
final FlutterSecureStorage? secureStorage;
|
|
||||||
static final _mutex = AsyncMutex();
|
|
||||||
|
|
||||||
Store()
|
|
||||||
: secureStorage =
|
|
||||||
PlatformInfos.isMobile ? const FlutterSecureStorage() : null;
|
|
||||||
|
|
||||||
Future<void> _setupLocalStorage() async {
|
|
||||||
if (storage == null) {
|
|
||||||
final directory = PlatformInfos.isBetaDesktop
|
|
||||||
? await getApplicationSupportDirectory()
|
|
||||||
: (PlatformInfos.isWeb
|
|
||||||
? null
|
|
||||||
: await getApplicationDocumentsDirectory());
|
|
||||||
storage = LocalStorage('LocalStorage', directory?.path);
|
|
||||||
await storage!.ready;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<String?> getItem(String key) async {
|
|
||||||
if (!PlatformInfos.isMobile) {
|
|
||||||
await _setupLocalStorage();
|
|
||||||
try {
|
|
||||||
return storage!.getItem(key)?.toString();
|
|
||||||
} catch (_) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
await _mutex.lock();
|
|
||||||
return await secureStorage!.read(key: key);
|
|
||||||
} catch (_) {
|
|
||||||
return null;
|
|
||||||
} finally {
|
|
||||||
_mutex.unlock();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<bool?> getItemBool(String key, [bool? defaultValue]) async {
|
|
||||||
final value = await getItem(key);
|
|
||||||
if (value == null) {
|
|
||||||
return defaultValue;
|
|
||||||
}
|
|
||||||
// we also check for '1' for legacy reasons, some booleans were stored that way
|
|
||||||
return value == '1' || value.toLowerCase() == 'true';
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> setItem(String key, String? value) async {
|
|
||||||
if (!PlatformInfos.isMobile) {
|
|
||||||
await _setupLocalStorage();
|
|
||||||
return await storage!.setItem(key, value);
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
await _mutex.lock();
|
|
||||||
return await secureStorage!.write(key: key, value: value);
|
|
||||||
} finally {
|
|
||||||
_mutex.unlock();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> setItemBool(String key, bool value) async {
|
|
||||||
await setItem(key, value.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> deleteItem(String key) async {
|
|
||||||
if (!PlatformInfos.isMobile) {
|
|
||||||
await _setupLocalStorage();
|
|
||||||
return await storage!.deleteItem(key);
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
await _mutex.lock();
|
|
||||||
return await secureStorage!.delete(key: key);
|
|
||||||
} finally {
|
|
||||||
_mutex.unlock();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user