From 0dd34f507f9e012eeb9d0cc36e82a17cd7e9124b Mon Sep 17 00:00:00 2001 From: mertalev <101130780+mertalev@users.noreply.github.com> Date: Mon, 2 Feb 2026 11:45:03 -0500 Subject: [PATCH] outdated comments --- .../alextran/immich/core/HttpClientManager.kt | 19 ++++++--- .../immich/images/RemoteImagesImpl.kt | 3 -- mobile/ios/Runner/Core/NetworkApiImpl.swift | 1 - .../ios/Runner/Images/RemoteImagesImpl.swift | 40 +++++++++---------- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/core/HttpClientManager.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/core/HttpClientManager.kt index f0105bcea0..9e98ffdd78 100644 --- a/mobile/android/app/src/main/kotlin/app/alextran/immich/core/HttpClientManager.kt +++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/core/HttpClientManager.kt @@ -24,7 +24,6 @@ const val USER_AGENT = "Immich_Android_${BuildConfig.VERSION_NAME}" /** * Manages a shared OkHttpClient with SSL configuration support. - * The client is shared across all Dart isolates and native code. */ object HttpClientManager { private const val CACHE_SIZE_BYTES = 100L * 1024 * 1024 // 100MiB @@ -37,7 +36,7 @@ object HttpClientManager { private lateinit var client: OkHttpClient - private val keyStore = KeyStore.getInstance("AndroidKeyStore").apply { load(null) } + private val keyStore = KeyStore.getInstance("AndroidKeyStore").apply { load(null) } val isMtls: Boolean get() = keyStore.containsAlias(CERT_ALIAS) @@ -123,7 +122,11 @@ object HttpClientManager { override fun getClientAliases(keyType: String, issuers: Array?): Array? = if (isMtls) arrayOf(CERT_ALIAS) else null - override fun chooseClientAlias(keyTypes: Array, issuers: Array?, socket: Socket?): String? = + override fun chooseClientAlias( + keyTypes: Array, + issuers: Array?, + socket: Socket? + ): String? = if (isMtls) CERT_ALIAS else null override fun getCertificateChain(alias: String): Array? = @@ -132,7 +135,13 @@ object HttpClientManager { override fun getPrivateKey(alias: String): PrivateKey? = keyStore.getKey(alias, null) as? PrivateKey - override fun getServerAliases(keyType: String, issuers: Array?): Array? = null - override fun chooseServerAlias(keyType: String, issuers: Array?, socket: Socket?): String? = null + override fun getServerAliases(keyType: String, issuers: Array?): Array? = + null + + override fun chooseServerAlias( + keyType: String, + issuers: Array?, + socket: Socket? + ): String? = null } } diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImagesImpl.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImagesImpl.kt index f63f3d8b66..04a181cd6e 100644 --- a/mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImagesImpl.kt +++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImagesImpl.kt @@ -30,7 +30,6 @@ import java.nio.file.SimpleFileVisitor import java.nio.file.attribute.BasicFileAttributes import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit private const val CACHE_SIZE_BYTES = 1024L * 1024 * 1024 @@ -113,8 +112,6 @@ private object ImageFetcherManager { appContext = context.applicationContext cacheDir = context.cacheDir fetcher = build() - // Listen to SharedHttpClientManager instead of SSLConfig directly. - // This ensures the shared client is already rebuilt when we invalidate. HttpClientManager.addClientChangedListener(::invalidate) initialized = true } diff --git a/mobile/ios/Runner/Core/NetworkApiImpl.swift b/mobile/ios/Runner/Core/NetworkApiImpl.swift index 843e4b2275..07fef68bf1 100644 --- a/mobile/ios/Runner/Core/NetworkApiImpl.swift +++ b/mobile/ios/Runner/Core/NetworkApiImpl.swift @@ -33,7 +33,6 @@ class NetworkApiImpl: NetworkApi { completion(.failure(ImportError.keychainError(status))) } - // TODO: remove this method once the app is fully transitioned to native clients func addCertificate(clientData: ClientCertData, completion: @escaping (Result) -> Void) { let status = importCert(clientData: clientData.data.data, password: clientData.password) if status == errSecSuccess { diff --git a/mobile/ios/Runner/Images/RemoteImagesImpl.swift b/mobile/ios/Runner/Images/RemoteImagesImpl.swift index e4523aa442..56e8938521 100644 --- a/mobile/ios/Runner/Images/RemoteImagesImpl.swift +++ b/mobile/ios/Runner/Images/RemoteImagesImpl.swift @@ -8,7 +8,7 @@ class RemoteImageRequest { let id: Int64 var isCancelled = false let completion: (Result<[String: Int64]?, any Error>) -> Void - + init(id: Int64, task: URLSessionDataTask, completion: @escaping (Result<[String: Int64]?, any Error>) -> Void) { self.id = id self.task = task @@ -32,27 +32,27 @@ class RemoteImageApiImpl: NSObject, RemoteImageApi { kCGImageSourceCreateThumbnailWithTransform: true, kCGImageSourceCreateThumbnailFromImageAlways: true ] as CFDictionary - + func requestImage(url: String, headers: [String : String], requestId: Int64, completion: @escaping (Result<[String : Int64]?, any Error>) -> Void) { var urlRequest = URLRequest(url: URL(string: url)!) urlRequest.cachePolicy = .returnCacheDataElseLoad for (key, value) in headers { urlRequest.setValue(value, forHTTPHeaderField: key) } - + let task = URLSessionManager.shared.session.dataTask(with: urlRequest) { data, response, error in Self.handleCompletion(requestId: requestId, data: data, response: response, error: error) } - + let request = RemoteImageRequest(id: requestId, task: task, completion: completion) - + os_unfair_lock_lock(&Self.lock) Self.requests[requestId] = request os_unfair_lock_unlock(&Self.lock) - + task.resume() } - + private static func handleCompletion(requestId: Int64, data: Data?, response: URLResponse?, error: Error?) { os_unfair_lock_lock(&Self.lock) guard let request = requests[requestId] else { @@ -60,47 +60,47 @@ class RemoteImageApiImpl: NSObject, RemoteImageApi { } requests[requestId] = nil os_unfair_lock_unlock(&Self.lock) - + if let error = error { if request.isCancelled || (error as NSError).code == NSURLErrorCancelled { return request.completion(ImageProcessing.cancelledResult) } return request.completion(.failure(error)) } - + if request.isCancelled { return request.completion(ImageProcessing.cancelledResult) } - + guard let data = data else { return request.completion(.failure(PigeonError(code: "", message: "No data received", details: nil))) } - + ImageProcessing.queue.async { ImageProcessing.semaphore.wait() defer { ImageProcessing.semaphore.signal() } - + if request.isCancelled { return request.completion(ImageProcessing.cancelledResult) } - + guard let imageSource = CGImageSourceCreateWithData(data as CFData, nil), let cgImage = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, decodeOptions) else { return request.completion(.failure(PigeonError(code: "", message: "Failed to decode image for request", details: nil))) } - + if request.isCancelled { return request.completion(ImageProcessing.cancelledResult) } - + do { let buffer = try vImage_Buffer(cgImage: cgImage, format: rgbaFormat) - + if request.isCancelled { buffer.free() return request.completion(ImageProcessing.cancelledResult) } - + request.completion( .success([ "pointer": Int64(Int(bitPattern: buffer.data)), @@ -113,17 +113,17 @@ class RemoteImageApiImpl: NSObject, RemoteImageApi { } } } - + func cancelRequest(requestId: Int64) { os_unfair_lock_lock(&Self.lock) let request = Self.requests[requestId] os_unfair_lock_unlock(&Self.lock) - + guard let request = request else { return } request.isCancelled = true request.task?.cancel() } - + func clearCache(completion: @escaping (Result) -> Void) { Task { let cache = URLSessionManager.shared.session.configuration.urlCache!