diff --git a/background_isolate_channels/lib/main.dart b/background_isolate_channels/lib/main.dart index a0c874e3439..c929ee0b101 100644 --- a/background_isolate_channels/lib/main.dart +++ b/background_isolate_channels/lib/main.dart @@ -65,10 +65,12 @@ class _MyHomePageState extends State { // Write the value to [SharedPreferences] which will get read on the // [SimpleDatabase]'s isolate. For this example the value is always true // just for demonstration purposes. - final Future sharedPreferencesSet = SharedPreferences.getInstance() - .then( - (sharedPreferences) => sharedPreferences.setBool('isDebug', true), - ); + final SharedPreferencesAsync sharedPreferences = SharedPreferencesAsync(); + + final Future sharedPreferencesSet = sharedPreferences.setBool( + 'isDebug', + true, + ); final Future tempDirFuture = path_provider .getTemporaryDirectory(); diff --git a/compass_app/app/integration_test/app_server_data_test.dart b/compass_app/app/integration_test/app_server_data_test.dart index cb4bb28b7ef..c406c72ea7c 100644 --- a/compass_app/app/integration_test/app_server_data_test.dart +++ b/compass_app/app/integration_test/app_server_data_test.dart @@ -30,7 +30,7 @@ void main() { setUpAll(() async { // Clear any stored shared preferences - final sharedPreferences = await SharedPreferences.getInstance(); + final sharedPreferences = SharedPreferencesAsync(); await sharedPreferences.clear(); // Start the dart server diff --git a/compass_app/app/lib/data/services/shared_preferences_service.dart b/compass_app/app/lib/data/services/shared_preferences_service.dart index 24a67a9b55a..09c34391f32 100644 --- a/compass_app/app/lib/data/services/shared_preferences_service.dart +++ b/compass_app/app/lib/data/services/shared_preferences_service.dart @@ -13,9 +13,11 @@ class SharedPreferencesService { Future> fetchToken() async { try { - final sharedPreferences = await SharedPreferences.getInstance(); + final sharedPreferences = SharedPreferencesAsync(); + _log.finer('Got token from SharedPreferences'); - return Result.ok(sharedPreferences.getString(_tokenKey)); + + return Result.ok(await sharedPreferences.getString(_tokenKey)); } on Exception catch (e) { _log.warning('Failed to get token', e); return Result.error(e); @@ -24,14 +26,18 @@ class SharedPreferencesService { Future> saveToken(String? token) async { try { - final sharedPreferences = await SharedPreferences.getInstance(); + final sharedPreferences = SharedPreferencesAsync(); + if (token == null) { _log.finer('Removed token'); + await sharedPreferences.remove(_tokenKey); } else { _log.finer('Replaced token'); + await sharedPreferences.setString(_tokenKey, token); } + return const Result.ok(null); } on Exception catch (e) { _log.warning('Failed to set token', e);