1 files changed, 15 insertions, 13 deletions

diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 0fd6759..16ce0f9 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -10,6 +10,7 @@ import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Units;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.maps.CGeoMap;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.settings.SettingsActivity;
@@ -47,6 +48,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -141,7 +143,7 @@ public class MainActivity extends AbstractActivity {
 
                     navLocation.setText(StringUtils.join(addressParts, ", "));
                 }
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 // nothing
             }
 
@@ -283,7 +285,7 @@ public class MainActivity extends AbstractActivity {
                 startActivity(new Intent(this, SettingsActivity.class));
                 return true;
             case R.id.menu_history:
-                cgeocaches.startActivityHistory(this);
+                CacheListActivity.startActivityHistory(this);
                 return true;
             case R.id.menu_scan:
                 startScannerApplication();
@@ -366,7 +368,7 @@ public class MainActivity extends AbstractActivity {
                     @Override
                     public void run(final Integer selectedListId) {
                         Settings.saveLastList(selectedListId);
-                        cgeocaches.startActivityOffline(MainActivity.this);
+                        CacheListActivity.startActivityOffline(MainActivity.this);
                     }
                 });
                 return true;
@@ -468,7 +470,7 @@ public class MainActivity extends AbstractActivity {
     }
 
     private void checkRestore() {
-        if (!cgData.isNewlyCreatedDatebase() || null == DatabaseBackupUtils.getRestoreFile()) {
+        if (!DataStore.isNewlyCreatedDatebase() || null == DatabaseBackupUtils.getRestoreFile()) {
             return;
         }
         new AlertDialog.Builder(this)
@@ -479,7 +481,7 @@ public class MainActivity extends AbstractActivity {
                     @Override
                     public void onClick(final DialogInterface dialog, final int id) {
                         dialog.dismiss();
-                        cgData.resetNewlyCreatedDatabase();
+                        DataStore.resetNewlyCreatedDatabase();
                         DatabaseBackupUtils.restoreDatabase(MainActivity.this);
                     }
                 })
@@ -487,7 +489,7 @@ public class MainActivity extends AbstractActivity {
                     @Override
                     public void onClick(final DialogInterface dialog, final int id) {
                         dialog.cancel();
-                        cgData.resetNewlyCreatedDatabase();
+                        DataStore.resetNewlyCreatedDatabase();
                     }
                 })
                 .create()
@@ -542,7 +544,7 @@ public class MainActivity extends AbstractActivity {
                     navAccuracy.setText(null);
                     navLocation.setText(res.getString(R.string.loc_trying));
                 }
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 Log.w("Failed to update location.");
             }
         }
@@ -567,7 +569,7 @@ public class MainActivity extends AbstractActivity {
         }
 
         nearestView.setPressed(true);
-        cgeocaches.startActivityNearest(this, app.currentGeo().getCoords());
+        CacheListActivity.startActivityNearest(this, app.currentGeo().getCoords());
     }
 
     /**
@@ -576,7 +578,7 @@ public class MainActivity extends AbstractActivity {
      */
     public void cgeoFindByOffline(final View v) {
         findByOffline.setPressed(true);
-        cgeocaches.startActivityOffline(this);
+        CacheListActivity.startActivityOffline(this);
     }
 
     /**
@@ -640,7 +642,7 @@ public class MainActivity extends AbstractActivity {
             }
 
             int checks = 0;
-            while (!cgData.isInitialized()) {
+            while (!DataStore.isInitialized()) {
                 try {
                     wait(500);
                     checks++;
@@ -653,7 +655,7 @@ public class MainActivity extends AbstractActivity {
                 }
             }
 
-            countBubbleCnt = cgData.getAllCachesCount();
+            countBubbleCnt = DataStore.getAllCachesCount();
 
             countBubbleHandler.sendEmptyMessage(0);
         }
@@ -678,7 +680,7 @@ public class MainActivity extends AbstractActivity {
             }
 
             cleanupRunning = true;
-            cgData.clean(more);
+            DataStore.clean(more);
             cleanupRunning = false;
 
             if (version > 0) {
@@ -721,7 +723,7 @@ public class MainActivity extends AbstractActivity {
                 final Geocoder geocoder = new Geocoder(MainActivity.this, Locale.getDefault());
                 final Geopoint coords = app.currentGeo().getCoords();
                 addresses = geocoder.getFromLocation(coords.getLatitude(), coords.getLongitude(), 1);
-            } catch (Exception e) {
+            } catch (IOException e) {
                 Log.i("Failed to obtain address");
             }