Make backPressedCallback lifecycle aware

Signed-off-by: Stefan Niedermann <info@niedermann.it>

1 files changed, 14 insertions, 1 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
index f46442c9e..e3395ea35 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
@@ -169,7 +169,7 @@ public class CardAttachmentsFragment extends BrandedFragment implements Attachme
             @Override
             public void onStateChanged(@NonNull View bottomSheet, int newState) {
                 if (newState == STATE_HIDDEN) {
-                    backPressedCallback.remove();
+                    backPressedCallback.setEnabled(false);
                     hidePicker();
                 }
             }
@@ -232,6 +232,7 @@ public class CardAttachmentsFragment extends BrandedFragment implements Attachme
                 }
                 mBottomSheetBehaviour.setState(STATE_HALF_EXPANDED);
                 showPicker();
+                backPressedCallback.setEnabled(true);
                 requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), backPressedCallback);
             });
             binding.fab.show();
@@ -264,6 +265,18 @@ public class CardAttachmentsFragment extends BrandedFragment implements Attachme
         return binding.getRoot();
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        backPressedCallback.setEnabled(false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        backPressedCallback.setEnabled(binding.pickerControlsWrapper.getVisibility() == VISIBLE);
+    }
+
     @RequiresApi(LOLLIPOP)
     public void pickCamera() {
         if (isPermissionRequestNeeded(CAMERA)) {