From ea4309642de1747c64342c94014e8785ce2e6945 Mon Sep 17 00:00:00 2001 From: Floens Date: Sat, 20 Jun 2015 02:06:42 +0200 Subject: [PATCH 1/2] Remove setUserAgentString call for better captcha's --- .../main/java/org/floens/chan/ui/fragment/ReplyFragment.java | 2 +- .../main/java/org/floens/chan/ui/layout/CaptchaLayout.java | 5 ++--- 2 files changed, 3 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 eeda3f03..0267657e 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 @@ -204,7 +204,7 @@ public class ReplyFragment extends DialogFragment implements CaptchaLayout.Captc String baseUrl = loadable.isThreadMode() ? ChanUrls.getThreadUrlDesktop(loadable.board, loadable.no) : ChanUrls.getBoardUrlDesktop(loadable.board); captchaLayout.initCaptcha(baseUrl, ChanUrls.getCaptchaSiteKey(), - ThemeHelper.getInstance().getTheme().isLightTheme, ChanApplication.getInstance().getUserAgent(), this); + ThemeHelper.getInstance().getTheme().isLightTheme, 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 e94e39b8..c48767f2 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 @@ -52,8 +52,8 @@ public class CaptchaLayout extends WebView { super(context, attrs, defStyle); } - @SuppressLint("SetJavaScriptEnabled") - public void initCaptcha(String baseUrl, String siteKey, boolean lightTheme, String userAgent, CaptchaCallback callback) { + @SuppressLint({"SetJavaScriptEnabled", "AddJavascriptInterface"}) + public void initCaptcha(String baseUrl, String siteKey, boolean lightTheme, CaptchaCallback callback) { this.callback = callback; this.baseUrl = baseUrl; this.siteKey = siteKey; @@ -61,7 +61,6 @@ public class CaptchaLayout extends WebView { WebSettings settings = getSettings(); settings.setJavaScriptEnabled(true); - settings.setUserAgentString(userAgent); setWebChromeClient(new WebChromeClient() { @Override From c9bc821fe7b1d7ad327c75c39d38909e27235e91 Mon Sep 17 00:00:00 2001 From: Floens Date: Sat, 20 Jun 2015 02:20:01 +0200 Subject: [PATCH 2/2] Update to v1.2.11 --- CHANGES.txt | 4 ++++ Clover/app/build.gradle | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index f9cd45a7..cd36c6e3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +New in 1.2.11 (2015-06-20) +- Update/fix captchas + + New in 1.2.10 (2015-04-01) With the help of recaptcha support and nin9tyfour (developer of the iOS 4chan app Fortune), recaptcha v2 has been implemented. This means you will see the captcha box you also see on the desktop. diff --git a/Clover/app/build.gradle b/Clover/app/build.gradle index 2be86d06..06c2ba04 100644 --- a/Clover/app/build.gradle +++ b/Clover/app/build.gradle @@ -8,8 +8,8 @@ android { minSdkVersion 14 targetSdkVersion 21 - versionName "v1.2.10" - versionCode 49 + versionName "v1.2.11" + versionCode 50 } compileOptions {