refactoring: remove useless code

A much more thorough cleanup is needed in the dataflow of the
`CacheDetailActivity` class.

2 files changed, 8 insertions, 20 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 23caf47..dce4a13 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -176,24 +176,15 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
         // set title in code, as the activity needs a hard coded title due to the intent filters
         setTitle(res.getString(R.string.cache));
 
-        String geocode = null;
-
-        // TODO Why can it happen that search is not null? onCreate should be called only once and it is not set before.
-        if (search != null) {
-            cache = search.getFirstCacheFromResult(LoadFlags.LOAD_ALL_DB_ONLY);
-            if (cache != null && cache.getGeocode() != null) {
-                geocode = cache.getGeocode();
-            }
-        }
-
         // get parameters
         final Bundle extras = getIntent().getExtras();
         final Uri uri = getIntent().getData();
 
         // try to get data from extras
         String name = null;
+        String geocode = null;
         String guid = null;
-        if (geocode == null && extras != null) {
+        if (extras != null) {
             geocode = extras.getString(Intents.EXTRA_GEOCODE);
             name = extras.getString(Intents.EXTRA_NAME);
             guid = extras.getString(Intents.EXTRA_GUID);
@@ -542,20 +533,19 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             if (UPDATE_LOAD_PROGRESS_DETAIL == msg.what && msg.obj instanceof String) {
                 updateStatusMsg((String) msg.obj);
             } else {
-                CacheDetailActivity activity = ((CacheDetailActivity) activityRef.get());
+                final CacheDetailActivity activity = ((CacheDetailActivity) activityRef.get());
                 if (activity == null) {
                     return;
                 }
-                SearchResult search = activity.getSearch();
-                if (search == null) {
+                if (activity.search == null) {
                     showToast(R.string.err_dwld_details_failed);
                     dismissProgress();
                     finishActivity();
                     return;
                 }
 
-                if (search.getError() != null) {
-                    activity.showToast(activity.getResources().getString(R.string.err_dwld_details_failed) + " " + search.getError().getErrorString(activity.getResources()) + ".");
+                if (activity.search.getError() != null) {
+                    activity.showToast(activity.getResources().getString(R.string.err_dwld_details_failed) + " " + activity.search.getError().getErrorString(activity.getResources()) + ".");
                     dismissProgress();
                     finishActivity();
                     return;
@@ -2255,10 +2245,6 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
         return cache;
     }
 
-    public SearchResult getSearch() {
-        return search;
-    }
-
     private static class StoreCacheHandler extends SimpleCancellableHandler {
 
         public StoreCacheHandler(CacheDetailActivity activity, Progress progress) {
diff --git a/main/src/cgeo/geocaching/SearchResult.java b/main/src/cgeo/geocaching/SearchResult.java
index 131a01c..46ac38e 100644
--- a/main/src/cgeo/geocaching/SearchResult.java
+++ b/main/src/cgeo/geocaching/SearchResult.java
@@ -10,6 +10,7 @@ import cgeo.geocaching.gcvote.GCVote;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jdt.annotation.Nullable;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -228,6 +229,7 @@ public class SearchResult implements Parcelable {
         return result;
     }
 
+    @Nullable
     public Geocache getFirstCacheFromResult(final EnumSet<LoadFlag> loadFlags) {
         return CollectionUtils.isNotEmpty(geocodes) ? DataStore.loadCache(geocodes.iterator().next(), loadFlags) : null;
     }