clear code

iOSClient/AppDelegate.m

@@ -225,7 +225,7 @@
     [self logUser];
     
     // Store review
-#if !TARGET_IPHONE_SIMULATOR
+#if !TARGET_OS_SIMULATOR
     NCStoreReview *review = [NCStoreReview new];
     [review incrementAppRuns];
     [review showStoreReview];

iOSClient/CCGlobal.h

@@ -38,6 +38,9 @@
 //#if targetEnvironment(simulator)
 //#endif
 
+//#if TARGET_OS_SIMULATOR
+//#endif
+
 #define CALL_ORIGIN NSLog(@"Origin: [%@]", [[[[NSThread callStackSymbols] objectAtIndex:1] componentsSeparatedByCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"[]"]] objectAtIndex:1])
 
 #endif

iOSClient/Main/CCMore.swift

@@ -122,6 +122,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
         functionMenu.append(item)
         
         // ITEM : Scan
+#if !targetEnvironment(simulator)
         if #available(iOS 11.0, *) {
             item = OCExternalSites.init()
             item.name = "_scanned_images_"
@@ -129,6 +130,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
             item.url = "openStoryboardScan"
             functionMenu.append(item)
         }
+#endif
         
         // ITEM : Trash
         let capabilities = NCManageDatabase.sharedInstance.getCapabilites()

iOSClient/Main/Create cloud/NCCreateMenuAdd.swift

@@ -51,9 +51,11 @@ class NCCreateMenuAdd: NSObject {
         
         items.append(ActionSheetItem(title: NSLocalizedString("_upload_file_text_", comment: ""), value: 3, image: CCGraphics.changeThemingColorImage(UIImage(named: "file_txt"), multiplier:1, color: NCBrandColor.sharedInstance.icon)))
         
+#if !targetEnvironment(simulator)
         if #available(iOS 11.0, *) {
             items.append(ActionSheetItem(title: NSLocalizedString("_scans_document_", comment: ""), value: 4, image: CCGraphics.changeThemingColorImage(UIImage(named: "scan"), multiplier:2, color: NCBrandColor.sharedInstance.icon)))
         }
+#endif
         
         items.append(ActionSheetItem(title: NSLocalizedString("_create_folder_", comment: ""), value: 5, image: CCGraphics.changeThemingColorImage(UIImage(named: "folder"), multiplier:1, color: colorIcon)))
         

iOSClient/Utility/CCUtility.m

@@ -86,7 +86,7 @@
 
 + (NSString *)getUUID
 {
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
     NSUUID *deviceId = [[NSUUID alloc]initWithUUIDString:k_UUID_SIM];
     return [deviceId UUIDString];
 #else