1 files changed, 7 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/utils/LogTemplateProvider.java b/main/src/cgeo/geocaching/utils/LogTemplateProvider.java
index b9bebc9..60866e0 100644
--- a/main/src/cgeo/geocaching/utils/LogTemplateProvider.java
+++ b/main/src/cgeo/geocaching/utils/LogTemplateProvider.java
@@ -2,14 +2,13 @@ package cgeo.geocaching.utils;
 
 import cgeo.geocaching.R;
 import cgeo.geocaching.Settings;
-import cgeo.geocaching.cgBase;
 import cgeo.geocaching.connector.gc.GCConstants;
-import cgeo.geocaching.network.Login;
+import cgeo.geocaching.connector.gc.Login;
 import cgeo.geocaching.network.Network;
+import cgeo.geocaching.ui.Formatter;
 
 import org.apache.commons.lang3.StringUtils;
 
-import android.util.Log;
 
 /**
  * provides all the available templates for logging
@@ -56,14 +55,14 @@ public class LogTemplateProvider {
 
                         @Override
                         public String getValue(final boolean offline) {
-                            return cgBase.formatFullDate(System.currentTimeMillis());
+                            return Formatter.formatFullDate(System.currentTimeMillis());
                         }
                     },
                     new LogTemplate("TIME", R.string.init_signature_template_time) {
 
                         @Override
                         public String getValue(final boolean offline) {
-                            return cgBase.formatTime(System.currentTimeMillis());
+                            return Formatter.formatTime(System.currentTimeMillis());
                         }
                     },
                     new LogTemplate("DATETIME", R.string.init_signature_template_datetime) {
@@ -71,7 +70,7 @@ public class LogTemplateProvider {
                         @Override
                         public String getValue(final boolean offline) {
                             final long currentTime = System.currentTimeMillis();
-                            return cgBase.formatFullDate(currentTime) + " " + cgBase.formatTime(currentTime);
+                            return Formatter.formatFullDate(currentTime) + " " + Formatter.formatTime(currentTime);
                         }
                     },
                     new LogTemplate("USER", R.string.init_signature_template_user) {
@@ -90,7 +89,7 @@ public class LogTemplateProvider {
                                 if (offline) {
                                     return "";
                                 }
-                                final String page = Network.getResponseData(Network.request("http://www.geocaching.com/email/", null, false, false, false));
+                                final String page = Network.getResponseData(Network.getRequest("http://www.geocaching.com/email/"));
                                 current = parseFindCount(page);
                             }
 
@@ -134,7 +133,7 @@ public class LogTemplateProvider {
         try {
             return Integer.parseInt(BaseUtils.getMatch(page, GCConstants.PATTERN_CACHES_FOUND, true, "-1").replaceAll("[,.]", ""));
         } catch (NumberFormatException e) {
-            Log.e(Settings.tag, "parseFindCount", e);
+            Log.e("parseFindCount", e);
             return -1;
         }
     }