From fa0427238ee14647d6240ad5b8cefb004b15d5d1 Mon Sep 17 00:00:00 2001 From: Vladimir Golyshev <3874873@gmail.com> Date: Wed, 16 Jun 2021 18:56:59 +0300 Subject: [PATCH 1/3] add loadUrl with headers --- .../ru/touchin/roboswag/webview/web_view/BaseWebView.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt index c78e67c..5d28988 100644 --- a/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt +++ b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt @@ -129,6 +129,14 @@ open class BaseWebView @JvmOverloads constructor( binding.webView.loadUrl(url ?: "") } + /** + * works like loadUrl(url: String?), + * but with extra headers to send + */ + fun loadUrl(url: String?, extraHeaders: Map?){ + binding.webView.loadUrl(url ?: "", extraHeaders?: emptyMap()) + } + fun setState(newState: WebViewLoadingState) { onStateChanged(newState) } From af3fe7aac55a9a5652fcad00c51ac0c8d75b7f41 Mon Sep 17 00:00:00 2001 From: Vladimir Golyshev <3874873@gmail.com> Date: Wed, 16 Jun 2021 19:20:03 +0300 Subject: [PATCH 2/3] delete useless fun --- .../touchin/roboswag/webview/web_view/BaseWebView.kt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt index 5d28988..071be56 100644 --- a/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt +++ b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt @@ -125,15 +125,7 @@ open class BaseWebView @JvmOverloads constructor( * if url is null it changes to empty string * to prevent infinite LOADING state */ - fun loadUrl(url: String?) { - binding.webView.loadUrl(url ?: "") - } - - /** - * works like loadUrl(url: String?), - * but with extra headers to send - */ - fun loadUrl(url: String?, extraHeaders: Map?){ + fun loadUrl(url: String?, extraHeaders: Map? = null) { binding.webView.loadUrl(url ?: "", extraHeaders?: emptyMap()) } From 8fdd83d8c8139b3d22869758d720957ad2b2015c Mon Sep 17 00:00:00 2001 From: Vladimir Golyshev <3874873@gmail.com> Date: Wed, 16 Jun 2021 19:26:46 +0300 Subject: [PATCH 3/3] clean code --- .../java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt index 071be56..964d271 100644 --- a/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt +++ b/webview/src/main/java/ru/touchin/roboswag/webview/web_view/BaseWebView.kt @@ -125,8 +125,8 @@ open class BaseWebView @JvmOverloads constructor( * if url is null it changes to empty string * to prevent infinite LOADING state */ - fun loadUrl(url: String?, extraHeaders: Map? = null) { - binding.webView.loadUrl(url ?: "", extraHeaders?: emptyMap()) + fun loadUrl(url: String?, extraHeaders: Map = emptyMap()) { + binding.webView.loadUrl(url ?: "", extraHeaders) } fun setState(newState: WebViewLoadingState) {