From 8e336a3c89a3844ad1c7acb14802821a1897f1a3 Mon Sep 17 00:00:00 2001 From: Floens Date: Wed, 1 Apr 2015 16:37:56 +0200 Subject: [PATCH] Add userAgent to initCaptcha parameters in Captcha Layout. --- .../main/java/org/floens/chan/ui/fragment/ReplyFragment.java | 3 ++- .../main/java/org/floens/chan/ui/layout/CaptchaLayout.java | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java index ab778e15..e41101e9 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java @@ -203,7 +203,8 @@ public class ReplyFragment extends DialogFragment implements CaptchaLayout.Captc showCommentCount(); String baseUrl = loadable.isThreadMode() ? ChanUrls.getThreadUrlDesktop(loadable.board, loadable.no) : ChanUrls.getBoardUrlDesktop(loadable.board); - captchaLayout.initCaptcha(baseUrl, ChanUrls.getCaptchaSiteKey(), ThemeHelper.getInstance().getTheme().isLightTheme, this); + captchaLayout.initCaptcha(baseUrl, ChanUrls.getCaptchaSiteKey(), + ThemeHelper.getInstance().getTheme().isLightTheme, ChanApplication.getReplyManager().getUserAgent(), this); } else { Logger.e(TAG, "Loadable in ReplyFragment was null"); closeReply(); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/CaptchaLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/CaptchaLayout.java index 95a8e03f..982fc8cd 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/layout/CaptchaLayout.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/CaptchaLayout.java @@ -25,7 +25,6 @@ import android.webkit.JavascriptInterface; import android.webkit.WebSettings; import android.webkit.WebView; -import org.floens.chan.ChanApplication; import org.floens.chan.utils.IOUtils; import org.floens.chan.utils.Utils; @@ -49,7 +48,7 @@ public class CaptchaLayout extends WebView { } @SuppressLint("SetJavaScriptEnabled") - public void initCaptcha(String baseUrl, String siteKey, boolean lightTheme, CaptchaCallback callback) { + public void initCaptcha(String baseUrl, String siteKey, boolean lightTheme, String userAgent, CaptchaCallback callback) { this.callback = callback; this.baseUrl = baseUrl; this.siteKey = siteKey; @@ -57,7 +56,7 @@ public class CaptchaLayout extends WebView { WebSettings settings = getSettings(); settings.setJavaScriptEnabled(true); - settings.setUserAgentString(ChanApplication.getReplyManager().getUserAgent()); + settings.setUserAgentString(userAgent); addJavascriptInterface(new CaptchaInterface(this), "CaptchaCallback"); }