Skip to content

Commit bd6d09e

Browse files
committed
Change getDownloadURL to return url rather than object
1 parent 486f7ce commit bd6d09e

File tree

2 files changed

+3
-42
lines changed

2 files changed

+3
-42
lines changed

android/src/main/java/io/fullstack/firestack/storage/FirestackStorage.java

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -115,47 +115,13 @@ public void getDownloadURL(final String path,
115115
.addOnSuccessListener(new OnSuccessListener<Uri>() {
116116
@Override
117117
public void onSuccess(Uri uri) {
118-
final WritableMap res = Arguments.createMap();
119-
120-
res.putString("status", "success");
121-
res.putString("bucket", FirebaseStorage.getInstance().getApp().getOptions().getStorageBucket());
122-
res.putString("fullPath", uri.toString());
123-
res.putString("path", uri.getPath());
124-
res.putString("url", uri.toString());
125-
126-
reference.getMetadata()
127-
.addOnSuccessListener(new OnSuccessListener<StorageMetadata>() {
128-
@Override
129-
public void onSuccess(final StorageMetadata storageMetadata) {
130-
Log.d(TAG, "getMetadata success " + storageMetadata);
131-
132-
res.putMap("metadata", getMetadataAsMap(storageMetadata));
133-
res.putString("name", storageMetadata.getName());
134-
res.putString("url", storageMetadata.getDownloadUrl().toString());
135-
callback.invoke(null, res);
136-
}
137-
})
138-
.addOnFailureListener(new OnFailureListener() {
139-
@Override
140-
public void onFailure(@NonNull Exception exception) {
141-
Log.e(TAG, "Failure in download " + exception);
142-
final int errorCode = 1;
143-
callback.invoke(makeErrorPayload(errorCode, exception));
144-
}
145-
});
146-
118+
callback.invoke(null, uri.toString());
147119
}
148120
})
149121
.addOnFailureListener(new OnFailureListener() {
150122
@Override
151123
public void onFailure(@NonNull Exception exception) {
152-
Log.e(TAG, "Failed to download file " + exception.getMessage());
153-
154-
WritableMap err = Arguments.createMap();
155-
err.putString("status", "error");
156-
err.putString("description", exception.getLocalizedMessage());
157-
158-
callback.invoke(err);
124+
callback.invoke(makeErrorPayload(1, exception));
159125
}
160126
});
161127
}

ios/Firestack/FirestackStorage.m

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,7 @@ - (dispatch_queue_t)methodQueue
5757
};
5858
callback(@[evt]);
5959
} else {
60-
NSDictionary *resp = @{
61-
@"status": @"success",
62-
@"url": [URL absoluteString],
63-
@"path": [URL path]
64-
};
65-
callback(@[[NSNull null], resp]);
60+
callback(@[[NSNull null], [URL absoluteString]]);
6661
}
6762
}];
6863
}

0 commit comments

Comments
 (0)