Add userAgent to initCaptcha parameters in Captcha Layout.

captchafix2
Floens 10 years ago
parent 899834f849
commit 8e336a3c89
  1. 3
      Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java
  2. 5
      Clover/app/src/main/java/org/floens/chan/ui/layout/CaptchaLayout.java

@ -203,7 +203,8 @@ public class ReplyFragment extends DialogFragment implements CaptchaLayout.Captc
showCommentCount(); showCommentCount();
String baseUrl = loadable.isThreadMode() ? ChanUrls.getThreadUrlDesktop(loadable.board, loadable.no) : ChanUrls.getBoardUrlDesktop(loadable.board); 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 { } else {
Logger.e(TAG, "Loadable in ReplyFragment was null"); Logger.e(TAG, "Loadable in ReplyFragment was null");
closeReply(); closeReply();

@ -25,7 +25,6 @@ import android.webkit.JavascriptInterface;
import android.webkit.WebSettings; import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import org.floens.chan.ChanApplication;
import org.floens.chan.utils.IOUtils; import org.floens.chan.utils.IOUtils;
import org.floens.chan.utils.Utils; import org.floens.chan.utils.Utils;
@ -49,7 +48,7 @@ public class CaptchaLayout extends WebView {
} }
@SuppressLint("SetJavaScriptEnabled") @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.callback = callback;
this.baseUrl = baseUrl; this.baseUrl = baseUrl;
this.siteKey = siteKey; this.siteKey = siteKey;
@ -57,7 +56,7 @@ public class CaptchaLayout extends WebView {
WebSettings settings = getSettings(); WebSettings settings = getSettings();
settings.setJavaScriptEnabled(true); settings.setJavaScriptEnabled(true);
settings.setUserAgentString(ChanApplication.getReplyManager().getUserAgent()); settings.setUserAgentString(userAgent);
addJavascriptInterface(new CaptchaInterface(this), "CaptchaCallback"); addJavascriptInterface(new CaptchaInterface(this), "CaptchaCallback");
} }

Loading…
Cancel
Save