Bugfix/all cookies cleared after calling remove (fryette#25)

* Fix deprecated use fryette#22

* Fix all cookies clearing issue fryette#23

Author: fryette

android/src/main/java/io/flutter/plugins/webview_cookie_manager/WebviewCookieManagerPlugin.java

@@ -129,8 +129,7 @@ private static void setCookies(final MethodCall methodCall, final Result result)
                 return;
             }
 
-            cookieManager.setCookie(
-                    cookieMap.get("domain").toString(), cookieMap.get("asString").toString());
+            cookieManager.setCookie(domain, cookieMap.get("asString").toString());
         }
 
         result.success(null);

lib/webview_cookie_manager.dart

@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:flutter/services.dart';
 
 class WebviewCookieManager {
-  static const MethodChannel _channel = const MethodChannel('webview_cookie_manager');
+  static const _channel = MethodChannel('webview_cookie_manager');
 
   /// Creates a [CookieManager] -- returns the instance if it's already been called.
   factory WebviewCookieManager() {
@@ -17,41 +17,42 @@ class WebviewCookieManager {
 
   /// Gets whether there are stored cookies
   Future<bool> hasCookies() {
-    return _channel.invokeMethod<bool>('hasCookies').then<bool>((bool result) => result);
+    return _channel
+        .invokeMethod<bool>('hasCookies')
+        .then<bool>((bool result) => result);
   }
 
-  /// Read out all cookies, or all cookies for a [currentUrl] when provided
-  Future<List<Cookie>> getCookies(String currentUrl) {
-    return _channel.invokeListMethod<Map<dynamic, dynamic>>(
-      'getCookies',
-      <dynamic, dynamic>{
-        'url': currentUrl,
-      },
-    ).then<List<Cookie>>((List<Map<dynamic, dynamic>> results) {
-      return results.map((Map<dynamic, dynamic> result) {
-        final Cookie c = Cookie(result['name'], removeInvalidCharacter(result['value']));
-        // following values optionally work on iOS only
-        c.path = result['path'];
-        c.domain = result['domain'];
-        c.secure = result['secure'];
-        c.httpOnly = result['httpOnly'];
+  /// Read out all cookies, or all cookies for a [url] when provided
+  Future<List<Cookie>> getCookies(String url) {
+    return _channel.invokeListMethod<Map>('getCookies', {
+      'url': url
+    }).then((results) => results.map((Map result) {
+          final c =
+              Cookie(result['name'], removeInvalidCharacter(result['value']))
+                // following values optionally work on iOS only
+                ..path = result['path']
+                ..domain = result['domain']
+                ..secure = result['secure']
+                ..httpOnly = result['httpOnly'];
 
-        if (result['expires'] != null) {
-          c.expires = DateTime.fromMillisecondsSinceEpoch((result['expires'] * 1000).toInt());
-        }
+          if (result['expires'] != null) {
+            c.expires = DateTime.fromMillisecondsSinceEpoch(
+                (result['expires'] * 1000).toInt());
+          }
 
-        return c;
-      }).toList();
-    });
+          return c;
+        }).toList());
   }
 
   /// Remove cookies with [currentUrl] for IOS and Android
   Future<void> removeCookie(String currentUrl) async {
-    final List<Cookie> listCookies = await getCookies(currentUrl);
-    clearCookies();
-    final List<Cookie> serializedCookies =
-        listCookies.where((element) => !currentUrl.contains(element.domain)).toList();
-    setCookies(serializedCookies);
+    final listCookies = await getCookies(currentUrl);
+    final serializedCookies = listCookies
+        .where((element) => currentUrl.contains(element.domain))
+        .toList();
+    serializedCookies
+        .forEach((c) => c.expires = DateTime.fromMicrosecondsSinceEpoch(0));
+    await setCookies(serializedCookies);
   }
 
   /// Remove all cookies
@@ -61,8 +62,8 @@ class WebviewCookieManager {
 
   /// Set [cookies] into the web view
   Future<void> setCookies(List<Cookie> cookies) {
-    final List<Map<String, dynamic>> transferCookies = cookies.map((Cookie c) {
-      final Map<String, dynamic> output = <String, dynamic>{
+    final transferCookies = cookies.map((Cookie c) {
+      final output = <String, dynamic>{
         'name': c.name,
         'value': c.value,
         'path': c.path,
@@ -83,7 +84,7 @@ class WebviewCookieManager {
 
   String removeInvalidCharacter(String value) {
     // Remove Invalid Character
-    String valueModified = value.replaceAll('\\"', "'");
+    var valueModified = value.replaceAll('\\"', "'");
     valueModified = valueModified.replaceAll(String.fromCharCode(32), "");
     return valueModified;
   }