Merge pull request TeamNewPipe/NewPipe#5442 from Stypox/fix-close-popup

Prevent IllegalArgumentException when closing popup
tossj · Apr 20, 2021 · 9ca58b2 · 9ca58b2
1 parent cf22a10
commit 9ca58b2
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/app/src/main/java/org/schabi/newpipelegacy/player/Player.java b/app/src/main/java/org/schabi/newpipelegacy/player/Player.java
@@ -1349,13 +1349,23 @@ public void closePopup() {
 
     public void removePopupFromView() {
         if (windowManager != null) {
-            final boolean isCloseOverlayHasParent = closeOverlayBinding != null
-                    && closeOverlayBinding.closeButton.getParent() != null;
-            if (popupHasParent()) {
-                windowManager.removeView(binding.getRoot());
+            // wrap in try-catch since it could sometimes generate errors randomly
+            try {
+                if (popupHasParent()) {
+                    windowManager.removeView(binding.getRoot());
+                }
+            } catch (final IllegalArgumentException e) {
+                Log.w(TAG, "Failed to remove popup from window manager", e);
             }
-            if (isCloseOverlayHasParent) {
-                windowManager.removeView(closeOverlayBinding.getRoot());
+
+            try {
+                final boolean closeOverlayHasParent = closeOverlayBinding != null
+                        && closeOverlayBinding.getRoot().getParent() != null;
+                if (closeOverlayHasParent) {
+                    windowManager.removeView(closeOverlayBinding.getRoot());
+                }
+            } catch (final IllegalArgumentException e) {
+                Log.w(TAG, "Failed to remove popup overlay from window manager", e);
             }
         }
     }