From f9c88b8ab8280df920dc0de8e101a3abe599a353 Mon Sep 17 00:00:00 2001 From: russa Date: Thu, 25 Jan 2018 18:10:50 +0100 Subject: [PATCH] CB-12277: (android) avoid NullPointerException on splashImageView when removing splashscreen --- src/android/SplashScreen.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/SplashScreen.java b/src/android/SplashScreen.java index 6f56c6c..428df33 100644 --- a/src/android/SplashScreen.java +++ b/src/android/SplashScreen.java @@ -219,7 +219,7 @@ public class SplashScreen extends CordovaPlugin { private void removeSplashScreen(final boolean forceHideImmediately) { cordova.getActivity().runOnUiThread(new Runnable() { public void run() { - if (splashDialog != null && splashDialog.isShowing()) { + if (splashDialog != null && splashImageView != null && splashDialog.isShowing()) {//check for non-null splashImageView, see https://issues.apache.org/jira/browse/CB-12277 final int fadeSplashScreenDuration = getFadeDuration(); // CB-10692 If the plugin is being paused/destroyed, skip the fading and hide it immediately if (fadeSplashScreenDuration > 0 && forceHideImmediately == false) { @@ -238,7 +238,7 @@ public class SplashScreen extends CordovaPlugin { @Override public void onAnimationEnd(Animation animation) { - if (splashDialog != null && splashDialog.isShowing()) { + if (splashDialog != null && splashImageView != null && splashDialog.isShowing()) {//check for non-null splashImageView, see https://issues.apache.org/jira/browse/CB-12277 splashDialog.dismiss(); splashDialog = null; splashImageView = null;