2 files changed, 11 insertions, 10 deletions

diff --git a/main/src/cgeo/geocaching/twitter/Twitter.java b/main/src/cgeo/geocaching/twitter/Twitter.java
index c630cec..c86c633 100644
--- a/main/src/cgeo/geocaching/twitter/Twitter.java
+++ b/main/src/cgeo/geocaching/twitter/Twitter.java
@@ -2,6 +2,7 @@ package cgeo.geocaching.twitter;
 
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.cgCache;
+import cgeo.geocaching.cgData;
 import cgeo.geocaching.cgTrackable;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.LoadFlags;
@@ -55,7 +56,7 @@ public final class Twitter {
     }
 
     public static void postTweetCache(String geocode) {
-        final cgCache cache = cgeoapplication.getInstance().loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
+        final cgCache cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
         String status;
         final String url = cache.getUrl();
         if (url.length() >= 100) {
@@ -76,7 +77,7 @@ public final class Twitter {
     }
 
     public static void postTweetTrackable(String geocode) {
-        final cgTrackable trackable = cgeoapplication.getInstance().getTrackableByGeocode(geocode);
+        final cgTrackable trackable = cgData.loadTrackable(geocode);
         String name = trackable.getName();
         if (name.length() > 82) {
             name = name.substring(0, 81) + '…';
diff --git a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
index 22ee0fb..96edebf 100644
--- a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
@@ -130,14 +130,13 @@ 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));
 
@@ -157,6 +156,7 @@ 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)));
@@ -174,15 +174,15 @@ public class TwitterAuthorizationActivity extends AbstractActivity {
     }
 
     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)));
 
@@ -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;
             }