Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/114508
Change subject: Actually create the account
......................................................................
Actually create the account
- Might inconsistently fail on testwiki, see bug 61663
- Will crash if you do captcha wrong. fix in future commit
Change-Id: I6fe8cba510b2ef3b05fe937ea1dcd6090c8e5a06
---
M wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
M wikipedia/AndroidManifest.xml
M wikipedia/res/layout/activity_create_account.xml
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
A wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountResult.java
A wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
D
wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTokenFetchTask.java
A
wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTokenResult.java
M wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
10 files changed, 226 insertions(+), 86 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/08/114508/1
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
b/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
index 39f9925..8daf32a 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/CreateAccountTokenTest.java
@@ -4,11 +4,8 @@
import android.content.*;
import android.test.*;
import android.text.*;
-import org.wikimedia.wikipedia.test.R;
import org.wikipedia.*;
import org.wikipedia.createaccount.*;
-import org.wikipedia.editing.*;
-import org.wikipedia.login.*;
import java.util.concurrent.*;
@@ -30,9 +27,9 @@
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- new
CreateAccountTokenFetchTask(getInstrumentation().getTargetContext(), username,
password) {
+ new CreateAccountTask(getInstrumentation().getTargetContext(),
username, password) {
@Override
- public void
onFinish(CreateAccountTokenFetchTask.CreateAccountTokenResult result) {
+ public void onFinish(CreateAccountTokenResult result) {
assertNotNull(result);
assertNotNull(result.getCaptchaResult());
assertFalse(TextUtils.isEmpty(result.getToken()));
diff --git a/wikipedia/AndroidManifest.xml b/wikipedia/AndroidManifest.xml
index 973aa8e..a6175b5 100644
--- a/wikipedia/AndroidManifest.xml
+++ b/wikipedia/AndroidManifest.xml
@@ -63,7 +63,10 @@
android:label="@string/login_activity_title"
android:windowSoftInputMode="stateVisible|adjustResize"
/>
- <activity android:name=".createaccount.CreateAccountActivity"
android:label="@string/create_account_activity_title"/>
+ <activity android:name=".createaccount.CreateAccountActivity"
+ android:label="@string/create_account_activity_title"
+ android:windowSoftInputMode="stateVisible|adjustResize"
+ />
<provider
android:authorities="org.wikipedia.history"
diff --git a/wikipedia/res/layout/activity_create_account.xml
b/wikipedia/res/layout/activity_create_account.xml
index 331053b..9b1af8f 100644
--- a/wikipedia/res/layout/activity_create_account.xml
+++ b/wikipedia/res/layout/activity_create_account.xml
@@ -1,24 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:padding="16dp"
>
- <org.wikipedia.styledviews.StylizedEditText
- android:id="@+id/create_account_username"
+ <LinearLayout
+ android:id="@+id/create_account_primary_container"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/create_account_username_hint"
- android:singleLine="true"
- />
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="16dp"
+ >
+ <org.wikipedia.styledviews.StylizedEditText
+ android:id="@+id/create_account_username"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/create_account_username_hint"
+ android:singleLine="true"
+ />
- <org.wikipedia.styledviews.StylizedEditText
- android:id="@+id/create_account_password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/create_account_password_hint"
- android:singleLine="true"
- />
-</LinearLayout>
\ No newline at end of file
+ <org.wikipedia.styledviews.StylizedEditText
+ android:id="@+id/create_account_password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/create_account_password_hint"
+ android:singleLine="true"
+ />
+
+ <org.wikipedia.styledviews.StylizedEditText
+ android:id="@+id/create_account_email"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/create_account_email_hint"
+ android:singleLine="true"
+ />
+ </LinearLayout>
+
+ <include layout="@layout/group_captcha" />
+</FrameLayout>
\ No newline at end of file
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index 10142eb..0e3adaf 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -86,4 +86,6 @@
<string name="login_create_account_link">Create account</string>
<string name="create_account_activity_title">Create an account</string>
<string name="edit_section_activity_title">Edit Section</string>
+ <string name="dialog_create_account_checking_progress">Verifying</string>
+ <string name="create_account_email_hint">Email (Optional)</string>
</resources>
diff --git
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
index eb04e1f..639c6e7 100644
---
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
+++
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
@@ -1,23 +1,102 @@
package org.wikipedia.createaccount;
-import android.app.Activity;
+import android.app.*;
import android.os.Bundle;
import android.support.v7.app.*;
import android.view.*;
+import android.widget.*;
+import org.mediawiki.api.json.*;
import org.wikipedia.*;
+import org.wikipedia.editing.*;
public class CreateAccountActivity extends ActionBarActivity {
+ private EditText usernameEdit;
+ private EditText passwordEdit;
+ private EditText emailEdit;
+ private View primaryContainer;
+
+ private WikipediaApp app;
+
+ private ProgressDialog progressDialog;
+
+ private CaptchaHandler captchaHandler;
+
+ private NonEmptyValidator nonEmptyValidator;
+
+ private CreateAccountResult createAccountResult;
+
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_create_account);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ app = (WikipediaApp) getApplicationContext();
+
+ usernameEdit = (EditText) findViewById(R.id.create_account_username);
+ passwordEdit = (EditText) findViewById(R.id.create_account_password);
+ emailEdit = (EditText) findViewById(R.id.create_account_email);
+ primaryContainer = findViewById(R.id.create_account_primary_container);
+
+ progressDialog = new ProgressDialog(this);
+ progressDialog.setIndeterminate(true);
+
progressDialog.setMessage(getString(R.string.dialog_create_account_checking_progress));
+
+ captchaHandler = new CaptchaHandler(this, app.getPrimarySite(),
progressDialog, primaryContainer, R.string.create_account_activity_title);
+
+ nonEmptyValidator = new NonEmptyValidator(new
NonEmptyValidator.ValidationChangedCallback() {
+ @Override
+ public void onValidationChanged(boolean isValid) {
+ supportInvalidateOptionsMenu();
+ }
+ }, usernameEdit, passwordEdit);
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_create_account, menu);
+
menu.findItem(R.id.menu_create_account).setEnabled(nonEmptyValidator.isValid());
return true;
+ }
+
+ public void doCreateAccount() {
+ String token = null, email = null;
+ if (createAccountResult != null && createAccountResult instanceof
CreateAccountTokenResult) {
+ token = ((CreateAccountTokenResult)
createAccountResult).getToken();
+ }
+ if (emailEdit.getText().length() != 0) {
+ email = emailEdit.getText().toString();
+ }
+ new CreateAccountTask(this, usernameEdit.getText().toString(),
passwordEdit.getText().toString(), email, token) {
+ @Override
+ public void onBeforeExecute() {
+ progressDialog.show();
+ }
+
+ @Override
+ public RequestBuilder buildRequest(Api api) {
+ if (createAccountResult != null && createAccountResult
instanceof CreateAccountTokenResult) {
+ return
captchaHandler.populateBuilder(super.buildRequest(api));
+ }
+ return super.buildRequest(api);
+ }
+
+ @Override
+ public void onFinish(final CreateAccountResult result) {
+ if (result instanceof CreateAccountTokenResult) {
+
captchaHandler.handleCaptcha(((CreateAccountTokenResult)result).getCaptchaResult());
+ } else {
+ // Returns lowercase 'success', unlike every other API.
GRR man, GRR
+ // Replace wen
https://bugzilla.wikimedia.org/show_bug.cgi?id=61663 is fixed?
+ if (result.getResult().equals("success")) {
+ finish();
+ } else {
+ throw new RuntimeException("Errored with " +
result.getResult());
+ }
+ }
+ createAccountResult = result;
+ }
+ }.execute();
}
@Override
@@ -26,6 +105,9 @@
case android.R.id.home:
finish();
return true;
+ case R.id.menu_create_account:
+ doCreateAccount();
+ return true;
}
return super.onOptionsItemSelected(item);
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountResult.java
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountResult.java
new file mode 100644
index 0000000..f9bed7d
--- /dev/null
+++
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountResult.java
@@ -0,0 +1,13 @@
+package org.wikipedia.createaccount;
+
+public class CreateAccountResult {
+ private final String result;
+
+ public CreateAccountResult(String result) {
+ this.result = result;
+ }
+
+ public String getResult() {
+ return result;
+ }
+}
diff --git
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
new file mode 100644
index 0000000..e786f0f
--- /dev/null
+++ b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTask.java
@@ -0,0 +1,66 @@
+package org.wikipedia.createaccount;
+
+import android.content.*;
+import android.util.*;
+import org.json.*;
+import org.mediawiki.api.json.*;
+import org.wikipedia.*;
+import org.wikipedia.concurrency.*;
+import org.wikipedia.editing.*;
+import org.wikipedia.interlanguage.*;
+
+public class CreateAccountTask extends ApiTask<CreateAccountResult> {
+
+
+ private final String username;
+ private final String password;
+ private final String email;
+ private final String token;
+ public CreateAccountTask(Context context, String username, String
password, String email, String token) {
+ super(
+
ExecutorService.getSingleton().getExecutor(LangLinksFetchTask.class, 1),
+ ((WikipediaApp)context.getApplicationContext()).getAPIForSite(
+
((WikipediaApp)context.getApplicationContext()).getPrimarySite()
+ )
+ );
+ this.username = username;
+ this.password = password;
+ this.email = email;
+ this.token = token;
+ }
+ @Override
+ public RequestBuilder buildRequest(Api api) {
+ RequestBuilder builder = api.action("createaccount")
+ .param("name", username)
+ .param("password", password);
+ if (email != null) {
+ builder.param("email", email);
+ }
+ if (token != null) {
+ builder.param("token", token);
+ }
+ return builder;
+ }
+
+ @Override
+ protected ApiResult makeRequest(RequestBuilder builder) {
+ return builder.post();
+ }
+
+ @Override
+ public CreateAccountResult processResult(ApiResult response) throws
Throwable {
+ Log.d("Wikipedia", response.asObject().toString(4));
+ if (response.asObject().has("error")) {
+ return new
CreateAccountResult(response.asObject().optJSONObject("error").optString("code"));
+ }
+ JSONObject ca = response.asObject().optJSONObject("createaccount");
+ String result = ca.optString("result");
+ if (result.equals("needtoken")) {
+ String token = ca.optString("token");
+ CaptchaResult captchaResult = new
CaptchaResult(ca.optJSONObject("captcha").optString("id"));
+ return new CreateAccountTokenResult(captchaResult, token);
+ } else {
+ return new CreateAccountResult(result);
+ }
+ }
+}
diff --git
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTokenFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTokenFetchTask.java
deleted file mode 100644
index 865baad..0000000
---
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTokenFetchTask.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.wikipedia.createaccount;
-
-import android.content.*;
-import org.json.*;
-import org.mediawiki.api.json.*;
-import org.wikipedia.*;
-import org.wikipedia.concurrency.*;
-import org.wikipedia.editing.*;
-import org.wikipedia.interlanguage.*;
-
-public class CreateAccountTokenFetchTask extends
ApiTask<CreateAccountTokenFetchTask.CreateAccountTokenResult> {
- public static class CreateAccountTokenResult{
- private final CaptchaResult captchaResult;
- private final String token;
-
- public CreateAccountTokenResult(CaptchaResult captchaResult, String
token) {
- this.captchaResult = captchaResult;
- this.token = token;
- }
-
- public CaptchaResult getCaptchaResult() {
- return captchaResult;
- }
-
- public String getToken() {
- return token;
- }
- }
-
-
- private final String username;
- private final String password;
- public CreateAccountTokenFetchTask(Context context, String username,
String password) {
- super(
-
ExecutorService.getSingleton().getExecutor(LangLinksFetchTask.class, 1),
- ((WikipediaApp)context.getApplicationContext()).getAPIForSite(
-
((WikipediaApp)context.getApplicationContext()).getPrimarySite()
- )
- );
- this.username = username;
- this.password = password;
- }
- @Override
- public RequestBuilder buildRequest(Api api) {
- return api.action("createaccount")
- .param("name", username)
- .param("password", password);
- }
-
- @Override
- protected ApiResult makeRequest(RequestBuilder builder) {
- return builder.post();
- }
-
- @Override
- public CreateAccountTokenResult processResult(ApiResult result) throws
Throwable {
- JSONObject ca = result.asObject().optJSONObject("createaccount");
- String token = ca.optString("token");
- CaptchaResult captchaResult = new
CaptchaResult(ca.optJSONObject("captcha").optString("id"));
- return new CreateAccountTokenResult(captchaResult, token);
- }
-}
diff --git
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTokenResult.java
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTokenResult.java
new file mode 100644
index 0000000..6f0062e
--- /dev/null
+++
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountTokenResult.java
@@ -0,0 +1,22 @@
+package org.wikipedia.createaccount;
+
+import org.wikipedia.editing.*;
+
+public class CreateAccountTokenResult extends CreateAccountResult {
+ private final CaptchaResult captchaResult;
+ private final String token;
+
+ public CreateAccountTokenResult(CaptchaResult captchaResult, String token)
{
+ super("needtoken");
+ this.captchaResult = captchaResult;
+ this.token = token;
+ }
+
+ public CaptchaResult getCaptchaResult() {
+ return captchaResult;
+ }
+
+ public String getToken() {
+ return token;
+ }
+}
diff --git a/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
b/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
index 509f6b7..59477e1 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java
@@ -3,6 +3,7 @@
import android.app.*;
import android.net.*;
import android.os.*;
+import android.util.*;
import android.view.*;
import android.widget.*;
import com.squareup.picasso.*;
--
To view, visit https://gerrit.wikimedia.org/r/114508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fe8cba510b2ef3b05fe937ea1dcd6090c8e5a06
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits