Fix android support

packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_state.dart

@@ -14,13 +14,17 @@ import 'async_state.dart';
 class SharedPreferencesState {
   /// Default constructor for [SharedPreferencesState].
   const SharedPreferencesState({
-    this.allKeys = const <String>[],
+    this.asyncKeys = const <String>[],
+    this.legacyKeys = const <String>[],
     this.selectedKey,
     this.editing = false,
   });
 
-  /// A list of all keys in the shared preferences of the target debug session.
-  final List<String> allKeys;
+  /// A list of all keys in the shared preferences of the target debug session using the async API.
+  final List<String> asyncKeys;
+
+  /// A list of all keys in the shared preferences of the target debug session using the legacy API.
+  final List<String> legacyKeys;
 
   /// The user selected key and its value in the shared preferences
   /// of the target debug session.
@@ -32,12 +36,14 @@ class SharedPreferencesState {
   /// Creates a copy of this [SharedPreferencesState] but replacing the given
   /// fields with the new values.
   SharedPreferencesState copyWith({
-    List<String>? allKeys,
+    List<String>? asyncKeys,
+    List<String>? legacyKeys,
     SelectedSharedPreferencesKey? selectedKey,
     bool? editing,
   }) {
     return SharedPreferencesState(
-      allKeys: allKeys ?? this.allKeys,
+      asyncKeys: asyncKeys ?? this.asyncKeys,
+      legacyKeys: legacyKeys ?? this.legacyKeys,
       selectedKey: selectedKey ?? this.selectedKey,
       editing: editing ?? this.editing,
     );
@@ -47,18 +53,23 @@ class SharedPreferencesState {
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other is SharedPreferencesState &&
-            listEquals(other.allKeys, allKeys) &&
+            listEquals(other.asyncKeys, asyncKeys) &&
+            listEquals(other.legacyKeys, legacyKeys) &&
             other.selectedKey == selectedKey &&
             other.editing == editing);
   }
 
   @override
-  int get hashCode =>
-      allKeys.hashCode ^ selectedKey.hashCode ^ editing.hashCode;
+  int get hashCode => Object.hash(
+        asyncKeys,
+        legacyKeys,
+        selectedKey,
+        editing,
+      );
 
   @override
   String toString() {
-    return 'SharedPreferencesState(allKeys: $allKeys, selectedKey: $selectedKey, editing: $editing)';
+    return 'SharedPreferencesState(asyncKeys: $asyncKeys, legacyKeys: $legacyKeys, selectedKey: $selectedKey, editing: $editing)';
   }
 }
 
@@ -71,15 +82,19 @@ class SelectedSharedPreferencesKey {
   const SelectedSharedPreferencesKey({
     required this.key,
     required this.value,
+    required this.legacy,
   });
 
-  /// The user selected key
+  /// The user selected key.
   final String key;
 
   /// The value of the selected key in the shared preferences of the target
   /// debug session.
   final AsyncState<SharedPreferencesData> value;
 
+  /// Whether or not this is a legacy key.
+  final bool legacy;
+
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||

packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_state_notifier.dart

@@ -21,17 +21,29 @@ class SharedPreferencesStateNotifier extends ValueNotifier<_State> {
 
   final SharedPreferencesToolEval _eval;
 
-  List<String> _keys = <String>[];
+  List<String> _asyncKeys = const <String>[];
+  List<String> _legacyKeys = const <String>[];
 
   /// Retrieves all keys from the shared preferences of the target debug session.
   ///
   /// If this is called when data already exists, it will update the list of keys.
   Future<void> fetchAllKeys() async {
     value = const _State.loading();
     try {
-      _keys = await _eval.fetchAllKeys();
+      final KeysResult allKeys = await _eval.fetchAllKeys();
+      _legacyKeys = allKeys.legacyKeys;
+      // Platforms other than Android also add the legacy keys to the async keys
+      // in the pattern `flutter.$key`, so we need to remove them to avoid duplicates.
+      const String legacyPrefix = 'flutter.';
+      _asyncKeys = <String>[
+        for (final String key in allKeys.asyncKeys)
+          if (!(key.startsWith(legacyPrefix) &&
+              _legacyKeys.contains(key.replaceAll(legacyPrefix, ''))))
+            key,
+      ];
       value = _State.data(SharedPreferencesState(
-        allKeys: _keys,
+        asyncKeys: _asyncKeys,
+        legacyKeys: _legacyKeys,
       ));
     } catch (error, stackTrace) {
       value = _State.error(error, stackTrace);
@@ -41,35 +53,41 @@ class SharedPreferencesStateNotifier extends ValueNotifier<_State> {
   void _setSelectedKeyValue(
     String key,
     AsyncState<SharedPreferencesData> asyncValue,
+    bool legacy,
   ) {
     value = value.whenData(
       (SharedPreferencesState data) => data.copyWith(
         selectedKey: SelectedSharedPreferencesKey(
           key: key,
           value: asyncValue,
+          legacy: legacy,
         ),
       ),
     );
   }
 
   /// Set the key as selected and retrieve the value from the shared preferences of the target debug session.
-  Future<void> selectKey(String key) async {
+  Future<void> selectKey(String key, bool legacy) async {
     stopEditing();
     _setSelectedKeyValue(
       key,
       const AsyncState<SharedPreferencesData>.loading(),
+      legacy,
     );
 
     try {
-      final SharedPreferencesData keyValue = await _eval.fetchValue(key);
+      final SharedPreferencesData keyValue =
+          await _eval.fetchValue(key, legacy);
       _setSelectedKeyValue(
         key,
         AsyncState<SharedPreferencesData>.data(keyValue),
+        legacy,
       );
     } catch (error, stackTrace) {
       _setSelectedKeyValue(
         key,
         AsyncState<SharedPreferencesData>.error(error, stackTrace),
+        legacy,
       );
     }
   }
@@ -84,36 +102,47 @@ class SharedPreferencesStateNotifier extends ValueNotifier<_State> {
   /// If all characters from the token are found in the key, the key is included in the result.
   void filter(String token) {
     final String lowercaseToken = token.toLowerCase();
+
+    bool filter(String key) {
+      String currentSubstring = key.toLowerCase();
+      for (final String char in lowercaseToken.characters) {
+        final int currentIndex = currentSubstring.indexOf(char);
+        if (currentIndex == -1) {
+          return false;
+        }
+        currentSubstring = currentSubstring.substring(currentIndex + 1);
+      }
+      return true;
+    }
+
     value = value.whenData((SharedPreferencesState data) {
       return data.copyWith(
-          allKeys: _keys.where(
-        (String key) {
-          String currentSubstring = key.toLowerCase();
-          for (final String char in lowercaseToken.characters) {
-            final int currentIndex = currentSubstring.indexOf(char);
-            if (currentIndex == -1) {
-              return false;
-            }
-            currentSubstring = currentSubstring.substring(currentIndex + 1);
-          }
-          return true;
-        },
-      ).toList());
+        asyncKeys: _asyncKeys.where(filter).toList(),
+        legacyKeys: _legacyKeys.where(filter).toList(),
+      );
     });
   }
 
   /// Changes the value of the selected key in the shared preferences of the target debug session.
-  Future<void> changeValue(String key, SharedPreferencesData newValue) async {
-    await _eval.changeValue(key, newValue);
-    await selectKey(key);
-    stopEditing();
+  Future<void> changeValue(
+    SharedPreferencesData newValue,
+  ) async {
+    if (value.dataOrNull?.selectedKey
+        case final SelectedSharedPreferencesKey selectedKey) {
+      await _eval.changeValue(selectedKey.key, newValue, selectedKey.legacy);
+      await selectKey(selectedKey.key, selectedKey.legacy);
+      stopEditing();
+    }
   }
 
   /// Deletes the selected key from the shared preferences of the target debug session.
-  Future<void> deleteKey(String selectedKey) async {
-    await _eval.deleteKey(selectedKey);
-    await fetchAllKeys();
-    stopEditing();
+  Future<void> deleteSelectedKey() async {
+    if (value.dataOrNull?.selectedKey
+        case final SelectedSharedPreferencesKey selectedKey) {
+      await _eval.deleteKey(selectedKey.key, selectedKey.legacy);
+      await fetchAllKeys();
+      stopEditing();
+    }
   }
 
   /// Change the editing state to true, allowing the user to edit the value of the selected key.

packages/shared_preferences/shared_preferences_tool/lib/src/shared_preferences_state_provider.dart

@@ -11,6 +11,12 @@ import 'shared_preferences_state.dart';
 import 'shared_preferences_state_notifier.dart';
 import 'shared_preferences_tool_eval.dart';
 
+/// A record that holds the string key and wether or not it is a legacy key.
+typedef KeyData = ({
+  String key,
+  bool legacy,
+});
+
 /// A class that provides a [SharedPreferencesStateNotifier] to its descendants
 /// without listening to state changes.
 ///
@@ -79,11 +85,14 @@ class _SharedPreferencesStateInheritedModel
 }
 
 extension on AsyncState<SharedPreferencesState> {
-  AsyncState<List<String>> get keysListState => mapWhenData(
-        (SharedPreferencesState data) => data.allKeys,
+  AsyncState<List<KeyData>> get keysListState => mapWhenData(
+        (SharedPreferencesState data) => <KeyData>[
+          for (final String key in data.asyncKeys) (key: key, legacy: false),
+          for (final String key in data.legacyKeys) (key: key, legacy: true),
+        ],
       );
 
-  String? get selectedKeyState => dataOrNull?.selectedKey?.key;
+  SelectedSharedPreferencesKey? get selectedKeyState => dataOrNull?.selectedKey;
 
   AsyncState<SharedPreferencesData?> get selectedKeyDataState =>
       flatMapWhenData(
@@ -148,13 +157,13 @@ class SharedPreferencesStateProvider extends StatefulWidget {
     required this.child,
   });
 
-  /// Returns the async state of the list of keys from the closest
+  /// Returns the async state of the list of all keys.
   /// [_SharedPreferencesStateInheritedModel] ancestor.
   ///
   /// Use of this method will cause the given [context] to rebuild whenever the
   /// list of keys changes, including loading and error states.
   /// This will not cause a rebuild when any other part of the state changes.
-  static AsyncState<List<String>> keysListStateOf(BuildContext context) {
+  static AsyncState<List<KeyData>> keysListStateOf(BuildContext context) {
     return context
         .dependOnInheritedWidgetOfExactType<
             _SharedPreferencesStateInheritedModel>(
@@ -170,7 +179,7 @@ class SharedPreferencesStateProvider extends StatefulWidget {
   /// Use of this method will cause the given [context] to rebuild whenever the
   /// selected key changes, including loading and error states.
   /// This will not cause a rebuild when any other part of the state changes.
-  static String? selectedKeyOf(BuildContext context) {
+  static SelectedSharedPreferencesKey? selectedKeyOf(BuildContext context) {
     return context
         .dependOnInheritedWidgetOfExactType<
             _SharedPreferencesStateInheritedModel>(
@@ -184,7 +193,8 @@ class SharedPreferencesStateProvider extends StatefulWidget {
   /// [_SharedPreferencesStateInheritedModel] ancestor.
   ///
   /// Throws an error if the selected key is null.
-  static String requireSelectedKeyOf(BuildContext context) {
+  static SelectedSharedPreferencesKey requireSelectedKeyOf(
+      BuildContext context) {
     return selectedKeyOf(context)!;
   }
 
@@ -235,12 +245,21 @@ class _SharedPreferencesStateProviderState
   @override
   void initState() {
     super.initState();
-    final EvalOnDartLibrary eval = EvalOnDartLibrary(
+    final EvalOnDartLibrary asyncEval = EvalOnDartLibrary(
       'package:shared_preferences/src/shared_preferences_async.dart',
       serviceManager.service!,
       serviceManager: serviceManager,
     );
-    final SharedPreferencesToolEval toolEval = SharedPreferencesToolEval(eval);
+    final EvalOnDartLibrary legacyEval = EvalOnDartLibrary(
+      'package:shared_preferences/src/shared_preferences_legacy.dart',
+      serviceManager.service!,
+      serviceManager: serviceManager,
+    );
+    final SharedPreferencesToolEval toolEval = SharedPreferencesToolEval(
+      asyncEval,
+      legacyEval,
+      serviceManager.connectedApp?.isFlutterWebAppNow ?? false,
+    );
     _notifier = SharedPreferencesStateNotifier(toolEval);
     _notifier.fetchAllKeys();
   }