1 files changed, 18 insertions, 13 deletions

diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 1b9fe46..0daa124 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;
@@ -24,8 +25,9 @@ import cgeo.geocaching.utils.Version;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jdt.annotation.NonNull;
 
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -284,7 +286,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();
@@ -367,7 +369,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;
@@ -469,7 +471,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)
@@ -480,7 +482,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);
                     }
                 })
@@ -488,7 +490,7 @@ public class MainActivity extends AbstractActivity {
                     @Override
                     public void onClick(final DialogInterface dialog, final int id) {
                         dialog.cancel();
-                        cgData.resetNewlyCreatedDatabase();
+                        DataStore.resetNewlyCreatedDatabase();
                     }
                 })
                 .create()
@@ -516,11 +518,14 @@ public class MainActivity extends AbstractActivity {
 
                             @Override
                             public boolean onLongClick(View v) {
+                                if (!Settings.isPremiumMember()) {
+                                    return true;
+                                }
                                 new PocketQueryList.UserInterface(MainActivity.this).promptForListSelection(new RunnableWithArgument<PocketQueryList>() {
 
                                     @Override
-                                    public void run(PocketQueryList pql) {
-                                        cgeocaches.startActivityPocket(MainActivity.this, pql.getGuid(), pql.getName());
+                                    public void run(final @NonNull PocketQueryList pql) {
+                                        CacheListActivity.startActivityPocket(MainActivity.this, pql);
                                     }
                                 });
                                 return true;
@@ -585,7 +590,7 @@ public class MainActivity extends AbstractActivity {
         }
 
         nearestView.setPressed(true);
-        cgeocaches.startActivityNearest(this, app.currentGeo().getCoords());
+        CacheListActivity.startActivityNearest(this, app.currentGeo().getCoords());
     }
 
     /**
@@ -594,7 +599,7 @@ public class MainActivity extends AbstractActivity {
      */
     public void cgeoFindByOffline(final View v) {
         findByOffline.setPressed(true);
-        cgeocaches.startActivityOffline(this);
+        CacheListActivity.startActivityOffline(this);
     }
 
     /**
@@ -658,7 +663,7 @@ public class MainActivity extends AbstractActivity {
             }
 
             int checks = 0;
-            while (!cgData.isInitialized()) {
+            while (!DataStore.isInitialized()) {
                 try {
                     wait(500);
                     checks++;
@@ -671,7 +676,7 @@ public class MainActivity extends AbstractActivity {
                 }
             }
 
-            countBubbleCnt = cgData.getAllCachesCount();
+            countBubbleCnt = DataStore.getAllCachesCount();
 
             countBubbleHandler.sendEmptyMessage(0);
         }
@@ -696,7 +701,7 @@ public class MainActivity extends AbstractActivity {
             }
 
             cleanupRunning = true;
-            cgData.clean(more);
+            DataStore.clean(more);
             cleanupRunning = false;
 
             if (version > 0) {