1 files changed, 16 insertions, 16 deletions

diff --git a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
index 22ee0fb..3bd6327 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 {
@@ -130,24 +130,23 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
     }
 
     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,7 +207,7 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
                 status = 1;
             }
         } catch (Exception e) {
-            Log.e("TwitterAuthorizationActivity.changeToken: " + e.toString());
+            Log.e("TwitterAuthorizationActivity.changeToken", e);
         }
 
         changeTokensHandler.sendEmptyMessage(status);
@@ -242,7 +242,7 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
 
         @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;
             }