aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java')
-rw-r--r--main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java58
1 files changed, 28 insertions, 30 deletions
diff --git a/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java b/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java
index eb56f0b..5efea02 100644
--- a/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java
@@ -40,6 +40,8 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
private static final int STATUS_ERROR = 0;
private static final int STATUS_SUCCESS = 1;
private static final int STATUS_ERROR_EXT_MSG = 2;
+ private static final Pattern PARAMS_PATTERN_1 = Pattern.compile("oauth_token=([\\w_.-]+)");
+ private static final Pattern PARAMS_PATTERN_2 = Pattern.compile("oauth_token_secret=([\\w_.-]+)");
@NonNull private String host = StringUtils.EMPTY;
@NonNull private String pathRequest = StringUtils.EMPTY;
@@ -51,18 +53,16 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
@NonNull private String callback = StringUtils.EMPTY;
private String OAtoken = null;
private String OAtokenSecret = null;
- private final Pattern paramsPattern1 = Pattern.compile("oauth_token=([a-zA-Z0-9\\-\\_.]+)");
- private final Pattern paramsPattern2 = Pattern.compile("oauth_token_secret=([a-zA-Z0-9\\-\\_.]+)");
@InjectView(R.id.start) protected Button startButton;
@InjectView(R.id.auth_1) protected TextView auth_1;
@InjectView(R.id.auth_2) protected TextView auth_2;
private ProgressDialog requestTokenDialog = null;
private ProgressDialog changeTokensDialog = null;
- private Handler requestTokenHandler = new Handler() {
+ private final Handler requestTokenHandler = new Handler() {
@Override
- public void handleMessage(Message msg) {
+ public void handleMessage(final Message msg) {
if (requestTokenDialog != null && requestTokenDialog.isShowing()) {
requestTokenDialog.dismiss();
}
@@ -85,10 +85,10 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
};
- private Handler changeTokensHandler = new Handler() {
+ private final Handler changeTokensHandler = new Handler() {
@Override
- public void handleMessage(Message msg) {
+ public void handleMessage(final Message msg) {
if (changeTokensDialog != null && changeTokensDialog.isShowing()) {
changeTokensDialog.dismiss();
}
@@ -105,10 +105,10 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
};
@Override
- public void onCreate(Bundle savedInstanceState) {
+ public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState, R.layout.authorization_activity);
- Bundle extras = getIntent().getExtras();
+ final Bundle extras = getIntent().getExtras();
if (extras != null) {
host = BundleUtils.getString(extras, Intents.EXTRA_OAUTH_HOST, host);
pathRequest = BundleUtils.getString(extras, Intents.EXTRA_OAUTH_PATH_REQUEST, pathRequest);
@@ -125,7 +125,7 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
auth_1.setText(getAuthExplainShort());
auth_2.setText(getAuthExplainLong());
- ImmutablePair<String, String> tempToken = getTempTokens();
+ final ImmutablePair<String, String> tempToken = getTempTokens();
OAtoken = tempToken.left;
OAtokenSecret = tempToken.right;
@@ -167,7 +167,7 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
final Parameters params = new Parameters();
params.put("oauth_callback", callback);
final String method = "GET";
- OAuth.signOAuth(host, pathRequest, method, https, params, null, null, consumerKey, consumerSecret);
+ OAuth.signOAuth(host, pathRequest, method, https, params, new OAuthTokens(null, null), consumerKey, consumerSecret);
final HttpResponse response = Network.getRequest(getUrlPrefix() + host + pathRequest, params);
if (Network.isSuccess(response)) {
@@ -176,11 +176,11 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
int status = STATUS_ERROR;
if (StringUtils.isNotBlank(line)) {
assert line != null;
- final MatcherWrapper paramsMatcher1 = new MatcherWrapper(paramsPattern1, line);
+ final MatcherWrapper paramsMatcher1 = new MatcherWrapper(PARAMS_PATTERN_1, line);
if (paramsMatcher1.find()) {
OAtoken = paramsMatcher1.group(1);
}
- final MatcherWrapper paramsMatcher2 = new MatcherWrapper(paramsPattern2, line);
+ final MatcherWrapper paramsMatcher2 = new MatcherWrapper(PARAMS_PATTERN_2, line);
if (paramsMatcher2.find()) {
OAtokenSecret = paramsMatcher2.group(1);
}
@@ -193,9 +193,7 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
final String encodedParams = EntityUtils.toString(new UrlEncodedFormEntity(paramsBrowser));
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getUrlPrefix() + host + pathAuthorize + "?" + encodedParams)));
status = STATUS_SUCCESS;
- } catch (ParseException e) {
- Log.e("OAuthAuthorizationActivity.requestToken", e);
- } catch (IOException e) {
+ } catch (ParseException | IOException e) {
Log.e("OAuthAuthorizationActivity.requestToken", e);
}
}
@@ -221,17 +219,17 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
final Parameters params = new Parameters("oauth_verifier", verifier);
final String method = "POST";
- OAuth.signOAuth(host, pathAccess, method, https, params, OAtoken, OAtokenSecret, consumerKey, consumerSecret);
+ OAuth.signOAuth(host, pathAccess, method, https, params, new OAuthTokens(OAtoken, OAtokenSecret), consumerKey, consumerSecret);
final String line = StringUtils.defaultString(Network.getResponseData(Network.postRequest(getUrlPrefix() + host + pathAccess, params)));
OAtoken = "";
OAtokenSecret = "";
- final MatcherWrapper paramsMatcher1 = new MatcherWrapper(paramsPattern1, line);
+ final MatcherWrapper paramsMatcher1 = new MatcherWrapper(PARAMS_PATTERN_1, line);
if (paramsMatcher1.find()) {
OAtoken = paramsMatcher1.group(1);
}
- final MatcherWrapper paramsMatcher2 = new MatcherWrapper(paramsPattern2, line);
+ final MatcherWrapper paramsMatcher2 = new MatcherWrapper(PARAMS_PATTERN_2, line);
if (paramsMatcher2.find() && paramsMatcher2.groupCount() > 0) {
OAtokenSecret = paramsMatcher2.group(1);
}
@@ -244,7 +242,7 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
setTokens(OAtoken, OAtokenSecret, true);
status = AUTHENTICATED;
}
- } catch (Exception e) {
+ } catch (final Exception e) {
Log.e("OAuthAuthorizationActivity.changeToken", e);
}
@@ -258,7 +256,7 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
private class StartListener implements View.OnClickListener {
@Override
- public void onClick(View arg0) {
+ public void onClick(final View arg0) {
if (requestTokenDialog == null) {
requestTokenDialog = new ProgressDialog(OAuthAuthorizationActivity.this);
requestTokenDialog.setCancelable(false);
@@ -333,7 +331,7 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
* @return String with a more detailed error message (user-facing, localized), can be empty
*/
@SuppressWarnings("static-method")
- protected String getExtendedErrorMsg(HttpResponse response) {
+ protected String getExtendedErrorMsg(final HttpResponse response) {
return StringUtils.EMPTY;
}
@@ -363,14 +361,14 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
@NonNull public final String consumerSecret;
@NonNull public final String callback;
- public OAuthParameters(@NonNull String host,
- @NonNull String pathRequest,
- @NonNull String pathAuthorize,
- @NonNull String pathAccess,
- boolean https,
- @NonNull String consumerKey,
- @NonNull String consumerSecret,
- @NonNull String callback) {
+ public OAuthParameters(@NonNull final String host,
+ @NonNull final String pathRequest,
+ @NonNull final String pathAuthorize,
+ @NonNull final String pathAccess,
+ final boolean https,
+ @NonNull final String consumerKey,
+ @NonNull final String consumerSecret,
+ @NonNull final String callback) {
this.host = host;
this.pathRequest = pathRequest;
this.pathAuthorize = pathAuthorize;
@@ -381,7 +379,7 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
this.callback = callback;
}
- public void setOAuthExtras(Intent intent) {
+ public void setOAuthExtras(final Intent intent) {
if (intent != null) {
intent.putExtra(Intents.EXTRA_OAUTH_HOST, host);
intent.putExtra(Intents.EXTRA_OAUTH_PATH_REQUEST, pathRequest);
generated by cgit v1.1 at 2025-11-10 14:29:47 +0000