Merge branch 'master' into dev

Conflicts:
	Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java
	Clover/app/src/main/java/org/floens/chan/ui/layout/CaptchaLayout.java

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.
 

Clover/app/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion 14
         targetSdkVersion 22
 
-        versionName "v1.2.10"
+        versionName "v1.2.11"
-        versionCode 49
+        versionCode 50
     }
 
     compileOptions {

Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java

@@ -332,7 +332,7 @@ public class ReplyPresenter implements ReplyManager.FileListener, ReplyManager.H
                         String baseUrl = loadable.isThreadMode() ?
                                 ChanUrls.getThreadUrlDesktop(loadable.board, loadable.no) :
                                 ChanUrls.getBoardUrlDesktop(loadable.board);
-                        callback.initCaptcha(baseUrl, ChanUrls.getCaptchaSiteKey(), Chan.getInstance().getUserAgent(), this);
+                        callback.initCaptcha(baseUrl, ChanUrls.getCaptchaSiteKey(), this);
                     }
                     break;
             }
@@ -392,7 +392,7 @@ public class ReplyPresenter implements ReplyManager.FileListener, ReplyManager.H
 
         void setPage(Page page, boolean animate);
 
-        void initCaptcha(String baseUrl, String siteKey, String userAgent, CaptchaLayout.CaptchaCallback callback);
+        void initCaptcha(String baseUrl, String siteKey, CaptchaLayout.CaptchaCallback callback);
 
         void resetCaptcha();
 

Clover/app/src/main/java/org/floens/chan/ui/layout/CaptchaLayout.java

@@ -54,7 +54,7 @@ public class CaptchaLayout extends WebView {
     }
 
     @SuppressLint({"SetJavaScriptEnabled", "AddJavascriptInterface"})
-    public void initCaptcha(String baseUrl, String siteKey, boolean lightTheme, String userAgent, CaptchaCallback callback) {
+    public void initCaptcha(String baseUrl, String siteKey, boolean lightTheme, CaptchaCallback callback) {
         this.callback = callback;
         this.baseUrl = baseUrl;
         this.siteKey = siteKey;
@@ -62,7 +62,6 @@ public class CaptchaLayout extends WebView {
 
         WebSettings settings = getSettings();
         settings.setJavaScriptEnabled(true);
-        settings.setUserAgentString(userAgent);
 
         setWebChromeClient(new WebChromeClient() {
             @Override

Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java

@@ -165,7 +165,7 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima
             return new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
         } else {
             // Captcha and the loadbar
-            return new LayoutParams(LayoutParams.MATCH_PARENT, dp(200));
+            return new LayoutParams(LayoutParams.MATCH_PARENT, dp(250));
         }
     }
 
@@ -209,13 +209,15 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima
                 }
 
                 setView(captchaLayout);
+
+                AndroidUtils.hideKeyboard(this);
                 break;
         }
     }
 
     @Override
-    public void initCaptcha(String baseUrl, String siteKey, String userAgent, CaptchaLayout.CaptchaCallback callback) {
+    public void initCaptcha(String baseUrl, String siteKey, CaptchaLayout.CaptchaCallback callback) {
-        captchaLayout.initCaptcha(baseUrl, siteKey, ThemeHelper.getInstance().getTheme().isLightTheme, userAgent, callback);
+        captchaLayout.initCaptcha(baseUrl, siteKey, ThemeHelper.getInstance().getTheme().isLightTheme, callback);
         captchaLayout.load();
     }