1 files changed, 7 insertions, 17 deletions
diff --git a/main/src/cgeo/geocaching/apps/LocusDataStorageProvider.java b/main/src/cgeo/geocaching/apps/LocusDataStorageProvider.java
index 6897f95..03954f5 100644
--- a/main/src/cgeo/geocaching/apps/LocusDataStorageProvider.java
+++ b/main/src/cgeo/geocaching/apps/LocusDataStorageProvider.java
@@ -4,16 +4,12 @@ import menion.android.locus.addon.publiclib.geoData.PointsData;
 import menion.android.locus.addon.publiclib.utils.DataCursor;
 import menion.android.locus.addon.publiclib.utils.DataStorage;
 
-import org.apache.commons.collections.CollectionUtils;
-
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Parcel;
 
-import java.util.ArrayList;
-
 /**
  * code provided by menion - developer of Locus
  */
@@ -23,20 +19,14 @@ public class LocusDataStorageProvider extends ContentProvider {
     public Cursor query(Uri aUri, String[] aProjection, String aSelection,
             String[] aSelectionArgs, String aSortOrder) {
 
-        DataCursor cursor = new DataCursor(new String[] { "data" });
-
-        ArrayList<PointsData> data = DataStorage.getData();
-        if (CollectionUtils.isEmpty(data)) {
-            return cursor;
-        }
+        final DataCursor cursor = new DataCursor(new String[] { "data" });
 
-        for (int i = 0; i < data.size(); i++) {
-            // get byte array
-            Parcel par = Parcel.obtain();
-            data.get(i).writeToParcel(par, 0);
-            byte[] byteData = par.marshall();
-            // add to row
-            cursor.addRow(new Object[] { byteData });
+        for (final PointsData item : DataStorage.getData()) {
+            final Parcel par = Parcel.obtain();
+            item.writeToParcel(par, 0);
+            // add byte array to row
+            cursor.addRow(new Object[] { par.marshall() });
+            par.recycle();
         }
         // data filled to cursor, clear reference to prevent some memory issue
         DataStorage.clearData();