[Predictive Back] Fixed MaterialBackAnimationHelper.onCancelBackProgr…

…ess being called twice. PiperOrigin-RevId: 543622236
material-components · Jun 27, 2023 · ad60bbf · ad60bbf
1 parent 27abfdb
commit ad60bbf
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/lib/java/com/google/android/material/motion/MaterialBackOrchestrator.java b/lib/java/com/google/android/material/motion/MaterialBackOrchestrator.java
@@ -123,11 +123,17 @@ OnBackInvokedCallback createOnBackInvokedCallback(@NonNull MaterialBackHandler b
 
         @Override
         public void onBackStarted(@NonNull BackEvent backEvent) {
+          if (!isListeningForBackCallbacks()) {
+            return;
+          }
           backHandler.startBackProgress(new BackEventCompat(backEvent));
         }
 
         @Override
         public void onBackProgressed(@NonNull BackEvent backEvent) {
+          if (!isListeningForBackCallbacks()) {
+            return;
+          }
           backHandler.updateBackProgress(new BackEventCompat(backEvent));
         }
 
@@ -138,6 +144,9 @@ public void onBackInvoked() {
 
         @Override
         public void onBackCancelled() {
+          if (!isListeningForBackCallbacks()) {
+            return;
+          }
           backHandler.cancelBackProgress();
         }
       };
@@ -149,6 +158,10 @@ private static class Api33BackCallbackDelegate implements BackCallbackDelegate {
 
     @Nullable private OnBackInvokedCallback onBackInvokedCallback;
 
+    boolean isListeningForBackCallbacks() {
+      return onBackInvokedCallback != null;
+    }
+
     @DoNotInline
     @Override
     public void startListeningForBackCallbacks(