-
Notifications
You must be signed in to change notification settings - Fork 2.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FXIOS-868 ⁃ #7069: Top Sites and Open Tabs Widget #7283
Merged
garvankeeley
merged 6 commits into
mozilla-mobile:main
from
nbhasin2:nb/top-sites-widget-main
Sep 18, 2020
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
aaa3b1c
For #7069: Add Open Tabs widget
sblatz c20e42a
Updated small widget to use widgetURL as Links work for Medium or lar…
nbhasin2 060dcdf
Removed libsync.a
nbhasin2 8615bc1
Commented out Tabs and Top sites widget which requires refactoring
nbhasin2 bafe751
nit: remove force unwrap
garvankeeley fc0afb4
Merge branch 'main' into nb/top-sites-widget-main
garvankeeley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| import Foundation | ||
| import WebKit | ||
| import Storage | ||
| import Shared | ||
|
|
||
| // This cannot be easily imported into extension targets, so we break it out here. | ||
| extension SavedTab { | ||
| convenience init?(tab: Tab, isSelected: Bool) { | ||
| assert(Thread.isMainThread) | ||
|
|
||
| var sessionData = tab.sessionData | ||
| if sessionData == nil { | ||
| let currentItem: WKBackForwardListItem! = tab.webView?.backForwardList.currentItem | ||
|
|
||
| // Freshly created web views won't have any history entries at all. | ||
| // If we have no history, abort. | ||
| if currentItem != nil { | ||
| // The back & forward list keep track of the users history within the session | ||
| let backList = tab.webView?.backForwardList.backList ?? [] | ||
| let forwardList = tab.webView?.backForwardList.forwardList ?? [] | ||
| let urls = (backList + [currentItem] + forwardList).map { $0.url } | ||
| let currentPage = -forwardList.count | ||
| sessionData = SessionData(currentPage: currentPage, urls: urls, lastUsedTime: tab.lastExecutedTime ?? Date.now()) | ||
| } | ||
| } | ||
|
|
||
| self.init(screenshotUUID: tab.screenshotUUID, isSelected: isSelected, title: tab.title ?? tab.lastTitle, isPrivate: tab.isPrivate, faviconURL: tab.displayFavicon?.url, url: tab.url, sessionData: sessionData) | ||
| } | ||
|
|
||
| func configureSavedTabUsing(_ tab: Tab, imageStore: DiskImageStore? = nil) -> Tab { | ||
| // Since this is a restored tab, reset the URL to be loaded as that will be handled by the SessionRestoreHandler | ||
| tab.url = nil | ||
|
|
||
| if let faviconURL = faviconURL { | ||
| let icon = Favicon(url: faviconURL, date: Date()) | ||
| icon.width = 1 | ||
| tab.favicons.append(icon) | ||
| } | ||
|
|
||
| if let screenshotUUID = screenshotUUID, | ||
| let imageStore = imageStore { | ||
| tab.screenshotUUID = screenshotUUID | ||
| imageStore.get(screenshotUUID.uuidString) >>== { screenshot in | ||
| if tab.screenshotUUID == screenshotUUID { | ||
| tab.setScreenshot(screenshot, revUUID: false) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| tab.sessionData = sessionData | ||
| tab.lastTitle = title | ||
|
|
||
| return tab | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: spacing