Safer cleanup of adapter temps on DB rebuild.

This commit is contained in:
dosiecki 2015-09-21 14:38:34 -07:00
parent 953919cb0f
commit c1ce11db19

View file

@ -1,6 +1,7 @@
package com.newsblur.database; package com.newsblur.database;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
@ -514,18 +515,18 @@ public class FolderListAdapter extends BaseExpandableListAdapter {
folders = Collections.emptyMap(); folders = Collections.emptyMap();
flatFolders = Collections.emptyMap(); flatFolders = Collections.emptyMap();
activeFolderNames.clear(); safeClear(activeFolderNames);
activeFolderChildren.clear(); safeClear(activeFolderChildren);
folderNeutCounts.clear(); safeClear(folderNeutCounts);
folderPosCounts.clear(); safeClear(folderPosCounts);
feeds = Collections.emptyMap(); feeds = Collections.emptyMap();
feedNeutCounts.clear(); safeClear(feedNeutCounts);
feedPosCounts.clear(); safeClear(feedPosCounts);
totalNeutCount = 0; totalNeutCount = 0;
totalPosCount = 0; totalPosCount = 0;
closedFolders.clear(); safeClear(closedFolders);
savedStoriesCount = 0; savedStoriesCount = 0;
} }
@ -674,4 +675,12 @@ public class FolderListAdapter extends BaseExpandableListAdapter {
} }
}; };
public void safeClear(Collection c) {
if (c != null) c.clear();
}
public void safeClear(Map m) {
if (m != null) m.clear();
}
} }