refactoring: first part of removing cgBase

* extract network stuff (non GC related)
* extract GC login stuff
* move UI related pieces to activities
* to do: move parsing and searching to better places, remove cgBase
completely afterwards

6 files changed, 15 insertions, 14 deletions

diff --git a/tests/src/cgeo/geocaching/cgBaseTest.java b/tests/src/cgeo/geocaching/cgBaseTest.java
index e6aa862..c89e41c 100644
--- a/tests/src/cgeo/geocaching/cgBaseTest.java
+++ b/tests/src/cgeo/geocaching/cgBaseTest.java
@@ -31,7 +31,7 @@ public class cgBaseTest extends AndroidTestCase {
     }
 
     public static void testElevation() {
-        assertEquals(125.663703918457, cgBase.getElevation(new Geopoint(48.0, 2.0)), 0.1);
+        assertEquals(125.663703918457, (new Geopoint(48.0, 2.0)).getElevation(), 0.1);
     }
 
     public static void testCompareCaches(ICache expected, cgCache actual) {
diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index 4062955..aaa0a43 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -8,6 +8,7 @@ import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
+import cgeo.geocaching.network.Login;
 import cgeo.geocaching.test.RegExPerformanceTest;
 import cgeo.geocaching.test.mock.GC1ZXX2;
 import cgeo.geocaching.test.mock.GC2CJPF;
@@ -55,7 +56,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
     @SuppressWarnings("static-method")
     @SmallTest
     public void testPreconditions() {
-        assertEquals(StatusCode.NO_ERROR, cgBase.login());
+        assertEquals(StatusCode.NO_ERROR, Login.login());
     }
 
     /**
@@ -155,7 +156,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
             // restore user and password
             Settings.setLogin(login.left, login.right);
             Settings.setMemberStatus(memberStatus);
-            cgBase.login();
+            Login.login();
         }
     }
 
@@ -181,7 +182,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
             // restore user and password
             Settings.setLogin(login.left, login.right);
             Settings.setMemberStatus(memberStatus);
-            cgBase.login();
+            Login.login();
         }
     }
 
@@ -300,7 +301,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
             // restore user and password
             Settings.setLogin(login.left, login.right);
             Settings.setMemberStatus(memberStatus);
-            cgBase.login();
+            Login.login();
             Settings.setLiveMapStrategy(strategy);
         }
     }
@@ -333,7 +334,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
     private static void deleteCacheFromDBAndLogout(String geocode) {
         cgeoapplication.getInstance().removeCache(geocode, LoadFlags.REMOVE_ALL);
 
-        cgBase.logout();
+        Login.logout();
         // Modify login data to avoid an automatic login again
         Settings.setLogin("c:geo", "c:geo");
         Settings.setMemberStatus("Basic member");
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
index 7f63ef3..3696568 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
@@ -2,12 +2,12 @@ package cgeo.geocaching.connector.gc;
 
 import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.Settings;
-import cgeo.geocaching.cgBase;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
+import cgeo.geocaching.network.Login;
 import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
 import cgeo.geocaching.test.R;
 
@@ -18,7 +18,7 @@ import android.util.Log;
 public class GCConnectorTest extends AbstractResourceInstrumentationTestCase {
 
     public static void testGetViewport() {
-        cgBase.login();
+        Login.login();
 
         String[] tokens = GCBase.getTokens();
 
diff --git a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
index 0f6fe79..bf4d0cf 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
@@ -1,10 +1,10 @@
 package cgeo.geocaching.test.mock;
 
-import cgeo.geocaching.cgBase;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.network.Login;
 
 import java.text.ParseException;
 import java.util.Arrays;
@@ -96,7 +96,7 @@ public class GC1ZXX2 extends MockedCache {
     @Override
     public Date getHiddenDate() {
         try {
-            return cgBase.parseGcCustomDate("16/10/2009", getDateFormat());
+            return Login.parseGcCustomDate("16/10/2009", getDateFormat());
         } catch (ParseException e) {
             // intentionally left blank
         }
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
index f78527f..b97d2bc 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
@@ -1,11 +1,11 @@
 package cgeo.geocaching.test.mock;
 
 import cgeo.geocaching.Settings;
-import cgeo.geocaching.cgBase;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.network.Login;
 
 import java.text.ParseException;
 import java.util.Arrays;
@@ -122,7 +122,7 @@ public class GC2CJPF extends MockedCache {
     @Override
     public Date getHiddenDate() {
         try {
-            return cgBase.parseGcCustomDate("31/07/2010", getDateFormat());
+            return Login.parseGcCustomDate("31/07/2010", getDateFormat());
         } catch (ParseException e) {
             // intentionally left blank
         }
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
index fe860a1..6fdd753 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
@@ -1,12 +1,12 @@
 package cgeo.geocaching.test.mock;
 
-import cgeo.geocaching.cgBase;
 import cgeo.geocaching.cgImage;
 import cgeo.geocaching.cgTrackable;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.network.Login;
 
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -90,7 +90,7 @@ public class GC2JVEH extends MockedCache {
     @Override
     public Date getHiddenDate() {
         try {
-            return cgBase.parseGcCustomDate("28/11/2010", getDateFormat());
+            return Login.parseGcCustomDate("28/11/2010", getDateFormat());
         } catch (ParseException e) {
             // intentionally left blank
         }