Skip to content

Commit 06db70c

Browse files
SalakarSalakar
committed
cleanup formatting
1 parent c65d53e commit 06db70c

File tree

1 file changed

+86
-82
lines changed

1 file changed

+86
-82
lines changed

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

Lines changed: 86 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -85,65 +85,67 @@ public void downloadUrl(final String javascriptStorageBucket,
8585
final StorageReference fileRef = storageRef.child(path);
8686

8787
Task<Uri> downloadTask = fileRef.getDownloadUrl();
88-
downloadTask.addOnSuccessListener(new OnSuccessListener<Uri>() {
89-
@Override
90-
public void onSuccess(Uri uri) {
91-
final WritableMap res = Arguments.createMap();
92-
93-
res.putString("status", "success");
94-
res.putString("bucket", storageRef.getBucket());
95-
res.putString("fullPath", uri.toString());
96-
res.putString("path", uri.getPath());
97-
res.putString("url", uri.toString());
98-
99-
fileRef.getMetadata()
100-
.addOnSuccessListener(new OnSuccessListener<StorageMetadata>() {
101-
@Override
102-
public void onSuccess(final StorageMetadata storageMetadata) {
103-
Log.d(TAG, "getMetadata success " + storageMetadata);
104-
res.putString("name", storageMetadata.getName());
105-
106-
WritableMap metadata = Arguments.createMap();
107-
metadata.putString("getBucket", storageMetadata.getBucket());
108-
metadata.putString("getName", storageMetadata.getName());
109-
metadata.putDouble("sizeBytes", storageMetadata.getSizeBytes());
110-
metadata.putDouble("created_at", storageMetadata.getCreationTimeMillis());
111-
metadata.putDouble("updated_at", storageMetadata.getUpdatedTimeMillis());
112-
metadata.putString("md5hash", storageMetadata.getMd5Hash());
113-
metadata.putString("encoding", storageMetadata.getContentEncoding());
114-
res.putString("url", storageMetadata.getDownloadUrl().toString());
115-
116-
res.putMap("metadata", metadata);
117-
callback.invoke(null, res);
118-
}
119-
}).addOnFailureListener(new OnFailureListener() {
88+
downloadTask
89+
.addOnSuccessListener(new OnSuccessListener<Uri>() {
12090
@Override
121-
public void onFailure(@NonNull Exception exception) {
122-
Log.e(TAG, "Failure in download " + exception);
123-
callback.invoke(makeErrorPayload(1, exception));
124-
}
125-
});
91+
public void onSuccess(Uri uri) {
92+
final WritableMap res = Arguments.createMap();
93+
94+
res.putString("status", "success");
95+
res.putString("bucket", storageRef.getBucket());
96+
res.putString("fullPath", uri.toString());
97+
res.putString("path", uri.getPath());
98+
res.putString("url", uri.toString());
99+
100+
fileRef.getMetadata()
101+
.addOnSuccessListener(new OnSuccessListener<StorageMetadata>() {
102+
@Override
103+
public void onSuccess(final StorageMetadata storageMetadata) {
104+
Log.d(TAG, "getMetadata success " + storageMetadata);
105+
res.putString("name", storageMetadata.getName());
106+
107+
WritableMap metadata = Arguments.createMap();
108+
metadata.putString("getBucket", storageMetadata.getBucket());
109+
metadata.putString("getName", storageMetadata.getName());
110+
metadata.putDouble("sizeBytes", storageMetadata.getSizeBytes());
111+
metadata.putDouble("created_at", storageMetadata.getCreationTimeMillis());
112+
metadata.putDouble("updated_at", storageMetadata.getUpdatedTimeMillis());
113+
metadata.putString("md5hash", storageMetadata.getMd5Hash());
114+
metadata.putString("encoding", storageMetadata.getContentEncoding());
115+
res.putString("url", storageMetadata.getDownloadUrl().toString());
116+
117+
res.putMap("metadata", metadata);
118+
callback.invoke(null, res);
119+
}
120+
})
121+
.addOnFailureListener(new OnFailureListener() {
122+
@Override
123+
public void onFailure(@NonNull Exception exception) {
124+
Log.e(TAG, "Failure in download " + exception);
125+
callback.invoke(makeErrorPayload(1, exception));
126+
}
127+
});
126128

127-
}
128-
}).addOnFailureListener(new OnFailureListener() {
129-
@Override
130-
public void onFailure(@NonNull Exception exception) {
131-
Log.e(TAG, "Failed to download file " + exception.getMessage());
129+
}
130+
})
131+
.addOnFailureListener(new OnFailureListener() {
132+
@Override
133+
public void onFailure(@NonNull Exception exception) {
134+
Log.e(TAG, "Failed to download file " + exception.getMessage());
132135

133-
WritableMap err = Arguments.createMap();
134-
err.putString("status", "error");
135-
err.putString("description", exception.getLocalizedMessage());
136+
WritableMap err = Arguments.createMap();
137+
err.putString("status", "error");
138+
err.putString("description", exception.getLocalizedMessage());
136139

137-
callback.invoke(err);
138-
}
139-
});
140+
callback.invoke(err);
141+
}
142+
});
140143
}
141144

142145
// STORAGE
143146
@ReactMethod
144147
public void uploadFile(final String urlStr, final String name, final String filepath, final ReadableMap metadata, final Callback callback) {
145148
FirebaseStorage storage = FirebaseStorage.getInstance();
146-
147149
StorageReference storageRef = storage.getReferenceFromUrl(urlStr);
148150
StorageReference fileRef = storageRef.child(name);
149151

@@ -161,29 +163,30 @@ public void uploadFile(final String urlStr, final String name, final String file
161163

162164
StorageMetadata md = metadataBuilder.build();
163165
UploadTask uploadTask = fileRef.putFile(file, md);
164-
// uploadTask uploadTask = fileRef.putStream(stream, md);
165166

166167
// Register observers to listen for when the download is done or if it fails
167-
uploadTask.addOnFailureListener(new OnFailureListener() {
168-
@Override
169-
public void onFailure(@NonNull Exception exception) {
170-
// Handle unsuccessful uploads
171-
Log.e(TAG, "Failed to upload file " + exception.getMessage());
172-
173-
WritableMap err = Arguments.createMap();
174-
err.putString("description", exception.getLocalizedMessage());
175-
176-
callback.invoke(err);
177-
}
178-
}).addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
179-
@Override
180-
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
181-
Log.d(TAG, "Successfully uploaded file " + taskSnapshot);
182-
// taskSnapshot.getMetadata() contains file metadata such as size, content-type, and download URL.
183-
WritableMap resp = getDownloadData(taskSnapshot);
184-
callback.invoke(null, resp);
185-
}
186-
})
168+
uploadTask
169+
.addOnFailureListener(new OnFailureListener() {
170+
@Override
171+
public void onFailure(@NonNull Exception exception) {
172+
// Handle unsuccessful uploads
173+
Log.e(TAG, "Failed to upload file " + exception.getMessage());
174+
175+
WritableMap err = Arguments.createMap();
176+
err.putString("description", exception.getLocalizedMessage());
177+
178+
callback.invoke(err);
179+
}
180+
})
181+
.addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
182+
@Override
183+
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
184+
Log.d(TAG, "Successfully uploaded file " + taskSnapshot);
185+
// taskSnapshot.getMetadata() contains file metadata such as size, content-type, and download URL.
186+
WritableMap resp = getDownloadData(taskSnapshot);
187+
callback.invoke(null, resp);
188+
}
189+
})
187190
.addOnProgressListener(new OnProgressListener<UploadTask.TaskSnapshot>() {
188191
@Override
189192
public void onProgress(UploadTask.TaskSnapshot taskSnapshot) {
@@ -200,18 +203,19 @@ public void onProgress(UploadTask.TaskSnapshot taskSnapshot) {
200203
FirestackUtils.sendEvent(mReactContext, "upload_progress", data);
201204
}
202205
}
203-
}).addOnPausedListener(new OnPausedListener<UploadTask.TaskSnapshot>() {
204-
@Override
205-
public void onPaused(UploadTask.TaskSnapshot taskSnapshot) {
206-
System.out.println("Upload is paused");
207-
StorageMetadata d = taskSnapshot.getMetadata();
208-
String bucket = d.getBucket();
209-
WritableMap data = Arguments.createMap();
210-
data.putString("eventName", "upload_paused");
211-
data.putString("ref", bucket);
212-
FirestackUtils.sendEvent(mReactContext, "upload_paused", data);
213-
}
214-
});
206+
})
207+
.addOnPausedListener(new OnPausedListener<UploadTask.TaskSnapshot>() {
208+
@Override
209+
public void onPaused(UploadTask.TaskSnapshot taskSnapshot) {
210+
System.out.println("Upload is paused");
211+
StorageMetadata d = taskSnapshot.getMetadata();
212+
String bucket = d.getBucket();
213+
WritableMap data = Arguments.createMap();
214+
data.putString("eventName", "upload_paused");
215+
data.putString("ref", bucket);
216+
FirestackUtils.sendEvent(mReactContext, "upload_paused", data);
217+
}
218+
});
215219
} catch (Exception ex) {
216220
callback.invoke(makeErrorPayload(2, ex));
217221
}

0 commit comments

Comments
 (0)