Merge branch 'release' into upstream

1 files changed, 8 insertions, 10 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 67a835c..9a99b81 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -313,6 +313,14 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
         });
 
         locationUpdater = new CacheDetailsGeoDirHandler(this);
+
+        // If we have a newer Android device setup Android Beam for easy cache sharing
+        initializeAndroidBeam(new ActivitySharingInterface() {
+            @Override
+            public String getUri() {
+                return cache != null ? cache.getCgeoUrl() : null;
+            }
+        });
     }
 
     @Override
@@ -605,16 +613,6 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
         updateTitleBar(cache.getGeocode(), cache.getName(), cache.getType());
 
-        // if we have a newer Android device setup Android Beam for easy cache sharing
-        initializeAndroidBeam(
-                new ActivitySharingInterface() {
-                    @Override
-                    public String getUri() {
-                        return cache.getCgeoUrl();
-                    }
-                }
-        );
-
         // reset imagesList so Images view page will be redrawn
         imagesList = null;
         reinitializeViewPager();