Memory Leak /Retain Cycles resolved #215
Open
Conversation
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
jfahrenkrug
approved these changes
Oct 17, 2019
Open
RuiAAPeres
reviewed
Oct 17, 2019
| @@ -19,14 +19,15 @@ final class GalleryPagingDataSource: NSObject, UIPageViewControllerDataSource { | |||
| fileprivate var itemCount: Int { return itemsDataSource?.itemCount() ?? 0 } | |||
| fileprivate unowned var scrubber: VideoScrubber | |||
|
|
|||
| init(itemsDataSource: GalleryItemsDataSource, displacedViewsDataSource: GalleryDisplacedViewsDataSource?, scrubber: VideoScrubber, configuration: GalleryConfiguration) { | |||
| init(itemsDataSource: GalleryItemsDataSource?, displacedViewsDataSource: GalleryDisplacedViewsDataSource?, scrubber: VideoScrubber, configuration: GalleryConfiguration) { | |||
There was a problem hiding this comment.
I am not too sure about this optional at the point of initialisation. Can you tell me in what scenario do you envision this happening?
RuiAAPeres
reviewed
Oct 17, 2019
| @@ -148,7 +148,7 @@ open class GalleryViewController: UIPageViewController, ItemControllerDelegate { | |||
| } | |||
| } | |||
|
|
|||
| pagingDataSource = GalleryPagingDataSource(itemsDataSource: itemsDataSource, displacedViewsDataSource: displacedViewsDataSource, scrubber: scrubber, configuration: configuration) | |||
| pagingDataSource = GalleryPagingDataSource(itemsDataSource:itemsDataSource, displacedViewsDataSource: displacedViewsDataSource, scrubber: scrubber, configuration: configuration) | |||
There was a problem hiding this comment.
itemsDataSource:itemsDataSource
⬇️
itemsDataSource: itemsDataSource
RuiAAPeres
reviewed
Oct 17, 2019
| @@ -464,7 +466,8 @@ open class GalleryViewController: UIPageViewController, ItemControllerDelegate { | |||
|
|
|||
| open func page(toIndex index: Int) { | |||
|
|
|||
| guard currentIndex != index && index >= 0 && index < self.itemsDataSource.itemCount() else { return } | |||
| guard let source = self.itemsDataSource else {return} | |||
RuiAAPeres
reviewed
Oct 17, 2019
| @@ -490,8 +493,8 @@ open class GalleryViewController: UIPageViewController, ItemControllerDelegate { | |||
| func removePage(atIndex index: Int, completion: @escaping () -> Void) { | |||
|
|
|||
| // If removing last item, go back, otherwise, go forward | |||
|
|
|||
| let direction: UIPageViewController.NavigationDirection = index < self.itemsDataSource.itemCount() ? .forward : .reverse | |||
| guard let source = self.itemsDataSource else {return} | |||
RuiAAPeres
reviewed
Oct 17, 2019
| @@ -502,8 +505,8 @@ open class GalleryViewController: UIPageViewController, ItemControllerDelegate { | |||
| } | |||
|
|
|||
| open func reload(atIndex index: Int) { | |||
|
|
|||
| guard index >= 0 && index < self.itemsDataSource.itemCount() else { return } | |||
| guard let source = self.itemsDataSource else {return} | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For a little while I didn't realize
pagingDataSourceis also holding a reference to itemsDataSource...Making
itemsDelegateanditemsDataSourceweak then passing the weak value toGalleryPagingDataSourceresolved my issues.Merge it with grain of salt....