home-assistant/iOS
1
0
Fork 0
mirror of https://github.com/home-assistant/iOS.git synced 2025-12-11 00:35:07 -06:00
Code Issues Packages Projects Releases 276 Wiki Activity

Bump HAKit 0.4.8 (#4011)

Browse Source 
<!-- Thank you for submitting a Pull Request and helping to improve Home
Assistant. Please complete the following sections to help the processing
and review of your changes. Please do not delete anything from this
template. -->

## Summary
<!-- Provide a brief summary of the changes you have made and most
importantly what they aim to achieve -->

## Screenshots
<!-- If this is a user-facing change not in the frontend, please include
screenshots in light and dark mode. -->

## Link to pull request in Documentation repository
<!-- Pull requests that add, change or remove functionality must have a
corresponding pull request in the Companion App Documentation repository
(https://github.com/home-assistant/companion.home-assistant). Please add
the number of this pull request after the "#" -->
Documentation: home-assistant/companion.home-assistant#

## Any other notes
<!-- If there is any other information of note, like if this Pull
Request is part of a bigger change, please include it here. -->
This commit is contained in:
Bruno Pantaleão Gonçalves 2025-11-26 17:26:54 +01:00 committed by GitHub
parent b068e2eca1
commit 80ec7287a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Podfile
View File

@ -37,9 +37,9 @@ pod 'XCGLogger'
# Keep Starscream reference even though HAKit already install it, because it defines our fork with the necessary fix
pod 'Starscream', git: 'https://github.com/bgoncal/starscream', branch: 'ha-URLSession-fix'
pod 'HAKit', git: 'https://github.com/home-assistant/HAKit.git', tag: '0.4.7'
pod 'HAKit/PromiseKit', git: 'https://github.com/home-assistant/HAKit.git', tag: '0.4.7'
pod 'HAKit/Mocks', git: 'https://github.com/home-assistant/HAKit.git', tag: '0.4.7'
pod 'HAKit', git: 'https://github.com/home-assistant/HAKit.git', tag: '0.4.8'
pod 'HAKit/PromiseKit', git: 'https://github.com/home-assistant/HAKit.git', tag: '0.4.8'
pod 'HAKit/Mocks', git: 'https://github.com/home-assistant/HAKit.git', tag: '0.4.8'
def test_pods
pod 'OHHTTPStubs/Swift'

24
Podfile.lock
View File

@ -54,13 +54,13 @@ PODS:
- GRDB.swift (7.8.0):
- GRDB.swift/standard (= 7.8.0)
- GRDB.swift/standard (7.8.0)
- HAKit (0.4.7):
- HAKit/Core (= 0.4.7)
- HAKit/Core (0.4.7):
- HAKit (0.4.8):
- HAKit/Core (= 0.4.8)
- HAKit/Core (0.4.8):
- Starscream (~> 4.0.4)
- HAKit/Mocks (0.4.7):
- HAKit/Mocks (0.4.8):
- HAKit/Core
- HAKit/PromiseKit (0.4.7):
- HAKit/PromiseKit (0.4.8):
- HAKit/Core
- PromiseKit (~> 8.1.1)
- Improv-iOS (0.0.6)
@ -132,9 +132,9 @@ DEPENDENCIES:
- Eureka (from `https://github.com/xmartlabs/Eureka`, branch `master`)
- FirebaseMessaging
- GRDB.swift (from `https://github.com/groue/GRDB.swift.git`, tag `v7.8.0`)
- HAKit (from `https://github.com/home-assistant/HAKit.git`, tag `0.4.7`)
- HAKit/Mocks (from `https://github.com/home-assistant/HAKit.git`, tag `0.4.7`)
- HAKit/PromiseKit (from `https://github.com/home-assistant/HAKit.git`, tag `0.4.7`)
- HAKit (from `https://github.com/home-assistant/HAKit.git`, tag `0.4.8`)
- HAKit/Mocks (from `https://github.com/home-assistant/HAKit.git`, tag `0.4.8`)
- HAKit/PromiseKit (from `https://github.com/home-assistant/HAKit.git`, tag `0.4.8`)
- Improv-iOS (~> 0.0.6)
- KeychainAccess
- MBProgressHUD (~> 1.2.0)
@ -206,7 +206,7 @@ EXTERNAL SOURCES:
:tag: v7.8.0
HAKit:
:git: https://github.com/home-assistant/HAKit.git
:tag: 0.4.7
:tag: 0.4.8
ObjectMapper:
:branch: master
:git: https://github.com/tristanhimmelman/ObjectMapper.git
@ -241,7 +241,7 @@ CHECKOUT OPTIONS:
:tag: v7.8.0
HAKit:
:git: https://github.com/home-assistant/HAKit.git
:tag: 0.4.7
:tag: 0.4.8
ObjectMapper:
:commit: a593b4d647a970b3d184d046f8f52b945083ccf9
:git: https://github.com/tristanhimmelman/ObjectMapper.git
@ -270,7 +270,7 @@ SPEC CHECKSUMS:
GoogleDataTransport: ea169759df570f4e37bdee1623ec32a7e64e67c4
GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f
GRDB.swift: 682e07f771a9100f0bdf40fd0bed57b83ca08e29
HAKit: 9522590d54a3f74259104f1fc842f0f26ac9d881
HAKit: 64da9eb0e3990420ab34ce029b29675f478ce311
Improv-iOS: 8973990c1b1f3e3aed7fc600c8efce95359cadd0
KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
@ -295,6 +295,6 @@ SPEC CHECKSUMS:
ViewRow: 8da541e9c019f3be63f4e28f311a62cac2045ecf
XCGLogger: 1943831ef907df55108b0b18657953f868de973b
PODFILE CHECKSUM: f35bfa5b695e1ce63c3a7ec3747c7482cc34784b
PODFILE CHECKSUM: 72f5b6d55792b4a04c356b46ad4d6b0106161842
COCOAPODS: 1.15.2

1
Sources/App/Resources/en.lproj/Localizable.strings
View File

@ -676,6 +676,7 @@ Home Assistant is open source, advocates for privacy and runs locally in your ho
"settings.connection_section.websocket.status.disconnected.next_retry" = "Next Retry: %1$@";
"settings.connection_section.websocket.status.disconnected.retry_count" = "Retry Count: %1$li";
"settings.connection_section.websocket.status.disconnected.title" = "Disconnected";
"settings.connection_section.websocket.status.rejected.title" = "Rejected";
"settings.connection_section.websocket.title" = "WebSocket";
"settings.debugging.critical_section.footer" = "Make sure you are aware that these operations cannot be reverted.";
"settings.debugging.header.subtitle" = "Let's fix that 🐞";

2
Sources/App/Settings/Connection/ConnectionSettingsView.swift
View File

@ -380,6 +380,8 @@ private struct WebSocketStatusView: View {
return components.joined(separator: "\n\n")
case .disconnected:
return L10n.Settings.ConnectionSection.Websocket.Status.Disconnected.title
case .rejected:
return L10n.Settings.ConnectionSection.Websocket.Status.Rejected.title
}
default:
return statusMessage

2
Sources/App/Utilities/WebSocketStatusRow.swift
View File

@ -65,7 +65,7 @@ public final class WebSocketStatusRow: Row<WebSocketStatusCell>, RowType {
))
verboseString = components.joined(separator: "\n\n")
case .disconnected:
case .disconnected, .rejected:
verboseString = nonVerboseString
}

3
Sources/Extensions/PushProvider/PushProvider.swift
View File

@ -12,6 +12,7 @@ import UserNotifications
enum PushProviderError: Error {
case noSuchServer
case noConfiguration
case connectionRejected
}
private var localPushManagers = [LocalPushManager]()
@ -130,6 +131,8 @@ import UserNotifications
retryCount: _
)):
seal.reject(error)
case .disconnected(reason: .rejected):
seal.reject(PushProviderError.connectionRejected)
case .authenticating,
.connecting,
.disconnected(reason: .disconnected),

4
Sources/Shared/Resources/Swiftgen/Strings.swift
View File

@ -2424,6 +2424,10 @@ public enum L10n {
/// Disconnected
public static var title: String { return L10n.tr("Localizable", "settings.connection_section.websocket.status.disconnected.title") }
}
public enum Rejected {
/// Rejected
public static var title: String { return L10n.tr("Localizable", "settings.connection_section.websocket.status.rejected.title") }
}
}
}
}