1 files changed, 19 insertions, 7 deletions

diff --git a/main/src/cgeo/geocaching/cgeoinit.java b/main/src/cgeo/geocaching/cgeoinit.java
index cb5808f..2269ad7 100644
--- a/main/src/cgeo/geocaching/cgeoinit.java
+++ b/main/src/cgeo/geocaching/cgeoinit.java
@@ -4,13 +4,15 @@ import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory.NavigationAppsEnum;
 import cgeo.geocaching.compatibility.Compatibility;
+import cgeo.geocaching.connector.gc.Login;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.maps.MapProviderFactory;
-import cgeo.geocaching.network.Login;
+import cgeo.geocaching.network.Cookies;
 import cgeo.geocaching.network.Network;
 import cgeo.geocaching.network.Parameters;
 import cgeo.geocaching.twitter.TwitterAuthorizationActivity;
+import cgeo.geocaching.ui.Formatter;
 import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.LogTemplateProvider;
 import cgeo.geocaching.utils.LogTemplateProvider.LogTemplate;
@@ -20,6 +22,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.http.HttpResponse;
 
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
@@ -73,7 +76,7 @@ public class cgeoinit extends AbstractActivity {
             } catch (Exception e) {
                 showToast(res.getString(R.string.err_login_failed));
 
-                Log.e(Settings.tag, "cgeoinit.logInHandler: " + e.toString());
+                Log.e("cgeoinit.logInHandler: " + e.toString());
             }
 
             if (loginDialog != null && loginDialog.isShowing()) {
@@ -101,7 +104,7 @@ public class cgeoinit extends AbstractActivity {
             } catch (Exception e) {
                 showToast(res.getString(R.string.init_sendToCgeo_register_fail));
 
-                Log.e(Settings.tag, "cgeoinit.webHandler: " + e.toString());
+                Log.e("cgeoinit.webHandler: " + e.toString());
             }
 
             if (webDialog != null && webDialog.isShowing()) {
@@ -731,7 +734,7 @@ public class cgeoinit extends AbstractActivity {
         TextView lastBackup = (TextView) findViewById(R.id.backup_last);
         File lastBackupFile = cgeoapplication.isRestoreFile();
         if (lastBackupFile != null) {
-            lastBackup.setText(res.getString(R.string.init_backup_last) + " " + cgBase.formatTime(lastBackupFile.lastModified()) + ", " + cgBase.formatDate(lastBackupFile.lastModified()));
+            lastBackup.setText(res.getString(R.string.init_backup_last) + " " + Formatter.formatTime(lastBackupFile.lastModified()) + ", " + Formatter.formatDate(lastBackupFile.lastModified()));
         } else {
             lastBackup.setText(res.getString(R.string.init_backup_last_no));
         }
@@ -821,7 +824,7 @@ public class cgeoinit extends AbstractActivity {
             loginDialog.setCancelable(false);
 
             Settings.setLogin(username, password);
-            Network.clearCookies();
+            Cookies.clearCookies();
 
             (new Thread() {
 
@@ -863,7 +866,7 @@ public class cgeoinit extends AbstractActivity {
                     final String cod = StringUtils.defaultString(deviceCode);
 
                     final Parameters params = new Parameters("name", nam, "code", cod);
-                    HttpResponse response = Network.request("http://send2.cgeo.org/auth.html", params, true);
+                    HttpResponse response = Network.getRequest("http://send2.cgeo.org/auth.html", params);
 
                     if (response != null && response.getStatusLine().getStatusCode() == 200)
                     {
@@ -872,7 +875,7 @@ public class cgeoinit extends AbstractActivity {
                         try {
                             pin = Integer.parseInt(strings[1].trim());
                         } catch (Exception e) {
-                            Log.e(Settings.tag, "webDialog: " + e.toString());
+                            Log.e("webDialog: " + e.toString());
                         }
                         String code = strings[0];
                         Settings.setWebNameCode(nam, code);
@@ -892,9 +895,18 @@ public class cgeoinit extends AbstractActivity {
             if (resultCode == RESULT_OK) {
                 if (data.hasExtra("mapfile")) {
                     Settings.setMapFile(data.getStringExtra("mapfile"));
+                    if (!Settings.isValidMapFile(Settings.getMapFile())) {
+                        showToast(res.getString(R.string.warn_invalid_mapfile));
+                    }
                 }
             }
             initMapfileEdittext(true);
         }
     }
+
+    public static void startActivity(Context fromActivity) {
+        final Intent initIntent = new Intent(fromActivity, cgeoinit.class);
+        fromActivity.startActivity(initIntent);
+    }
+
 }