Просмотр исходного кода

Prefix client platform with "mac_catalyst" for Mac Catalyst

Amir Khan 9 месяцев назад
Родитель
Сommit
1bb4d4216f

+ 15 - 1
MobileLibrary/iOS/PsiphonTunnel/PsiphonTunnel/Utils/PsiphonClientPlatform.m

@@ -36,6 +36,11 @@
     if (@available(iOS 14.0, *)) {
         isiOSAppOnMac = [[NSProcessInfo processInfo] isiOSAppOnMac];
     }
+    
+    BOOL isMacCatalyst = FALSE;
+    if (@available(iOS 13.0, macCatalyst 13.0, *)) {
+        isMacCatalyst = [[NSProcessInfo processInfo] isMacCatalystApp];
+    }
 
     // Like "10.2.1"
     NSString *systemVersion = [[[[UIDevice currentDevice]systemVersion]
@@ -53,7 +58,16 @@
         // iOS app running on ARM Mac.
 
         NSString *systemName = @"mac_iOSAppOnMac";
-
+        
+        return [NSString stringWithFormat:@"%@_%@_%@",
+                systemName,
+                systemVersion,
+                bundleIdentifier];
+        
+    } else if (isMacCatalyst) {
+        
+        NSString *systemName = @"mac_catalyst";
+        
         return [NSString stringWithFormat:@"%@_%@_%@",
                 systemName,
                 systemVersion,