From 2497f099052dde8a6eab1d6c72469c6080f38a04 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Wed, 12 Jun 2019 18:25:12 -0700 Subject: [PATCH] Add type arguments in StorageTaskManager --- .../firebase/storage/StorageTaskManager.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskManager.java b/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskManager.java index f703a9d845f..8814afcfbe8 100644 --- a/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskManager.java +++ b/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskManager.java @@ -32,7 +32,7 @@ /*package*/ class StorageTaskManager { private static final StorageTaskManager _instance = new StorageTaskManager(); - private final Map> inProgressTasks = new HashMap<>(); + private final Map>> inProgressTasks = new HashMap<>(); private final Object syncObject = new Object(); @@ -44,7 +44,7 @@ public List getUploadTasksUnder(@NonNull StorageReference parent) { synchronized (syncObject) { ArrayList inProgressList = new ArrayList<>(); String parentPath = parent.toString(); - for (Map.Entry> entry : inProgressTasks.entrySet()) { + for (Map.Entry>> entry : inProgressTasks.entrySet()) { if (entry.getKey().startsWith(parentPath)) { StorageTask task = entry.getValue().get(); if (task instanceof UploadTask) { @@ -60,9 +60,9 @@ public List getDownloadTasksUnder(@NonNull StorageReference pa synchronized (syncObject) { ArrayList inProgressList = new ArrayList<>(); String parentPath = parent.toString(); - for (Map.Entry> entry : inProgressTasks.entrySet()) { + for (Map.Entry>> entry : inProgressTasks.entrySet()) { if (entry.getKey().startsWith(parentPath)) { - StorageTask task = entry.getValue().get(); + StorageTask task = entry.getValue().get(); if (task instanceof FileDownloadTask) { inProgressList.add((FileDownloadTask) task); } @@ -72,19 +72,19 @@ public List getDownloadTasksUnder(@NonNull StorageReference pa } } - public void ensureRegistered(StorageTask targetTask) { + public void ensureRegistered(StorageTask targetTask) { synchronized (syncObject) { // ensure *this* is added to the in progress list inProgressTasks.put(targetTask.getStorage().toString(), new WeakReference<>(targetTask)); } } - public void unRegister(StorageTask targetTask) { + public void unRegister(StorageTask targetTask) { synchronized (syncObject) { // ensure *this* is added to the in progress list String key = targetTask.getStorage().toString(); - WeakReference weakReference = inProgressTasks.get(key); - StorageTask task = weakReference != null ? weakReference.get() : null; + WeakReference> weakReference = inProgressTasks.get(key); + StorageTask task = weakReference != null ? weakReference.get() : null; if (task == null || task == targetTask) { inProgressTasks.remove(key); }