Skip to content

Commit 1962431

Browse files
Add type arguments in StorageTaskManager (#517)
1 parent 9d66b1f commit 1962431

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskManager.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/*package*/ class StorageTaskManager {
3333
private static final StorageTaskManager _instance = new StorageTaskManager();
3434

35-
private final Map<String, WeakReference<StorageTask>> inProgressTasks = new HashMap<>();
35+
private final Map<String, WeakReference<StorageTask<?>>> inProgressTasks = new HashMap<>();
3636

3737
private final Object syncObject = new Object();
3838

@@ -44,7 +44,7 @@ public List<UploadTask> getUploadTasksUnder(@NonNull StorageReference parent) {
4444
synchronized (syncObject) {
4545
ArrayList<UploadTask> inProgressList = new ArrayList<>();
4646
String parentPath = parent.toString();
47-
for (Map.Entry<String, WeakReference<StorageTask>> entry : inProgressTasks.entrySet()) {
47+
for (Map.Entry<String, WeakReference<StorageTask<?>>> entry : inProgressTasks.entrySet()) {
4848
if (entry.getKey().startsWith(parentPath)) {
4949
StorageTask task = entry.getValue().get();
5050
if (task instanceof UploadTask) {
@@ -60,9 +60,9 @@ public List<FileDownloadTask> getDownloadTasksUnder(@NonNull StorageReference pa
6060
synchronized (syncObject) {
6161
ArrayList<FileDownloadTask> inProgressList = new ArrayList<>();
6262
String parentPath = parent.toString();
63-
for (Map.Entry<String, WeakReference<StorageTask>> entry : inProgressTasks.entrySet()) {
63+
for (Map.Entry<String, WeakReference<StorageTask<?>>> entry : inProgressTasks.entrySet()) {
6464
if (entry.getKey().startsWith(parentPath)) {
65-
StorageTask task = entry.getValue().get();
65+
StorageTask<?> task = entry.getValue().get();
6666
if (task instanceof FileDownloadTask) {
6767
inProgressList.add((FileDownloadTask) task);
6868
}
@@ -72,19 +72,19 @@ public List<FileDownloadTask> getDownloadTasksUnder(@NonNull StorageReference pa
7272
}
7373
}
7474

75-
public void ensureRegistered(StorageTask targetTask) {
75+
public void ensureRegistered(StorageTask<?> targetTask) {
7676
synchronized (syncObject) {
7777
// ensure *this* is added to the in progress list
7878
inProgressTasks.put(targetTask.getStorage().toString(), new WeakReference<>(targetTask));
7979
}
8080
}
8181

82-
public void unRegister(StorageTask targetTask) {
82+
public void unRegister(StorageTask<?> targetTask) {
8383
synchronized (syncObject) {
8484
// ensure *this* is added to the in progress list
8585
String key = targetTask.getStorage().toString();
86-
WeakReference<StorageTask> weakReference = inProgressTasks.get(key);
87-
StorageTask task = weakReference != null ? weakReference.get() : null;
86+
WeakReference<StorageTask<?>> weakReference = inProgressTasks.get(key);
87+
StorageTask<?> task = weakReference != null ? weakReference.get() : null;
8888
if (task == null || task == targetTask) {
8989
inProgressTasks.remove(key);
9090
}

0 commit comments

Comments
 (0)