Made moveFileFromUrl return the absolute path of the new location (so that f.ex. an image file can be passed on to the Image-component)

Preben Ludviksen · Preben Ludviksen · commit a82012e36218 · 2016-10-28T00:03:28.000+04:00
diff --git a/ios/RNFileSystem/RNFileSystem.h b/ios/RNFileSystem/RNFileSystem.h
@@ -15,6 +15,6 @@ extern NSString *const STORAGE_TEMPORARY;
 + (BOOL)deleteFileOrDirectory:(NSString*)relativePath inStorage:(NSString*)storage;
 
 // Extra method for integration from other modules / native code
-+ (void)moveFileFromUrl:(NSURL*)location toRelativePath:(NSString*)relativePath inStorage:(NSString*)storage;
++ (NSString*)moveFileFromUrl:(NSURL*)location toRelativePath:(NSString*)relativePath inStorage:(NSString*)storage;
 
 @end
diff --git a/ios/RNFileSystem/RNFileSystem.m b/ios/RNFileSystem/RNFileSystem.m
@@ -97,7 +97,7 @@ + (BOOL)addSkipBackupAttributeToItemAtPath:(NSString *) filePathString
 }
 
 // Extra method for integration from other modules / native code
-+ (void)moveFileFromUrl:(NSURL*)location toRelativePath:(NSString*)relativePath inStorage:(NSString*)storage {
++ (NSString*)moveFileFromUrl:(NSURL*)location toRelativePath:(NSString*)relativePath inStorage:(NSString*)storage {
   NSFileManager *fileManager = [NSFileManager defaultManager];
   NSURL *baseDir = [RNFileSystem baseDirForStorage:storage];
   NSURL *fullPath = [baseDir URLByAppendingPathComponent:relativePath];
@@ -106,6 +106,7 @@ + (void)moveFileFromUrl:(NSURL*)location toRelativePath:(NSString*)relativePath
   if ([storage isEqual:STORAGE_IMPORTANT]) {
     [RNFileSystem addSkipBackupAttributeToItemAtPath:[fullPath path]];
   }
+  return [fullPath path];
 }
 
 RCT_EXPORT_MODULE()

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ + (BOOL)addSkipBackupAttributeToItemAtPath:(NSString *) filePathString`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`// Extra method for integration from other modules / native code`
`100`		`-+ (void)moveFileFromUrl:(NSURL)location toRelativePath:(NSString)relativePath inStorage:(NSString*)storage {`
	`100`	`++ (NSString)moveFileFromUrl:(NSURL)location toRelativePath:(NSString)relativePath inStorage:(NSString)storage {`
`101`	`101`	`NSFileManager *fileManager = [NSFileManager defaultManager];`
`102`	`102`	`NSURL *baseDir = [RNFileSystem baseDirForStorage:storage];`
`103`	`103`	`NSURL *fullPath = [baseDir URLByAppendingPathComponent:relativePath];`
`@@ -106,6 +106,7 @@ + (void)moveFileFromUrl:(NSURL)location toRelativePath:(NSString)relativePath`
`106`	`106`	`if ([storage isEqual:STORAGE_IMPORTANT]) {`
`107`	`107`	`[RNFileSystem addSkipBackupAttributeToItemAtPath:[fullPath path]];`
`108`	`108`	`}`
	`109`	`+ return [fullPath path];`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`RCT_EXPORT_MODULE()`