Use single instance for Core Telephony network info

at-internet · Feb 6, 2021 · 90e9552 · 90e9552
1 parent 221490e
commit 90e9552
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/ATInternetTracker/Sources/TechnicalContext.swift b/ATInternetTracker/Sources/TechnicalContext.swift
@@ -408,16 +408,19 @@ class TechnicalContext: NSObject {
         }
     }
 
+    #if os(iOS) && canImport(CoreTelephony) && !targetEnvironment(simulator)
+    private static let telephonyInfo = CTTelephonyNetworkInfo()
+    #endif
+
     /// Carrier
     @objc class var carrier: String {
         get {
             #if os(iOS) && canImport(CoreTelephony) && !targetEnvironment(simulator)
-            let networkInfo = CTTelephonyNetworkInfo()
             var provider : CTCarrier? = nil
             if #available(iOS 12, *) {
-                provider = networkInfo.serviceSubscriberCellularProviders?.values.first
+                provider = telephonyInfo.serviceSubscriberCellularProviders?.values.first
             } else {
-                provider = networkInfo.subscriberCellularProvider
+                provider = telephonyInfo.subscriberCellularProvider
             }
 
             if let optProvider = provider {
@@ -546,8 +549,7 @@ class TechnicalContext: NSObject {
                 } else if(optReachability.currentReachabilityStatus == ATReachability.NetworkStatus.notReachable) {
                     return ConnexionType.offline
                 } else {
-                    #if os(iOS) && canImport(CoreTelephony)
-                    let telephonyInfo = CTTelephonyNetworkInfo()
+                    #if os(iOS) && canImport(CoreTelephony) && !targetEnvironment(simulator)
                     var radioType : String? = nil
                     if #available(iOS 12, *) {
                         radioType = telephonyInfo.serviceCurrentRadioAccessTechnology?.values.first