aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/LogEntry.java6
-rw-r--r--main/src/cgeo/geocaching/NavigateAnyPointActivity.java2
-rw-r--r--main/src/cgeo/geocaching/StaticMapsActivity.java24
-rw-r--r--main/src/cgeo/geocaching/StaticMapsProvider.java51
4 files changed, 42 insertions, 41 deletions
diff --git a/main/src/cgeo/geocaching/LogEntry.java b/main/src/cgeo/geocaching/LogEntry.java
index 790becd..0121424 100644
--- a/main/src/cgeo/geocaching/LogEntry.java
+++ b/main/src/cgeo/geocaching/LogEntry.java
@@ -38,7 +38,7 @@ public final class LogEntry {
this(Settings.getUsername(), dateInMilliSeconds, type, text);
}
- public LogEntry(final String author, long dateInMilliSeconds, final LogType type, final String text) {
+ public LogEntry(final String author, final long dateInMilliSeconds, final LogType type, final String text) {
this.author = author;
this.date = dateInMilliSeconds;
this.type = type;
@@ -51,7 +51,7 @@ public final class LogEntry {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -109,7 +109,7 @@ public final class LogEntry {
public String getDisplayText() {
if (Settings.getPlainLogs()) {
MatcherWrapper matcher = new MatcherWrapper(PATTERN_REMOVE_COLORS, log);
- return matcher.replaceAll("");
+ return matcher.replaceAll(StringUtils.EMPTY);
}
return log;
}
diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index e7ffc3b..be4ef05 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -62,7 +62,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
private int contextMenuItemPosition;
- private String distanceUnit = "";
+ private String distanceUnit = StringUtils.EMPTY;
protected static class ViewHolder extends AbstractViewHolder {
@InjectView(R.id.simple_way_point_longitude) protected TextView longitude;
diff --git a/main/src/cgeo/geocaching/StaticMapsActivity.java b/main/src/cgeo/geocaching/StaticMapsActivity.java
index 4658262..2268df9 100644
--- a/main/src/cgeo/geocaching/StaticMapsActivity.java
+++ b/main/src/cgeo/geocaching/StaticMapsActivity.java
@@ -33,7 +33,7 @@ public class StaticMapsActivity extends AbstractActivity {
private static final String EXTRAS_GEOCODE = "geocode";
@Extra(EXTRAS_DOWNLOAD) boolean download = false;
- @Extra(EXTRAS_WAYPOINT) Integer waypoint_id = null;
+ @Extra(EXTRAS_WAYPOINT) Integer waypointId = null;
@Extra(EXTRAS_GEOCODE) String geocode = null;
private final List<Bitmap> maps = new ArrayList<Bitmap>();
@@ -43,7 +43,7 @@ public class StaticMapsActivity extends AbstractActivity {
private final Handler loadMapsHandler = new Handler() {
@Override
- public void handleMessage(Message msg) {
+ public void handleMessage(final Message msg) {
if (waitDialog != null) {
waitDialog.dismiss();
}
@@ -92,7 +92,7 @@ public class StaticMapsActivity extends AbstractActivity {
}
@Override
- public void onCreate(Bundle savedInstanceState) {
+ public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState, R.layout.staticmaps_activity);
if (geocode == null) {
@@ -107,12 +107,6 @@ public class StaticMapsActivity extends AbstractActivity {
(new LoadMapsThread()).start();
}
- @Override
- public void onResume() {
- super.onResume();
-
- }
-
private class LoadMapsThread extends Thread {
@Override
@@ -120,11 +114,11 @@ public class StaticMapsActivity extends AbstractActivity {
try {
// try downloading 2 times
for (int trials = 0; trials < 2; trials++) {
- for (int level = 1; level <= 5; level++) {
+ for (int level = 1; level <= StaticMapsProvider.MAPS_LEVEL_MAX; level++) {
try {
- if (waypoint_id != null) {
+ if (waypointId != null) {
final Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
- final Bitmap image = StaticMapsProvider.getWaypointMap(geocode, cache.getWaypointById(waypoint_id), level);
+ final Bitmap image = StaticMapsProvider.getWaypointMap(geocode, cache.getWaypointById(waypointId), level);
if (image != null) {
maps.add(image);
}
@@ -158,12 +152,12 @@ public class StaticMapsActivity extends AbstractActivity {
private boolean downloadStaticMaps() {
final Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
- if (waypoint_id == null) {
+ if (waypointId == null) {
showToast(res.getString(R.string.info_storing_static_maps));
StaticMapsProvider.storeCacheStaticMap(cache, true);
return cache.hasStaticMap();
}
- final Waypoint waypoint = cache.getWaypointById(waypoint_id);
+ final Waypoint waypoint = cache.getWaypointById(waypointId);
if (waypoint != null) {
showToast(res.getString(R.string.info_storing_static_maps));
// refresh always removes old waypoint files
@@ -178,7 +172,7 @@ public class StaticMapsActivity extends AbstractActivity {
public static void startActivity(final Context activity, final String geocode, final boolean download, final Waypoint waypoint) {
StaticMapsActivity_.IntentBuilder_ builder = StaticMapsActivity_.intent(activity).geocode(geocode).download(download);
if (waypoint != null) {
- builder.waypoint_id(waypoint.getId());
+ builder.waypointId(waypoint.getId());
}
builder.start();
}
diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java
index 041e703..2555b80 100644
--- a/main/src/cgeo/geocaching/StaticMapsProvider.java
+++ b/main/src/cgeo/geocaching/StaticMapsProvider.java
@@ -24,7 +24,8 @@ import android.view.WindowManager;
import java.io.File;
import java.util.concurrent.TimeUnit;
-public class StaticMapsProvider {
+public final class StaticMapsProvider {
+ static final int MAPS_LEVEL_MAX = 5;
private static final String PREFIX_PREVIEW = "preview";
private static final String GOOGLE_STATICMAP_URL = "http://maps.google.com/maps/api/staticmap";
private static final String SATELLITE = "satellite";
@@ -32,16 +33,22 @@ public class StaticMapsProvider {
private static final String WAYPOINT_PREFIX = "wp";
private static final String MAP_FILENAME_PREFIX = "map_";
private static final String MARKERS_URL = "http://status.cgeo.org/assets/markers/";
- /** We assume there is no real usable image with less than 1k */
+
+ /** We assume there is no real usable image with less than 1k. */
private static final int MIN_MAP_IMAGE_BYTES = 1000;
+
/** ThreadPool restricting this to 1 Thread. **/
- private static final BlockingThreadPool pool = new BlockingThreadPool(1, Thread.MIN_PRIORITY);
+ private static final BlockingThreadPool POOL = new BlockingThreadPool(1, Thread.MIN_PRIORITY);
+
+ private StaticMapsProvider() {
+ // utility class
+ }
- private static File getMapFile(final String geocode, String prefix, final boolean createDirs) {
+ private static File getMapFile(final String geocode, final String prefix, final boolean createDirs) {
return LocalStorage.getStorageFile(geocode, MAP_FILENAME_PREFIX + prefix, false, createDirs);
}
- private static void downloadDifferentZooms(final String geocode, String markerUrl, String prefix, String latlonMap, int edge, final Parameters waypoints) {
+ private static void downloadDifferentZooms(final String geocode, final String markerUrl, final String prefix, final String latlonMap, final int edge, final Parameters waypoints) {
downloadMap(geocode, 20, SATELLITE, markerUrl, prefix + '1', "", latlonMap, edge, edge, waypoints);
downloadMap(geocode, 18, SATELLITE, markerUrl, prefix + '2', "", latlonMap, edge, edge, waypoints);
downloadMap(geocode, 16, ROADMAP, markerUrl, prefix + '3', "", latlonMap, edge, edge, waypoints);
@@ -49,7 +56,7 @@ public class StaticMapsProvider {
downloadMap(geocode, 11, ROADMAP, markerUrl, prefix + '5', "", latlonMap, edge, edge, waypoints);
}
- private static void downloadMap(String geocode, int zoom, String mapType, String markerUrl, String prefix, String shadow, String latlonMap, int width, int height, final Parameters waypoints) {
+ private static void downloadMap(final String geocode, final int zoom, final String mapType, final String markerUrl, final String prefix, final String shadow, final String latlonMap, final int width, final int height, final Parameters waypoints) {
final Parameters params = new Parameters(
"center", latlonMap,
"zoom", String.valueOf(zoom),
@@ -80,7 +87,7 @@ public class StaticMapsProvider {
}
}
- public static void downloadMaps(Geocache cache) {
+ public static void downloadMaps(final Geocache cache) {
if ((!Settings.isStoreOfflineMaps() && !Settings.isStoreOfflineWpMaps()) || StringUtils.isBlank(cache.getGeocode())) {
return;
}
@@ -110,19 +117,19 @@ public class StaticMapsProvider {
* @param edge
* The boundings
*/
- private static void refreshAllWpStaticMaps(Geocache cache, int edge) {
+ private static void refreshAllWpStaticMaps(final Geocache cache, final int edge) {
LocalStorage.deleteFilesWithPrefix(cache.getGeocode(), MAP_FILENAME_PREFIX + WAYPOINT_PREFIX);
for (Waypoint waypoint : cache.getWaypoints()) {
storeWaypointStaticMap(cache.getGeocode(), edge, waypoint, false);
}
}
- public static void storeWaypointStaticMap(Geocache cache, Waypoint waypoint, boolean waitForResult) {
+ public static void storeWaypointStaticMap(final Geocache cache, final Waypoint waypoint, final boolean waitForResult) {
int edge = StaticMapsProvider.guessMaxDisplaySide();
storeWaypointStaticMap(cache.getGeocode(), edge, waypoint, waitForResult);
}
- private static void storeWaypointStaticMap(final String geocode, int edge, Waypoint waypoint, final boolean waitForResult) {
+ private static void storeWaypointStaticMap(final String geocode, final int edge, final Waypoint waypoint, final boolean waitForResult) {
if (geocode == null) {
Log.e("storeWaypointStaticMap - missing input parameter geocode");
return;
@@ -142,7 +149,7 @@ public class StaticMapsProvider {
}
}
- public static void storeCacheStaticMap(Geocache cache, final boolean waitForResult) {
+ public static void storeCacheStaticMap(final Geocache cache, final boolean waitForResult) {
int edge = guessMaxDisplaySide();
storeCacheStaticMap(cache, edge, waitForResult);
}
@@ -179,7 +186,7 @@ public class StaticMapsProvider {
}
private static void downloadMaps(final String geocode, final String markerUrl, final String prefix, final String latlonMap, final int edge,
- final Parameters waypoints, boolean waitForResult) {
+ final Parameters waypoints, final boolean waitForResult) {
if (waitForResult) {
downloadDifferentZooms(geocode, markerUrl, prefix, latlonMap, edge, waypoints);
}
@@ -191,7 +198,7 @@ public class StaticMapsProvider {
}
};
try {
- pool.add(currentTask, 20, TimeUnit.SECONDS);
+ POOL.add(currentTask, 20, TimeUnit.SECONDS);
} catch (InterruptedException e) {
Log.e("StaticMapsProvider.downloadMaps error adding task", e);
}
@@ -215,13 +222,13 @@ public class StaticMapsProvider {
return MARKERS_URL + "marker_waypoint_" + type + ".png";
}
- public static void removeWpStaticMaps(Waypoint waypoint, final String geocode) {
+ public static void removeWpStaticMaps(final Waypoint waypoint, final String geocode) {
if (waypoint == null) {
return;
}
int waypointId = waypoint.getId();
int waypointMapHash = waypoint.getStaticMapsHashcode();
- for (int level = 1; level <= 5; level++) {
+ for (int level = 1; level <= MAPS_LEVEL_MAX; level++) {
try {
StaticMapsProvider.getMapFile(geocode, WAYPOINT_PREFIX + waypointId + "_" + waypointMapHash + '_' + level, false).delete();
} catch (Exception e) {
@@ -244,7 +251,7 @@ public class StaticMapsProvider {
if (StringUtils.isBlank(geocode)) {
return false;
}
- for (int level = 1; level <= 5; level++) {
+ for (int level = 1; level <= MAPS_LEVEL_MAX; level++) {
File mapFile = StaticMapsProvider.getMapFile(geocode, String.valueOf(level), false);
if (mapFile.exists()) {
return true;
@@ -260,10 +267,10 @@ public class StaticMapsProvider {
* @param waypoint
* @return <code>true</code> if at least one map file exists; <code>false</code> otherwise
*/
- public static boolean hasStaticMapForWaypoint(String geocode, Waypoint waypoint) {
+ public static boolean hasStaticMapForWaypoint(final String geocode, final Waypoint waypoint) {
int waypointId = waypoint.getId();
int waypointMapHash = waypoint.getStaticMapsHashcode();
- for (int level = 1; level <= 5; level++) {
+ for (int level = 1; level <= MAPS_LEVEL_MAX; level++) {
File mapFile = StaticMapsProvider.getMapFile(geocode, WAYPOINT_PREFIX + waypointId + "_" + waypointMapHash + "_" + level, false);
if (mapFile.exists()) {
return true;
@@ -279,10 +286,10 @@ public class StaticMapsProvider {
* @param waypoint
* @return <code>true</code> if all map files exist; <code>false</code> otherwise
*/
- public static boolean hasAllStaticMapsForWaypoint(String geocode, Waypoint waypoint) {
+ public static boolean hasAllStaticMapsForWaypoint(final String geocode, final Waypoint waypoint) {
int waypointId = waypoint.getId();
int waypointMapHash = waypoint.getStaticMapsHashcode();
- for (int level = 1; level <= 5; level++) {
+ for (int level = 1; level <= MAPS_LEVEL_MAX; level++) {
File mapFile = StaticMapsProvider.getMapFile(geocode, WAYPOINT_PREFIX + waypointId + "_" + waypointMapHash + "_" + level, false);
boolean mapExists = mapFile.exists();
if (!mapExists) {
@@ -296,13 +303,13 @@ public class StaticMapsProvider {
return decodeFile(StaticMapsProvider.getMapFile(geocode, PREFIX_PREVIEW, false));
}
- public static Bitmap getWaypointMap(final String geocode, Waypoint waypoint, int level) {
+ public static Bitmap getWaypointMap(final String geocode, final Waypoint waypoint, final int level) {
int waypointId = waypoint.getId();
int waypointMapHash = waypoint.getStaticMapsHashcode();
return decodeFile(StaticMapsProvider.getMapFile(geocode, WAYPOINT_PREFIX + waypointId + "_" + waypointMapHash + "_" + level, false));
}
- public static Bitmap getCacheMap(final String geocode, int level) {
+ public static Bitmap getCacheMap(final String geocode, final int level) {
return decodeFile(StaticMapsProvider.getMapFile(geocode, String.valueOf(level), false));
}
generated by cgit v1.1 at 2025-11-10 20:36:29 +0000