From 110f0edf9d25887984fcdf12becb11a4661ad637 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Thu, 9 Nov 2017 14:43:53 -0800 Subject: Clang-formatting Storage --- Firebase/Storage/FIRStorage.m | 10 +++--- Firebase/Storage/FIRStorageConstants.m | 8 +++-- Firebase/Storage/FIRStorageDeleteTask.m | 4 +-- Firebase/Storage/FIRStorageDownloadTask.m | 14 ++++++--- Firebase/Storage/FIRStorageErrors.m | 3 +- Firebase/Storage/FIRStorageGetMetadataTask.m | 2 +- Firebase/Storage/FIRStorageMetadata.m | 2 +- Firebase/Storage/FIRStorageObservableTask.m | 16 +++++----- Firebase/Storage/FIRStoragePath.m | 7 +++-- Firebase/Storage/FIRStorageReference.m | 30 +++++++++--------- Firebase/Storage/FIRStorageTask.m | 5 ++- Firebase/Storage/FIRStorageTaskSnapshot.m | 15 +++++---- Firebase/Storage/FIRStorageUpdateMetadataTask.m | 6 ++-- Firebase/Storage/FIRStorageUploadTask.m | 36 ++++++++++++---------- Firebase/Storage/Private/FIRStorageDeleteTask.h | 2 +- .../Storage/Private/FIRStorageGetMetadataTask.h | 2 +- .../Storage/Private/FIRStorageTokenAuthorizer.h | 2 +- .../Storage/Private/FIRStorageUpdateMetadataTask.h | 2 +- Firebase/Storage/Public/FIRStorage.h | 3 +- Firebase/Storage/Public/FIRStorageDownloadTask.h | 2 +- Firebase/Storage/Public/FIRStorageMetadata.h | 6 ++-- Firebase/Storage/Public/FIRStorageReference.h | 31 +++++++++++++------ .../Storage/Public/FIRStorageSwiftNameSupport.h | 2 +- Firebase/Storage/Public/FIRStorageTask.h | 2 +- Firebase/Storage/Public/FIRStorageUploadTask.h | 2 +- 25 files changed, 117 insertions(+), 97 deletions(-) (limited to 'Firebase/Storage') diff --git a/Firebase/Storage/FIRStorage.m b/Firebase/Storage/FIRStorage.m index dd11391..21657bc 100644 --- a/Firebase/Storage/FIRStorage.m +++ b/Firebase/Storage/FIRStorage.m @@ -38,8 +38,7 @@ static GTMSessionFetcherRetryBlock _retryWhenOffline; + (void)initialize { static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - _retryWhenOffline = ^(BOOL suggestedWillRetry, - NSError * GTM_NULLABLE_TYPE error, + _retryWhenOffline = ^(BOOL suggestedWillRetry, NSError *GTM_NULLABLE_TYPE error, GTMSessionFetcherRetryResponse response) { bool shouldRetry = suggestedWillRetry; // GTMSessionFetcher does not consider being offline a retryable error, but we do, so we @@ -84,11 +83,12 @@ static GTMSessionFetcherRetryBlock _retryWhenOffline; } + (instancetype)storageForApp:(FIRApp *)app { - NSString* url; + NSString *url; if (app.options.storageBucket) { - url = [app.options.storageBucket isEqualToString:@""] ? @"" - : [@"gs://" stringByAppendingString:app.options.storageBucket]; + url = [app.options.storageBucket isEqualToString:@""] + ? @"" + : [@"gs://" stringByAppendingString:app.options.storageBucket]; } return [self storageForApp:app URL:url]; diff --git a/Firebase/Storage/FIRStorageConstants.m b/Firebase/Storage/FIRStorageConstants.m index aa3da1b..2018b42 100644 --- a/Firebase/Storage/FIRStorageConstants.m +++ b/Firebase/Storage/FIRStorageConstants.m @@ -40,8 +40,10 @@ NSString *const kFIRStorageResponseBody = @"ResponseBody"; NSString *const FIRStorageErrorDomain = @"FIRStorageErrorDomain"; NSString *const kFIRStorageInvalidDataFormat = @"Invalid data returned from the server: %@"; -NSString *const kFIRStorageInvalidObserverStatus = @"Invalid observer status requested, use one " - @"of: FIRStorageTaskStatusPause, Resume, Progress, " @"Complete, or Failure"; +NSString *const kFIRStorageInvalidObserverStatus = + @"Invalid observer status requested, use one " + @"of: FIRStorageTaskStatusPause, Resume, Progress, " + @"Complete, or Failure"; /** * String constants mapping GCS Object#resource mappings to metadata fields. @@ -80,4 +82,4 @@ NSString *const kFIRStorageBundleIdentifier = @"com.google.firebase.storage"; #define STR(x) STR_EXPAND(x) #define STR_EXPAND(x) #x const unsigned char *const FIRStorageVersionString = - (const unsigned char *const) STR(FIRStorage_VERSION); + (const unsigned char *const)STR(FIRStorage_VERSION); diff --git a/Firebase/Storage/FIRStorageDeleteTask.m b/Firebase/Storage/FIRStorageDeleteTask.m index 825bd51..738d8a5 100644 --- a/Firebase/Storage/FIRStorageDeleteTask.m +++ b/Firebase/Storage/FIRStorageDeleteTask.m @@ -24,7 +24,7 @@ @synthesize fetcher = _fetcher; @synthesize fetcherCompletion = _fetcherCompletion; -- (void) dealloc { +- (void)dealloc { [_fetcher stopFetching]; } @@ -64,7 +64,7 @@ }; #pragma clang diangostic pop - __weak FIRStorageDeleteTask* weakSelf = self; + __weak FIRStorageDeleteTask *weakSelf = self; [fetcher beginFetchWithCompletionHandler:^(NSData *_Nullable data, NSError *_Nullable error) { weakSelf.fetcherCompletion(data, error); }]; diff --git a/Firebase/Storage/FIRStorageDownloadTask.m b/Firebase/Storage/FIRStorageDownloadTask.m index 783ac68..c410f05 100644 --- a/Firebase/Storage/FIRStorageDownloadTask.m +++ b/Firebase/Storage/FIRStorageDownloadTask.m @@ -36,7 +36,7 @@ return self; } -- (void) dealloc { +- (void)dealloc { [_fetcher stopFetching]; } @@ -45,7 +45,8 @@ } - (void)enqueueWithData:(nullable NSData *)resumeData { - NSAssert([NSThread isMainThread], @"Download attempting to execute on non main queue! Please " + NSAssert([NSThread isMainThread], + @"Download attempting to execute on non main queue! Please " @"only execute this method on the main queue."); self.state = FIRStorageTaskStateQueueing; NSMutableURLRequest *request = [self.baseRequest mutableCopy]; @@ -146,7 +147,8 @@ } - (void)cancelWithError:(NSError *)error { - NSAssert([NSThread isMainThread], @"Cancel attempting to execute on non main queue! Please only " + NSAssert([NSThread isMainThread], + @"Cancel attempting to execute on non main queue! Please only " @"execute this method on the main queue."); self.state = FIRStorageTaskStateCancelled; [self.fetcher stopFetching]; @@ -155,7 +157,8 @@ } - (void)pause { - NSAssert([NSThread isMainThread], @"Pause attempting to execute on non main queue! Please only " + NSAssert([NSThread isMainThread], + @"Pause attempting to execute on non main queue! Please only " @"execute this method on the main queue."); self.state = FIRStorageTaskStatePausing; [self.fetcher stopFetching]; @@ -167,7 +170,8 @@ } - (void)resume { - NSAssert([NSThread isMainThread], @"Resume attempting to execute on non main queue! Please only " + NSAssert([NSThread isMainThread], + @"Resume attempting to execute on non main queue! Please only " @"execute this method on the main queue."); self.state = FIRStorageTaskStateResuming; FIRStorageTaskSnapshot *snapshot = self.snapshot; diff --git a/Firebase/Storage/FIRStorageErrors.m b/Firebase/Storage/FIRStorageErrors.m index 49a5ffa..92c0536 100644 --- a/Firebase/Storage/FIRStorageErrors.m +++ b/Firebase/Storage/FIRStorageErrors.m @@ -72,7 +72,8 @@ } case FIRStorageErrorCodeUnauthenticated: - errorMessage = @"User is not authenticated, please authenticate using Firebase " + errorMessage = + @"User is not authenticated, please authenticate using Firebase " @"Authentication and try again."; break; diff --git a/Firebase/Storage/FIRStorageGetMetadataTask.m b/Firebase/Storage/FIRStorageGetMetadataTask.m index fe0844d..78d8a16 100644 --- a/Firebase/Storage/FIRStorageGetMetadataTask.m +++ b/Firebase/Storage/FIRStorageGetMetadataTask.m @@ -39,7 +39,7 @@ return self; } -- (void) dealloc { +- (void)dealloc { [_fetcher stopFetching]; } diff --git a/Firebase/Storage/FIRStorageMetadata.m b/Firebase/Storage/FIRStorageMetadata.m index c4ff5a8..d2b8277 100644 --- a/Firebase/Storage/FIRStorageMetadata.m +++ b/Firebase/Storage/FIRStorageMetadata.m @@ -209,7 +209,7 @@ + (void)removeMatchingMetadata:(NSMutableDictionary *)metadata oldMetadata:(NSDictionary *)oldMetadata { - for (NSString* metadataKey in [oldMetadata allKeys]) { + for (NSString *metadataKey in [oldMetadata allKeys]) { id oldValue = [oldMetadata objectForKey:metadataKey]; id newValue = [metadata objectForKey:metadataKey]; diff --git a/Firebase/Storage/FIRStorageObservableTask.m b/Firebase/Storage/FIRStorageObservableTask.m index bac5924..58455f6 100644 --- a/Firebase/Storage/FIRStorageObservableTask.m +++ b/Firebase/Storage/FIRStorageObservableTask.m @@ -203,14 +203,14 @@ @synchronized(self) { handlersCopy = [handlers copy]; } // @synchronized(self) - [handlersCopy enumerateKeysAndObjectsUsingBlock:^(NSString *_Nonnull key, - FIRStorageVoidSnapshot _Nonnull handler, - BOOL *_Nonnull stop) { - - dispatch_async(callbackQueue, ^{ - handler(snapshot); - }); - }]; + [handlersCopy + enumerateKeysAndObjectsUsingBlock:^( + NSString *_Nonnull key, FIRStorageVoidSnapshot _Nonnull handler, BOOL *_Nonnull stop) { + + dispatch_async(callbackQueue, ^{ + handler(snapshot); + }); + }]; } @end diff --git a/Firebase/Storage/FIRStoragePath.m b/Firebase/Storage/FIRStoragePath.m index 7188ab6..aa7f130 100644 --- a/Firebase/Storage/FIRStoragePath.m +++ b/Firebase/Storage/FIRStoragePath.m @@ -74,9 +74,10 @@ if (bucketName.length == 0) { [NSException raise:NSInternalInconsistencyException - format:@"URL must be in the form of " - @"http[s]://firebasestorage.googleapis.com/v0/b//o/[?token=signed_url_params]"]; + format: + @"URL must be in the form of " + @"http[s]://firebasestorage.googleapis.com/v0/b//o/[?token=signed_url_params]"]; return nil; } diff --git a/Firebase/Storage/FIRStorageReference.m b/Firebase/Storage/FIRStorageReference.m index 6e8105c..2a4e0c2 100644 --- a/Firebase/Storage/FIRStorageReference.m +++ b/Firebase/Storage/FIRStorageReference.m @@ -266,21 +266,21 @@ completion(nil, snapshot.error); }); }]; - [task observeStatus:FIRStorageTaskStatusProgress - handler:^(FIRStorageTaskSnapshot *_Nonnull snapshot) { - FIRStorageDownloadTask *task = snapshot.task; - if (task.progress.totalUnitCount > size || - task.progress.completedUnitCount > size) { - NSDictionary *infoDictionary = @{ - @"totalSize" : @(task.progress.totalUnitCount), - @"maxAllowedSize" : @(size) - }; - NSError *error = - [FIRStorageErrors errorWithCode:FIRStorageErrorCodeDownloadSizeExceeded - infoDictionary:infoDictionary]; - [task cancelWithError:error]; - } - }]; + [task + observeStatus:FIRStorageTaskStatusProgress + handler:^(FIRStorageTaskSnapshot *_Nonnull snapshot) { + FIRStorageDownloadTask *task = snapshot.task; + if (task.progress.totalUnitCount > size || task.progress.completedUnitCount > size) { + NSDictionary *infoDictionary = @{ + @"totalSize" : @(task.progress.totalUnitCount), + @"maxAllowedSize" : @(size) + }; + NSError *error = + [FIRStorageErrors errorWithCode:FIRStorageErrorCodeDownloadSizeExceeded + infoDictionary:infoDictionary]; + [task cancelWithError:error]; + } + }]; [task enqueue]; return task; } diff --git a/Firebase/Storage/FIRStorageTask.m b/Firebase/Storage/FIRStorageTask.m index 3c1cf6f..0305a39 100644 --- a/Firebase/Storage/FIRStorageTask.m +++ b/Firebase/Storage/FIRStorageTask.m @@ -15,12 +15,12 @@ #import "FIRStorageTask.h" #import "FIRStorage.h" -#import "FIRStorage_Private.h" #import "FIRStorageReference.h" #import "FIRStorageReference_Private.h" #import "FIRStorageTaskSnapshot.h" #import "FIRStorageTaskSnapshot_Private.h" #import "FIRStorageTask_Private.h" +#import "FIRStorage_Private.h" #import "GTMSessionFetcherService.h" @@ -48,8 +48,7 @@ - (FIRStorageTaskSnapshot *)snapshot { @synchronized(self) { - NSProgress *progress = - [NSProgress progressWithTotalUnitCount:self.progress.totalUnitCount]; + NSProgress *progress = [NSProgress progressWithTotalUnitCount:self.progress.totalUnitCount]; progress.completedUnitCount = self.progress.completedUnitCount; FIRStorageTaskSnapshot *snapshot = [[FIRStorageTaskSnapshot alloc] initWithTask:self diff --git a/Firebase/Storage/FIRStorageTaskSnapshot.m b/Firebase/Storage/FIRStorageTaskSnapshot.m index 050d05c..c964993 100644 --- a/Firebase/Storage/FIRStorageTaskSnapshot.m +++ b/Firebase/Storage/FIRStorageTaskSnapshot.m @@ -67,20 +67,19 @@ return self; } - --(NSString *)description { +- (NSString *)description { switch (_status) { - case FIRStorageTaskStatusResume: + case FIRStorageTaskStatusResume: return @""; - case FIRStorageTaskStatusProgress: + case FIRStorageTaskStatusProgress: return [NSString stringWithFormat:@"", _progress]; - case FIRStorageTaskStatusPause: + case FIRStorageTaskStatusPause: return @""; - case FIRStorageTaskStatusSuccess: + case FIRStorageTaskStatusSuccess: return @""; - case FIRStorageTaskStatusFailure: + case FIRStorageTaskStatusFailure: return [NSString stringWithFormat:@"", _error]; - default: + default: return @""; }; } diff --git a/Firebase/Storage/FIRStorageUpdateMetadataTask.m b/Firebase/Storage/FIRStorageUpdateMetadataTask.m index 642ebcd..cf1bf93 100644 --- a/Firebase/Storage/FIRStorageUpdateMetadataTask.m +++ b/Firebase/Storage/FIRStorageUpdateMetadataTask.m @@ -39,7 +39,7 @@ return self; } -- (void) dealloc { +- (void)dealloc { [_fetcher stopFetching]; } @@ -63,7 +63,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Warc-retain-cycles" - _fetcherCompletion =^(NSData *data, NSError *error) { + _fetcherCompletion = ^(NSData *data, NSError *error) { if (error) { if (!self.error) { self.error = [FIRStorageErrors errorWithServerError:error reference:self.reference]; @@ -80,7 +80,7 @@ FIRStorageMetadata *metadata = [[FIRStorageMetadata alloc] initWithDictionary:responseDictionary]; [metadata setType:FIRStorageMetadataTypeFile]; - if (callback){ + if (callback) { callback(metadata, nil); } } else { diff --git a/Firebase/Storage/FIRStorageUploadTask.m b/Firebase/Storage/FIRStorageUploadTask.m index dd3b329..0df0bf4 100644 --- a/Firebase/Storage/FIRStorageUploadTask.m +++ b/Firebase/Storage/FIRStorageUploadTask.m @@ -63,12 +63,13 @@ return self; } -- (void) dealloc { +- (void)dealloc { [_uploadFetcher stopFetching]; } - (void)enqueue { - NSAssert([NSThread isMainThread], @"Upload attempting to execute on non main queue! Please only " + NSAssert([NSThread isMainThread], + @"Upload attempting to execute on non main queue! Please only " @"execute this method on the main queue."); self.state = FIRStorageTaskStateQueueing; @@ -78,8 +79,8 @@ NSData *bodyData = [NSData frs_dataFromJSONDictionary:[_uploadMetadata dictionaryRepresentation]]; request.HTTPBody = bodyData; [request setValue:@"application/json; charset=UTF-8" forHTTPHeaderField:@"Content-Type"]; - NSString *contentLengthString = [NSString stringWithFormat:@"%zu", - (unsigned long)[bodyData length]]; + NSString *contentLengthString = + [NSString stringWithFormat:@"%zu", (unsigned long)[bodyData length]]; [request setValue:contentLengthString forHTTPHeaderField:@"Content-Length"]; NSURLComponents *components = @@ -89,7 +90,7 @@ [components setPercentEncodedPath:[@"/upload" stringByAppendingString:components.path]]; } - NSDictionary *queryParams = @{ @"uploadType" : @"resumable", @"name" : self.uploadMetadata.path }; + NSDictionary *queryParams = @{@"uploadType" : @"resumable", @"name" : self.uploadMetadata.path}; [components setPercentEncodedQuery:[FIRStorageUtils queryStringForDictionary:queryParams]]; request.URL = components.URL; @@ -109,7 +110,7 @@ uploadFetcher.maxRetryInterval = self.reference.storage.maxUploadRetryTime; - __weak FIRStorageUploadTask* weakSelf = self; + __weak FIRStorageUploadTask *weakSelf = self; [uploadFetcher setSendProgressBlock:^(int64_t bytesSent, int64_t totalBytesSent, int64_t totalBytesExpectedToSend) { @@ -128,8 +129,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Warc-retain-cycles" - _fetcherCompletion = ^(NSData *_Nullable data, - NSError *_Nullable error) { + _fetcherCompletion = ^(NSData *_Nullable data, NSError *_Nullable error) { // Fire last progress updates [self fireHandlersForStatus:FIRStorageTaskStatusProgress snapshot:self.snapshot]; @@ -161,8 +161,7 @@ if (invalidDataString.length > 0) { dict = @{NSLocalizedFailureReasonErrorKey : invalidDataString}; } - self.error = - [FIRStorageErrors errorWithCode:FIRStorageErrorCodeUnknown infoDictionary:dict]; + self.error = [FIRStorageErrors errorWithCode:FIRStorageErrorCodeUnknown infoDictionary:dict]; } [self fireHandlersForStatus:FIRStorageTaskStatusSuccess snapshot:self.snapshot]; @@ -171,16 +170,17 @@ }; #pragma clang diagnostic pop - [_uploadFetcher beginFetchWithCompletionHandler:^(NSData *_Nullable data, - NSError *_Nullable error) { - weakSelf.fetcherCompletion(data, error); - }]; + [_uploadFetcher + beginFetchWithCompletionHandler:^(NSData *_Nullable data, NSError *_Nullable error) { + weakSelf.fetcherCompletion(data, error); + }]; } #pragma mark - Upload Management - (void)cancel { - NSAssert([NSThread isMainThread], @"Cancel attempting to execute on non main queue! Please only " + NSAssert([NSThread isMainThread], + @"Cancel attempting to execute on non main queue! Please only " @"execute this method on the main queue."); self.state = FIRStorageTaskStateCancelled; [_uploadFetcher stopFetching]; @@ -192,7 +192,8 @@ } - (void)pause { - NSAssert([NSThread isMainThread], @"Pause attempting to execute on non main queue! Please only " + NSAssert([NSThread isMainThread], + @"Pause attempting to execute on non main queue! Please only " @"execute this method on the main queue."); self.state = FIRStorageTaskStatePaused; [_uploadFetcher pauseFetching]; @@ -203,7 +204,8 @@ } - (void)resume { - NSAssert([NSThread isMainThread], @"Resume attempting to execute on non main queue! Please only " + NSAssert([NSThread isMainThread], + @"Resume attempting to execute on non main queue! Please only " @"execute this method on the main queue."); self.state = FIRStorageTaskStateResuming; [_uploadFetcher resumeFetching]; diff --git a/Firebase/Storage/Private/FIRStorageDeleteTask.h b/Firebase/Storage/Private/FIRStorageDeleteTask.h index c97fd27..4c93de2 100644 --- a/Firebase/Storage/Private/FIRStorageDeleteTask.h +++ b/Firebase/Storage/Private/FIRStorageDeleteTask.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN /** * Task which provides the ability to delete an object in Firebase Storage. */ -@interface FIRStorageDeleteTask : FIRStorageTask +@interface FIRStorageDeleteTask : FIRStorageTask - (instancetype)initWithReference:(FIRStorageReference *)reference fetcherService:(GTMSessionFetcherService *)service diff --git a/Firebase/Storage/Private/FIRStorageGetMetadataTask.h b/Firebase/Storage/Private/FIRStorageGetMetadataTask.h index 5f1dc8f..e5ba37e 100644 --- a/Firebase/Storage/Private/FIRStorageGetMetadataTask.h +++ b/Firebase/Storage/Private/FIRStorageGetMetadataTask.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN /** * Task which provides the ability to get metadata on an object in Firebase Storage. */ -@interface FIRStorageGetMetadataTask : FIRStorageTask +@interface FIRStorageGetMetadataTask : FIRStorageTask - (instancetype)initWithReference:(FIRStorageReference *)reference fetcherService:(GTMSessionFetcherService *)service diff --git a/Firebase/Storage/Private/FIRStorageTokenAuthorizer.h b/Firebase/Storage/Private/FIRStorageTokenAuthorizer.h index 78a8218..00bf141 100644 --- a/Firebase/Storage/Private/FIRStorageTokenAuthorizer.h +++ b/Firebase/Storage/Private/FIRStorageTokenAuthorizer.h @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN * If no authentication provider exists or no token is found, no token is added * and the request is passed. */ -@interface FIRStorageTokenAuthorizer : NSObject +@interface FIRStorageTokenAuthorizer : NSObject /** * Initializes the token authorizer with an instance of FIRApp. diff --git a/Firebase/Storage/Private/FIRStorageUpdateMetadataTask.h b/Firebase/Storage/Private/FIRStorageUpdateMetadataTask.h index 2fcefdd..46bd65a 100644 --- a/Firebase/Storage/Private/FIRStorageUpdateMetadataTask.h +++ b/Firebase/Storage/Private/FIRStorageUpdateMetadataTask.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN /** * Task which provides the ability update the metadata on an object in Firebase Storage. */ -@interface FIRStorageUpdateMetadataTask : FIRStorageTask +@interface FIRStorageUpdateMetadataTask : FIRStorageTask - (instancetype)initWithReference:(FIRStorageReference *)reference fetcherService:(GTMSessionFetcherService *)service diff --git a/Firebase/Storage/Public/FIRStorage.h b/Firebase/Storage/Public/FIRStorage.h index 3b37a0e..112b1c6 100644 --- a/Firebase/Storage/Public/FIRStorage.h +++ b/Firebase/Storage/Public/FIRStorage.h @@ -68,8 +68,7 @@ FIR_SWIFT_NAME(Storage) * @param url The gs:// url to your Firebase Storage Bucket. * @return the FIRStorage instance, initialized with the custom FIRApp. */ -+ (instancetype)storageForApp:(FIRApp *)app - URL:(NSString *)url FIR_SWIFT_NAME(storage(app:url:)); ++ (instancetype)storageForApp:(FIRApp *)app URL:(NSString *)url FIR_SWIFT_NAME(storage(app:url:)); /** * The Firebase App associated with this Firebase Storage instance. diff --git a/Firebase/Storage/Public/FIRStorageDownloadTask.h b/Firebase/Storage/Public/FIRStorageDownloadTask.h index 252b910..f9d3e76 100644 --- a/Firebase/Storage/Public/FIRStorageDownloadTask.h +++ b/Firebase/Storage/Public/FIRStorageDownloadTask.h @@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN * Currently all uploads must be initiated and managed on the main queue. */ FIR_SWIFT_NAME(StorageDownloadTask) -@interface FIRStorageDownloadTask : FIRStorageObservableTask +@interface FIRStorageDownloadTask : FIRStorageObservableTask @end diff --git a/Firebase/Storage/Public/FIRStorageMetadata.h b/Firebase/Storage/Public/FIRStorageMetadata.h index 8d844f7..61d95ca 100644 --- a/Firebase/Storage/Public/FIRStorageMetadata.h +++ b/Firebase/Storage/Public/FIRStorageMetadata.h @@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN * @see https://cloud.google.com/storage/docs/json_api/v1/objects#resource */ FIR_SWIFT_NAME(StorageMetadata) -@interface FIRStorageMetadata : NSObject +@interface FIRStorageMetadata : NSObject /** * The name of the bucket containing this object. @@ -118,14 +118,14 @@ FIR_SWIFT_NAME(StorageMetadata) * Creates an instanece of FIRStorageMetadata from the contents of a dictionary. * @return An instance of FIRStorageMetadata that represents the contents of a dictionary. */ -- (nullable instancetype)initWithDictionary:(NSDictionary *)dictionary +- (nullable instancetype)initWithDictionary:(NSDictionary *)dictionary NS_DESIGNATED_INITIALIZER; /** * Creates an NSDictionary from the contents of the metadata. * @return An NSDictionary that represents the contents of the metadata. */ -- (NSDictionary *)dictionaryRepresentation; +- (NSDictionary *)dictionaryRepresentation; /** * Determines if the current metadata represents a "file". diff --git a/Firebase/Storage/Public/FIRStorageReference.h b/Firebase/Storage/Public/FIRStorageReference.h index 0b85267..a85c738 100644 --- a/Firebase/Storage/Public/FIRStorageReference.h +++ b/Firebase/Storage/Public/FIRStorageReference.h @@ -110,9 +110,11 @@ FIR_SWIFT_NAME(StorageReference) * about the object being uploaded. * @return An instance of FIRStorageUploadTask, which can be used to monitor or manage the upload. */ +// clang-format off - (FIRStorageUploadTask *)putData:(NSData *)uploadData metadata:(nullable FIRStorageMetadata *)metadata - FIR_SWIFT_NAME(putData(_:metadata:)); +FIR_SWIFT_NAME(putData(_:metadata:)); +// clang-format on /** * Asynchronously uploads data to the currently specified FIRStorageReference. @@ -124,11 +126,13 @@ FIR_SWIFT_NAME(StorageReference) * or an error on failure. * @return An instance of FIRStorageUploadTask, which can be used to monitor or manage the upload. */ +// clang-format off - (FIRStorageUploadTask *)putData:(NSData *)uploadData metadata:(nullable FIRStorageMetadata *)metadata completion:(nullable void (^)(FIRStorageMetadata *_Nullable metadata, NSError *_Nullable error))completion - FIR_SWIFT_NAME(putData(_:metadata:completion:)); + FIR_SWIFT_NAME(putData(_:metadata:completion:)); +// clang-format on /** * Asynchronously uploads a file to the currently specified FIRStorageReference, @@ -145,8 +149,11 @@ FIR_SWIFT_NAME(StorageReference) * about the object being uploaded. * @return An instance of FIRStorageUploadTask, which can be used to monitor or manage the upload. */ -- (FIRStorageUploadTask *)putFile:(NSURL *)fileURL metadata:(nullable FIRStorageMetadata *)metadata - FIR_SWIFT_NAME(putFile(from:metadata:)); +// clang-format off +- (FIRStorageUploadTask *)putFile:(NSURL *)fileURL + metadata:(nullable FIRStorageMetadata *)metadata + FIR_SWIFT_NAME(putFile(from:metadata:)); +// clang-format on /** * Asynchronously uploads a file to the currently specified FIRStorageReference. @@ -157,11 +164,13 @@ FIR_SWIFT_NAME(StorageReference) * or an error on failure. * @return An instance of FIRStorageUploadTask, which can be used to monitor or manage the upload. */ +// clang-format off - (FIRStorageUploadTask *)putFile:(NSURL *)fileURL metadata:(nullable FIRStorageMetadata *)metadata completion:(nullable void (^)(FIRStorageMetadata *_Nullable metadata, NSError *_Nullable error))completion - FIR_SWIFT_NAME(putFile(from:metadata:completion:)); + FIR_SWIFT_NAME(putFile(from:metadata:completion:)); +// clang-format on #pragma mark - Downloads @@ -175,10 +184,12 @@ FIR_SWIFT_NAME(StorageReference) * or an error on failure. * @return An FIRStorageDownloadTask that can be used to monitor or manage the download. */ +// clang-format off - (FIRStorageDownloadTask *)dataWithMaxSize:(int64_t)size completion:(void (^)(NSData *_Nullable data, NSError *_Nullable error))completion - FIR_SWIFT_NAME(getData(maxSize:completion:)); + FIR_SWIFT_NAME(getData(maxSize:completion:)); +// clang-format on /** * Asynchronously retrieves a long lived download URL with a revokable token. @@ -216,8 +227,8 @@ FIR_SWIFT_NAME(StorageReference) * @param completion A completion block which returns the object metadata on success, * or an error on failure. */ -- (void)metadataWithCompletion:(void (^)(FIRStorageMetadata *_Nullable metadata, - NSError *_Nullable error))completion +- (void)metadataWithCompletion: + (void (^)(FIRStorageMetadata *_Nullable metadata, NSError *_Nullable error))completion FIR_SWIFT_NAME(getMetadata(completion:)); /** @@ -226,10 +237,12 @@ FIR_SWIFT_NAME(StorageReference) * @param completion A completion block which returns the FIRStorageMetadata on success, * or an error on failure. */ +// clang-format off - (void)updateMetadata:(FIRStorageMetadata *)metadata completion:(nullable void (^)(FIRStorageMetadata *_Nullable metadata, NSError *_Nullable error))completion - FIR_SWIFT_NAME(updateMetadata(_:completion:)); +FIR_SWIFT_NAME(updateMetadata(_:completion:)); +// clang-format on #pragma mark - Delete diff --git a/Firebase/Storage/Public/FIRStorageSwiftNameSupport.h b/Firebase/Storage/Public/FIRStorageSwiftNameSupport.h index 55e1bcc..216c047 100644 --- a/Firebase/Storage/Public/FIRStorageSwiftNameSupport.h +++ b/Firebase/Storage/Public/FIRStorageSwiftNameSupport.h @@ -24,6 +24,6 @@ #define FIR_SWIFT_NAME(X) NS_SWIFT_NAME(X) #else #define FIR_SWIFT_NAME(X) // Intentionally blank. -#endif // #ifdef __IPHONE_9_3 +#endif // #ifdef __IPHONE_9_3 #endif // FIR_SWIFT_NAME diff --git a/Firebase/Storage/Public/FIRStorageTask.h b/Firebase/Storage/Public/FIRStorageTask.h index 0428220..b49363c 100644 --- a/Firebase/Storage/Public/FIRStorageTask.h +++ b/Firebase/Storage/Public/FIRStorageTask.h @@ -47,7 +47,7 @@ FIR_SWIFT_NAME(StorageTask) * operations. */ FIR_SWIFT_NAME(StorageTaskManagement) -@protocol FIRStorageTaskManagement +@protocol FIRStorageTaskManagement @required /** diff --git a/Firebase/Storage/Public/FIRStorageUploadTask.h b/Firebase/Storage/Public/FIRStorageUploadTask.h index cdf1d29..cf9bde8 100644 --- a/Firebase/Storage/Public/FIRStorageUploadTask.h +++ b/Firebase/Storage/Public/FIRStorageUploadTask.h @@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN * Currently all uploads must be initiated and managed on the main queue. */ FIR_SWIFT_NAME(StorageUploadTask) -@interface FIRStorageUploadTask : FIRStorageObservableTask +@interface FIRStorageUploadTask : FIRStorageObservableTask @end -- cgit v1.2.3