Fixing device variant detection for M1 catalyst and sims

We previously were relying on the device architecture to determine the device variant, but that is no longer sufficient with the release of M1 macs.

Author: emawby

iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m

@@ -474,16 +474,12 @@ + (NSString*)getDeviceVariant {
     let systemInfoMachine = [self getSystemInfoMachine];
 
     // x86_64 could mean an iOS Simulator or Catalyst app on macOS
-    if ([systemInfoMachine isEqualToString:@"x86_64"]) {
-        let systemName = UIDevice.currentDevice.systemName;
-        if ([systemName isEqualToString:@"iOS"]) {
-            let model = UIDevice.currentDevice.model;
-            return [@"Simulator " stringByAppendingString:model];
-        } else {
-            return @"Mac";
-        }
-    }
-
+    #if TARGET_OS_MACCATALYST
+        return @"Mac";
+    #elif TARGET_OS_SIMULATOR
+        let model = UIDevice.currentDevice.model;
+        return [@"Simulator " stringByAppendingString:model];
+    #endif
     return systemInfoMachine;
 }