[Offline pages] Adding capability to free up space used by Offline pages

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkItemsAdapter.java

Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkItemsAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkItemsAdapter.java
index 40b83b2efb3186b2d232ecbc663a9ef55e59ed2d..d5fccb433c15b6b379118b35c422ba87dbb07a83 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkItemsAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkItemsAdapter.java
@@ -16,6 +16,8 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BookmarksBridge.BookmarkItem;
 import org.chromium.chrome.browser.BookmarksBridge.BookmarkModelObserver;
 import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkPromoHeader.PromoHeaderShowingChangeListener;
+import org.chromium.chrome.browser.offline_pages.OfflinePageStorageSpaceHeader;
+import org.chromium.chrome.browser.offline_pages.OfflinePageStorageSpaceHeader.StorageSpaceHeaderCallback;
 import org.chromium.components.bookmarks.BookmarkId;
 
 import java.util.ArrayList;
@@ -31,18 +33,23 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
     private static final int FOLDER_VIEW = 1;
     private static final int DIVIDER_VIEW = 2;
     private static final int BOOKMARK_VIEW = 3;
+    private static final int OFFLINE_PAGES_STORAGE_VIEW = 4;
 
     private EnhancedBookmarkDelegate mDelegate;
     private Context mContext;
     private EnhancedBookmarkPromoHeader mPromoHeaderManager;
+    private OfflinePageStorageSpaceHeader mOfflineStorageHeader;
 
     private List<List<? extends Object>> mSections;
     private List<Object> mPromoHeaderSection = new ArrayList<>();
+    private List<Object> mOfflineStorageSection = new ArrayList<>();
     private List<Object> mFolderDividerSection = new ArrayList<>();
     private List<BookmarkId> mFolderSection = new ArrayList<>();
     private List<Object> mBookmarkDividerSection = new ArrayList<>();
     private List<BookmarkId> mBookmarkSection = new ArrayList<>();
 
+    private int mCurrentHeader = -1;

[Kibeom Kim (inactive), 2015/08/21 20:19:39]

minor suggestion:

I think it's good to reduce states to keep track in general. How about using
mDelegate#getCurrentState() instead of this variable.

So |void setCurrentHeader(int ...)| will become |void updateHeader()| and just
check the state there. also at #253.

[fgorski, 2015/08/21 22:09:38]

Done.
I made a relevant update, but i think for applying that solution long term, we
should also move UIState from EnhancedBookmarkManager (If this is the official
set of values for the EBDelegte.getCurrentState()

+
     private BookmarkModelObserver mBookmarkModelObserver = new BookmarkModelObserver() {
         @Override
         public void bookmarkNodeChanged(BookmarkItem node) {
@@ -74,6 +81,7 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
         mSections = new ArrayList<>();
         mSections.add(mPromoHeaderSection);
+        mSections.add(mOfflineStorageSection);
         mSections.add(mFolderDividerSection);
         mSections.add(mFolderSection);
         mSections.add(mBookmarkDividerSection);
@@ -141,11 +149,14 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
     private void updateDividerSections() {
         mFolderDividerSection.clear();
         mBookmarkDividerSection.clear();
-        if (!mPromoHeaderSection.isEmpty() && !mFolderSection.isEmpty()) {
+
+        boolean isHeaderPresent =
+                !mPromoHeaderSection.isEmpty() || !mOfflineStorageSection.isEmpty();
+
+        if (isHeaderPresent && !mFolderSection.isEmpty()) {
             mFolderDividerSection.add(null);
         }
-        if ((!mPromoHeaderSection.isEmpty() || !mFolderSection.isEmpty())
-                && !mBookmarkSection.isEmpty()) {
+        if ((isHeaderPresent || !mFolderSection.isEmpty()) && !mBookmarkSection.isEmpty()) {
             mBookmarkDividerSection.add(null);
         }
     }
@@ -174,6 +185,8 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
         if (section == mPromoHeaderSection) {
             return PROMO_HEADER_VIEW;
+        } else if (section == mOfflineStorageSection) {
+            return OFFLINE_PAGES_STORAGE_VIEW;
         } else if (section == mFolderDividerSection
                 || section == mBookmarkDividerSection) {
             return DIVIDER_VIEW;
@@ -192,6 +205,8 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         switch (viewType) {
             case PROMO_HEADER_VIEW:
                 return mPromoHeaderManager.createHolder(parent);
+            case OFFLINE_PAGES_STORAGE_VIEW:
+                return mOfflineStorageHeader.createHolder(parent);
             case DIVIDER_VIEW:
                 return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(
                         R.layout.eb_divider, parent, false)) {};
@@ -217,6 +232,7 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         BookmarkId id = getItem(position);
         switch (getItemViewType(position)) {
             case PROMO_HEADER_VIEW:
+            case OFFLINE_PAGES_STORAGE_VIEW:
             case DIVIDER_VIEW:
                 break;
             case FOLDER_VIEW:
@@ -234,6 +250,8 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
     @Override
     public void onPromoHeaderShowingChanged(boolean isShowing) {
+        if (mCurrentHeader != PROMO_HEADER_VIEW) return;
+
         mPromoHeaderSection.clear();
         if (isShowing) mPromoHeaderSection.add(null);
 
@@ -249,8 +267,15 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         mDelegate.addUIObserver(this);
         mDelegate.getModel().addObserver(mBookmarkModelObserver);
         mPromoHeaderManager = new EnhancedBookmarkPromoHeader(mContext, this);
-        if (mPromoHeaderManager.shouldShow()) mPromoHeaderSection.add(null);
-
+        mOfflineStorageHeader = new OfflinePageStorageSpaceHeader(mContext,
+                mDelegate.getModel().getOfflinePageBridge(), new StorageSpaceHeaderCallback() {

[jianli, 2015/08/21 21:06:27]

I believe you will hit an assert in OfflinePageStorageSpaceHeader constructor
when offline pages feature is not enabled. Should we create
OfflinePageStorageSpaceHeader if it is not enabled?

[fgorski, 2015/08/21 22:09:38]

Done.

+                    @Override
+                    public void onStorageSpaceCleanUpDone() {
+                        refreshOfflinePagesFilterView();
+                    }
+                });
+
+        setCurrentHeader(PROMO_HEADER_VIEW);

[Kibeom Kim (inactive), 2015/08/21 20:19:39]

Actually, we always set some state after
onEnhancedBookmarkDelegateInitialized(), so we don't need to update header here
as now we update promo header on state changes. Also below
updateDividerSections() weren't needed (my fault)

[fgorski, 2015/08/21 22:09:38]

Done.

         updateDividerSections();
     }
 
@@ -263,11 +288,13 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
     @Override
     public void onAllBookmarksStateSet() {
+        setCurrentHeader(PROMO_HEADER_VIEW);
         setBookmarks(null, mDelegate.getModel().getAllBookmarkIDsOrderedByCreationDate());
     }
 
     @Override
     public void onFolderStateSet(BookmarkId folder) {
+        setCurrentHeader(PROMO_HEADER_VIEW);
         setBookmarks(mDelegate.getModel().getChildIDs(folder, true, false),
                 mDelegate.getModel().getChildIDs(folder, false, true));
     }
@@ -275,6 +302,7 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
     @Override
     public void onFilterStateSet(EnhancedBookmarkFilter filter) {
         assert filter == EnhancedBookmarkFilter.OFFLINE_PAGES;
+        setCurrentHeader(OFFLINE_PAGES_STORAGE_VIEW);
         setBookmarks(null, mDelegate.getModel().getBookmarkIDsByFilter(filter));
     }
 
@@ -286,4 +314,27 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             super(view);
         }
     }
+
+    private void setCurrentHeader(int headerViewType) {

[jianli, 2015/08/21 21:06:27]

Please comment this method for better understanding its purpose.

[fgorski, 2015/08/21 22:09:38]

It was renamed to updateHeader, and that is exactly what it is doing.

+        if (headerViewType != PROMO_HEADER_VIEW && headerViewType != OFFLINE_PAGES_STORAGE_VIEW) {
+            assert false : "Incorrect header view type.";
+            return;

[Kibeom Kim (inactive), 2015/08/21 20:19:39]

I think in general we don't handle assert fall back gracefully unless it's
related to a security issue, so just:

assert headerViewType == PROMO_HEADER_VIEW || headerViewType ==
OFFLINE_PAGES_STORAGE_VIEW : "Incorrect header view type.";

[fgorski, 2015/08/21 22:09:38]

Done. And then updated to updateHeader approach.

+        }
+
+        mCurrentHeader = headerViewType;
+        mPromoHeaderSection.clear();
+        mOfflineStorageSection.clear();
+        if (headerViewType == PROMO_HEADER_VIEW) {
+            if (mPromoHeaderManager.shouldShow()) mPromoHeaderSection.add(null);
+        } else {
+            if (mOfflineStorageHeader.shouldShow()) mOfflineStorageSection.add(null);
+        }
+    }
+
+    private void refreshOfflinePagesFilterView() {
+        if (mCurrentHeader != OFFLINE_PAGES_STORAGE_VIEW) return;
+        setCurrentHeader(OFFLINE_PAGES_STORAGE_VIEW);
+        setBookmarks(null,
+                mDelegate.getModel().getBookmarkIDsByFilter(EnhancedBookmarkFilter.OFFLINE_PAGES));
+    }
 }