Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit e214b6d

Browse files
authored
Merge pull request #143 from janvogt/fix-storage-config
Use storage url from .plist file if not setStorageUrl() hasn't been called
2 parents 0349b61 + dfc0bd1 commit e214b6d

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

‎ios/Firestack/FirestackStorage.m

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ - (dispatch_queue_t)methodQueue
2525
path:(NSString *) path
2626
callback:(RCTResponseSenderBlock) callback)
2727
{
28-
FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:storageUrl];
28+
FIRStorageReference *storageRef;
29+
if (storageUrl == nil ) {
30+
storageRef = [[FIRStorage storage] reference];
31+
} else {
32+
storageRef = [[FIRStorage storage] referenceForURL:storageUrl];
33+
}
2934
FIRStorageReference *fileRef = [storageRef child:path];
3035
[fileRef downloadURLWithCompletion:^(NSURL * _Nullable URL, NSError * _Nullable error) {
3136
if (error != nil) {
@@ -52,14 +57,13 @@ - (dispatch_queue_t)methodQueue
5257
metadata:(NSDictionary *)metadata
5358
callback:(RCTResponseSenderBlock) callback)
5459
{
60+
FIRStorageReference *storageRef;
5561
if (urlStr == nil) {
56-
NSError *err = [[NSError alloc] init];
57-
[err setValue:@"Storage configuration error" forKey:@"name"];
58-
[err setValue:@"Call setStorageUrl() first" forKey:@"description"];
59-
return callback(@[err]);
62+
storageRef = [[FIRStorage storage] reference];
63+
} else {
64+
storageRef = [[FIRStorage storage] referenceForURL:urlStr];
6065
}
6166

62-
FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:urlStr];
6367
FIRStorageReference *uploadRef = [storageRef child:name];
6468
FIRStorageMetadata *firmetadata = [[FIRStorageMetadata alloc] initWithDictionary:metadata];
6569

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /