[shared_preferences] Adds new clearWithParameters and getAllWithParameters methods to platform interface.

packages/shared_preferences/shared_preferences/lib/shared_preferences.dart

@@ -182,6 +182,7 @@ class SharedPreferences {
     _preferenceCache.clear();
     if (_prefixHasBeenChanged) {
       try {
+        // ignore: deprecated_member_use
         return _store.clearWithPrefix(_prefix);
       } catch (e) {
         // Catching and clarifying UnimplementedError to provide a more robust message.
@@ -213,6 +214,7 @@ Either update the implementation to support setPrefix, or do not call setPrefix.
     final Map<String, Object> fromSystem = <String, Object>{};
     if (_prefixHasBeenChanged) {
       try {
+        // ignore: deprecated_member_use
         fromSystem.addAll(await _store.getAllWithPrefix(_prefix));
       } catch (e) {
         // Catching and clarifying UnimplementedError to provide a more robust message.

packages/shared_preferences/shared_preferences/test/shared_preferences_test.dart

@@ -335,6 +335,7 @@ class FakeSharedPreferencesStore extends SharedPreferencesStorePlatform {
   @override
   Future<Map<String, Object>> getAllWithPrefix(String prefix) {
     log.add(const MethodCall('getAllWithPrefix'));
+    // ignore: deprecated_member_use
     return backend.getAllWithPrefix(prefix);
   }
 

packages/shared_preferences/shared_preferences_android/example/integration_test/shared_preferences_test.dart

@@ -48,10 +48,12 @@ void main() {
     });
 
     tearDown(() {
+      // ignore: deprecated_member_use
       preferences.clearWithPrefix('');
     });
 
     testWidgets('reading', (WidgetTester _) async {
+      // ignore: deprecated_member_use
       final Map<String, Object> values = await preferences.getAllWithPrefix('');
       expect(values['String'], isNull);
       expect(values['Bool'], isNull);
@@ -83,6 +85,7 @@ void main() {
             allTestValues['flutter.StringList']!)
       ]);
       final Map<String, Object> values =
+          // ignore: deprecated_member_use
           await preferences.getAllWithPrefix('prefix.');
       expect(values['prefix.String'], allTestValues['prefix.String']);
       expect(values['prefix.Bool'], allTestValues['prefix.Bool']);
@@ -113,14 +116,17 @@ void main() {
         preferences.setValue('StringList', 'flutter.StringList',
             allTestValues['flutter.StringList']!)
       ]);
+      // ignore: deprecated_member_use
       await preferences.clearWithPrefix('prefix.');
       Map<String, Object> values =
+          // ignore: deprecated_member_use
           await preferences.getAllWithPrefix('prefix.');
       expect(values['prefix.String'], null);
       expect(values['prefix.Bool'], null);
       expect(values['prefix.Int'], null);
       expect(values['prefix.Double'], null);
       expect(values['prefix.StringList'], null);
+      // ignore: deprecated_member_use
       values = await preferences.getAllWithPrefix('flutter.');
       expect(values['flutter.String'], allTestValues['flutter.String']);
       expect(values['flutter.Bool'], allTestValues['flutter.Bool']);
@@ -148,6 +154,7 @@ void main() {
         preferences.setValue('StringList', 'flutter.StringList',
             allTestValues['flutter.StringList']!)
       ]);
+      // ignore: deprecated_member_use
       final Map<String, Object> values = await preferences.getAllWithPrefix('');
       expect(values['String'], allTestValues['String']);
       expect(values['Bool'], allTestValues['Bool']);
@@ -180,7 +187,9 @@ void main() {
         preferences.setValue('StringList', 'flutter.StringList',
             allTestValues['flutter.StringList']!)
       ]);
+      // ignore: deprecated_member_use
       await preferences.clearWithPrefix('');
+      // ignore: deprecated_member_use
       final Map<String, Object> values = await preferences.getAllWithPrefix('');
       expect(values['String'], null);
       expect(values['Bool'], null);
@@ -226,6 +235,7 @@ void main() {
       await preferences.setValue(
           'StringList', key, allTestValues['flutter.StringList']!);
       await preferences.remove(key);
+      // ignore: deprecated_member_use
       final Map<String, Object> values = await preferences.getAllWithPrefix('');
       expect(values[key], isNull);
     });
@@ -260,6 +270,7 @@ void main() {
       // All writes should succeed.
       expect(result.where((bool element) => !element), isEmpty);
       // The last write should win.
+      // ignore: deprecated_member_use
       final Map<String, Object> values = await preferences.getAllWithPrefix('');
       expect(values['Int'], writeCount);
     });
@@ -268,6 +279,7 @@ void main() {
         (WidgetTester _) async {
       const String key = 'akey';
       const String value = 'a string value';
+      // ignore: deprecated_member_use
       await preferences.clearWithPrefix('');
 
       // Special prefixes used to store datatypes that can't be stored directly
@@ -284,6 +296,7 @@ void main() {
         expect(preferences.setValue('String', key, prefix + value),
             throwsA(isA<PlatformException>()));
         final Map<String, Object> values =
+            // ignore: deprecated_member_use
             await preferences.getAllWithPrefix('');
         expect(values[key], null);
       }

packages/shared_preferences/shared_preferences_foundation/example/integration_test/shared_preferences_test.dart

@@ -47,10 +47,12 @@ void main() {
     });
 
     tearDown(() {
+      // ignore: deprecated_member_use
       preferences.clearWithPrefix('');
     });
 
     testWidgets('reading', (WidgetTester _) async {
+      // ignore: deprecated_member_use
       final Map<String, Object> values = await preferences.getAllWithPrefix('');
       expect(values['String'], isNull);
       expect(values['Bool'], isNull);
@@ -82,6 +84,7 @@ void main() {
             allTestValues['flutter.StringList']!)
       ]);
       final Map<String, Object> values =
+          // ignore: deprecated_member_use
           await preferences.getAllWithPrefix('prefix.');
       expect(values['prefix.String'], allTestValues['prefix.String']);
       expect(values['prefix.Bool'], allTestValues['prefix.Bool']);
@@ -112,14 +115,17 @@ void main() {
         preferences.setValue('StringList', 'flutter.StringList',
             allTestValues['flutter.StringList']!)
       ]);
+      // ignore: deprecated_member_use
       await preferences.clearWithPrefix('prefix.');
       Map<String, Object> values =
+          // ignore: deprecated_member_use
           await preferences.getAllWithPrefix('prefix.');
       expect(values['prefix.String'], null);
       expect(values['prefix.Bool'], null);
       expect(values['prefix.Int'], null);
       expect(values['prefix.Double'], null);
       expect(values['prefix.StringList'], null);
+      // ignore: deprecated_member_use
       values = await preferences.getAllWithPrefix('flutter.');
       expect(values['flutter.String'], allTestValues['flutter.String']);
       expect(values['flutter.Bool'], allTestValues['flutter.Bool']);
@@ -147,6 +153,7 @@ void main() {
         preferences.setValue('StringList', 'flutter.StringList',
             allTestValues['flutter.StringList']!)
       ]);
+      // ignore: deprecated_member_use
       final Map<String, Object> values = await preferences.getAllWithPrefix('');
       expect(values['String'], allTestValues['String']);
       expect(values['Bool'], allTestValues['Bool']);
@@ -179,7 +186,9 @@ void main() {
         preferences.setValue('StringList', 'flutter.StringList',
             allTestValues['flutter.StringList']!)
       ]);
+      // ignore: deprecated_member_use
       await preferences.clearWithPrefix('');
+      // ignore: deprecated_member_use
       final Map<String, Object> values = await preferences.getAllWithPrefix('');
       expect(values['String'], null);
       expect(values['Bool'], null);
@@ -225,6 +234,7 @@ void main() {
       await preferences.setValue(
           'StringList', key, allTestValues['flutter.StringList']!);
       await preferences.remove(key);
+      // ignore: deprecated_member_use
       final Map<String, Object> values = await preferences.getAllWithPrefix('');
       expect(values[key], isNull);
     });
@@ -259,6 +269,7 @@ void main() {
       // All writes should succeed.
       expect(result.where((bool element) => !element), isEmpty);
       // The last write should win.
+      // ignore: deprecated_member_use
       final Map<String, Object> values = await preferences.getAllWithPrefix('');
       expect(values['Int'], writeCount);
     });

packages/shared_preferences/shared_preferences_platform_interface/CHANGELOG.md

@@ -1,5 +1,7 @@
-## NEXT
+## 2.3.0
 
+* Adds `clearWithParameters` and `getAllWithParameters` methods.
+* Deprecates `clearWithPrefix` and `getAllWithPrefix` methods.
 * Updates minimum supported SDK version to Flutter 3.3/Dart 2.18.
 
 ## 2.2.0

packages/shared_preferences/shared_preferences_platform_interface/lib/method_channel_shared_preferences.dart

@@ -7,6 +7,7 @@ import 'dart:async';
 import 'package:flutter/services.dart';
 
 import 'shared_preferences_platform_interface.dart';
+import 'types.dart';
 
 const MethodChannel _kChannel =
     MethodChannel('plugins.flutter.io/shared_preferences');
@@ -39,25 +40,58 @@ class MethodChannelSharedPreferencesStore
   }
 
   @override
+  @Deprecated('Use clearWithParameters instead')
   Future<bool> clearWithPrefix(String prefix) async {
+    return clearWithParameters(
+      ClearParameters(
+        filter: PreferencesFilter(prefix: prefix),
+      ),
+    );
+  }
+
+  @override
+  Future<bool> clearWithParameters(ClearParameters parameters) async {
+    final PreferencesFilter filter = parameters.filter;
     return (await _kChannel.invokeMethod<bool>(
-      'clearWithPrefix',
-      <String, dynamic>{'prefix': prefix},
+      'clearWithParameters',
+      <String, dynamic>{
+        'prefix': filter.prefix,
+        'allowList': filter.allowList?.toList(),
+      },
     ))!;
   }
 
   @override
-  Future<Map<String, Object>> getAllWithPrefix(String prefix) async {
-    return await _kChannel.invokeMapMethod<String, Object>(
-          'getAllWithPrefix',
-          <String, dynamic>{'prefix': prefix},
-        ) ??
+  Future<Map<String, Object>> getAll() async {
+    return await _kChannel.invokeMapMethod<String, Object>('getAll') ??
         <String, Object>{};
   }
 
   @override
-  Future<Map<String, Object>> getAll() async {
-    return await _kChannel.invokeMapMethod<String, Object>('getAll') ??
+  @Deprecated('Use getAllWithParameters instead')
+  Future<Map<String, Object>> getAllWithPrefix(
+    String prefix, {
+    Set<String>? allowList,
+  }) async {
+    return getAllWithParameters(
+      GetAllParameters(
+        filter: PreferencesFilter(prefix: prefix),
+      ),
+    );
+  }
+
+  @override
+  Future<Map<String, Object>> getAllWithParameters(
+      GetAllParameters parameters) async {
+    final PreferencesFilter filter = parameters.filter;
+    final List<String>? allowListAsList = filter.allowList?.toList();
+    return await _kChannel.invokeMapMethod<String, Object>(
+          'getAllWithParameters',
+          <String, dynamic>{
+            'prefix': filter.prefix,
+            'allowList': allowListAsList
+          },
+        ) ??
         <String, Object>{};
   }
 }

packages/shared_preferences/shared_preferences_platform_interface/lib/shared_preferences_platform_interface.dart

@@ -8,6 +8,7 @@ import 'package:flutter/foundation.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
 import 'method_channel_shared_preferences.dart';
+import 'types.dart';
 
 /// The interface that implementations of shared_preferences must implement.
 ///
@@ -69,11 +70,17 @@ abstract class SharedPreferencesStorePlatform extends PlatformInterface {
   /// prefix 'flutter.'.
   Future<bool> clear();
 
-  /// Removes all keys and values in the store with given prefix.
+  /// Removes all keys and values in the store with given [prefix].
+  @Deprecated('Use clearWithParameters instead')
   Future<bool> clearWithPrefix(String prefix) {
     throw UnimplementedError('clearWithPrefix is not implemented.');
   }
 
+  /// Removes all keys and values in the store that match [options].
+  Future<bool> clearWithParameters(ClearParameters parameters) {
+    throw UnimplementedError('clearWithParameters is not implemented.');
+  }
+
   /// Returns all key/value pairs persisted in this store where the key starts with 'flutter.'.
   ///
   /// This default behavior is for backwards compatibility with older versions of this
@@ -82,9 +89,16 @@ abstract class SharedPreferencesStorePlatform extends PlatformInterface {
   Future<Map<String, Object>> getAll();
 
   /// Returns all key/value pairs persisting in this store that have given [prefix].
+  @Deprecated('Use getAllWithParameters instead')
   Future<Map<String, Object>> getAllWithPrefix(String prefix) {
     throw UnimplementedError('getAllWithPrefix is not implemented.');
   }
+
+  /// Returns all key/value pairs persisting in this store that match [options].
+  Future<Map<String, Object>> getAllWithParameters(
+      GetAllParameters parameters) {
+    throw UnimplementedError('getAllWithParameters is not implemented.');
+  }
 }
 
 /// Stores data in memory.
@@ -103,24 +117,60 @@ class InMemorySharedPreferencesStore extends SharedPreferencesStorePlatform {
 
   @override
   Future<bool> clear() async {
-    return clearWithPrefix(_defaultPrefix);
+    return clearWithParameters(
+      ClearParameters(
+        filter: PreferencesFilter(prefix: _defaultPrefix),
+      ),
+    );
   }
 
   @override
   Future<bool> clearWithPrefix(String prefix) async {
-    _data.removeWhere((String key, _) => key.startsWith(prefix));
+    return clearWithParameters(
+      ClearParameters(
+        filter: PreferencesFilter(prefix: prefix),
+      ),
+    );
+  }
+
+  @override
+  Future<bool> clearWithParameters(ClearParameters parameters) async {
+    final PreferencesFilter filter = parameters.filter;
+    if (filter.allowList != null) {
+      _data.removeWhere((String key, _) =>
+          key.startsWith(filter.prefix) && filter.allowList!.contains(key));
+    } else {
+      _data.removeWhere((String key, _) => key.startsWith(filter.prefix));
+    }
     return true;
   }
 
   @override
   Future<Map<String, Object>> getAll() async {
-    return getAllWithPrefix(_defaultPrefix);
+    return getAllWithParameters(
+      GetAllParameters(
+        filter: PreferencesFilter(prefix: _defaultPrefix),
+      ),
+    );
   }
 
   @override
   Future<Map<String, Object>> getAllWithPrefix(String prefix) async {
+    return getAllWithParameters(
+      GetAllParameters(
+        filter: PreferencesFilter(prefix: prefix),
+      ),
+    );
+  }
+
+  @override
+  Future<Map<String, Object>> getAllWithParameters(
+      GetAllParameters parameters) async {
+    final PreferencesFilter filter = parameters.filter;
     final Map<String, Object> preferences = Map<String, Object>.from(_data);
-    preferences.removeWhere((String key, _) => !key.startsWith(prefix));
+    preferences.removeWhere((String key, _) =>
+        !key.startsWith(filter.prefix) ||
+        (filter.allowList != null && !filter.allowList!.contains(key)));
     return preferences;
   }