[iOS] fix ios unintended timetable switching when favoriting a session

DroidKaigi · Sep 11, 2024 · 63ba4a3 · 63ba4a3
1 parent 4862d8a
commit 63ba4a3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/app-ios/Sources/ContributorFeature/Resources/Localizable.xcstrings b/app-ios/Sources/ContributorFeature/Resources/Localizable.xcstrings
@@ -1,6 +1,9 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    "%lld" : {
+
+    },
     "Contributor" : {
       "localizations" : {
         "en" : {
@@ -51,4 +54,4 @@
     }
   },
   "version" : "1.0"
-}
+}
diff --git a/app-ios/Sources/TimetableFeature/TimetableReducer.swift b/app-ios/Sources/TimetableFeature/TimetableReducer.swift
@@ -70,18 +70,21 @@ public struct TimetableReducer : Sendable{
                  }
 
             case let .requestDay(dayTab):
-                return .run { send in
-                    for try await timetables in try timetableClient.streamTimetable() {
-                        let internalDay: DroidKaigi2024Day = switch dayTab {
-                        case DayTab.day1:
-                            DroidKaigi2024Day.conferenceDay1
-                        case DayTab.day2:
-                            DroidKaigi2024Day.conferenceDay2
+                return .concatenate(
+                    .cancel(id: CancelID.connection),
+                    .run { send in
+                        for try await timetables in try timetableClient.streamTimetable() {
+                            let internalDay: DroidKaigi2024Day = switch dayTab {
+                            case DayTab.day1:
+                                DroidKaigi2024Day.conferenceDay1
+                            case DayTab.day2:
+                                DroidKaigi2024Day.conferenceDay2
+                            }
+                            await send(.response(.success(timetables.dayTimetable(droidKaigi2024Day: internalDay).contents)))
                         }
-                        await send(.response(.success(timetables.dayTimetable(droidKaigi2024Day: internalDay).contents)))
                     }
-                }
-                .cancellable(id: CancelID.connection)
+                    .cancellable(id: CancelID.connection)
+                )
 
             case .response(.success(let timetables)):
                 state.timetableItems = sortListIntoTimeGroups(timetableItems: timetables)