ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hardcode the sliding sync proxy. (#502)

Browse Source 
* Add support for migrating between versions.
* Rename InfoPlistReader property.
* Bump SDK version.
This commit is contained in:
Doug
2023-01-31 17:48:24 +00:00
committed by GitHub
parent 4f8cc08989
commit f6629e0d6e
31 changed files with 143 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/Extensions/UIDevice.swift
+1 -1
View File
@@ -23,6 +23,6 @@ extension UIDevice {
}
var initialDisplayName: String {
ElementL10n.defaultSessionDisplayName(InfoPlistReader.target.bundleDisplayName)
ElementL10n.defaultSessionDisplayName(InfoPlistReader.main.bundleDisplayName)
}
}
ElementX/Sources/Other/Extensions/URL.swift
+2 -2
View File
@@ -27,7 +27,7 @@ extension URL {
/// The URL of the primary app group container.
static var appGroupContainerDirectory: URL {
guard let url = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: InfoPlistReader.target.appGroupIdentifier) else {
guard let url = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: InfoPlistReader.main.appGroupIdentifier) else {
fatalError("Should always be able to retrieve the container directory")
}
return url
@@ -64,7 +64,7 @@ extension URL {
var url = appGroupContainerDirectory
.appendingPathComponent("Library", isDirectory: true)
.appendingPathComponent("Application Support", isDirectory: true)
.appendingPathComponent(InfoPlistReader.target.baseBundleIdentifier, isDirectory: true)
.appendingPathComponent(InfoPlistReader.main.baseBundleIdentifier, isDirectory: true)
try? FileManager.default.createDirectoryIfNeeded(at: url)
ElementX/Sources/Other/InfoPlistReader.swift
+2 -2
View File
@@ -25,8 +25,8 @@ struct InfoPlistReader {
static let bundleDisplayName = "CFBundleDisplayName"
}
/// Info.plist reader on the current target
static let target = InfoPlistReader(bundle: .main)
/// Info.plist reader on the bundle object that contains the current executable.
static let main = InfoPlistReader(bundle: .main)
private let bundle: Bundle
ElementX/Sources/Other/Logging/MXLogger.swift
+3 -3
View File
@@ -150,9 +150,9 @@ class MXLogger {
MXLogger.logCrashes(false)
// Extract running app information
let app = InfoPlistReader.target.bundleExecutable
let appId = InfoPlistReader.target.bundleIdentifier
let appVersion = "\(InfoPlistReader.target.bundleShortVersionString) (r\(InfoPlistReader.target.bundleVersion))"
let app = InfoPlistReader.main.bundleExecutable
let appId = InfoPlistReader.main.bundleIdentifier
let appVersion = "\(InfoPlistReader.main.bundleShortVersionString) (r\(InfoPlistReader.main.bundleVersion))"
// Build the crash log
let model = UIDevice.current.model
ElementX/Sources/Other/UserAgentBuilder.swift
+2 -2
View File
@@ -27,8 +27,8 @@ final class UserAgentBuilder {
}
private class func makeUserAgent() -> String? {
let clientName = InfoPlistReader.target.bundleDisplayName
let clientVersion = InfoPlistReader.target.bundleShortVersionString
let clientName = InfoPlistReader.main.bundleDisplayName
let clientVersion = InfoPlistReader.main.bundleShortVersionString
#if os(iOS)
return String(