aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firebase/Storage/FIRStorageMetadata.m
diff options
context:
space:
mode:
authorGravatar Sebastian Schmidt <mrschmidt@google.com>2018-04-09 14:21:00 -0700
committerGravatar Sebastian Schmidt <mrschmidt@google.com>2018-04-09 14:41:54 -0700
commit2dd40e3abba3d3a5a949aa4980f741ae412147ba (patch)
tree05628f8f8805fc22e5f54d0ed90a68c29680e1a6 /Firebase/Storage/FIRStorageMetadata.m
parent42bc113754d2f9e2f0f6cf552916ae76149e717d (diff)
Removing FirebaseStorage.downloadURL
Diffstat (limited to 'Firebase/Storage/FIRStorageMetadata.m')
-rw-r--r--Firebase/Storage/FIRStorageMetadata.m48
1 files changed, 0 insertions, 48 deletions
diff --git a/Firebase/Storage/FIRStorageMetadata.m b/Firebase/Storage/FIRStorageMetadata.m
index ab25076..764907c 100644
--- a/Firebase/Storage/FIRStorageMetadata.m
+++ b/Firebase/Storage/FIRStorageMetadata.m
@@ -41,7 +41,6 @@
_contentType = dictionary[kFIRStorageMetadataContentType];
_customMetadata = dictionary[kFIRStorageMetadataCustomMetadata];
_size = [dictionary[kFIRStorageMetadataSize] longLongValue];
- _downloadURLs = dictionary[kFIRStorageMetadataDownloadURLs];
_generation = [dictionary[kFIRStorageMetadataGeneration] longLongValue];
_metageneration = [dictionary[kFIRStorageMetadataMetageneration] longLongValue];
_timeCreated = [self dateFromRFC3339String:dictionary[kFIRStorageMetadataTimeCreated]];
@@ -50,26 +49,6 @@
// GCS "name" is our path, our "name" is just the last path component of the path
_path = dictionary[kFIRStorageMetadataName];
_name = [_path lastPathComponent];
- NSString *downloadTokens = dictionary[kFIRStorageMetadataDownloadTokens];
- if (downloadTokens) {
- NSArray<NSString *> *downloadStringArray = [downloadTokens componentsSeparatedByString:@","];
- NSMutableArray<NSURL *> *downloadURLArray =
- [[NSMutableArray alloc] initWithCapacity:[downloadStringArray count]];
- [downloadStringArray enumerateObjectsUsingBlock:^(NSString *_Nonnull token, NSUInteger idx,
- BOOL *_Nonnull stop) {
- NSURLComponents *components = [[NSURLComponents alloc] init];
- components.scheme = kFIRStorageScheme;
- components.host = kFIRStorageHost;
- NSString *path = [FIRStorageUtils GCSEscapedString:self->_path];
- NSString *fullPath =
- [NSString stringWithFormat:kFIRStorageFullPathFormat, self->_bucket, path];
- components.percentEncodedPath = fullPath;
- components.query = [NSString stringWithFormat:@"alt=media&token=%@", token];
-
- [downloadURLArray insertObject:[components URL] atIndex:idx];
- }];
- _downloadURLs = downloadURLArray;
- }
}
return self;
}
@@ -147,29 +126,6 @@
metadataDictionary[kFIRStorageMetadataCustomMetadata] = _customMetadata;
}
- if (_downloadURLs) {
- NSMutableArray *downloadTokens = [[NSMutableArray alloc] init];
- [_downloadURLs
- enumerateObjectsUsingBlock:^(NSURL *_Nonnull URL, NSUInteger idx, BOOL *_Nonnull stop) {
- NSArray *queryItems = [URL.query componentsSeparatedByString:@"&"];
- [queryItems enumerateObjectsUsingBlock:^(NSString *queryString, NSUInteger idx,
- BOOL *_Nonnull stop) {
- NSString *key;
- NSString *value;
- NSScanner *scanner = [NSScanner scannerWithString:queryString];
- [scanner scanUpToString:@"=" intoString:&key];
- [scanner scanString:@"=" intoString:NULL];
- [scanner scanUpToString:@"\n" intoString:&value];
- if ([key isEqual:@"token"]) {
- [downloadTokens addObject:value];
- *stop = YES;
- }
- }];
- }];
- NSString *downloadTokenString = [downloadTokens componentsJoinedByString:@","];
- metadataDictionary[kFIRStorageMetadataDownloadTokens] = downloadTokenString;
- }
-
if (_generation) {
NSString *generationString = [NSString stringWithFormat:@"%lld", _generation];
metadataDictionary[kFIRStorageMetadataGeneration] = generationString;
@@ -207,10 +163,6 @@
return _type == FIRStorageMetadataTypeFolder;
}
-- (nullable NSURL *)downloadURL {
- return [_downloadURLs firstObject];
-}
-
#pragma mark - Private methods
+ (void)removeMatchingMetadata:(NSMutableDictionary *)metadata