Bug 1234331 - Remove readercache item when exiting readermode on bookmarked page r?margaret draft
authorAndrzej Hunt <ahunt@mozilla.com>
Mon, 07 Mar 2016 14:31:46 -0800
changeset 341359 ebb929ebc82b5b21e2e16dbc811ed8191c150c2f
parent 341358 44301cf7c3279058ee383c92c004ce1cf8d285d2
child 516389 da385a900187cad7c2b84143fabc5c2dfd6ef968
push id13200
push userahunt@mozilla.com
push dateWed, 16 Mar 2016 22:30:18 +0000
reviewersmargaret
bugs1234331
milestone48.0a1
Bug 1234331 - Remove readercache item when exiting readermode on bookmarked page r?margaret A readermoded bookmark that is currently opened will be in the readercache, if the user exits readermode then we can presume that the user no longer wants to store the readermode version locally. MozReview-Commit-ID: AzTwo8pK8O0
mobile/android/base/java/org/mozilla/gecko/Tab.java
--- a/mobile/android/base/java/org/mozilla/gecko/Tab.java
+++ b/mobile/android/base/java/org/mozilla/gecko/Tab.java
@@ -750,16 +750,18 @@ public class Tab {
 
                 ThumbnailHelper.getInstance().getAndProcessThumbnailFor(tab);
             }
         }, 500);
 
         // Ensure we store bookmarked pages in the readercache if we open them into readermode
         if (success && isBookmark() && AboutPages.isAboutReader(oldURL)) {
             ReadingListHelper.cacheReaderItem(ReaderModeUtils.stripAboutReaderUrl(oldURL), mAppContext);
+        } else if (success && isBookmark() && !AboutPages.isAboutReader(oldURL)) {
+            ReadingListHelper.removeCachedReaderItem(oldURL, mAppContext);
         }
     }
 
     void handleContentLoaded() {
         setLoadProgressIfLoading(LOAD_PROGRESS_LOADED);
     }
 
     protected void saveThumbnailToDB(final BrowserDB db) {