From f421a88ed7f8c11d1ab8632f2da40a0da08da694 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Wed, 27 Aug 2014 22:05:26 +0200
Subject: fix #4245: IllegalStateException with NFC

Setting the Ndef record creator in onCreate() is the recommended way to
do it. A null can also be returned if no message should be created.
---
 main/src/cgeo/geocaching/CacheDetailActivity.java | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'main/src')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index cbc3840..bebb63a 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -305,6 +305,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
@@ -583,16 +591,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();
-- 
cgit v1.1