From 9af4920fe44a89da5eb55c173bfb9d44b46a5c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= Date: Mon, 27 Apr 2020 15:43:36 +0200 Subject: [PATCH] [expo-file-system] Fix error codes --- .../modules/filesystem/FileSystemModule.java | 22 ++--- .../ios/EXFileSystem/EXFileSystem.m | 80 +++++++++---------- .../EXSessionDownloadTaskDelegate.m | 4 +- .../EXSessionResumableDownloadTaskDelegate.m | 2 +- .../EXSessionTasks/EXSessionTaskDelegate.h | 1 - .../EXSessionTasks/EXSessionTaskDelegate.m | 18 ++--- .../EXSessionUploadTaskDelegate.m | 2 +- 7 files changed, 64 insertions(+), 65 deletions(-) diff --git a/packages/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.java b/packages/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.java index bb2067f193842..6b2ab43f8bf30 100644 --- a/packages/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.java +++ b/packages/expo-file-system/android/src/main/java/expo/modules/filesystem/FileSystemModule.java @@ -315,7 +315,7 @@ public void deleteAsync(String uriStr, Map options, Promise prom if (options.containsKey("idempotent") && (Boolean) options.get("idempotent")) { promise.resolve(null); } else { - promise.reject("E_FILE_NOT_FOUND", + promise.reject("ERR_FILESYSTEM_CANNOT_FIND_FILE", "File '" + uri + "' could not be deleted because it could not be found"); } } @@ -332,13 +332,13 @@ public void deleteAsync(String uriStr, Map options, Promise prom public void moveAsync(Map options, Promise promise) { try { if (!options.containsKey("from")) { - promise.reject("E_MISSING_PARAMETER", "`FileSystem.moveAsync` needs a `from` path."); + promise.reject("ERR_FILESYSTEM_MISSING_PARAMETER", "`FileSystem.moveAsync` needs a `from` path."); return; } Uri fromUri = Uri.parse((String) options.get("from")); ensurePermission(Uri.withAppendedPath(fromUri, ".."), Permission.WRITE, "Location '" + fromUri + "' isn't movable."); if (!options.containsKey("to")) { - promise.reject("E_MISSING_PARAMETER", "`FileSystem.moveAsync` needs a `to` path."); + promise.reject("ERR_FILESYSTEM_MISSING_PARAMETER", "`FileSystem.moveAsync` needs a `to` path."); return; } Uri toUri = Uri.parse((String) options.get("to")); @@ -350,7 +350,7 @@ public void moveAsync(Map options, Promise promise) { if (from.renameTo(to)) { promise.resolve(null); } else { - promise.reject("E_FILE_NOT_MOVED", + promise.reject("ERR_FILESYSTEM_CANNOT_MOVE_FILE", "File '" + fromUri + "' could not be moved to '" + toUri + "'"); } } else { @@ -366,13 +366,13 @@ public void moveAsync(Map options, Promise promise) { public void copyAsync(Map options, Promise promise) { try { if (!options.containsKey("from")) { - promise.reject("E_MISSING_PARAMETER", "`FileSystem.moveAsync` needs a `from` path."); + promise.reject("ERR_FILESYSTEM_MISSING_PARAMETER", "`FileSystem.moveAsync` needs a `from` path."); return; } Uri fromUri = Uri.parse((String) options.get("from")); ensurePermission(fromUri, Permission.READ); if (!options.containsKey("to")) { - promise.reject("E_MISSING_PARAMETER", "`FileSystem.moveAsync` needs a `to` path."); + promise.reject("ERR_FILESYSTEM_MISSING_PARAMETER", "`FileSystem.moveAsync` needs a `to` path."); return; } Uri toUri = Uri.parse((String) options.get("to")); @@ -420,7 +420,7 @@ public void makeDirectoryAsync(String uriStr, Map options, Promi if (success || (setIntermediates && previouslyCreated)) { promise.resolve(null); } else { - promise.reject("E_DIRECTORY_NOT_CREATED", + promise.reject("ERR_FILESYSTEM_CANNOT_CREATE_DIRECTORY", "Directory '" + uri + "' could not be created or already exists."); } } else { @@ -447,7 +447,7 @@ public void readDirectoryAsync(String uriStr, Map options, Promi } promise.resolve(result); } else { - promise.reject("E_DIRECTORY_NOT_READ", + promise.reject("ERR_FILESYSTEM_CANNOT_READ_DIRECTORY", "Directory '" + uri + "' could not be read."); } } else { @@ -545,7 +545,7 @@ public void getTotalDiskCapacityAsync(Promise promise) { promise.resolve(capacityDouble); } catch (Exception e) { Log.e(TAG, e.getMessage()); - promise.reject("ERR_FILESYSTEM", "Unable to access total disk capacity", e); + promise.reject("ERR_FILESYSTEM_CANNOT_DETERMINE_DISK_CAPACITY", "Unable to access total disk capacity", e); } } @@ -562,7 +562,7 @@ public void getFreeDiskStorageAsync(Promise promise) { promise.resolve(storageDouble); } catch (Exception e) { Log.e(TAG, e.getMessage()); - promise.reject("ERR_FILESYSTEM", "Unable to determine free disk storage capacity", e); + promise.reject("ERR_FILESYSTEM_CANNOT_DETERMINE_DISK_CAPACITY", "Unable to determine free disk storage capacity", e); } } @@ -577,7 +577,7 @@ public void getContentUriAsync(String uri, Promise promise) { File file = uriToFile(fileUri); promise.resolve(contentUriFromFile(file).toString()); } else { - promise.reject("E_DIRECTORY_NOT_READ", "No readable files with the uri: " + uri + ". Please use other uri."); + promise.reject("ERR_FILESYSTEM_CANNOT_READ_DIRECTORY", "No readable files with the uri: " + uri + ". Please use other uri."); } } catch (Exception e) { Log.e(TAG, e.getMessage()); diff --git a/packages/expo-file-system/ios/EXFileSystem/EXFileSystem.m b/packages/expo-file-system/ios/EXFileSystem/EXFileSystem.m index 54fe00b800d59..eea324a64f300 100644 --- a/packages/expo-file-system/ios/EXFileSystem/EXFileSystem.m +++ b/packages/expo-file-system/ios/EXFileSystem/EXFileSystem.m @@ -175,7 +175,7 @@ - (NSDictionary *)encodingMap uri = [NSURL fileURLWithPath:uriString isDirectory:false]; } if (!([self permissionsForURI:uri] & UMFileSystemPermissionRead)) { - reject(@"E_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"File '%@' isn't readable.", uri], nil); return; @@ -186,7 +186,7 @@ - (NSDictionary *)encodingMap } else if ([uri.scheme isEqualToString:@"assets-library"] || [uri.scheme isEqualToString:@"ph"]) { [EXFileSystemAssetLibraryHandler getInfoForFile:uri withOptions:options resolver:resolve rejecter:reject]; } else { - reject(@"E_FILESYSTEM_INVALID_URI", + reject(@"ERR_FILESYSTEM_INVALID_URI", [NSString stringWithFormat:@"Unsupported URI scheme for '%@'", uri], nil); } @@ -204,7 +204,7 @@ - (NSDictionary *)encodingMap uri = [NSURL fileURLWithPath:uriString isDirectory:false]; } if (!([self permissionsForURI:uri] & UMFileSystemPermissionRead)) { - reject(@"E_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"File '%@' isn't readable.", uri], nil); return; @@ -218,7 +218,7 @@ - (NSDictionary *)encodingMap if ([encodingType isEqualToString:@"base64"]) { NSFileHandle *file = [NSFileHandle fileHandleForReadingAtPath:uri.path]; if (file == nil) { - reject(@"E_FILE_NOT_READ", + reject(@"ERR_FILESYSTEM_CANNOT_READ_FILE", [NSString stringWithFormat:@"File '%@' could not be read.", uri.path], nil); return; @@ -246,13 +246,13 @@ - (NSDictionary *)encodingMap if (string) { resolve(string); } else { - reject(@"E_FILE_NOT_READ", + reject(@"ERR_FILESYSTEM_CANNOT_READ_FILE", [NSString stringWithFormat:@"File '%@' could not be read.", uri], error); } } } else { - reject(@"E_FILESYSTEM_INVALID_URI", + reject(@"ERR_FILESYSTEM_INVALID_URI", [NSString stringWithFormat:@"Unsupported URI scheme for '%@'", uri], nil); } @@ -267,7 +267,7 @@ - (NSDictionary *)encodingMap { NSURL *uri = [NSURL URLWithString:uriString]; if (!([self permissionsForURI:uri] & UMFileSystemPermissionWrite)) { - reject(@"E_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"File '%@' isn't writable.", uri], nil); return; @@ -286,12 +286,12 @@ - (NSDictionary *)encodingMap if ([[NSFileManager defaultManager] createFileAtPath:uri.path contents:imageData attributes:nil]) { resolve([NSNull null]); } else { - return reject(@"E_FILE_UNKNOWN", + return reject(@"ERR_FILESYSTEM_UNKNOWN_FILE", [NSString stringWithFormat:@"No such file or directory '%@'", uri.path], nil); } } else { - reject(@"E_INVALID_FORMAT", + reject(@"ERR_FILESYSTEM_INVALID_FORMAT", @"Failed to parse base64 string.", nil); } @@ -307,13 +307,13 @@ - (NSDictionary *)encodingMap if ([string writeToFile:uri.path atomically:YES encoding:encoding error:&error]) { resolve([NSNull null]); } else { - reject(@"E_FILE_NOT_WRITTEN", + reject(@"ERR_FILESYSTEM_CANNOT_WRITE_TO_FILE", [NSString stringWithFormat:@"File '%@' could not be written.", uri], error); } } } else { - reject(@"E_FILESYSTEM_INVALID_URI", + reject(@"ERR_FILESYSTEM_INVALID_URI", [NSString stringWithFormat:@"Unsupported URI scheme for '%@'", uri], nil); } @@ -327,7 +327,7 @@ - (NSDictionary *)encodingMap { NSURL *uri = [NSURL URLWithString:uriString]; if (!([self permissionsForURI:[uri URLByAppendingPathComponent:@".."]] & UMFileSystemPermissionWrite)) { - reject(@"E_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"Location '%@' isn't deletable.", uri], nil); return; @@ -340,7 +340,7 @@ - (NSDictionary *)encodingMap if ([[NSFileManager defaultManager] removeItemAtPath:path error:&error]) { resolve([NSNull null]); } else { - reject(@"E_FILE_NOT_DELETED", + reject(@"ERR_FILESYSTEM_CANNOT_DELETE_FILE", [NSString stringWithFormat:@"File '%@' could not be deleted.", uri], error); } @@ -348,13 +348,13 @@ - (NSDictionary *)encodingMap if (options[@"idempotent"]) { resolve([NSNull null]); } else { - reject(@"E_FILE_NOT_FOUND", + reject(@"ERR_FILESYSTEM_CANNOT_FIND_FILE", [NSString stringWithFormat:@"File '%@' could not be deleted because it could not be found.", uri], nil); } } } else { - reject(@"E_FILESYSTEM_INVALID_URI", + reject(@"ERR_FILESYSTEM_INVALID_URI", [NSString stringWithFormat:@"Unsupported URI scheme for '%@'", uri], nil); } @@ -367,22 +367,22 @@ - (NSDictionary *)encodingMap { NSURL *from = [NSURL URLWithString:options[@"from"]]; if (!from) { - reject(@"E_MISSING_PARAMETER", @"Need a `from` location.", nil); + reject(@"ERR_FILESYSTEM_MISSING_PARAMETER", @"Need a `from` location.", nil); return; } if (!([self permissionsForURI:[from URLByAppendingPathComponent:@".."]] & UMFileSystemPermissionWrite)) { - reject(@"E_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"Location '%@' isn't movable.", from], nil); return; } NSURL *to = [NSURL URLWithString:options[@"to"]]; if (!to) { - reject(@"E_MISSING_PARAMETER", @"Need a `to` location.", nil); + reject(@"ERR_FILESYSTEM_MISSING_PARAMETER", @"Need a `to` location.", nil); return; } if (!([self permissionsForURI:to] & UMFileSystemPermissionWrite)) { - reject(@"E_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"File '%@' isn't writable.", to], nil); return; @@ -395,7 +395,7 @@ - (NSDictionary *)encodingMap NSError *error; if ([self _checkIfFileExists:toPath]) { if (![[NSFileManager defaultManager] removeItemAtPath:toPath error:&error]) { - reject(@"E_FILE_NOT_MOVED", + reject(@"ERR_FILESYSTEM_CANNOT_MOVE_FILE", [NSString stringWithFormat:@"File '%@' could not be moved to '%@' because a file already exists at " "the destination and could not be deleted.", from, to], error); @@ -405,12 +405,12 @@ - (NSDictionary *)encodingMap if ([[NSFileManager defaultManager] moveItemAtPath:fromPath toPath:toPath error:&error]) { resolve([NSNull null]); } else { - reject(@"E_FILE_NOT_MOVED", + reject(@"ERR_FILESYSTEM_CANNOT_MOVE_FILE", [NSString stringWithFormat:@"File '%@' could not be moved to '%@'.", from, to], error); } } else { - reject(@"E_FILESYSTEM_INVALID_URI", + reject(@"ERR_FILESYSTEM_INVALID_URI", [NSString stringWithFormat:@"Unsupported URI scheme for '%@'", from], nil); } @@ -423,22 +423,22 @@ - (NSDictionary *)encodingMap { NSURL *from = [NSURL URLWithString:options[@"from"]]; if (!from) { - reject(@"E_MISSING_PARAMETER", @"Need a `from` location.", nil); + reject(@"ERR_FILESYSTEM_MISSING_PARAMETER", @"Need a `from` location.", nil); return; } if (!([self permissionsForURI:from] & UMFileSystemPermissionRead)) { - reject(@"E_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"File '%@' isn't readable.", from], nil); return; } NSURL *to = [NSURL URLWithString:options[@"to"]]; if (!to) { - reject(@"E_MISSING_PARAMETER", @"Need a `to` location.", nil); + reject(@"ERR_FILESYSTEM_MISSING_PARAMETER", @"Need a `to` location.", nil); return; } if (!([self permissionsForURI:to] & UMFileSystemPermissionWrite)) { - reject(@"E_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"File '%@' isn't writable.", to], nil); return; @@ -449,7 +449,7 @@ - (NSDictionary *)encodingMap } else if ([from.scheme isEqualToString:@"assets-library"] || [from.scheme isEqualToString:@"ph"]) { [EXFileSystemAssetLibraryHandler copyFrom:from to:to resolver:resolve rejecter:reject]; } else { - reject(@"E_FILESYSTEM_INVALID_URI", + reject(@"ERR_FILESYSTEM_INVALID_URI", [NSString stringWithFormat:@"Unsupported URI scheme for '%@'", from], nil); } @@ -464,7 +464,7 @@ - (NSDictionary *)encodingMap NSURL *uri = [NSURL URLWithString:uriString]; if (!([self permissionsForURI:uri] & UMFileSystemPermissionWrite)) { - reject(@"E_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"Directory '%@' could not be created because the location isn't writable.", uri], nil); return; @@ -478,12 +478,12 @@ - (NSDictionary *)encodingMap error:&error]) { resolve([NSNull null]); } else { - reject(@"E_DIRECTORY_NOT_CREATED", + reject(@"ERR_FILESYSTEM_CANNOT_CREATE_DIRECTORY", [NSString stringWithFormat:@"Directory '%@' could not be created.", uri], error); } } else { - reject(@"E_FILESYSTEM_INVALID_URI", + reject(@"ERR_FILESYSTEM_INVALID_URI", [NSString stringWithFormat:@"Unsupported URI scheme for '%@'", uri], nil); } @@ -497,7 +497,7 @@ - (NSDictionary *)encodingMap { NSURL *uri = [NSURL URLWithString:uriString]; if (!([self permissionsForURI:uri] & UMFileSystemPermissionRead)) { - reject(@"E_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"Location '%@' isn't readable.", uri], nil); return; @@ -509,12 +509,12 @@ - (NSDictionary *)encodingMap if (children) { resolve(children); } else { - reject(@"E_DIRECTORY_NOT_READ", + reject(@"ERR_FILESYSTEM_CANNOT_READ_DIRECTORY", [NSString stringWithFormat:@"Directory '%@' could not be read.", uri], error); } } else { - reject(@"E_FILESYSTEM_INVALID_URI", + reject(@"ERR_FILESYSTEM_INVALID_URI", [NSString stringWithFormat:@"Unsupported URI scheme for '%@'", uri], nil); } @@ -536,7 +536,7 @@ - (NSDictionary *)encodingMap return; } if (!([self permissionsForURI:localUri] & UMFileSystemPermissionWrite)) { - reject(@"ERR_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"File '%@' isn't writable.", localUri], nil); return; @@ -576,7 +576,7 @@ - (NSDictionary *)encodingMap NSURL *fileUri = [NSURL URLWithString:fileUriString]; NSString *httpMethod = options[@"httpMethod"]; if (![fileUri.scheme isEqualToString:@"file"]) { - reject(@"ERR_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"Cannot upload file '%@'. Only 'file://' URI are supported.", fileUri], nil); return; @@ -632,7 +632,7 @@ - (NSDictionary *)encodingMap return; } if (![localUrl.scheme isEqualToString:@"file"]) { - reject(@"ERR_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"Cannot download to '%@': only 'file://' URI destinations are supported.", fileUri], nil); return; @@ -640,7 +640,7 @@ - (NSDictionary *)encodingMap NSString *path = localUrl.path; if (!([self _permissionsForPath:path] & UMFileSystemPermissionWrite)) { - reject(@"ERR_FILESYSTEM_PERMISSIONS", + reject(@"ERR_FILESYSTEM_NO_PERMISSIONS", [NSString stringWithFormat:@"File '%@' isn't writable.", fileUri], nil); return; @@ -670,7 +670,7 @@ - (NSDictionary *)encodingMap { NSURLSessionDownloadTask *task = [_resumableManager taskForId:uuid]; if (!task) { - reject(@"ERR_UNABLE_TO_PAUSE", + reject(@"ERR_FILESYSTEM_CANNOT_FIND_TASK", [NSString stringWithFormat:@"There is no download object with UUID: %@", uuid], nil); return; @@ -686,7 +686,7 @@ - (NSDictionary *)encodingMap UM_EXPORT_METHOD_AS(getFreeDiskStorageAsync, getFreeDiskStorageAsyncWithResolver:(UMPromiseResolveBlock)resolve rejecter:(UMPromiseRejectBlock)reject) { if(![self freeDiskStorage]) { - reject(@"ERR_FILESYSTEM", @"Unable to determine free disk storage capacity", nil); + reject(@"ERR_FILESYSTEM_CANNOT_DETERMINE_DISK_CAPACITY", @"Unable to determine free disk storage capacity", nil); } else { resolve([self freeDiskStorage]); } @@ -695,7 +695,7 @@ - (NSDictionary *)encodingMap UM_EXPORT_METHOD_AS(getTotalDiskCapacityAsync, getTotalDiskCapacityAsyncWithResolver:(UMPromiseResolveBlock)resolve rejecter:(UMPromiseRejectBlock)reject) { if(![self totalDiskCapacity]) { - reject(@"ERR_FILESYSTEM", @"Unable to determine total disk capacity", nil); + reject(@"ERR_FILESYSTEM_CANNOT_DETERMINE_DISK_CAPACITY", @"Unable to determine total disk capacity", nil); } else { resolve([self totalDiskCapacity]); } diff --git a/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionDownloadTaskDelegate.m b/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionDownloadTaskDelegate.m index ac853b7ad16a9..b64f55cef0358 100644 --- a/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionDownloadTaskDelegate.m +++ b/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionDownloadTaskDelegate.m @@ -32,7 +32,7 @@ - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTas if ([fileManager fileExistsAtPath:_localUrl.path]) { [fileManager removeItemAtURL:_localUrl error:&error]; if (error) { - self.reject(@"ERR_FILE_SYSTEM_UNABLE_TO_REMOVE", + self.reject(@"ERR_FILESYSTEM_CANNOT_REMOVE", [NSString stringWithFormat:@"Unable to remove file from local URI: '%@'", error.description], error); return; @@ -41,7 +41,7 @@ - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTas [fileManager moveItemAtURL:location toURL:_localUrl error:&error]; if (error) { - self.reject(@"ERR_FILE_SYSTEM_UNABLE_TO_SAVE", + self.reject(@"ERR_FILESYSTEM_CANNOT_SAVE", [NSString stringWithFormat:@"Unable to save file to local URI: '%@'", error.description], error); return; diff --git a/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionResumableDownloadTaskDelegate.m b/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionResumableDownloadTaskDelegate.m index 71d6d0ef78b58..5723028f18abc 100644 --- a/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionResumableDownloadTaskDelegate.m +++ b/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionResumableDownloadTaskDelegate.m @@ -38,7 +38,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp if (error.code == NSURLErrorCancelled) { self.resolve([NSNull null]); } else { - self.reject(@"ERR_FILE_SYSTEM_UNABLE_TO_DOWNLOAD", + self.reject(@"ERR_FILESYSTEM_CANNOT_DOWNLOAD", [NSString stringWithFormat:@"Unable to download file: %@", error.description], error); } diff --git a/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionTaskDelegate.h b/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionTaskDelegate.h index 364fdce99f09c..c9ca3739f5df2 100644 --- a/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionTaskDelegate.h +++ b/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionTaskDelegate.h @@ -11,7 +11,6 @@ - (instancetype)initWithResolve:(UMPromiseResolveBlock)resolve reject:(UMPromiseRejectBlock)reject; -+ (NSDictionary *)parseServerResponse:(NSURLResponse *)response; - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location; diff --git a/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionTaskDelegate.m b/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionTaskDelegate.m index 4a2e2bebe8154..85e2b6bcbabae 100644 --- a/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionTaskDelegate.m +++ b/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionTaskDelegate.m @@ -14,6 +14,15 @@ - (instancetype)initWithResolve:(UMPromiseResolveBlock)resolve return self; } +- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error +{ + if (error) { + self.reject(@"ERR_FILESYSTEM_CANNOT_DOWNLOAD", + [NSString stringWithFormat:@"Unable to download file: %@", error.description], + error); + } +} + - (NSDictionary *)parseServerResponse:(NSURLResponse *)response { NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response; @@ -24,15 +33,6 @@ - (NSDictionary *)parseServerResponse:(NSURLResponse *)response }; } -- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error -{ - if (error) { - self.reject(@"ERR_FILE_SYSTEM_UNABLE_TO_DOWNLOAD", - [NSString stringWithFormat:@"Unable to download file: %@", error.description], - error); - } -} - - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location { } diff --git a/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionUploadTaskDelegate.m b/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionUploadTaskDelegate.m index b2e54e1dfe46a..2e6465a24a619 100644 --- a/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionUploadTaskDelegate.m +++ b/packages/expo-file-system/ios/EXFileSystem/EXSessionTasks/EXSessionUploadTaskDelegate.m @@ -21,7 +21,7 @@ - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)data - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error { if (error) { - self.reject(@"ERR_FILE_SYSTEM_UNABLE_TO_UPLOAD_FILE.", + self.reject(@"ERR_FILESYSTEM_CANNOT_UPLOAD", [NSString stringWithFormat:@"Unable to upload the file: '%@'", error.description], error); return;