fix: move privacy-related files to own file outside TitaniumKit

hansemannn · Jun 11, 2024 · 5e95ac0 · 5e95ac0
1 parent 2f1212f
commit 5e95ac0
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 43 deletions.
diff --git a/iphone/Classes/TiFilesystemFileProxy+Addons.h b/iphone/Classes/TiFilesystemFileProxy+Addons.h
@@ -0,0 +1,25 @@
+/**
+ * Titanium SDK
+ * Copyright TiDev, Inc. 04/07/2022-Present. All Rights Reserved.
+ * Licensed under the terms of the Apache Public License
+ * Please see the LICENSE included with this distribution for details.
+ */
+
+#import <TitaniumKit/TiBase.h>
+#import <TitaniumKit/TiFilesystemFileProxy.h>
+
+@interface TiFilesystemFileProxy (Addons)
+
+#ifdef USE_TI_FILESYSTEMCREATEDAT
+- (NSDate *)createdAt:(id)unused;
+#endif
+
+#ifdef USE_TI_FILESYSTEMMODIFIEDAT
+- (NSDate *)modifiedAt:(id)unused;
+#endif
+
+#ifdef USE_TI_FILESYSTEMSPACEAVAILABLE
+- (NSNumber *)spaceAvailable:(id)unused;
+#endif
+
+@end
diff --git a/iphone/Classes/TiFilesystemFileProxy+Addons.m b/iphone/Classes/TiFilesystemFileProxy+Addons.m
@@ -0,0 +1,50 @@
+/**
+ * Titanium SDK
+ * Copyright TiDev, Inc. 04/07/2022-Present. All Rights Reserved.
+ * Licensed under the terms of the Apache Public License
+ * Please see the LICENSE included with this distribution for details.
+ */
+
+#import "TiFilesystemFileProxy+Addons.h"
+
+@implementation TiFilesystemFileProxy (Addons)
+
+#ifdef USE_TI_FILESYSTEMCREATEDAT
+- (NSDate *)createdAt:(id)unused
+{
+  NSError *error = nil;
+  NSDictionary *resultDict = [[NSFileManager defaultManager] attributesOfItemAtPath:path error:&error];
+  if (error != nil) {
+    [self throwException:TiExceptionOSError subreason:[error localizedDescription] location:CODELOCATION];
+  }
+
+  return [resultDict objectForKey:NSFileCreationDate] ?: [resultDict objectForKey:NSFileModificationDate];
+}
+#endif
+
+#ifdef USE_TI_FILESYSTEMMODIFIEDAT
+- (NSDate *)modifiedAt:(id)unused
+{
+  NSError *error = nil;
+  NSDictionary *resultDict = [[NSFileManager defaultManager] attributesOfItemAtPath:path error:&error];
+  if (error != nil) {
+    [self throwException:TiExceptionOSError subreason:[error localizedDescription] location:CODELOCATION];
+  }
+  return [resultDict objectForKey:NSFileModificationDate];
+}
+#endif
+
+#ifdef USE_TI_FILESYSTEMSPACEAVAILABLE
+- (NSNumber *)spaceAvailable:(id)unused
+{
+  NSError *error = nil;
+  NSDictionary *resultDict = [[NSFileManager defaultManager] attributesOfFileSystemForPath:path error:&error];
+  if (error != nil) {
+    NSLog(@"[ERROR] Could not receive available space: %@", error.localizedDescription);
+    return @(0.0);
+  }
+  return [resultDict objectForKey:NSFileSystemFreeSize];
+}
+#endif
+
+@end
diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/Modules/TiFilesystemFileProxy.m b/iphone/TitaniumKit/TitaniumKit/Sources/Modules/TiFilesystemFileProxy.m
@@ -68,23 +68,6 @@ - (NSDate *)createTimestamp:(id)unused
   return [NSDate new];
 }
 
-#ifdef USE_TI_FILESYSTEMCREATEDAT
-- (NSDate *)createdAt:(id)unused
-{
-  NSError *error = nil;
-  NSDictionary *resultDict = [[NSFileManager defaultManager] attributesOfItemAtPath:path error:&error];
-  if (error != nil) {
-    [self throwException:TiExceptionOSError subreason:[error localizedDescription] location:CODELOCATION];
-  }
-  // Have to do this one up special because of 3.x bug where NSFileCreationDate is sometimes undefined
-  NSDate *result = [resultDict objectForKey:NSFileCreationDate];
-  if (result == nil) {
-    result = [resultDict objectForKey:NSFileModificationDate];
-  }
-  return result;
-}
-#endif
-
 - (NSDate *)modificationTimestamp
 {
   DEPRECATED_REPLACED_REMOVED(@"Filesystem.File.modificationTimestamp", @"7.3.0", @"12.4.0", @"Filesystem.File.modifiedAt()");
@@ -97,18 +80,6 @@ - (NSDate *)modificationTimestamp:(id)unused
   return [NSDate new];
 }
 
-#ifdef USE_TI_FILESYSTEMMODIFIEDAT
-- (NSDate *)modifiedAt:(id)unused
-{
-  NSError *error = nil;
-  NSDictionary *resultDict = [[NSFileManager defaultManager] attributesOfItemAtPath:path error:&error];
-  if (error != nil) {
-    [self throwException:TiExceptionOSError subreason:[error localizedDescription] location:CODELOCATION];
-  }
-  return [resultDict objectForKey:NSFileModificationDate];
-}
-#endif
-
 - (NSNumber *)symbolicLink
 {
   NSError *error = nil;
@@ -151,19 +122,6 @@ - (NSArray *)getDirectoryListing:(id)args
   return resultArray;
 }
 
-#ifdef USE_TI_FILESYSTEMSPACEAVAILABLE
-- (NSNumber *)spaceAvailable:(id)unused
-{
-  NSError *error = nil;
-  NSDictionary *resultDict = [[NSFileManager defaultManager] attributesOfFileSystemForPath:path error:&error];
-  if (error != nil) {
-    NSLog(@"[ERROR] Could not receive available space: %@", error.localizedDescription);
-    return @(0.0);
-  }
-  return [resultDict objectForKey:NSFileSystemFreeSize];
-}
-#endif
-
 - (NSString *)getProtectionKey:(id)args
 {
   NSError *error = nil;

diff --git a/iphone/iphone/Titanium.xcodeproj/project.pbxproj b/iphone/iphone/Titanium.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -179,6 +179,7 @@
 		3AB913801BB61FDA0063A4AD /* TiUIiOSPreviewActionProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AB9137F1BB61FDA0063A4AD /* TiUIiOSPreviewActionProxy.m */; };
 		3ABA85AB1D7204B100BCD3F1 /* TiAppiOSSearchQueryProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3ABA85AA1D7204B100BCD3F1 /* TiAppiOSSearchQueryProxy.m */; };
 		3AC8F4592916A6B900A8A3D7 /* TiAppiOSActivityAttributesProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AC8F4582916A6B900A8A3D7 /* TiAppiOSActivityAttributesProxy.m */; };
+		3AD017762C186DF800779F34 /* TiFilesystemFileProxy+Addons.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AD017752C186DF800779F34 /* TiFilesystemFileProxy+Addons.m */; };
 		673144D6211DBAD7001BDBF2 /* TiUIApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 673144D5211DBAD7001BDBF2 /* TiUIApplication.m */; };
 		6CF8E95921CDA58800519245 /* TiUITabbedBarProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CF8E95821CDA58800519245 /* TiUITabbedBarProxy.m */; };
 		823CC8AC1B7F0E4D00D220C7 /* WatchSessionModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 823CC8AB1B7F0E4D00D220C7 /* WatchSessionModule.m */; };
@@ -642,6 +643,8 @@
 		3ABA85AA1D7204B100BCD3F1 /* TiAppiOSSearchQueryProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TiAppiOSSearchQueryProxy.m; sourceTree = "<group>"; };
 		3AC8F4572916A6B900A8A3D7 /* TiAppiOSActivityAttributesProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TiAppiOSActivityAttributesProxy.h; sourceTree = "<group>"; };
 		3AC8F4582916A6B900A8A3D7 /* TiAppiOSActivityAttributesProxy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TiAppiOSActivityAttributesProxy.m; sourceTree = "<group>"; };
+		3AD017742C186DF800779F34 /* TiFilesystemFileProxy+Addons.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TiFilesystemFileProxy+Addons.h"; sourceTree = "<group>"; };
+		3AD017752C186DF800779F34 /* TiFilesystemFileProxy+Addons.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "TiFilesystemFileProxy+Addons.m"; sourceTree = "<group>"; };
 		50115A9315D5DE0500122055 /* ThirdpartyNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThirdpartyNS.h; path = ../Classes/ThirdpartyNS.h; sourceTree = SOURCE_ROOT; };
 		673144D4211DBAD7001BDBF2 /* TiUIApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TiUIApplication.h; path = ../Classes/TiUIApplication.h; sourceTree = "<group>"; };
 		673144D5211DBAD7001BDBF2 /* TiUIApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TiUIApplication.m; path = ../Classes/TiUIApplication.m; sourceTree = "<group>"; };
@@ -1986,6 +1989,8 @@
 				3A38F30324D6EBBD00CC6EFB /* TiUtils+Addons.swift */,
 				DBF30942210F37080001F770 /* TiWindowProxy+Addons.h */,
 				DBF30943210F37080001F770 /* TiWindowProxy+Addons.m */,
+				3AD017742C186DF800779F34 /* TiFilesystemFileProxy+Addons.h */,
+				3AD017752C186DF800779F34 /* TiFilesystemFileProxy+Addons.m */,
 			);
 			name = "TitaniumKit Extensions";
 			sourceTree = "<group>";
@@ -2304,6 +2309,7 @@
 				1923696320E48C2A00567508 /* TiUIiOSWebViewDecisionHandlerProxy.m in Sources */,
 				24F29F83122105C70099351D /* LocaleModule.m in Sources */,
 				D4AB36F5123DE20200DED4A0 /* TiUIClipboardProxy.m in Sources */,
+				3AD017762C186DF800779F34 /* TiFilesystemFileProxy+Addons.m in Sources */,
 				DA9BE36F127F8F6C000FE9E1 /* UIImageExtras.m in Sources */,
 				1923696220E48C2A00567508 /* TiUIiOSWebViewConfigurationProxy.m in Sources */,
 				24ADC5121299F60C0014DB75 /* TiAppiOSProxy.m in Sources */,