diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 201b1711..90698878 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -15,14 +15,12 @@
-
-
-
+
+
-
@@ -39,11 +37,11 @@
-
+
-
-
+
+
@@ -54,8 +52,8 @@
-
-
+
+
@@ -63,34 +61,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -102,10 +72,6 @@
- shouldOverrideUrlLoading
- toolbarTopFixedTitle
- useChromeSafariBrowser
- toolbat
onProgress
goBack
_controller
@@ -132,6 +98,10 @@
loadData
_valide
initialized
+ HashMap
+ headers
+ .cast
+ WebView
activity.getPreferences(0)
@@ -175,9 +145,9 @@
-
-
+
+
@@ -211,6 +181,7 @@
+
@@ -222,7 +193,6 @@
-
@@ -390,9 +360,9 @@
-
+
-
+
@@ -408,7 +378,7 @@
-
+
@@ -646,38 +616,12 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -692,40 +636,39 @@
-
+
-
-
+
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/MyCookieManager.java b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/MyCookieManager.java
index 7717a56c..1bb9e9fa 100644
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/MyCookieManager.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/MyCookieManager.java
@@ -1,15 +1,15 @@
package com.pichillilorenzo.flutter_inappbrowser;
import android.os.Build;
-import android.text.TextUtils;
import android.util.Log;
import android.webkit.CookieManager;
import android.webkit.ValueCallback;
import java.net.HttpCookie;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import io.flutter.plugin.common.MethodCall;
import io.flutter.plugin.common.MethodChannel;
@@ -44,6 +44,9 @@ public class MyCookieManager implements MethodChannel.MethodCallHandler {
MyCookieManager.setCookie(url, name, value, domain, path, expiresDate, isHTTPOnly, isSecure, result);
}
break;
+ case "getCookies":
+ result.success(MyCookieManager.getCookies((String) call.argument("url")));
+ break;
default:
result.notImplemented();
}
@@ -70,9 +73,8 @@ public class MyCookieManager implements MethodChannel.MethodCallHandler {
if (expiresDate != null)
cookieValue += "; Max-Age=" + expiresDate.toString();
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
- if (isHTTPOnly != null && isHTTPOnly)
- cookieValue += "; HttpOnly";
+ if (isHTTPOnly != null && isHTTPOnly)
+ cookieValue += "; HttpOnly";
if (isSecure != null && isSecure)
cookieValue += "; Secure";
@@ -93,4 +95,24 @@ public class MyCookieManager implements MethodChannel.MethodCallHandler {
}
}
+ public static List> getCookies(final String url) {
+
+ final List> cookieListMap = new ArrayList<>();
+
+ CookieManager cookieManager = CookieManager.getInstance();
+
+ String[] cookies = cookieManager.getCookie(url).split(";");
+ for (String cookie : cookies) {
+ String[] nameValue = cookie.split("=", 2);
+ String name = nameValue[0].trim();
+ String value = nameValue[1].trim();
+ Map cookieMap = new HashMap<>();
+ cookieMap.put("name", name);
+ cookieMap.put("value", value);
+ cookieListMap.add(cookieMap);
+ }
+ return cookieListMap;
+
+ }
+
}
diff --git a/example/android/build.gradle b/example/android/build.gradle
index e81b1a1d..bb8a3038 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.2.0'
+ classpath 'com.android.tools.build:gradle:3.2.1'
}
}
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 358afaca..2c7a44f3 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -66,6 +66,12 @@ class MyInAppBrowser extends InAppBrowser {
// await this.webViewController.injectScriptCode("console.debug('testDebug', true);");
//
print(await this.webViewController.injectScriptCode("document.cookie"));
+
+ print("");
+ print(await CookieManager.getCookies("https://flutter.io/"));
+ print("");
+ print(await CookieManager.getCookie("https://flutter.io/", "_ga"));
+ print("");
//
// print(await this.webViewController.injectScriptCode("null"));
// print(await this.webViewController.injectScriptCode("undefined"));
@@ -281,6 +287,7 @@ class _MyAppState extends State {
//"toolbarTop": false,
//"toolbarBottom": false
});
+
},
child: Text("Open InAppBrowser")
),
diff --git a/lib/flutter_inappbrowser.dart b/lib/flutter_inappbrowser.dart
index ffb8e710..993f6607 100644
--- a/lib/flutter_inappbrowser.dart
+++ b/lib/flutter_inappbrowser.dart
@@ -1119,6 +1119,7 @@ class InAppLocalhostServer {
}
+///Manages the cookies used by an application's [InAppWebView] instances.
class CookieManager {
static bool _initialized = false;
static const MethodChannel _channel = const MethodChannel('com.pichillilorenzo/flutter_inappbrowser_cookiemanager');
@@ -1131,6 +1132,7 @@ class CookieManager {
static Future _handleMethod(MethodCall call) async {
}
+ ///Sets a cookie for the given [url]. Any existing cookie with the same [host], [path] and [name] will be replaced with the new cookie. The cookie being set will be ignored if it is expired.
static Future setCookie(String url, String name, String value, String domain,
{ String path = "/",
int expiresDate,
@@ -1157,4 +1159,36 @@ class CookieManager {
await _channel.invokeMethod('setCookie', args);
}
+
+ ///Gets all the cookies for the given [url].
+ static Future>> getCookies(String url) async {
+ assert(url != null && url.isNotEmpty);
+
+ Map args = {};
+ args.putIfAbsent('url', () => url);
+ List cookies = await _channel.invokeMethod('getCookies', args);
+ cookies = cookies.cast>();
+ for(var i = 0; i < cookies.length; i++) {
+ cookies[i] = cookies[i].cast();
+ }
+ cookies = cookies.cast>();
+ return cookies;
+ }
+
+ ///Gets a cookie by its [cookieName] for the given [url].
+ static Future> getCookie(String url, String cookieName) async {
+ assert(url != null && url.isNotEmpty);
+ assert(cookieName != null && cookieName.isNotEmpty);
+
+ Map args = {};
+ args.putIfAbsent('url', () => url);
+ List cookies = await _channel.invokeMethod('getCookies', args);
+ cookies = cookies.cast>();
+ for(var i = 0; i < cookies.length; i++) {
+ cookies[i] = cookies[i].cast();
+ if (cookies[i]["name"] == cookieName)
+ return cookies[i];
+ }
+ return null;
+ }
}