Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Prevent IllegalArgumentException when closing popup

Browse source
This commit is contained in:
Stypox 2021-01-17 14:04:07 +01:00
parent 9bf5049aa1
commit 1522eae016
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/org/schabi/newpipe/player/Player.java
View file

@ -1349,13 +1349,23 @@ public final class Player implements
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);
}
}
}