Correct log messages to account for refactoring

26 files changed, 41 insertions, 41 deletions

diff --git a/main/src/cgeo/geocaching/CachePopup.java b/main/src/cgeo/geocaching/CachePopup.java
index 4df428e..39a896a 100644
--- a/main/src/cgeo/geocaching/CachePopup.java
+++ b/main/src/cgeo/geocaching/CachePopup.java
@@ -94,7 +94,7 @@ public class CachePopup extends AbstractPopupActivity {
             CacheDetailActivity.updateOfflineBox(findViewById(android.R.id.content), cache, res, new RefreshCacheClickListener(), new DropCacheClickListener(), new StoreCacheClickListener());
 
         } catch (Exception e) {
-            Log.e("cgeopopup.init", e);
+            Log.e("CachePopup.init", e);
         }
 
         // cache is loaded. remove progress-popup if any there
diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index 0a1d22d..74cac4d 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -277,7 +277,7 @@ public class EditWaypointActivity extends AbstractActivity {
 
                 loadWaypointHandler.sendMessage(Message.obtain());
             } catch (Exception e) {
-                Log.e("cgeowaypoint.loadWaypoint.run", e);
+                Log.e("EditWaypointActivity.loadWaypoint.run", e);
             }
         }
     }
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index f99fee6..fd1c2ce 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -1637,7 +1637,7 @@ public class Geocache implements ICache, IWaypoint {
                 handler.sendMessage(Message.obtain());
             }
         } catch (Exception e) {
-            Log.e("cgBase.storeCache");
+            Log.e("Geocache.storeCache", e);
         }
     }
 
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 7579a1d..87f7ffd 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -180,7 +180,7 @@ public class MainActivity extends AbstractActivity {
                     showToast(res.getString(reason == StatusCode.MAINTENANCE ? reason.getErrorString() : R.string.err_login_failed_toast));
                 }
             } catch (Exception e) {
-                Log.w("cgeo.firstLoginHander", e);
+                Log.w("MainActivity.firstLoginHander", e);
             }
         }
     };
@@ -632,7 +632,7 @@ public class MainActivity extends AbstractActivity {
                         countBubble.setVisibility(View.VISIBLE);
                     }
                 } catch (Exception e) {
-                    Log.w("cgeo.countBubbleHander", e);
+                    Log.w("MainActivity.countBubbleHander", e);
                 }
             }
         };
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index e99da8d..89a7249 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -555,7 +555,7 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
 
                 return logResult.getPostLogResult();
             } catch (Exception e) {
-                Log.e("cgeovisit.postLogFn", e);
+                Log.e("VisitCacheActivity.Poster.doInBackgroundInternal", e);
             }
 
             return StatusCode.LOG_POST_ERROR;
diff --git a/main/src/cgeo/geocaching/WaypointPopup.java b/main/src/cgeo/geocaching/WaypointPopup.java
index b77fc0c..a1ab36a 100644
--- a/main/src/cgeo/geocaching/WaypointPopup.java
+++ b/main/src/cgeo/geocaching/WaypointPopup.java
@@ -89,7 +89,7 @@ public class WaypointPopup extends AbstractPopupActivity {
             addCacheDetails();
 
         } catch (Exception e) {
-            Log.e("cgeopopup.init", e);
+            Log.e("WaypointPopup.init", e);
         }
     }
 
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java
index eac33cc..03fae9e 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsApp.java
@@ -30,7 +30,7 @@ class GoogleMapsApp extends AbstractPointNavigationApp {
         } catch (Exception e) {
             // nothing
         }
-        Log.i("cgBase.runExternalMap: No maps application available.");
+        Log.i("GoogleMapsApp.navigate: No maps application available.");
 
         ActivityMixin.showToast(activity, getString(R.string.err_application_no));
     }
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsDirectionApp.java b/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsDirectionApp.java
index db4fc1c..a84b7e8 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsDirectionApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/GoogleMapsDirectionApp.java
@@ -40,7 +40,7 @@ public class GoogleMapsDirectionApp extends AbstractPointNavigationApp {
             }
 
         } catch (Exception e) {
-            Log.i("GoogleMapsDirection: application not available.");
+            Log.i("GoogleMapsDirectionApp: application not available.", e);
         }
 
     }
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java b/main/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java
index f1616ad..1019b0f 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/GoogleNavigationApp.java
@@ -30,7 +30,7 @@ abstract class GoogleNavigationApp extends AbstractPointNavigationApp {
                             + coords.getLongitude() + mode)));
 
         } catch (Exception e) {
-            Log.i("cgBase.runNavigation: No navigation application available.");
+            Log.i("GoogleNavigationApp.navigate: No navigation application available.", e);
         }
     }
 
diff --git a/main/src/cgeo/geocaching/connector/gc/GCMap.java b/main/src/cgeo/geocaching/connector/gc/GCMap.java
index 3143a06..643caf5 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCMap.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCMap.java
@@ -237,7 +237,7 @@ public class GCMap {
             Log.d("Retrieved " + searchResult.getCount() + " caches for tile " + tile.toString());
 
         } catch (Exception e) {
-            Log.e("GCBase.parseMapJSON", e);
+            Log.e("GCMap.parseMapJSON", e);
         }
 
         return searchResult;
@@ -283,7 +283,7 @@ public class GCMap {
      * @return
      */
     private static SearchResult searchByViewport(final Viewport viewport, final String[] tokens, Strategy strategy) {
-        Log.d("GCBase.searchByViewport" + viewport.toString());
+        Log.d("GCMap.searchByViewport" + viewport.toString());
 
         final SearchResult searchResult = new SearchResult();
         searchResult.setUrl(GCConstants.URL_LIVE_MAP + "?ll=" + viewport.getCenter().getLatitude() + "," + viewport.getCenter().getLongitude());
@@ -330,11 +330,11 @@ public class GCMap {
 
                     String data = Tile.requestMapInfo(GCConstants.URL_MAP_INFO, params, GCConstants.URL_LIVE_MAP);
                     if (StringUtils.isEmpty(data)) {
-                        Log.w("GCBase.searchByViewport: No data from server for tile (" + tile.getX() + "/" + tile.getY() + ")");
+                        Log.w("GCMap.searchByViewport: No data from server for tile (" + tile.getX() + "/" + tile.getY() + ")");
                     } else {
                         final SearchResult search = GCMap.parseMapJSON(data, tile, bitmap, strategy);
                         if (search == null || CollectionUtils.isEmpty(search.getGeocodes())) {
-                            Log.e("GCBase.searchByViewport: No cache parsed for viewport " + viewport);
+                            Log.e("GCMap.searchByViewport: No cache parsed for viewport " + viewport);
                         }
                         else {
                             searchResult.addGeocodes(search.getGeocodes());
diff --git a/main/src/cgeo/geocaching/connector/gc/SearchHandler.java b/main/src/cgeo/geocaching/connector/gc/SearchHandler.java
index 840cad1..45832e4 100644
--- a/main/src/cgeo/geocaching/connector/gc/SearchHandler.java
+++ b/main/src/cgeo/geocaching/connector/gc/SearchHandler.java
@@ -102,7 +102,7 @@ public class SearchHandler extends Handler {
 
                 imgHandler.sendEmptyMessage(0);
             } catch (IOException e) {
-                Log.e("Failed to download reCAPTCHA image");
+                Log.e("Failed to download reCAPTCHA image", e);
             }
         }
     }
diff --git a/main/src/cgeo/geocaching/connector/gc/Tile.java b/main/src/cgeo/geocaching/connector/gc/Tile.java
index 0e5ffe7..dd7f352 100644
--- a/main/src/cgeo/geocaching/connector/gc/Tile.java
+++ b/main/src/cgeo/geocaching/connector/gc/Tile.java
@@ -243,7 +243,7 @@ public class Tile {
         try {
             return response != null ? BitmapFactory.decodeStream(response.getEntity().getContent()) : null;
         } catch (IOException e) {
-            Log.e("cgBase.requestMapTile() " + e.getMessage());
+            Log.e("Tile.requestMapTile() ", e);
         }
         return null;
     }
diff --git a/main/src/cgeo/geocaching/files/GPXImporter.java b/main/src/cgeo/geocaching/files/GPXImporter.java
index 87c0ec4..e146fca 100644
--- a/main/src/cgeo/geocaching/files/GPXImporter.java
+++ b/main/src/cgeo/geocaching/files/GPXImporter.java
@@ -154,10 +154,10 @@ public class GPXImporter {
 
                 importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED, search.getCount(), 0, search));
             } catch (IOException e) {
-                Log.i("Importing caches failed - error reading data: " + e.getMessage());
+                Log.i("Importing caches failed - error reading data: ", e);
                 importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED_WITH_ERROR, R.string.gpx_import_error_io, 0, e.getLocalizedMessage()));
             } catch (ParserException e) {
-                Log.i("Importing caches failed - data format error" + e.getMessage());
+                Log.i("Importing caches failed - data format error", e);
                 importStepHandler.sendMessage(importStepHandler.obtainMessage(IMPORT_STEP_FINISHED_WITH_ERROR, R.string.gpx_import_error_parser, 0, e.getLocalizedMessage()));
             } catch (CancellationException e) {
                 Log.i("Importing caches canceled");
diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index fe290c3..873bf1b 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -110,7 +110,7 @@ public final class LocParser extends FileParser {
         try {
             return new Geopoint(Double.valueOf(latitude), Double.valueOf(longitude));
         } catch (NumberFormatException e) {
-            Log.e("LOC format has changed");
+            Log.e("LOC format has changed", e);
         }
         // fall back to parser, just in case the format changes
         return new Geopoint(latitude, longitude);
diff --git a/main/src/cgeo/geocaching/geopoint/Geopoint.java b/main/src/cgeo/geocaching/geopoint/Geopoint.java
index dbe0aa4..1973b03 100644
--- a/main/src/cgeo/geocaching/geopoint/Geopoint.java
+++ b/main/src/cgeo/geocaching/geopoint/Geopoint.java
@@ -297,7 +297,7 @@ public final class Geopoint implements ICoordinates, Parcelable {
     /**
      * Returns formatted coordinates with default format.
      * Default format is decimalminutes, e.g. N 52° 36.123 E 010° 03.456
-     *
+     * 
      * @return formatted coordinates
      */
     @Override
@@ -345,7 +345,7 @@ public final class Geopoint implements ICoordinates, Parcelable {
                 return result.getDouble("elevation");
             }
         } catch (Exception e) {
-            Log.w("cgBase.getElevation", e);
+            Log.w("Geopoint.getElevation", e);
         }
 
         return null;
diff --git a/main/src/cgeo/geocaching/loaders/UrlLoader.java b/main/src/cgeo/geocaching/loaders/UrlLoader.java
index abafd5f..9f6c3d5 100644
--- a/main/src/cgeo/geocaching/loaders/UrlLoader.java
+++ b/main/src/cgeo/geocaching/loaders/UrlLoader.java
@@ -28,7 +28,7 @@ public class UrlLoader extends AsyncTaskLoader<String> {
         try {
             return Network.getResponseData(Network.getRequest(url, params));
         } catch (final Exception e) {
-            Log.w("cgeovisit.UrlLoader.loadInBackground", e);
+            Log.w("UrlLoader.loadInBackground", e);
             return null;
         }
     }
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 989bff4..a377e38 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -592,7 +592,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
             menu.findItem(R.id.menu_strategy_auto).setChecked(strategy == Strategy.AUTO);
             menu.findItem(R.id.menu_strategy_detailed).setChecked(strategy == Strategy.DETAILED);
         } catch (Exception e) {
-            Log.e("cgeomap.onPrepareOptionsMenu", e);
+            Log.e("CGeoMap.onPrepareOptionsMenu", e);
         }
 
         return true;
@@ -1032,7 +1032,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
 
                     yield();
                 } catch (Exception e) {
-                    Log.w("cgeomap.LoadTimer.run", e);
+                    Log.w("CGeoMap.LoadTimer.run", e);
                 }
             }
         }
@@ -1328,7 +1328,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
 
                     geoDirUpdate.startDir();
                 } catch (Exception e) {
-                    Log.e("cgeocaches.onPrepareOptionsMenu.onCancel", e);
+                    Log.e("CGeoMap.storeCaches.onCancel", e);
                 }
             }
         });
@@ -1406,7 +1406,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
                         Geocache.storeCache(null, geocode, listId, false, handler);
                     }
                 } catch (Exception e) {
-                    Log.e("cgeocaches.LoadDetails.run", e);
+                    Log.e("CGeoMap.LoadDetails.run", e);
                 } finally {
                     // one more cache over
                     detailProgress++;
diff --git a/main/src/cgeo/geocaching/maps/CachesOverlay.java b/main/src/cgeo/geocaching/maps/CachesOverlay.java
index 82d8707..f1dd9b3 100644
--- a/main/src/cgeo/geocaching/maps/CachesOverlay.java
+++ b/main/src/cgeo/geocaching/maps/CachesOverlay.java
@@ -244,7 +244,7 @@ public class CachesOverlay extends AbstractItemizedOverlay {
 
             progress.dismiss();
         } catch (Exception e) {
-            Log.e("cgMapOverlay.onTap", e);
+            Log.e("CachesOverlay.onTap", e);
             if (progress != null) {
                 progress.dismiss();
             }
@@ -258,7 +258,7 @@ public class CachesOverlay extends AbstractItemizedOverlay {
         try {
             return items.get(index);
         } catch (Exception e) {
-            Log.e("cgMapOverlay.createItem", e);
+            Log.e("CachesOverlay.createItem", e);
         }
 
         return null;
@@ -269,7 +269,7 @@ public class CachesOverlay extends AbstractItemizedOverlay {
         try {
             return items.size();
         } catch (Exception e) {
-            Log.e("cgMapOverlay.size", e);
+            Log.e("CachesOverlay.size", e);
         }
 
         return 0;
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
index 7cc697d..7cf18fb 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
@@ -68,7 +68,7 @@ public final class MapsforgeMapProvider extends AbstractMapProvider {
             Collections.sort(mapFileList, String.CASE_INSENSITIVE_ORDER);
             return mapFileList;
         } catch (Exception e) {
-            Log.e("Settings.getOfflineMaps: " + e);
+            Log.e("MapsforgeMapProvider.getOfflineMaps: ", e);
         }
         return Collections.emptyList();
     }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java
index 85d61fe..cc8bc66 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java
@@ -53,7 +53,7 @@ public class MapsforgeMapView024 extends MapView implements MapViewImpl {
 
             super.draw(canvas);
         } catch (Exception e) {
-            Log.e("MapsforgeMapView.draw", e);
+            Log.e("MapsforgeMapView024.draw", e);
         }
     }
 
@@ -208,7 +208,7 @@ public class MapsforgeMapView024 extends MapView implements MapViewImpl {
                 }
 
             } catch (Exception e) {
-                Log.e("MapsforgeMapView.repaintRequired", e);
+                Log.e("MapsforgeMapView024.repaintRequired", e);
             }
         }
     }
diff --git a/main/src/cgeo/geocaching/twitter/Twitter.java b/main/src/cgeo/geocaching/twitter/Twitter.java
index 525b7f0..3f1f749 100644
--- a/main/src/cgeo/geocaching/twitter/Twitter.java
+++ b/main/src/cgeo/geocaching/twitter/Twitter.java
@@ -46,7 +46,7 @@ public final class Twitter {
                 Log.e("Tweet could not be posted");
             }
         } catch (Exception e) {
-            Log.e("cgBase.postTweet", e);
+            Log.e("Twitter.postTweet", e);
         }
     }
 
diff --git a/main/src/cgeo/geocaching/ui/FileSelectionListAdapter.java b/main/src/cgeo/geocaching/ui/FileSelectionListAdapter.java
index 1db3f21..ea32178 100644
--- a/main/src/cgeo/geocaching/ui/FileSelectionListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/FileSelectionListAdapter.java
@@ -33,7 +33,7 @@ public class FileSelectionListAdapter extends ArrayAdapter<File> {
         }
 
         if (position > getCount()) {
-            Log.w("cgGPXListAdapter.getView: Attempt to access missing item #" + position);
+            Log.w("FileSelectionListAdapter.getView: Attempt to access missing item #" + position);
             return null;
         }
 
diff --git a/main/src/cgeo/geocaching/ui/GPXListAdapter.java b/main/src/cgeo/geocaching/ui/GPXListAdapter.java
index 9f6c14c..d2bfe16 100644
--- a/main/src/cgeo/geocaching/ui/GPXListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/GPXListAdapter.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.ui;
 
-import cgeo.geocaching.R;
 import cgeo.geocaching.GpxFileListActivity;
+import cgeo.geocaching.R;
 import cgeo.geocaching.files.GPXImporter;
 import cgeo.geocaching.utils.Log;
 
@@ -39,7 +39,7 @@ public class GPXListAdapter extends ArrayAdapter<File> {
         }
 
         if (position > getCount()) {
-            Log.w("cgGPXListAdapter.getView: Attempt to access missing item #" + position);
+            Log.w("GPXListAdapter.getView: Attempt to access missing item #" + position);
             return null;
         }
 
diff --git a/main/src/cgeo/geocaching/ui/ImagesList.java b/main/src/cgeo/geocaching/ui/ImagesList.java
index a0ffe84..0f860c4 100644
--- a/main/src/cgeo/geocaching/ui/ImagesList.java
+++ b/main/src/cgeo/geocaching/ui/ImagesList.java
@@ -186,7 +186,7 @@ public class ImagesList {
             stream = new BufferedOutputStream(new FileOutputStream(file));
             image.getBitmap().compress(CompressFormat.JPEG, 100, stream);
         } catch (Exception e) {
-            Log.e("ImagesActivity.handleMessage.onClick", e);
+            Log.e("ImagesList.viewImageInStandardApp", e);
             return;
         } finally {
             IOUtils.closeQuietly(stream);
diff --git a/main/src/cgeo/geocaching/utils/CryptUtils.java b/main/src/cgeo/geocaching/utils/CryptUtils.java
index df2baa0..5ddae96 100644
--- a/main/src/cgeo/geocaching/utils/CryptUtils.java
+++ b/main/src/cgeo/geocaching/utils/CryptUtils.java
@@ -71,7 +71,7 @@ public final class CryptUtils {
             digest.update(text.getBytes(), 0, text.length());
             hashed = new BigInteger(1, digest.digest()).toString(16);
         } catch (Exception e) {
-            Log.e("cgBase.md5", e);
+            Log.e("CryptUtils.md5", e);
         }
 
         return hashed;
@@ -85,7 +85,7 @@ public final class CryptUtils {
             digest.update(text.getBytes(), 0, text.length());
             hashed = new BigInteger(1, digest.digest()).toString(16);
         } catch (Exception e) {
-            Log.e("cgBase.sha1", e);
+            Log.e("CryptUtils.sha1", e);
         }
 
         return hashed;
@@ -100,7 +100,7 @@ public final class CryptUtils {
             mac.init(secretKeySpec);
             macBytes = mac.doFinal(text.getBytes());
         } catch (Exception e) {
-            Log.e("cgBase.hashHmac", e);
+            Log.e("CryptUtils.hashHmac", e);
         }
 
         return macBytes;
diff --git a/main/src/cgeo/geocaching/utils/ImageHelper.java b/main/src/cgeo/geocaching/utils/ImageHelper.java
index ec77018..a01e836 100644
--- a/main/src/cgeo/geocaching/utils/ImageHelper.java
+++ b/main/src/cgeo/geocaching/utils/ImageHelper.java
@@ -76,7 +76,7 @@ public class ImageHelper {
             bos.flush();
             bos.close();
         } catch (Exception e) {
-            Log.e("Image", e);
+            Log.e("ImageHelper.storeBitmap", e);
         }
     }
 }