refactoring: remove duplicated code for logging in

2 files changed, 18 insertions, 31 deletions

diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index a58b2cc..3e26eb2 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -1008,7 +1008,7 @@ public abstract class GCParser {
         final String uri = new Uri.Builder().scheme("http").authority("www.geocaching.com").path("/seek/log.aspx").encodedQuery("ID=" + cacheid).build().toString();
         String page = Login.postRequestLogged(uri, params);
         if (!Login.getLoginStatus(page)) {
-            Log.e("GCParser.postLogTrackable: Can not log in geocaching");
+            Log.e("GCParser.postLog: Cannot log in geocaching");
             return new ImmutablePair<StatusCode, String>(StatusCode.NOT_LOGGED_IN, "");
         }
 
@@ -1103,19 +1103,12 @@ public abstract class GCParser {
      * @return status code to indicate success or failure
      */
     public static ImmutablePair<StatusCode, String> uploadLogImage(final String logId, final String caption, final String description, final Uri imageUri) {
-        final String uri = new Uri.Builder().scheme("http").authority("www.geocaching.com").path("/seek/upload.aspx").encodedQuery("LID=" + logId).build().toString();
-
-        String page = Network.getResponseData(Network.getRequest(uri));
+        final String uri = new Uri.Builder().scheme("http").authority("www.geocaching.com").path("/seek/upload.aspx").build().toString();
 
-        if (!Login.getLoginStatus(page)) {
-            // Login.isActualLoginStatus() was wrong, we are not logged in
-            final StatusCode loginState = Login.login();
-            if (loginState == StatusCode.NO_ERROR) {
-                page = Network.getResponseData(Network.getRequest(uri));
-            } else {
-                Log.e("Image upload: No login (error: " + loginState + ')');
-                return ImmutablePair.of(StatusCode.NOT_LOGGED_IN, null);
-            }
+        final String page = Login.getRequestLogged(uri, new Parameters("LID=", logId));
+        if (StringUtils.isBlank(page)) {
+            Log.e("GCParser.uploadLogImage: No data from server");
+            return new ImmutablePair<StatusCode, String>(StatusCode.UNKNOWN_ERROR, null);
         }
 
         final String[] viewstates = Login.getViewstates(page);
@@ -1195,7 +1188,7 @@ public abstract class GCParser {
         final String uri = new Uri.Builder().scheme("http").authority("www.geocaching.com").path("/track/log.aspx").encodedQuery("wid=" + tbid).build().toString();
         final String page = Login.postRequestLogged(uri, params);
         if (!Login.getLoginStatus(page)) {
-            Log.e("GCParser.postLogTrackable: Can not log in geocaching");
+            Log.e("GCParser.postLogTrackable: Cannot log in geocaching");
             return StatusCode.NOT_LOGGED_IN;
         }
 
diff --git a/main/src/cgeo/geocaching/export/FieldnoteExport.java b/main/src/cgeo/geocaching/export/FieldnoteExport.java
index a42a48a..38b603c 100644
--- a/main/src/cgeo/geocaching/export/FieldnoteExport.java
+++ b/main/src/cgeo/geocaching/export/FieldnoteExport.java
@@ -70,10 +70,10 @@ class FieldnoteExport extends AbstractExport {
     }
 
     private Dialog getExportOptionsDialog(final Geocache[] caches, final Activity activity) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 
         // AlertDialog has always dark style, so we have to apply it as well always
-        View layout = View.inflate(new ContextThemeWrapper(activity, R.style.dark), R.layout.fieldnote_export_dialog, null);
+        final View layout = View.inflate(new ContextThemeWrapper(activity, R.style.dark), R.layout.fieldnote_export_dialog, null);
         builder.setView(layout);
 
         final CheckBox uploadOption = (CheckBox) layout.findViewById(R.id.upload);
@@ -132,13 +132,13 @@ class FieldnoteExport extends AbstractExport {
             final StringBuilder fieldNoteBuffer = new StringBuilder();
             try {
                 int i = 0;
-                for (Geocache cache : caches) {
+                for (final Geocache cache : caches) {
                     if (cache.isLogOffline()) {
                         appendFieldNote(fieldNoteBuffer, cache, cgData.loadLogOffline(cache.getGeocode()));
                         publishProgress(++i);
                     }
                 }
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 Log.e("FieldnoteExport.ExportTask generation", e);
                 return false;
             }
@@ -151,17 +151,17 @@ class FieldnoteExport extends AbstractExport {
 
             exportLocation.mkdirs();
 
-            SimpleDateFormat fileNameDateFormat = new SimpleDateFormat("yyyyMMddHHmmss", Locale.US);
+            final SimpleDateFormat fileNameDateFormat = new SimpleDateFormat("yyyyMMddHHmmss", Locale.US);
             exportFile = new File(exportLocation.toString() + '/' + fileNameDateFormat.format(new Date()) + ".txt");
 
             Writer fileWriter = null;
             BufferedOutputStream buffer = null;
             try {
-                OutputStream os = new FileOutputStream(exportFile);
+                final OutputStream os = new FileOutputStream(exportFile);
                 buffer = new BufferedOutputStream(os);
                 fileWriter = new OutputStreamWriter(buffer, CharEncoding.UTF_16);
                 fileWriter.write(fieldNoteBuffer.toString());
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 Log.e("FieldnoteExport.ExportTask export", e);
                 return false;
             } finally {
@@ -181,17 +181,11 @@ class FieldnoteExport extends AbstractExport {
                 }
 
                 final String uri = "http://www.geocaching.com/my/uploadfieldnotes.aspx";
-                String page = Network.getResponseData(Network.getRequest(uri));
+                final String page = Login.getRequestLogged(uri, null);
 
-                if (!Login.getLoginStatus(page)) {
-                    // Login.isActualLoginStatus() was wrong, we are not logged in
-                    final StatusCode loginState = Login.login();
-                    if (loginState == StatusCode.NO_ERROR) {
-                        page = Network.getResponseData(Network.getRequest(uri));
-                    } else {
-                        Log.e("FieldnoteExport.ExportTask upload: No login (error: " + loginState + ')');
-                        return false;
-                    }
+                if (StringUtils.isBlank(page)) {
+                    Log.e("FieldnoteExport.ExportTask get page: No data from server");
+                    return false;
                 }
 
                 final String[] viewstates = Login.getViewstates(page);