Merge pull request #419 from wordpress-mobile/issue/411-stats-crash

Limit the amount of group data we load  to MAX_ITEMS so that we don’t sp...

Author: nbradbury

src/org/wordpress/android/datasets/StatsClickGroupsTable.java

@@ -9,6 +9,7 @@
 import android.net.Uri;
 
 import org.wordpress.android.models.StatsClickGroup;
+import org.wordpress.android.ui.stats.StatsActivity;
 import org.wordpress.android.ui.stats.StatsTimeframe;
 
 /**
@@ -87,12 +88,12 @@ public static ContentValues getContentValues(StatsClickGroup item) {
     @Override
     public Cursor query(SQLiteDatabase database, Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
 
-        String sort = NAME + "." + Columns.TOTAL + " DESC, " + NAME + "." + Columns.NAME + " ASC";
+        String sort = NAME + "." + Columns.TOTAL + " DESC, " + NAME + "." + Columns.NAME + " ASC LIMIT " + StatsActivity.STATS_GROUP_MAX_ITEMS;
 
         String timeframe = uri.getQueryParameter("timeframe");
         if (timeframe == null)
             return super.query(database, uri, projection, selection, selectionArgs, sort);
-        
+
         // get the latest for "Today", and the next latest for "Yesterday"
         if (timeframe.equals(StatsTimeframe.TODAY.name())) {
             return database.rawQuery("SELECT * FROM " + NAME +", " +

src/org/wordpress/android/datasets/StatsGeoviewsTable.java

@@ -9,6 +9,7 @@
 import android.net.Uri;
 
 import org.wordpress.android.models.StatsGeoview;
+import org.wordpress.android.ui.stats.StatsActivity;
 import org.wordpress.android.ui.stats.StatsTimeframe;
 
 /**
@@ -77,7 +78,7 @@ public static ContentValues getContentValues(StatsGeoview item) {
     @Override
     public Cursor query(SQLiteDatabase database, Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
 
-        String sort = NAME + "." + Columns.VIEWS + " DESC, " + NAME + "." + Columns.COUNTRY + " ASC";
+        String sort = NAME + "." + Columns.VIEWS + " DESC, " + NAME + "." + Columns.COUNTRY + " ASC LIMIT " + StatsActivity.STATS_GROUP_MAX_ITEMS;
 
         String timeframe = uri.getQueryParameter("timeframe");
         if (timeframe == null)

src/org/wordpress/android/datasets/StatsReferrerGroupsTable.java

@@ -1,16 +1,17 @@
 package org.wordpress.android.datasets;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 
 import org.wordpress.android.models.StatsReferrerGroup;
+import org.wordpress.android.ui.stats.StatsActivity;
 import org.wordpress.android.ui.stats.StatsTimeframe;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 /**
  * A database table to represent groups in the stats for referrers.
  * A group may or may not have children. 
@@ -88,7 +89,7 @@ public static ContentValues getContentValues(StatsReferrerGroup item) {
     @Override
     public Cursor query(SQLiteDatabase database, Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
 
-        String sort = NAME + "." + Columns.TOTAL + " DESC, " + NAME + "." + Columns.NAME + " ASC";
+        String sort = NAME + "." + Columns.TOTAL + " DESC, " + NAME + "." + Columns.NAME + " ASC LIMIT " + StatsActivity.STATS_GROUP_MAX_ITEMS;
 
         String timeframe = uri.getQueryParameter("timeframe");
         if (timeframe == null)

src/org/wordpress/android/datasets/StatsSearchEngineTermsTable.java

@@ -9,6 +9,7 @@
 import android.net.Uri;
 
 import org.wordpress.android.models.StatsSearchEngineTerm;
+import org.wordpress.android.ui.stats.StatsActivity;
 import org.wordpress.android.ui.stats.StatsTimeframe;
 
 /**
@@ -73,7 +74,7 @@ public static ContentValues getContentValues(StatsSearchEngineTerm item) {
 
     @Override
     public Cursor query(SQLiteDatabase database, Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        String sort = NAME + "." + Columns.VIEWS + " DESC, " + NAME + "." + Columns.SEARCH + " ASC";
+        String sort = NAME + "." + Columns.VIEWS + " DESC, " + NAME + "." + Columns.SEARCH + " ASC LIMIT " + StatsActivity.STATS_GROUP_MAX_ITEMS;
 
         String timeframe = uri.getQueryParameter("timeframe");
         if (timeframe == null)

src/org/wordpress/android/datasets/StatsTopPostsAndPagesTable.java

@@ -9,6 +9,7 @@
 import android.net.Uri;
 
 import org.wordpress.android.models.StatsTopPostsAndPages;
+import org.wordpress.android.ui.stats.StatsActivity;
 import org.wordpress.android.ui.stats.StatsTimeframe;
 
 /**
@@ -79,7 +80,7 @@ public static ContentValues getContentValues(StatsTopPostsAndPages item) {
 
     @Override
     public Cursor query(SQLiteDatabase database, Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        String sort = NAME + "." + Columns.VIEWS + " DESC, " + NAME + "." + Columns.TITLE + " ASC";
+        String sort = NAME + "." + Columns.VIEWS + " DESC, " + NAME + "." + Columns.TITLE + " ASC LIMIT " + StatsActivity.STATS_GROUP_MAX_ITEMS;
 
         String timeframe = uri.getQueryParameter("timeframe");
         if (timeframe == null)

src/org/wordpress/android/ui/stats/StatsActivity.java

@@ -54,6 +54,9 @@
  */
 public class StatsActivity extends WPActionBarActivity {
 
+    // Max number of rows to show in a stats fragment
+    public static final int STATS_GROUP_MAX_ITEMS = 10;
+
     private static final String SAVED_NAV_POSITION = "SAVED_NAV_POSITION";
     private static final String SAVED_WP_LOGIN_STATE = "SAVED_WP_LOGIN_STATE";
     private static final int REQUEST_JETPACK = 7000;

src/org/wordpress/android/ui/stats/StatsCursorFragment.java

@@ -17,14 +17,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockFragment;
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
-import org.wordpress.android.util.Utils;
 
 /**
  * A fragment that appears as a 'page' in the {@link StatsAbsPagedViewFragment}. 
@@ -41,7 +39,6 @@
  */
 public class StatsCursorFragment extends SherlockFragment implements LoaderManager.LoaderCallbacks<Cursor> {
 
-    private static final int MAX_ITEMS_ON_TABLET = 10;
     private static final String ARGS_URI = "ARGS_URI";
     private static final String ARGS_ENTRY_LABEL = "ARGS_ENTRY_LABEL";
     private static final String ARGS_TOTALS_LABEL = "ARGS_TOTALS_LABEL";
@@ -164,7 +161,7 @@ private void reloadLinearLayout() {
         mLinearLayout.removeAllViews();
 
         // limit number of items to show otherwise it would cause performance issues on the linearlayout
-        int count = Math.min(mAdapter.getCount(), MAX_ITEMS_ON_TABLET);
+        int count = Math.min(mAdapter.getCount(), StatsActivity.STATS_GROUP_MAX_ITEMS);
         for (int i = 0; i < count; i++) {
             View view = mAdapter.getView(i, null, mLinearLayout);
             if (i % 2 == 1)

src/org/wordpress/android/ui/stats/StatsCursorTreeFragment.java

@@ -19,15 +19,13 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.CursorTreeAdapter;
-import android.widget.ExpandableListView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockFragment;
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
-import org.wordpress.android.util.Utils;
 
 /**
  * A fragment that appears as a 'page' in the {@link StatsAbsPagedViewFragment}. Similar to {@link StatsCursorFragment}, 
@@ -48,9 +46,7 @@
  */
 public class StatsCursorTreeFragment extends SherlockFragment implements LoaderManager.LoaderCallbacks<Cursor>, StatsCursorLoaderCallback {
 
-    private static final int MAX_ITEMS_ON_TABLET = 10;
     private static final int LOADER_URI_GROUP_INDEX = -1;
-    
     private static final String ARGS_GROUP_URI = "ARGS_GROUP_URI";
     private static final String ARGS_CHILDREN_URI = "ARGS_CHILDREN_URI";
     private static final String ARGS_ENTRY_LABEL = "ARGS_ENTRY_LABEL";
@@ -175,19 +171,19 @@ public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
 
         // cursor is for groups
         if (loader.getId() == LOADER_URI_GROUP_INDEX) {
-            
+
             // start loaders on children
             while (data.moveToNext()) {
                 String groupId = data.getString(data.getColumnIndex("groupId"));
                 long date = data.getLong(data.getColumnIndex("date"));
-                
+
                 Bundle bundle = new Bundle();
                 bundle.putString(StatsCursorLoaderCallback.BUNDLE_GROUP_ID, groupId);
                 bundle.putLong(StatsCursorLoaderCallback.BUNDLE_DATE, date);
-                
+
                 getLoaderManager().restartLoader(data.getPosition(), bundle, StatsCursorTreeFragment.this);
             }
-        
+
 
             mCallback.onCursorLoaded(getGroupUri(), data);
 
@@ -235,7 +231,7 @@ private void reloadLinearLayout() {
         mLinearLayout.removeAllViews();
 
         // limit number of items to show otherwise it would cause performance issues on the linearlayout
-        int groupCount = Math.min(mAdapter.getGroupCount(), MAX_ITEMS_ON_TABLET);
+        int groupCount = Math.min(mAdapter.getGroupCount(), StatsActivity.STATS_GROUP_MAX_ITEMS);
         for (int i = 0; i < groupCount; i++) {
 
             boolean isExpanded = mGroupIdToExpandedMap.get(i);