aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java12
-rw-r--r--main/src/cgeo/geocaching/ICache.java4
-rw-r--r--main/src/cgeo/geocaching/apps/AbstractLocusApp.java2
-rw-r--r--main/src/cgeo/geocaching/cgCache.java42
-rw-r--r--main/src/cgeo/geocaching/cgData.java8
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCConstants.java4
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCMap.java2
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCParser.java6
-rw-r--r--main/src/cgeo/geocaching/connector/oc/OkapiClient.java2
-rw-r--r--main/src/cgeo/geocaching/export/GpxExport.java4
-rw-r--r--main/src/cgeo/geocaching/files/GPXParser.java13
11 files changed, 54 insertions, 45 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index d3bb28a..f1d214c 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -885,8 +885,8 @@ public class CacheDetailActivity extends AbstractActivity {
}
// Use real owner name vice the one owner chose to display
- if (StringUtils.isNotBlank(cache.getOwnerReal())) {
- clickedItemText = cache.getOwnerReal();
+ if (StringUtils.isNotBlank(cache.getOwnerUserId())) {
+ clickedItemText = cache.getOwnerUserId();
} else {
clickedItemText = ((TextView) view).getText().toString();
}
@@ -1358,12 +1358,12 @@ public class CacheDetailActivity extends AbstractActivity {
}
// cache author
- if (StringUtils.isNotBlank(cache.getOwner()) || StringUtils.isNotBlank(cache.getOwnerReal())) {
+ if (StringUtils.isNotBlank(cache.getOwnerDisplayName()) || StringUtils.isNotBlank(cache.getOwnerUserId())) {
TextView ownerView = details.add(R.string.cache_owner, "");
- if (StringUtils.isNotBlank(cache.getOwner())) {
- ownerView.setText(Html.fromHtml(cache.getOwner()), TextView.BufferType.SPANNABLE);
+ if (StringUtils.isNotBlank(cache.getOwnerDisplayName())) {
+ ownerView.setText(Html.fromHtml(cache.getOwnerDisplayName()), TextView.BufferType.SPANNABLE);
} else { // OwnerReal guaranteed to be not blank based on above
- ownerView.setText(Html.fromHtml(cache.getOwnerReal()), TextView.BufferType.SPANNABLE);
+ ownerView.setText(Html.fromHtml(cache.getOwnerUserId()), TextView.BufferType.SPANNABLE);
}
ownerView.setOnClickListener(new OwnerActionsClickListener());
}
diff --git a/main/src/cgeo/geocaching/ICache.java b/main/src/cgeo/geocaching/ICache.java
index a4f5eda..d76bacc 100644
--- a/main/src/cgeo/geocaching/ICache.java
+++ b/main/src/cgeo/geocaching/ICache.java
@@ -17,12 +17,12 @@ public interface ICache extends IBasicCache {
/**
* @return Displayed owner, might differ from the real owner
*/
- public String getOwner();
+ public String getOwnerDisplayName();
/**
* @return GC username of the (actual) owner, might differ from the owner. Never empty.
*/
- public String getOwnerReal();
+ public String getOwnerUserId();
/**
* @return true if the user is the owner of the cache, false else
diff --git a/main/src/cgeo/geocaching/apps/AbstractLocusApp.java b/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
index 8f5160a..ac6fc1c 100644
--- a/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
+++ b/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
@@ -123,7 +123,7 @@ public abstract class AbstractLocusApp extends AbstractApp {
pg.archived = cache.isArchived();
pg.premiumOnly = cache.isPremiumMembersOnly();
pg.name = cache.getName();
- pg.placedBy = cache.getOwner();
+ pg.placedBy = cache.getOwnerDisplayName();
if (cache.getHiddenDate() != null) {
pg.hidden = ISO8601DATE.format(cache.getHiddenDate().getTime());
}
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index fce7709..b889d3e 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -62,8 +62,8 @@ public class cgCache implements ICache, IWaypoint {
private CacheType cacheType = CacheType.UNKNOWN;
private String name = "";
private Spannable nameSp = null;
- private String owner = "";
- private String ownerReal = "";
+ private String ownerDisplayName = "";
+ private String ownerUserId = "";
private Date hidden = null;
private String hint = "";
private CacheSize size = CacheSize.UNKNOWN;
@@ -190,11 +190,11 @@ public class cgCache implements ICache, IWaypoint {
if (StringUtils.isBlank(nameSp)) {
nameSp = other.nameSp;
}
- if (StringUtils.isBlank(owner)) {
- owner = other.owner;
+ if (StringUtils.isBlank(ownerDisplayName)) {
+ ownerDisplayName = other.ownerDisplayName;
}
- if (StringUtils.isBlank(ownerReal)) {
- ownerReal = other.ownerReal;
+ if (StringUtils.isBlank(ownerUserId)) {
+ ownerUserId = other.ownerUserId;
}
if (hidden == null) {
hidden = other.hidden;
@@ -317,8 +317,8 @@ public class cgCache implements ICache, IWaypoint {
disabled == other.disabled &&
archived == other.archived &&
listId == other.listId &&
- StringUtils.equalsIgnoreCase(owner, other.owner) &&
- StringUtils.equalsIgnoreCase(ownerReal, other.ownerReal) &&
+ StringUtils.equalsIgnoreCase(ownerDisplayName, other.ownerDisplayName) &&
+ StringUtils.equalsIgnoreCase(ownerUserId, other.ownerUserId) &&
StringUtils.equalsIgnoreCase(description, other.description) &&
StringUtils.equalsIgnoreCase(personalNote, other.personalNote) &&
StringUtils.equalsIgnoreCase(shortdesc, other.shortdesc) &&
@@ -431,7 +431,7 @@ public class cgCache implements ICache, IWaypoint {
}
public List<LogType> getPossibleLogTypes() {
- boolean isOwner = owner != null && owner.equalsIgnoreCase(Settings.getUsername());
+ boolean isOwner = getOwnerUserId() != null && getOwnerUserId().equalsIgnoreCase(Settings.getUsername());
List<LogType> logTypes = new ArrayList<LogType>();
if (isEventCache()) {
logTypes.add(LogType.WILL_ATTEND);
@@ -507,8 +507,8 @@ public class cgCache implements ICache, IWaypoint {
}
@Override
- public String getOwner() {
- return owner;
+ public String getOwnerDisplayName() {
+ return ownerDisplayName;
}
@Override
@@ -549,8 +549,8 @@ public class cgCache implements ICache, IWaypoint {
}
@Override
- public String getOwnerReal() {
- return ownerReal;
+ public String getOwnerUserId() {
+ return ownerUserId;
}
@Override
@@ -989,12 +989,12 @@ public class cgCache implements ICache, IWaypoint {
this.name = name;
}
- public void setOwner(String owner) {
- this.owner = owner;
+ public void setOwnerDisplayName(String ownerDisplayName) {
+ this.ownerDisplayName = ownerDisplayName;
}
- public void setOwnerReal(String ownerReal) {
- this.ownerReal = ownerReal;
+ public void setOwnerUserId(String ownerUserId) {
+ this.ownerUserId = ownerUserId;
}
public void setHint(String hint) {
@@ -1404,11 +1404,11 @@ public class cgCache implements ICache, IWaypoint {
if (getDifficulty() == 0.0) {
Log.e("difficulty not parsed correctly");
}
- if (StringUtils.isBlank(getOwner())) {
- Log.e("owner not parsed correctly");
+ if (StringUtils.isBlank(getOwnerDisplayName())) {
+ Log.e("owner display name not parsed correctly");
}
- if (StringUtils.isBlank(getOwnerReal())) {
- Log.e("owner real not parsed correctly");
+ if (StringUtils.isBlank(getOwnerUserId())) {
+ Log.e("owner user id real not parsed correctly");
}
if (getHiddenDate() == null) {
Log.e("hidden not parsed correctly");
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 892ba74..6483901 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -1003,8 +1003,8 @@ public class cgData {
values.put("type", cache.getType().id);
values.put("name", cache.getName());
values.put("own", cache.isOwn() ? 1 : 0);
- values.put("owner", cache.getOwner());
- values.put("owner_real", cache.getOwnerReal());
+ values.put("owner", cache.getOwnerDisplayName());
+ values.put("owner_real", cache.getOwnerUserId());
if (cache.getHiddenDate() == null) {
values.put("hidden", 0);
} else {
@@ -1624,8 +1624,8 @@ public class cgData {
cache.setType(CacheType.getById(cursor.getString(cacheColumnIndex[8])));
cache.setName(cursor.getString(cacheColumnIndex[9]));
cache.setOwn(cursor.getInt(cacheColumnIndex[10]) == 1);
- cache.setOwner(cursor.getString(cacheColumnIndex[11]));
- cache.setOwnerReal(cursor.getString(cacheColumnIndex[12]));
+ cache.setOwnerDisplayName(cursor.getString(cacheColumnIndex[11]));
+ cache.setOwnerUserId(cursor.getString(cacheColumnIndex[12]));
long dateValue = cursor.getLong(cacheColumnIndex[13]);
if (dateValue != 0) {
cache.setHidden(new Date(dateValue));
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
index 23de2b1..ae62b33 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
@@ -37,10 +37,10 @@ public final class GCConstants {
public final static Pattern PATTERN_NAME = Pattern.compile("<span id=\"ctl00_ContentBody_CacheName\">(.*?)</span>");
public final static Pattern PATTERN_DIFFICULTY = Pattern.compile("<span id=\"ctl00_ContentBody_uxLegendScale\"[^>]*>[^<]*<img src=\"[^\"]*/images/stars/stars([0-9_]+)\\.gif\"");
public final static Pattern PATTERN_TERRAIN = Pattern.compile("<span id=\"ctl00_ContentBody_Localize[\\d]+\"[^>]*>[^<]*<img src=\"[^\"]*/images/stars/stars([0-9_]+)\\.gif\"");
- public final static Pattern PATTERN_OWNERREAL = Pattern.compile("<a id=\"ctl00_ContentBody_uxFindLinksHiddenByThisUser\" href=\"[^\"]*/seek/nearest\\.aspx\\?u=(.*?)\"");
+ public final static Pattern PATTERN_OWNER_USERID = Pattern.compile("<a id=\"ctl00_ContentBody_uxFindLinksHiddenByThisUser\" href=\"[^\"]*/seek/nearest\\.aspx\\?u=(.*?)\"");
public final static Pattern PATTERN_FOUND = Pattern.compile("<a id=\"ctl00_ContentBody_hlFoundItLog\"[^<]*<img src=\".*/images/stockholm/16x16/check\\.gif\"[^>]*>[^<]*</a>[^<]*</p>");
public final static Pattern PATTERN_FOUND_ALTERNATIVE = Pattern.compile("<div class=\"StatusInformationWidget FavoriteWidget\"");
- public final static Pattern PATTERN_OWNER = Pattern.compile("<div id=\"ctl00_ContentBody_mcd1\">[^<]+<a href=\"[^\"]+\">([^<]+)</a></div>");
+ public final static Pattern PATTERN_OWNER_DISPLAYNAME = Pattern.compile("<div id=\"ctl00_ContentBody_mcd1\">[^<]+<a href=\"[^\"]+\">([^<]+)</a></div>");
public final static Pattern PATTERN_TYPE = Pattern.compile("<img src=\"[^\"]*/WptTypes/\\d+\\.gif\" alt=\"([^\"]+?)\" title=\"[^\"]+\" width=\"32\" height=\"32\"");
public final static Pattern PATTERN_HIDDEN = Pattern.compile("<div id=\"ctl00_ContentBody_mcd2\">\\W*Hidden[\\s:]*([^<]+?)</div>");
public final static Pattern PATTERN_HIDDENEVENT = Pattern.compile("Event\\s*Date\\s*:\\s*([^<]+)<div id=\"calLinks\">", Pattern.DOTALL);
diff --git a/main/src/cgeo/geocaching/connector/gc/GCMap.java b/main/src/cgeo/geocaching/connector/gc/GCMap.java
index dd9193d..c71b859 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCMap.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCMap.java
@@ -88,7 +88,7 @@ public class GCMap {
JSONObject typeObj = dataObject.getJSONObject("type");
cache.setType(CacheType.getByPattern(typeObj.getString("text"))); // Traditional Cache
JSONObject ownerObj = dataObject.getJSONObject("owner");
- cache.setOwner(ownerObj.getString("text"));
+ cache.setOwnerDisplayName(ownerObj.getString("text"));
result.addCache(cache);
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index 44b35b6..ab579c4 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -377,9 +377,9 @@ public abstract class GCParser {
cache.setName(cacheName);
// owner real name
- cache.setOwnerReal(URLDecoder.decode(BaseUtils.getMatch(page, GCConstants.PATTERN_OWNERREAL, true, cache.getOwnerReal())));
+ cache.setOwnerUserId(URLDecoder.decode(BaseUtils.getMatch(page, GCConstants.PATTERN_OWNER_USERID, true, cache.getOwnerUserId())));
- cache.setOwn(StringUtils.equalsIgnoreCase(cache.getOwnerReal(), Settings.getUsername()));
+ cache.setOwn(StringUtils.equalsIgnoreCase(cache.getOwnerUserId(), Settings.getUsername()));
String tableInside = page;
@@ -405,7 +405,7 @@ public abstract class GCParser {
}
// owner
- cache.setOwner(Html.fromHtml(BaseUtils.getMatch(tableInside, GCConstants.PATTERN_OWNER, true, cache.getOwner())).toString());
+ cache.setOwnerDisplayName(Html.fromHtml(BaseUtils.getMatch(tableInside, GCConstants.PATTERN_OWNER_DISPLAYNAME, true, cache.getOwnerDisplayName())).toString());
// hidden
try {
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 0212a64..8bdb9a4 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -133,7 +133,7 @@ final public class OkapiClient {
// not used: url
final JSONObject owner = response.getJSONObject(CACHE_OWNER);
- cache.setOwner(parseUser(owner));
+ cache.setOwnerDisplayName(parseUser(owner));
cache.getLogCounts().put(LogType.FOUND_IT, response.getInt(CACHE_FOUNDS));
cache.getLogCounts().put(LogType.DIDNT_FIND_IT, response.getInt(CACHE_NOTFOUNDS));
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index 156d9d4..afae7ae 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -134,11 +134,11 @@ class GpxExport extends AbstractExport {
gpx.write("</groundspeak:name>");
gpx.write("<groundspeak:placed_by>");
- gpx.write(StringEscapeUtils.escapeXml(cache.getOwner()));
+ gpx.write(StringEscapeUtils.escapeXml(cache.getOwnerDisplayName()));
gpx.write("</groundspeak:placed_by>");
gpx.write("<groundspeak:owner>");
- gpx.write(StringEscapeUtils.escapeXml(cache.getOwnerReal()));
+ gpx.write(StringEscapeUtils.escapeXml(cache.getOwnerUserId()));
gpx.write("</groundspeak:owner>");
gpx.write("<groundspeak:type>");
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index e083f58..76ca111 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -485,8 +485,17 @@ public abstract class GPXParser extends FileParser {
gcCache.getChild(nsGC, "owner").setEndTextElementListener(new EndTextElementListener() {
@Override
- public void end(String cacheOwner) {
- cache.setOwner(validate(cacheOwner));
+ public void end(String ownerUserId) {
+ cache.setOwnerUserId(validate(ownerUserId));
+ }
+ });
+
+ // waypoint.cache.getOwner()
+ gcCache.getChild(nsGC, "placed_by").setEndTextElementListener(new EndTextElementListener() {
+
+ @Override
+ public void end(String ownerDisplayName) {
+ cache.setOwnerDisplayName(validate(ownerDisplayName));
}
});
generated by cgit v1.1 at 2025-11-14 00:46:33 +0000