1 files changed, 8 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 57b391f..c6c13cf 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -142,7 +142,7 @@ public class SearchActivity extends AbstractActivity {
         }
 
         if (keywordSearch) { // keyword fallback, if desired by caller
-            cgeocaches.startActivityKeyword(this, query.trim());
+            CacheListActivity.startActivityKeyword(this, query.trim());
             return true;
         }
 
@@ -171,7 +171,7 @@ public class SearchActivity extends AbstractActivity {
                 findByGeocodeFn();
             }
         });
-        addHistoryEntries(geocodeEdit, cgData.getRecentGeocodesForSearch());
+        addHistoryEntries(geocodeEdit, DataStore.getRecentGeocodesForSearch());
         displayByGeocode.setOnClickListener(new FindByGeocodeListener());
 
         EditUtils.setActionListener((EditText) findViewById(R.id.keyword), new Runnable() {
@@ -214,7 +214,7 @@ public class SearchActivity extends AbstractActivity {
                 findTrackableFn();
             }
         });
-        addHistoryEntries(trackable, cgData.getTrackableCodes());
+        addHistoryEntries(trackable, DataStore.getTrackableCodes());
         disableSuggestions(trackable);
         displayTrackable.setOnClickListener(new FindTrackableListener());
     }
@@ -238,7 +238,7 @@ public class SearchActivity extends AbstractActivity {
                         lonEdit.setHint(geo.getCoords().format(GeopointFormatter.Format.LON_DECMINUTE_RAW));
                     }
                 }
-            } catch (final Exception e) {
+            } catch (final RuntimeException e) {
                 Log.w("Failed to update location.");
             }
         }
@@ -281,7 +281,7 @@ public class SearchActivity extends AbstractActivity {
             }
         } else {
             try {
-                cgeocaches.startActivityCoordinates(this, new Geopoint(StringUtils.trim(latText), StringUtils.trim(lonText)));
+                CacheListActivity.startActivityCoordinates(this, new Geopoint(StringUtils.trim(latText), StringUtils.trim(lonText)));
             } catch (final Geopoint.ParseException e) {
                 showToast(res.getString(e.resource));
             }
@@ -305,7 +305,7 @@ public class SearchActivity extends AbstractActivity {
             return;
         }
 
-        cgeocaches.startActivityKeyword(this, StringUtils.trim(keyText));
+        CacheListActivity.startActivityKeyword(this, StringUtils.trim(keyText));
     }
 
     private class FindByAddressListener implements View.OnClickListener {
@@ -344,7 +344,7 @@ public class SearchActivity extends AbstractActivity {
             return;
         }
 
-        cgeocaches.startActivityUserName(this, StringUtils.trim(usernameText));
+        CacheListActivity.startActivityUserName(this, StringUtils.trim(usernameText));
     }
 
     private void findByOwnerFn() {
@@ -359,7 +359,7 @@ public class SearchActivity extends AbstractActivity {
             return;
         }
 
-        cgeocaches.startActivityOwner(this, StringUtils.trim(usernameText));
+        CacheListActivity.startActivityOwner(this, StringUtils.trim(usernameText));
     }
 
     private class FindByGeocodeListener implements View.OnClickListener {