Skip to content

[Fix/#305] 와치 session이 열렸을 때 상태 업데이트 로직 개선 #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GRJeon merged 3 commits into from
Feb 5, 2026
Merged

[Fix/#305] 와치 session이 열렸을 때 상태 업데이트 로직 개선 #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6af7d8e
fix: watch state push session 활성화 이후로
GRJeon Feb 5, 2026
de26f56
fix: 세션이 연결되고 나면 Reachability 업데이트
GRJeon Feb 5, 2026
565c173
Merge branch 'develop' into fix/#305-WatchStatePushRetry
GRJeon Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions mirroringBooth/mirroringBooth/Device/Camera/Browser/WatchConnectionManager+iOS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ final class WatchConnectionManager: NSObject {
self.logger.info("WCSession이 이미 활성화되어 있습니다.")

// 이미 활성화된 경우 현재 reachable 상태를 확인하여 콜백 호출
Task { @MainActor in
self.onReachableChanged?(session.isReachable)
}
handleWatchReachability(session: session)
Copy link
Collaborator

@YunDaeHyeon YunDaeHyeon Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

handleWatchReachability을 호출하는 방법이 있었네요..

return
}

Expand Down Expand Up @@ -201,6 +199,7 @@ extension WatchConnectionManager: WCSessionDelegate {
} else {
self.logger.info("WCSession 활성화 성공")
}
handleWatchReachability(session: session)
}

nonisolated func session(
Expand Down
9 changes: 6 additions & 3 deletions mirroringBooth/mirroringBooth/Device/Remote/AppleWatch/WatchConnectionManger+watchOS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ final class WatchConnectionManager: NSObject {

session.delegate = self

// iPhone에게 Watch 앱이 active 상태임을 전달
pushWatchAppState(.active)

if session.activationState == .activated {
self.logger.info("WCSession이 이미 활성화되어 있습니다.")

// 이미 활성화된 경우 상태 푸시
pushWatchAppState(.active)

// 이미 활성화된 경우에도 현재 상태를 확인하여 콜백 호출
let context: [String: Any] = session.receivedApplicationContext
Expand Down Expand Up @@ -198,6 +198,9 @@ extension WatchConnectionManager: WCSessionDelegate {
self.logger.error("WCSession 활성화 실패: 오류=\(error.localizedDescription)")
} else {
self.logger.info("WCSession 활성화 성공")
Task { @MainActor in
self.pushWatchAppState(.active)
}
}

let context: [String: Any] = session.receivedApplicationContext
Expand Down