From 617960ee3ef0ef8e905e22ed3fb94783c555fddc Mon Sep 17 00:00:00 2001 From: daserge Date: Mon, 25 Jan 2016 16:21:57 +0300 Subject: [PATCH] CB-10422 Splashscreen displays black screen with no image on Android --- 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 68a4ce0..6a077c0 100644 --- a/src/android/SplashScreen.java +++ b/src/android/SplashScreen.java @@ -258,7 +258,7 @@ public class SplashScreen extends CordovaPlugin { final int drawableId = preferences.getInteger("SplashDrawableId", 0); final int fadeSplashScreenDuration = getFadeDuration(); - final int effectiveSplashDuration = splashscreenTime - fadeSplashScreenDuration; + final int effectiveSplashDuration = Math.max(0, splashscreenTime - fadeSplashScreenDuration); lastHideAfterDelay = hideAfterDelay; @@ -266,7 +266,7 @@ public class SplashScreen extends CordovaPlugin { if (splashDialog != null && splashDialog.isShowing()) { return; } - if (drawableId == 0 || (effectiveSplashDuration <= 0 && hideAfterDelay)) { + if (drawableId == 0 || (splashscreenTime <= 0 && hideAfterDelay)) { return; }