Merge branch 'investigate-crash-in-locationdatasource-ios-567'

buggmagnet · buggmagnet · commit 573c88670df5 · 2024-03-28T13:25:05.000+01:00
diff --git a/ios/MullvadVPN/View controllers/SelectLocation/LocationDataSource.swift b/ios/MullvadVPN/View controllers/SelectLocation/LocationDataSource.swift
@@ -85,14 +85,12 @@ final class LocationDataSource: UITableViewDiffableDataSource<LocationSection, L
                 return
             }
 
-            DispatchQueue.main.async {
-                if searchString.isEmpty {
-                    self.setSelectedItem(self.selectedItem, animated: false, completion: {
-                        self.scrollToSelectedRelay()
-                    })
-                } else {
-                    self.scrollToTop(animated: false)
-                }
+            if searchString.isEmpty {
+                self.setSelectedItem(self.selectedItem, animated: false, completion: {
+                    self.scrollToSelectedRelay()
+                })
+            } else {
+                self.scrollToTop(animated: false)
             }
         }
     }
@@ -134,7 +132,9 @@ final class LocationDataSource: UITableViewDiffableDataSource<LocationSection, L
             }
         }
 
-        apply(snapshot, animatingDifferences: animated, completion: completion)
+        DispatchQueue.main.async {
+            self.apply(snapshot, animatingDifferences: animated, completion: completion)
+        }
     }
 
     private func registerClasses() {

Original file line number	Diff line number	Diff line change
`@@ -85,14 +85,12 @@ final class LocationDataSource: UITableViewDiffableDataSource<LocationSection, L`
`85`	`85`	`return`
`86`	`86`	`}`
`87`	`87`
`88`		`- DispatchQueue.main.async {`
`89`		`- if searchString.isEmpty {`
`90`		`- self.setSelectedItem(self.selectedItem, animated: false, completion: {`
`91`		`- self.scrollToSelectedRelay()`
`92`		`- })`
`93`		`- } else {`
`94`		`- self.scrollToTop(animated: false)`
`95`		`- }`
	`88`	`+ if searchString.isEmpty {`
	`89`	`+ self.setSelectedItem(self.selectedItem, animated: false, completion: {`
	`90`	`+ self.scrollToSelectedRelay()`
	`91`	`+ })`
	`92`	`+ } else {`
	`93`	`+ self.scrollToTop(animated: false)`
`96`	`94`	`}`
`97`	`95`	`}`
`98`	`96`	`}`
`@@ -134,7 +132,9 @@ final class LocationDataSource: UITableViewDiffableDataSource<LocationSection, L`
`134`	`132`	`}`
`135`	`133`	`}`
`136`	`134`
`137`		`- apply(snapshot, animatingDifferences: animated, completion: completion)`
	`135`	`+ DispatchQueue.main.async {`
	`136`	`+ self.apply(snapshot, animatingDifferences: animated, completion: completion)`
	`137`	`+ }`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`private func registerClasses() {`