Merge pull request #446 from yate/recaptcha-v2

implement recaptcha-v2 for easier captchas
grzegorznittner · Apr 2, 2015 · 7f16f0d · 7f16f0d
2 parents 1cb4b85 + 25f3b3d
commit 7f16f0d
Show file tree

Hide file tree

Showing 8 changed files with 705 additions and 961 deletions.
diff --git a/app/.classpath b/app/.classpath
@@ -4,6 +4,7 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="UniversalImageLoader/src"/>
 	<classpathentry kind="src" path="Gallery2/src"/>
+	<classpathentry kind="src" path="assets"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>

diff --git a/app/assets/captcha.html b/app/assets/captcha.html
@@ -0,0 +1,24 @@
+<html>
+<head>
+<script type="text/javascript">
+	var dataCallback = function(res) {
+		CaptchaCallback.captchaEntered(res);
+	};
+
+	var onloadCallback = function() {
+		grecaptcha.render('html_element', {
+			'sitekey' : '6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc',
+			'callback' : dataCallback
+		});
+	};
+</script>
+<script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit"></script>
+</head>
+<body>
+	<form name="myform" action="" method="post">
+		<div style="width: 304px; margin: auto;">
+			<div id="html_element"></div>
+		</div>
+	</form>
+</body>
+</html>
diff --git a/app/res/layout-land/post_reply_layout.xml b/app/res/layout-land/post_reply_layout.xml
diff --git a/app/res/layout/post_reply_layout.xml b/app/res/layout/post_reply_layout.xml
diff --git a/app/res/values/dimens.xml b/app/res/values/dimens.xml
@@ -396,7 +396,7 @@
     <dimen name="PostReplyRecaptcha.marginLeft">20dp</dimen>
     <dimen name="PostReplyRecaptcha.marginRight">20dp</dimen>
     <dimen name="PostReplyRecaptcha.marginBottom">8dp</dimen>
-    <dimen name="PostReplyRecaptcha.layoutHeight">80dp</dimen>
+    <dimen name="PostReplyRecaptcha.layoutHeight">200dp</dimen>
     <dimen name="PostReplyButton.marginLeft">16dp</dimen>
     <dimen name="PostReplyButton.marginRight">16dp</dimen>
     <dimen name="PostReplyButton.marginBottom">8dp</dimen>

diff --git a/app/src/com/chanapps/four/activity/PostReplyActivity.java b/app/src/com/chanapps/four/activity/PostReplyActivity.java
diff --git a/app/src/com/chanapps/four/fragment/ReportPostDialogFragment.java b/app/src/com/chanapps/four/fragment/ReportPostDialogFragment.java
@@ -11,11 +11,17 @@
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.*;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+
 import com.chanapps.four.activity.ChanIdentifiedActivity;
 import com.chanapps.four.activity.R;
-import com.chanapps.four.component.URLFormatComponent;
-import com.chanapps.four.task.LoadCaptchaTask;
 import com.chanapps.four.task.ReportPostTask;
 
 /**
@@ -37,7 +43,6 @@ public class ReportPostDialogFragment extends DialogFragment {
     private ImageButton recaptchaButton;
     private ImageView recaptchaLoading;
     private TextView reportPostBugWarning;
-    private LoadCaptchaTask loadCaptchaTask;
 
     public ReportPostDialogFragment(){}
 
@@ -125,16 +130,16 @@ public void onClick(View v) {
                     Toast.makeText(getActivity(), R.string.post_reply_enter_captcha, Toast.LENGTH_SHORT).show();
                     return;
                 }
-                String recaptchaChallenge = loadCaptchaTask.getRecaptchaChallenge();
+                /*String recaptchaChallenge = loadCaptchaTask.getRecaptchaChallenge();
                 if (recaptchaChallenge == null || recaptchaChallenge.trim().isEmpty()) {
                     Toast.makeText(getActivity(), R.string.post_reply_captcha_error, Toast.LENGTH_SHORT).show();
                     return;
-                }
+                }*/
 
                 closeKeyboard();
                 ReportPostTask reportPostTask = new ReportPostTask(
                         (ChanIdentifiedActivity)getActivity(), boardCode, threadNo, postNos,
-                        reportType, reportTypeIndex, recaptchaChallenge, recaptchaResponse);
+                        reportType, reportTypeIndex, "", recaptchaResponse);
                 ReportingPostDialogFragment dialogFragment = new ReportingPostDialogFragment(reportPostTask);
                 dialogFragment.show(getActivity().getSupportFragmentManager(), ReportingPostDialogFragment.TAG);
                 if (!reportPostTask.isCancelled())
@@ -158,8 +163,8 @@ private void closeKeyboard() {
     public void reloadCaptcha() {
         reportRecaptchaResponse.setText("");
         reportRecaptchaResponse.setHint(R.string.post_reply_recaptcha_hint);
-        loadCaptchaTask = new LoadCaptchaTask(getActivity(), recaptchaButton, recaptchaLoading, false);
-        loadCaptchaTask.execute(URLFormatComponent.getUrl(getActivity(), URLFormatComponent.GOOGLE_CHANU_RECAPTCHA_URL));
+//        loadCaptchaTask = new LoadCaptchaTask(getActivity(), recaptchaButton, recaptchaLoading, false);
+//        loadCaptchaTask.execute(URLFormatComponent.getUrl(getActivity(), URLFormatComponent.GOOGLE_CHANU_RECAPTCHA_URL));
     }
 
 }
diff --git a/app/src/com/chanapps/four/task/LoadCaptchaTask.java b/app/src/com/chanapps/four/task/LoadCaptchaTask.java