[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..d5d33a188686eb23e4175cc62614cc0d69b15f5e 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
@@ -15,7 +15,10 @@ import org.chromium.base.annotations.SuppressFBWarnings;
 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.EnhancedBookmarkManager.UIState;
 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,13 +34,16 @@ 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<>();
@@ -74,6 +80,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);
@@ -131,6 +138,7 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         mBookmarkSection.clear();
         mBookmarkSection.addAll(bookmarks);
 
+        updateHeader();
         updateDividerSections();
 
         // TODO(kkimlabs): Animation is disabled due to a performance issue on bookmark undo.
@@ -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,9 +250,12 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
     @Override
     public void onPromoHeaderShowingChanged(boolean isShowing) {
-        mPromoHeaderSection.clear();
-        if (isShowing) mPromoHeaderSection.add(null);
+        if (mDelegate.getCurrentState() != UIState.STATE_ALL_BOOKMARKS
+                && mDelegate.getCurrentState() != UIState.STATE_FOLDER) {
+            return;
+        }
 
+        updateHeader();
         updateDividerSections();
         notifyDataSetChanged();
     }
@@ -249,9 +268,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);
-
-        updateDividerSections();
+        if (mDelegate.getModel().getOfflinePageBridge() != null) {

[jianli, 2015/08/21 23:39:21]

nit: cache mDelegate.getModel().getOfflinePageBridge() since you also need it
below

[fgorski, 2015/08/24 18:47:14]

Done.

+            mOfflineStorageHeader = new OfflinePageStorageSpaceHeader(mContext,
+                    mDelegate.getModel().getOfflinePageBridge(), new StorageSpaceHeaderCallback() {
+                        @Override
+                        public void onStorageSpaceCleanUpDone() {
+                            refreshOfflinePagesFilterView();
+                        }
+                    });
+        }
     }
 
     @Override
@@ -286,4 +311,29 @@ class EnhancedBookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             super(view);
         }
     }
+
+    private void updateHeader() {
+        int currentUIState = mDelegate.getCurrentState();
+        if (currentUIState == UIState.STATE_LOADING) return;
+
+        mPromoHeaderSection.clear();
+        mOfflineStorageSection.clear();
+        if (currentUIState == UIState.STATE_FILTER) {
+            if (mOfflineStorageHeader != null && mOfflineStorageHeader.shouldShow()) {
+                mOfflineStorageSection.add(null);
+            }
+        } else {
+            assert currentUIState == UIState.STATE_ALL_BOOKMARKS
+                    || currentUIState == UIState.STATE_FOLDER : "Unexpected UI state";
+            if (mPromoHeaderManager.shouldShow()) {
+                mPromoHeaderSection.add(null);
+            }
+        }
+    }
+
+    private void refreshOfflinePagesFilterView() {
+        if (mDelegate.getCurrentState() != UIState.STATE_FILTER) return;
+        setBookmarks(null,
+                mDelegate.getModel().getBookmarkIDsByFilter(EnhancedBookmarkFilter.OFFLINE_PAGES));
+    }
 }