* Extracted a clearRequests() and re-used it in onStop() and onDestroy()

bumptech · Jun 21, 2023 · 31d9ce3 · 31d9ce3
1 parent 5837c55
commit 31d9ce3
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/library/src/main/java/com/bumptech/glide/RequestManager.java b/library/src/main/java/com/bumptech/glide/RequestManager.java
@@ -372,13 +372,11 @@ public synchronized void onStart() {
    */
   @Override
   public synchronized void onStop() {
-    pauseRequests();
     targetTracker.onStop();
     if (clearOnStop) {
-      for (Target<?> target : targetTracker.getAll()) {
-        clear(target);
-      }
-      targetTracker.clear();
+      clearRequests();
+    } else {
+      pauseRequests();
     }
   }
 
@@ -389,10 +387,7 @@ public synchronized void onStop() {
   @Override
   public synchronized void onDestroy() {
     targetTracker.onDestroy();
-    for (Target<?> target : targetTracker.getAll()) {
-      clear(target);
-    }
-    targetTracker.clear();
+    clearRequests();
     requestTracker.clearRequests();
     lifecycle.removeListener(this);
     lifecycle.removeListener(connectivityMonitor);
@@ -723,6 +718,13 @@ public void onLowMemory() {
     // Nothing to add conditionally. See Glide#onTrimMemory for unconditional behavior.
   }
 
+  private synchronized void clearRequests() {
+    for (Target<?> target : targetTracker.getAll()) {
+      clear(target);
+    }
+    targetTracker.clear();
+  }
+
   @Override
   public void onConfigurationChanged(Configuration newConfig) {}