Merge branch 'fix-bug-where-location-list-is-empty-on-release-build-i…

…os-543'
mullvad · Mar 5, 2024 · b90afeb · b90afeb
2 parents ba74cac + e5569a9
commit b90afeb
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/ios/MullvadVPN/View controllers/SelectLocation/LocationDataSource.swift b/ios/MullvadVPN/View controllers/SelectLocation/LocationDataSource.swift
@@ -51,28 +51,28 @@ final class LocationDataSource: UITableViewDiffableDataSource<LocationSection, L
     }
 
     func setRelays(_ response: REST.ServerRelaysResponse, selectedLocations: RelayLocations?, filter: RelayFilter) {
-        guard let customListsDataSource =
-            dataSources.first(where: { $0 is CustomListsDataSource }) as? CustomListsDataSource,
-            let allLocationsDataSource =
+        let allLocationsDataSource =
             dataSources.first(where: { $0 is AllLocationDataSource }) as? AllLocationDataSource
-        else { return }
+
+        let customListsDataSource =
+            dataSources.first(where: { $0 is CustomListsDataSource }) as? CustomListsDataSource
 
         let relays = response.wireguard.relays.filter { relay in
             RelaySelector.relayMatchesFilter(relay, filter: filter)
         }
 
-        allLocationsDataSource.reload(response, relays: relays)
-        customListsDataSource.reload(allLocationNodes: allLocationsDataSource.nodes)
+        allLocationsDataSource?.reload(response, relays: relays)
+        customListsDataSource?.reload(allLocationNodes: allLocationsDataSource?.nodes ?? [])
 
         if let selectedLocations {
             // Look for a matching custom list node.
             if let customListId = selectedLocations.customListId,
-               let customList = customListsDataSource.customList(by: customListId),
-               let selectedNode = customListsDataSource.node(by: selectedLocations.locations, for: customList) {
+               let customList = customListsDataSource?.customList(by: customListId),
+               let selectedNode = customListsDataSource?.node(by: selectedLocations.locations, for: customList) {
                 selectedItem = LocationCellViewModel(section: .customLists, node: selectedNode)
                 // Look for a matching all locations node.
             } else if let location = selectedLocations.locations.first,
-                      let selectedNode = allLocationsDataSource.node(by: location) {
+                      let selectedNode = allLocationsDataSource?.node(by: location) {
                 selectedItem = LocationCellViewModel(section: .allLocations, node: selectedNode)
             }
         }