Merge branch 'issue-2322' into upstream

Conflicts:
	main/src/cgeo/geocaching/connector/IConnector.java
	main/src/cgeo/geocaching/connector/gc/GCParser.java
	main/src/cgeo/geocaching/maps/CGeoMap.java

1 files changed, 3 insertions, 3 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 933e2d2..373536b 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1543,7 +1543,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             Button buttonRemove = (Button) view.findViewById(R.id.remove_from_watchlist);
             TextView text = (TextView) view.findViewById(R.id.watchlist_text);
 
-            if (cache.isOnWatchlist() || cache.isOwn()) {
+            if (cache.isOnWatchlist() || cache.isOwner()) {
                 buttonAdd.setVisibility(View.GONE);
                 buttonRemove.setVisibility(View.VISIBLE);
                 text.setText(R.string.cache_watchlist_on);
@@ -1554,7 +1554,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             }
 
             // the owner of a cache has it always on his watchlist. Adding causes an error
-            if (cache.isOwn()) {
+            if (cache.isOwner()) {
                 buttonAdd.setEnabled(false);
                 buttonAdd.setVisibility(View.GONE);
                 buttonRemove.setEnabled(false);
@@ -1570,7 +1570,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             LinearLayout layout = (LinearLayout) view.findViewById(R.id.favpoint_box);
             boolean supportsFavoritePoints = cache.supportsFavoritePoints();
             layout.setVisibility(supportsFavoritePoints ? View.VISIBLE : View.GONE);
-            if (!supportsFavoritePoints || cache.isOwn() || !Settings.isPremiumMember()) {
+            if (!supportsFavoritePoints || cache.isOwner() || !Settings.isPremiumMember()) {
                 return;
             }
             Button buttonAdd = (Button) view.findViewById(R.id.add_to_favpoint);