aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java')
-rw-r--r--main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java48
1 files changed, 24 insertions, 24 deletions
diff --git a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
index 22ee0fb..3d9f283 100644
--- a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
@@ -7,6 +7,7 @@ import cgeo.geocaching.network.Network;
import cgeo.geocaching.network.OAuth;
import cgeo.geocaching.network.Parameters;
import cgeo.geocaching.utils.Log;
+import cgeo.geocaching.utils.MatcherWrapper;
import ch.boye.httpclientandroidlib.client.entity.UrlEncodedFormEntity;
import ch.boye.httpclientandroidlib.util.EntityUtils;
@@ -24,7 +25,6 @@ import android.view.View;
import android.widget.Button;
import android.widget.EditText;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class TwitterAuthorizationActivity extends AbstractActivity {
@@ -45,7 +45,7 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
requestTokenDialog.dismiss();
}
- startButton.setOnClickListener(new startListener());
+ startButton.setOnClickListener(new StartListener());
startButton.setEnabled(true);
if (msg.what == 1) {
@@ -53,7 +53,7 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
pinEntry.setVisibility(View.VISIBLE);
pinEntryButton.setVisibility(View.VISIBLE);
- pinEntryButton.setOnClickListener(new confirmPINListener());
+ pinEntryButton.setOnClickListener(new ConfirmPINListener());
} else {
showToast(res.getString(R.string.err_auth_initialize));
startButton.setText(res.getString(R.string.auth_start));
@@ -68,7 +68,7 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
changeTokensDialog.dismiss();
}
- pinEntryButton.setOnClickListener(new confirmPINListener());
+ pinEntryButton.setOnClickListener(new ConfirmPINListener());
pinEntryButton.setEnabled(true);
if (msg.what == 1) {
@@ -92,7 +92,7 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
super.onCreate(savedInstanceState);
setTheme();
- setContentView(R.layout.auth);
+ setContentView(R.layout.twitter_authorization_activity);
setTitle(res.getString(R.string.auth_twitter));
init();
@@ -114,7 +114,7 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
OAtokenSecret = tempToken.right;
startButton.setEnabled(true);
- startButton.setOnClickListener(new startListener());
+ startButton.setOnClickListener(new StartListener());
if (StringUtils.isBlank(OAtoken) && StringUtils.isBlank(OAtokenSecret)) {
// start authorization process
@@ -125,29 +125,28 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
pinEntry.setVisibility(View.VISIBLE);
pinEntryButton.setVisibility(View.VISIBLE);
- pinEntryButton.setOnClickListener(new confirmPINListener());
+ pinEntryButton.setOnClickListener(new ConfirmPINListener());
}
}
private void requestToken() {
- final String host = "api.twitter.com";
- final String pathRequest = "/oauth/request_token";
- final String pathAuthorize = "/oauth/authorize";
- final String method = "GET";
int status = 0;
try {
final Parameters params = new Parameters();
+ final String method = "GET";
+ final String pathRequest = "/oauth/request_token";
+ final String host = "api.twitter.com";
OAuth.signOAuth(host, pathRequest, method, true, params, null, null);
final String line = Network.getResponseData(Network.getRequest("https://" + host + pathRequest, params));
if (StringUtils.isNotBlank(line)) {
- final Matcher paramsMatcher1 = paramsPattern1.matcher(line);
+ final MatcherWrapper paramsMatcher1 = new MatcherWrapper(paramsPattern1, line);
if (paramsMatcher1.find()) {
OAtoken = paramsMatcher1.group(1);
}
- final Matcher paramsMatcher2 = paramsPattern2.matcher(line);
+ final MatcherWrapper paramsMatcher2 = new MatcherWrapper(paramsPattern2, line);
if (paramsMatcher2.find()) {
OAtokenSecret = paramsMatcher2.group(1);
}
@@ -157,43 +156,44 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
try {
final Parameters paramsBrowser = new Parameters();
paramsBrowser.put("oauth_callback", "oob");
+ final String pathAuthorize = "/oauth/authorize";
OAuth.signOAuth(host, pathAuthorize, "GET", true, paramsBrowser, OAtoken, OAtokenSecret);
final String encodedParams = EntityUtils.toString(new UrlEncodedFormEntity(paramsBrowser));
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://" + host + pathAuthorize + "?" + encodedParams)));
status = 1;
} catch (Exception e) {
- Log.e("TwitterAuthorizationActivity.requestToken(2): " + e.toString());
+ Log.e("TwitterAuthorizationActivity.requestToken(2)", e);
}
}
}
} catch (Exception e) {
- Log.e("TwitterAuthorizationActivity.requestToken(1): " + e.toString());
+ Log.e("TwitterAuthorizationActivity.requestToken(1)", e);
}
requestTokenHandler.sendEmptyMessage(status);
}
private void changeToken() {
- final String host = "api.twitter.com";
- final String path = "/oauth/access_token";
- final String method = "POST";
int status = 0;
try {
final Parameters params = new Parameters("oauth_verifier", pinEntry.getText().toString());
+ final String method = "POST";
+ final String path = "/oauth/access_token";
+ final String host = "api.twitter.com";
OAuth.signOAuth(host, path, method, true, params, OAtoken, OAtokenSecret);
final String line = StringUtils.defaultString(Network.getResponseData(Network.postRequest("https://" + host + path, params)));
OAtoken = "";
OAtokenSecret = "";
- final Matcher paramsMatcher1 = paramsPattern1.matcher(line);
+ final MatcherWrapper paramsMatcher1 = new MatcherWrapper(paramsPattern1, line);
if (paramsMatcher1.find()) {
OAtoken = paramsMatcher1.group(1);
}
- final Matcher paramsMatcher2 = paramsPattern2.matcher(line);
+ final MatcherWrapper paramsMatcher2 = new MatcherWrapper(paramsPattern2, line);
if (paramsMatcher2.find() && paramsMatcher2.groupCount() > 0) {
OAtokenSecret = paramsMatcher2.group(1);
}
@@ -207,13 +207,13 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
status = 1;
}
} catch (Exception e) {
- Log.e("TwitterAuthorizationActivity.changeToken: " + e.toString());
+ Log.e("TwitterAuthorizationActivity.changeToken", e);
}
changeTokensHandler.sendEmptyMessage(status);
}
- private class startListener implements View.OnClickListener {
+ private class StartListener implements View.OnClickListener {
@Override
public void onClick(View arg0) {
@@ -238,11 +238,11 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
}
}
- private class confirmPINListener implements View.OnClickListener {
+ private class ConfirmPINListener implements View.OnClickListener {
@Override
public void onClick(View arg0) {
- if (((EditText) findViewById(R.id.pin)).getText().toString().length() == 0) {
+ if (StringUtils.isEmpty(((EditText) findViewById(R.id.pin)).getText().toString())) {
helpDialog(res.getString(R.string.auth_dialog_pin_title), res.getString(R.string.auth_dialog_pin_message));
return;
}
generated by cgit v1.1 at 2025-11-15 23:40:23 +0000