Merge branch 'main' into twn

LocNguyenHuu · Oct 5, 2020 · e91d690 · e91d690
2 parents 76d93af + 4f18f4c
commit e91d690
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/WMF Framework/WidgetController.swift b/WMF Framework/WidgetController.swift
@@ -137,6 +137,9 @@ public final class WidgetController: NSObject {
  completion()
  finishBackgroundActivity()
  #if DEBUG
+ guard !self.isCreatingDataStore, self._dataStore == nil else { // Don't check open files if another MWKDataStore was created after this one was destroyed
+ return
+ }
  let openFiles = self.openFilePaths()
  let openSqliteFile = openFiles.first(where: { $0.hasSuffix(".sqlite") })
  assert(openSqliteFile == nil, "There should be no open sqlite files (which in our case are Core Data persistent stores) in the shared app container after the data store is released. The widget still has a lock on these files: \(openFiles)")

diff --git a/Wikipedia/Code/MWKDataStore.m b/Wikipedia/Code/MWKDataStore.m
@@ -115,6 +115,7 @@ - (instancetype)initWithContainerURL:(NSURL *)containerURL {
 
 - (void)teardown:(nullable dispatch_block_t)completion {
  if (self.cacheController) {
+ [self.session teardown];
  [self.cacheController teardown:^{
  if (completion) {
  completion();

diff --git a/Wikipedia/Code/Session.swift b/Wikipedia/Code/Session.swift
@@ -135,12 +135,15 @@ public class Session: NSObject {
  }
 
  deinit {
- defaultURLSession.invalidateAndCancel()
+ teardown()
  }
 
- public func cancelAllRequests() {
+ @objc public func teardown() {
+ guard defaultURLSession !== URLSession.shared else { // [NSURLSession sharedSession] may not be invalidated
+ return
+ }
  defaultURLSession.invalidateAndCancel()
- defaultURLSession = Session.getURLSession(with: permanentCache, delegate: sessionDelegate)
+ defaultURLSession = URLSession.shared
  }
 
  public let wifiOnlyURLSession: URLSession = {

diff --git a/WikipediaUnitTests/Code/ArticleViewControllerTests.swift b/WikipediaUnitTests/Code/ArticleViewControllerTests.swift
@@ -48,7 +48,7 @@ class ArticleViewControllerTests: XCTestCase {
  XCTAssert(schemeHandler.accessed, "SchemeHandler was not accessed during article load.")
  UIApplication.shared.keyWindow?.rootViewController = nil
  dataStore.clearTemporaryCache()
- dataStore.session.cancelAllRequests()
+ dataStore.session.teardown()
  }
 
  UIApplication.shared.keyWindow?.rootViewController = articleVC