refactoring: move twitter stuff into separate package

4 files changed, 20 insertions, 10 deletions

diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 7221549..60efcf1 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -18,6 +18,7 @@ import cgeo.geocaching.geopoint.GeopointFormatter.Format;
 import cgeo.geocaching.geopoint.IConversion;
 import cgeo.geocaching.geopoint.Viewport;
 import cgeo.geocaching.network.HtmlImage;
+import cgeo.geocaching.twitter.Twitter;
 import cgeo.geocaching.utils.BaseUtils;
 import cgeo.geocaching.utils.CancellableHandler;
 
diff --git a/main/src/cgeo/geocaching/cgeoinit.java b/main/src/cgeo/geocaching/cgeoinit.java
index ec6aedf..2c2d911 100644
--- a/main/src/cgeo/geocaching/cgeoinit.java
+++ b/main/src/cgeo/geocaching/cgeoinit.java
@@ -6,6 +6,7 @@ import cgeo.geocaching.compatibility.Compatibility;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.maps.MapProviderFactory;
+import cgeo.geocaching.twitter.TwitterAuthorizationActivity;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpResponse;
@@ -264,7 +265,7 @@ public class cgeoinit extends AbstractActivity {
         authorizeTwitter.setOnClickListener(new View.OnClickListener() {
 
             public void onClick(View arg0) {
-                Intent authIntent = new Intent(cgeoinit.this, cgeoauth.class);
+                Intent authIntent = new Intent(cgeoinit.this, TwitterAuthorizationActivity.class);
                 startActivity(authIntent);
             }
         });
@@ -277,7 +278,7 @@ public class cgeoinit extends AbstractActivity {
             public void onClick(View v) {
                 Settings.setUseTwitter(twitterButton.isChecked());
                 if (Settings.isUseTwitter() && !Settings.isTwitterLoginValid()) {
-                    Intent authIntent = new Intent(cgeoinit.this, cgeoauth.class);
+                    Intent authIntent = new Intent(cgeoinit.this, TwitterAuthorizationActivity.class);
                     startActivity(authIntent);
                 }
 
diff --git a/main/src/cgeo/geocaching/Twitter.java b/main/src/cgeo/geocaching/twitter/Twitter.java
index 6d5ec29..2f653f5 100644
--- a/main/src/cgeo/geocaching/Twitter.java
+++ b/main/src/cgeo/geocaching/twitter/Twitter.java
@@ -1,5 +1,9 @@
-package cgeo.geocaching;
+package cgeo.geocaching.twitter;
 
+import cgeo.geocaching.Parameters;
+import cgeo.geocaching.Settings;
+import cgeo.geocaching.cgBase;
+import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.GeopointFormatter.Format;
 import cgeo.geocaching.network.OAuth;
diff --git a/main/src/cgeo/geocaching/cgeoauth.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
index 885bcd6..9066dae 100644
--- a/main/src/cgeo/geocaching/cgeoauth.java
+++ b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java
@@ -1,5 +1,9 @@
-package cgeo.geocaching;
+package cgeo.geocaching.twitter;
 
+import cgeo.geocaching.Parameters;
+import cgeo.geocaching.R;
+import cgeo.geocaching.Settings;
+import cgeo.geocaching.cgBase;
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.network.OAuth;
 
@@ -22,7 +26,7 @@ import android.widget.EditText;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class cgeoauth extends AbstractActivity {
+public class TwitterAuthorizationActivity extends AbstractActivity {
     private String OAtoken = null;
     private String OAtokenSecret = null;
     private final Pattern paramsPattern1 = Pattern.compile("oauth_token=([a-zA-Z0-9\\-\\_.]+)");
@@ -163,12 +167,12 @@ public class cgeoauth extends AbstractActivity {
                         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://" + host + pathAuthorize + "?" + encodedParams)));
                         status = 1;
                     } catch (Exception e) {
-                        Log.e(Settings.tag, "cgeoauth.requestToken(2): " + e.toString());
+                        Log.e(Settings.tag, "TwitterAuthorizationActivity.requestToken(2): " + e.toString());
                     }
                 }
             }
         } catch (Exception e) {
-            Log.e(Settings.tag, "cgeoauth.requestToken(1): " + e.toString());
+            Log.e(Settings.tag, "TwitterAuthorizationActivity.requestToken(1): " + e.toString());
         }
 
         requestTokenHandler.sendEmptyMessage(status);
@@ -220,7 +224,7 @@ public class cgeoauth extends AbstractActivity {
                 status = 1;
             }
         } catch (Exception e) {
-            Log.e(Settings.tag, "cgeoauth.changeToken: " + e.toString());
+            Log.e(Settings.tag, "TwitterAuthorizationActivity.changeToken: " + e.toString());
         }
 
         changeTokensHandler.sendEmptyMessage(status);
@@ -230,7 +234,7 @@ public class cgeoauth extends AbstractActivity {
 
         public void onClick(View arg0) {
             if (requestTokenDialog == null) {
-                requestTokenDialog = new ProgressDialog(cgeoauth.this);
+                requestTokenDialog = new ProgressDialog(TwitterAuthorizationActivity.this);
                 requestTokenDialog.setCancelable(false);
                 requestTokenDialog.setMessage(res.getString(R.string.auth_dialog_wait));
             }
@@ -263,7 +267,7 @@ public class cgeoauth extends AbstractActivity {
             }
 
             if (changeTokensDialog == null) {
-                changeTokensDialog = new ProgressDialog(cgeoauth.this);
+                changeTokensDialog = new ProgressDialog(TwitterAuthorizationActivity.this);
                 changeTokensDialog.setCancelable(false);
                 changeTokensDialog.setMessage(res.getString(R.string.auth_dialog_wait));
             }