Performance improvement (make query of unreadItemCountFeedFolder around 2 times faster)

Author: David-Development

News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ListView/SubscriptionExpandableListAdapter.java

@@ -424,10 +424,12 @@ protected Void doInBackground(Void... voids) {
             StopWatch stopwatch = new StopWatch();
             stopwatch.start();
 
-            unreadCountFoldersTemp = dbConn.getUnreadItemCountForFolder();
-            unreadCountFeedsTemp = dbConn.getUnreadItemCountForFeed();
-            starredCountFeedsTemp = dbConn.getStarredItemCountForFeed();
+            SparseArray<String>[] temp = dbConn.getUnreadItemCountFeedFolder();
 
+            unreadCountFoldersTemp = temp[0];// dbConn.getUnreadItemCountForFolder();
+            unreadCountFeedsTemp = temp[1]; // dbConn.getUnreadItemCountForFeed();
+
+            starredCountFeedsTemp = dbConn.getStarredItemCount();
             urlsToFavIconsTemp = dbConn.getUrlsToFavIcons();
 
             stopwatch.stop();

News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java

@@ -508,20 +508,27 @@ private boolean syncFinishedHandler() {
 		return false;
 	}
 
+
+	private int onResumeCount = 0;
 	@Override
 	protected void onResume() {
-		ThemeChooser.chooseTheme(this);
+        ThemeChooser.chooseTheme(this); // Causes onResume to be called twice
 
-		//reloadCountNumbersOfSlidingPaneAdapter();
+		if(onResumeCount > 1) {
+			//reloadCountNumbersOfSlidingPaneAdapter();
 
-		//reload adapter - a sync could have been finished
-		NewsReaderListFragment newsReaderListFragment = getSlidingListFragment();
-		if (newsReaderListFragment != null) {
-			newsReaderListFragment.ReloadAdapter();
-            newsReaderListFragment.bindUserInfoToUI();
-		}
+			//reload adapter - a sync could have been finished
+			NewsReaderListFragment newsReaderListFragment = getSlidingListFragment();
+			if (newsReaderListFragment != null) {
+				newsReaderListFragment.ReloadAdapter();
+				newsReaderListFragment.bindUserInfoToUI();
+			}
+
+			invalidateOptionsMenu();
+		} else {
+            onResumeCount++;
+        }
 
-		invalidateOptionsMenu();
 
 		super.onResume();
 	}
@@ -835,8 +842,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             //Update settings of image Loader
             ((NewsReaderApplication)getApplication()).initImageLoader();
 
-			getSlidingListFragment().ReloadAdapter();
-
 			String oldLayout = data.getStringExtra(SettingsActivity.SP_FEED_LIST_LAYOUT);
 			String newLayout = PreferenceManager.getDefaultSharedPreferences(this).getString(SettingsActivity.SP_FEED_LIST_LAYOUT,"0");
 

News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/DatabaseConnectionOrm.java

@@ -338,7 +338,8 @@ public void run() {
                 for (RssItem rssItem : list) {
                     daoSession.getRssItemDao().delete(rssItem);
                 }
-            }});
+            }
+        });
     }
 
     public void renameFeedById(long feedId, String newTitle) {
@@ -489,23 +490,6 @@ public void run() {
         Log.v(TAG, "Time needed for insert: " + sw.toString());
     }
 
-    public SparseArray<String> getUnreadItemCountForFolder() {
-        String buildSQL = "SELECT f." + FolderDao.Properties.Id.columnName + ", COUNT(1)" +
-                " FROM " + RssItemDao.TABLENAME + " rss " +
-                " JOIN " + FeedDao.TABLENAME + " feed ON rss." + RssItemDao.Properties.FeedId.columnName + " = feed." + FeedDao.Properties.Id.columnName +
-                " JOIN " + FolderDao.TABLENAME + " f ON feed." + FeedDao.Properties.FolderId.columnName + " = f." + FolderDao.Properties.Id.columnName +
-                " WHERE " + RssItemDao.Properties.Read_temp.columnName + " != 1 " +
-                " GROUP BY f." + FolderDao.Properties.Id.columnName;
-
-        SparseArray<String> values = getStringSparseArrayFromSQL(buildSQL, 0, 1);
-
-        values.put(SPECIAL_FOLDERS.ALL_UNREAD_ITEMS.getValue(), getUnreadItemsCountForSpecificFolder(SPECIAL_FOLDERS.ALL_UNREAD_ITEMS));
-        values.put(SPECIAL_FOLDERS.ALL_STARRED_ITEMS.getValue(), getUnreadItemsCountForSpecificFolder(SPECIAL_FOLDERS.ALL_STARRED_ITEMS));
-
-
-        return values;
-    }
-
     public String getUnreadItemsCountForSpecificFolder(SPECIAL_FOLDERS specialFolder) {
         String buildSQL = "SELECT COUNT(1)" +
                 " FROM " + RssItemDao.TABLENAME + " rss ";
@@ -520,16 +504,66 @@ public String getUnreadItemsCountForSpecificFolder(SPECIAL_FOLDERS specialFolder
         return values.valueAt(0);
     }
 
-    public SparseArray<String> getUnreadItemCountForFeed() {
-        String buildSQL = "SELECT " + RssItemDao.Properties.FeedId.columnName + ", COUNT(1)" + // rowid as _id,
-                " FROM " + RssItemDao.TABLENAME +
+    /**
+     *
+     * @return [0] = unread items count for folders, [1] = unread items count for feeds
+     */
+    public SparseArray<String>[] getUnreadItemCountFeedFolder() {
+        SparseArray<String>[] values = new SparseArray[2];
+
+        String buildSQL = "SELECT f." + FolderDao.Properties.Id.columnName + ", feed." + FeedDao.Properties.Id.columnName + ", COUNT(1)" +
+                " FROM " + RssItemDao.TABLENAME + " rss " +
+                " JOIN " + FeedDao.TABLENAME + " feed ON rss." + RssItemDao.Properties.FeedId.columnName + " = feed." + FeedDao.Properties.Id.columnName +
+                " LEFT OUTER JOIN " + FolderDao.TABLENAME + " f ON feed." + FeedDao.Properties.FolderId.columnName + " = f." + FolderDao.Properties.Id.columnName +
                 " WHERE " + RssItemDao.Properties.Read_temp.columnName + " != 1 " +
-                " GROUP BY " + RssItemDao.Properties.FeedId.columnName;
+                " GROUP BY f." + FolderDao.Properties.Id.columnName + ", feed." + FeedDao.Properties.Id.columnName;
+                //" GROUP BY (case when f." + FolderDao.Properties.Id.columnName + " IS NULL then feed." + FeedDao.Properties.Id.columnName + " ELSE f." + FolderDao.Properties.Id.columnName + " end)";
+
+        values[0] = new SparseArray<>();
+        values[1] = new SparseArray<>();
+
+        int totalUnreadItemsCount = 0;
+
+        Cursor cursor = daoSession.getDatabase().rawQuery(buildSQL, null);
+        try
+        {
+            if(cursor != null)
+            {
+                if(cursor.getCount() > 0)
+                {
+                    cursor.moveToFirst();
+                    do {
+                        int folderId = cursor.getInt(0);
+                        int feedId = cursor.getInt(1);
+                        int unreadCount = cursor.getInt(2);
+
+                        totalUnreadItemsCount += unreadCount;
+
+                        values[1].put(feedId, String.valueOf(unreadCount));
+                        if(folderId != 0) {
+                            if(values[0].get(folderId) != null) {
+                                unreadCount += Integer.parseInt(values[0].get(folderId));
+                            }
+
+                            values[0].put(folderId, String.valueOf(unreadCount));
+                        }
+                    } while(cursor.moveToNext());
+                }
+            }
+        } finally {
+            cursor.close();
+        }
+
+
+        values[0].put(SPECIAL_FOLDERS.ALL_UNREAD_ITEMS.getValue(), String.valueOf(totalUnreadItemsCount));
+        values[0].put(SPECIAL_FOLDERS.ALL_STARRED_ITEMS.getValue(), getUnreadItemsCountForSpecificFolder(SPECIAL_FOLDERS.ALL_STARRED_ITEMS));
+
+
+        return values;
 
-        return getStringSparseArrayFromSQL(buildSQL, 0, 1);
     }
 
-    public SparseArray<String> getStarredItemCountForFeed() {
+    public SparseArray<String> getStarredItemCount() {
         String buildSQL = "SELECT " + RssItemDao.Properties.FeedId.columnName + ", COUNT(1)" + // rowid as _id,
                 " FROM " + RssItemDao.TABLENAME +
                 " WHERE " + RssItemDao.Properties.Starred_temp.columnName + " = 1 " +