Skip to content

fix(splash-screen): defer removeOnPreDrawListener to main looper #2548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FelippoStedile wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −4
Open

fix(splash-screen): defer removeOnPreDrawListener to main looper #2548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions splash-screen/android/src/main/java/com/capacitorjs/plugins/splashscreen/SplashScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,11 +538,15 @@ private void hide(final int fadeOutDuration, boolean isLaunchSplash) {
);
}
this.isVisible = false;
if (null != content) {
content.getViewTreeObserver().removeOnPreDrawListener(this.onPreDrawListener);
final View hideContent = content;
final OnPreDrawListener listenerToRemove = this.onPreDrawListener;
if (null != hideContent) {
new Handler(context.getMainLooper())
.post(() -> hideContent.getViewTreeObserver().removeOnPreDrawListener(listenerToRemove));
}
this.onPreDrawListener = null;
return;

}

if (splashImage == null || splashImage.getParent() == null) {
Expand Down Expand Up @@ -608,8 +612,11 @@ private void hideDialog(final AppCompatActivity activity, boolean isLaunchSplash
// Hide with Android 12 API
if (null != this.onPreDrawListener) {
this.isVisible = false;
if (null != content) {
content.getViewTreeObserver().removeOnPreDrawListener(this.onPreDrawListener);
final View hideContent = content;
final OnPreDrawListener listenerToRemove = this.onPreDrawListener;
if (null != hideContent) {
new Handler(context.getMainLooper())
.post(() -> hideContent.getViewTreeObserver().removeOnPreDrawListener(listenerToRemove));
}
this.onPreDrawListener = null;
return;
Expand Down