Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1267467 - Strip about:reader when storing URIs in history r=margaret

Browse Source 
MozReview-Commit-ID: JbUBMVNFdU9

--HG--
extra : amend_source : 5f2a41567dd1155188e09f691ae6099892ea3a09
This commit is contained in:
Andrzej Hunt 2016-05-10 15:33:33 -07:00
parent 21ccc189ed
commit c1794a0e7c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/android/base/java/org/mozilla/gecko/GlobalHistory.java
View File

@ -12,6 +12,7 @@ import java.util.Queue;
import java.util.Set;
import org.mozilla.gecko.db.BrowserDB;
import org.mozilla.gecko.reader.ReaderModeUtils;
import org.mozilla.gecko.util.ThreadUtils;
import android.content.ContentResolver;
@ -118,12 +119,15 @@ class GlobalHistory {
ThreadUtils.assertOnBackgroundThread();
final long start = SystemClock.uptimeMillis();
db.updateVisitedHistory(context.getContentResolver(), uri);
// stripAboutReaderUrl only removes about:reader if present, in all other cases the original string is returned
final String uriToStore = ReaderModeUtils.stripAboutReaderUrl(uri);
db.updateVisitedHistory(context.getContentResolver(), uriToStore);
final long end = SystemClock.uptimeMillis();
final long took = end - start;
Telemetry.addToHistogram(TELEMETRY_HISTOGRAM_ADD, (int) Math.min(took, Integer.MAX_VALUE));
addToGeckoOnly(uri);
addToGeckoOnly(uriToStore);
}
@SuppressWarnings("static-method")
@ -131,7 +135,9 @@ class GlobalHistory {
ThreadUtils.assertOnBackgroundThread();
final long start = SystemClock.uptimeMillis();
db.updateHistoryTitle(cr, uri, title);
final String uriToStore = ReaderModeUtils.stripAboutReaderUrl(uri);
db.updateHistoryTitle(cr, uriToStore, title);
final long end = SystemClock.uptimeMillis();
final long took = end - start;
@ -139,13 +145,15 @@ class GlobalHistory {
}
public void checkUriVisited(final String uri) {
final String storedURI = ReaderModeUtils.stripAboutReaderUrl(uri);
final NotifierRunnable runnable = new NotifierRunnable(GeckoAppShell.getContext());
mHandler.post(new Runnable() {
@Override
public void run() {
// this runs on the same handler thread as the processing loop,
// so no synchronization needed
mPendingUris.add(uri);
mPendingUris.add(storedURI);
if (mProcessing) {
// there's already a runnable queued up or working away, so
// no need to post another