aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/GCConstants.java3
-rw-r--r--main/src/cgeo/geocaching/apps/AbstractApp.java22
-rw-r--r--main/src/cgeo/geocaching/cgCache.java10
-rw-r--r--main/src/cgeo/geocaching/cgCoord.java2
-rw-r--r--main/src/cgeo/geocaching/cgeo.java4
-rw-r--r--main/src/cgeo/geocaching/cgeoadvsearch.java2
-rw-r--r--main/src/cgeo/geocaching/cgeocoords.java24
-rw-r--r--main/src/cgeo/geocaching/cgeopoint.java2
-rw-r--r--main/src/cgeo/geocaching/cgeowaypointadd.java3
-rw-r--r--main/src/cgeo/geocaching/files/LocParser.java2
-rw-r--r--main/src/cgeo/geocaching/ui/CacheListAdapter.java10
11 files changed, 48 insertions, 36 deletions
diff --git a/main/src/cgeo/geocaching/GCConstants.java b/main/src/cgeo/geocaching/GCConstants.java
index eb6f61e..a37b264 100644
--- a/main/src/cgeo/geocaching/GCConstants.java
+++ b/main/src/cgeo/geocaching/GCConstants.java
@@ -59,8 +59,7 @@ public final class GCConstants {
// Info box top-right
public static final Pattern PATTERN_LOGIN_NAME = Pattern.compile("\"SignedInProfileLink\">([^<]+)</a>");
public static final Pattern PATTERN_MEMBER_STATUS = Pattern.compile("<span id=\"ctl00_litPMLevel\" style=\"display: block;\">([^<]+)</span>");
- public static final Pattern PATTERN_CACHES_FOUND = Pattern.compile("title=\"Caches Found\"\\s*/>\\s*(\\d+)<");
-
+ public static final Pattern PATTERN_CACHES_FOUND = Pattern.compile("title=\"Caches Found\"\\s*/>\\s*(\\d+)");
public static final Pattern PATTERN_AVATAR_IMAGE_PROFILE_PAGE = Pattern.compile("<img src=\"(http://img.geocaching.com/user/avatar/[0-9a-f-]+\\.jpg)\"[^>]*\\salt=\"Avatar\"");
public static final Pattern PATTERN_LOGIN_NAME_LOGIN_PAGE = Pattern.compile("<span class=\"Success\">You are logged in as[^<]*<strong[^>]*>([^<]+)</strong>[^<]*</span>");
public static final Pattern PATTERN_USERLOGGEDIN = Pattern.compile("<strong>Hello, <a href=\"/my/default.aspx\" title=\"View Profile for[^\"]*\" class=\"SignedInProfileLink\">(.*?)</a></strong>");
diff --git a/main/src/cgeo/geocaching/apps/AbstractApp.java b/main/src/cgeo/geocaching/apps/AbstractApp.java
index 0c38b02..1161a05 100644
--- a/main/src/cgeo/geocaching/apps/AbstractApp.java
+++ b/main/src/cgeo/geocaching/apps/AbstractApp.java
@@ -1,15 +1,11 @@
package cgeo.geocaching.apps;
+import cgeo.geocaching.cgeo;
import cgeo.geocaching.cgeoapplication;
-import org.apache.commons.collections.CollectionUtils;
-
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-
-import java.util.List;
public abstract class AbstractApp implements App {
@@ -48,21 +44,7 @@ public abstract class AbstractApp implements App {
if (getLaunchIntent(context) != null) {
return true;
}
- return isIntentAvailable(context, intent);
- }
-
- private static boolean isIntentAvailable(Context context, String action) {
- final Intent intent = new Intent(action);
-
- return isIntentAvailable(context, intent);
- }
-
- protected static boolean isIntentAvailable(Context context, Intent intent) {
- final PackageManager packageManager = context.getPackageManager();
- final List<ResolveInfo> list = packageManager.queryIntentActivities(
- intent, PackageManager.MATCH_DEFAULT_ONLY);
-
- return CollectionUtils.isNotEmpty(list);
+ return cgeo.isIntentAvailable(context, intent);
}
@Override
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index 432bd93..9fdaaaf 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -507,6 +507,9 @@ public class cgCache implements ICache {
@Override
public CacheSize getSize() {
+ if (size == null) {
+ return CacheSize.UNKNOWN;
+ }
return size;
}
@@ -986,7 +989,12 @@ public class cgCache implements ICache {
}
public void setSize(CacheSize size) {
- this.size = size;
+ if (size == null) {
+ this.size = CacheSize.UNKNOWN;
+ }
+ else {
+ this.size = size;
+ }
}
public void setDifficulty(float difficulty) {
diff --git a/main/src/cgeo/geocaching/cgCoord.java b/main/src/cgeo/geocaching/cgCoord.java
index 010fc22..0c5b5b5 100644
--- a/main/src/cgeo/geocaching/cgCoord.java
+++ b/main/src/cgeo/geocaching/cgCoord.java
@@ -20,7 +20,7 @@ public class cgCoord implements IBasicCache, IWaypoint {
private Geopoint coords = new Geopoint(0, 0);
private float difficulty = 0;
private float terrain = 0;
- private CacheSize size = null;
+ private CacheSize size = CacheSize.UNKNOWN;
public cgCoord() {
}
diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java
index ff47b15..4de8e50 100644
--- a/main/src/cgeo/geocaching/cgeo.java
+++ b/main/src/cgeo/geocaching/cgeo.java
@@ -262,12 +262,12 @@ public class cgeo extends AbstractActivity {
return true;
}
- private static boolean isIntentAvailable(Context context, String intent) {
+ public static boolean isIntentAvailable(Context context, String intent) {
final PackageManager packageManager = context.getPackageManager();
final List<ResolveInfo> list = packageManager.queryIntentActivities(
new Intent(intent), PackageManager.MATCH_DEFAULT_ONLY);
- return list.size() > 0;
+ return CollectionUtils.isNotEmpty(list);
}
@Override
diff --git a/main/src/cgeo/geocaching/cgeoadvsearch.java b/main/src/cgeo/geocaching/cgeoadvsearch.java
index 0951b31..754cbdb 100644
--- a/main/src/cgeo/geocaching/cgeoadvsearch.java
+++ b/main/src/cgeo/geocaching/cgeoadvsearch.java
@@ -263,7 +263,7 @@ public class cgeoadvsearch extends AbstractActivity {
@Override
public void onClick(View arg0) {
- cgeocoords coordsDialog = new cgeocoords(cgeoadvsearch.this, null, geo);
+ cgeocoords coordsDialog = new cgeocoords(cgeoadvsearch.this, null, null, geo);
coordsDialog.setCancelable(true);
coordsDialog.setOnCoordinateUpdate(new cgeocoords.CoordinateUpdate() {
@Override
diff --git a/main/src/cgeo/geocaching/cgeocoords.java b/main/src/cgeo/geocaching/cgeocoords.java
index 367fb22..3aadf05 100644
--- a/main/src/cgeo/geocaching/cgeocoords.java
+++ b/main/src/cgeo/geocaching/cgeocoords.java
@@ -29,6 +29,7 @@ public class cgeocoords extends Dialog {
final private AbstractActivity context;
final private cgGeo geo;
+ final private cgCache cache;
private Geopoint gp;
private EditText eLat, eLon;
@@ -44,10 +45,11 @@ public class cgeocoords extends Dialog {
private coordInputFormatEnum currentFormat = null;
- public cgeocoords(final AbstractActivity context, final Geopoint gp, final cgGeo geo) {
+ public cgeocoords(final AbstractActivity context, final cgCache cache, final Geopoint gp, final cgGeo geo) {
super(context);
this.context = context;
this.geo = geo;
+ this.cache = cache;
if (gp != null) {
this.gp = gp;
@@ -131,6 +133,12 @@ public class cgeocoords extends Dialog {
final Button buttonCurrent = (Button) findViewById(R.id.current);
buttonCurrent.setOnClickListener(new CurrentListener());
+ final Button buttonCache = (Button) findViewById(R.id.cache);
+ if (cache != null) {
+ buttonCache.setOnClickListener(new CacheListener());
+ } else {
+ buttonCache.setVisibility(View.GONE);
+ }
final Button buttonDone = (Button) findViewById(R.id.done);
buttonDone.setOnClickListener(new InputDoneListener());
}
@@ -481,6 +489,20 @@ public class cgeocoords extends Dialog {
}
}
+ private class CacheListener implements View.OnClickListener {
+
+ @Override
+ public void onClick(View v) {
+ if (cache == null || cache.getCoords() == null) {
+ context.showToast(context.getResources().getString(R.string.err_location_unknown));
+ return;
+ }
+
+ gp = cache.getCoords();
+ updateGUI();
+ }
+ }
+
private class InputDoneListener implements View.OnClickListener {
@Override
diff --git a/main/src/cgeo/geocaching/cgeopoint.java b/main/src/cgeo/geocaching/cgeopoint.java
index a976b20..56e5866 100644
--- a/main/src/cgeo/geocaching/cgeopoint.java
+++ b/main/src/cgeo/geocaching/cgeopoint.java
@@ -282,7 +282,7 @@ public class cgeopoint extends AbstractActivity {
if (latButton.getText().length() > 0 && lonButton.getText().length() > 0) {
gp = new Geopoint(latButton.getText().toString() + " " + lonButton.getText().toString());
}
- cgeocoords coordsDialog = new cgeocoords(cgeopoint.this, gp, geo);
+ cgeocoords coordsDialog = new cgeocoords(cgeopoint.this, null, gp, geo);
coordsDialog.setCancelable(true);
coordsDialog.setOnCoordinateUpdate(new cgeocoords.CoordinateUpdate() {
@Override
diff --git a/main/src/cgeo/geocaching/cgeowaypointadd.java b/main/src/cgeo/geocaching/cgeowaypointadd.java
index 74aee55..66e000e 100644
--- a/main/src/cgeo/geocaching/cgeowaypointadd.java
+++ b/main/src/cgeo/geocaching/cgeowaypointadd.java
@@ -229,7 +229,8 @@ public class cgeowaypointadd extends AbstractActivity {
if (waypoint != null && waypoint.getCoords() != null) {
gp = waypoint.getCoords();
}
- cgeocoords coordsDialog = new cgeocoords(cgeowaypointadd.this, gp, geo);
+ cgCache cache = app.getCacheByGeocode(geocode);
+ cgeocoords coordsDialog = new cgeocoords(cgeowaypointadd.this, cache, gp, geo);
coordsDialog.setCancelable(true);
coordsDialog.setOnCoordinateUpdate(new cgeocoords.CoordinateUpdate() {
@Override
diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index 38ddb80..7a8a674 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -125,7 +125,7 @@ public final class LocParser extends FileParser {
} else if (size == 8) {
pointCoord.setSize(CacheSize.SMALL);
} else {
- pointCoord.setSize(null);
+ pointCoord.setSize(CacheSize.UNKNOWN);
}
}
diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
index bc046f1..0a4e395 100644
--- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
@@ -570,11 +570,11 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
holder.favourite.setBackgroundResource(favoriteBack);
if (cacheListType == CacheListType.HISTORY && cache.getVisitedDate() > 0) {
- StringBuilder cacheInfo = new StringBuilder(50);
- cacheInfo.append(cgBase.formatTime(cache.getVisitedDate()));
- cacheInfo.append("; ");
- cacheInfo.append(cgBase.formatDate(cache.getVisitedDate()));
- holder.info.setText(cacheInfo.toString());
+ ArrayList<String> infos = new ArrayList<String>();
+ infos.add(StringUtils.upperCase(cache.getGeocode()));
+ infos.add(cgBase.formatDate(cache.getVisitedDate()));
+ infos.add(cgBase.formatTime(cache.getVisitedDate()));
+ holder.info.setText(StringUtils.join(infos, SEPARATOR));
} else {
ArrayList<String> infos = new ArrayList<String>();
if (StringUtils.isNotBlank(cache.getGeocode())) {
generated by cgit v1.1 at 2025-11-14 09:56:19 +0000