From 7a12204ba9c49d8b23cf67634e2d69890944274a Mon Sep 17 00:00:00 2001 From: daserge Date: Fri, 15 Jan 2016 11:54:21 +0300 Subject: [PATCH] CB-8396 Add AutoHideSplashScreen logic to Android's Splashscreen Also initializing the splashscreen image irrespective of firstShow because the splashscreen could be shown manually via navigator.splashscreen.show(); after exiting the app using BackButton or via navigator.app.exitApp(); --- src/android/SplashScreen.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/android/SplashScreen.java b/src/android/SplashScreen.java index 7f91147..7e27d49 100644 --- a/src/android/SplashScreen.java +++ b/src/android/SplashScreen.java @@ -73,7 +73,7 @@ public class SplashScreen extends CordovaPlugin { @Override protected void pluginInitialize() { - if (HAS_BUILT_IN_SPLASH_SCREEN || !firstShow) { + if (HAS_BUILT_IN_SPLASH_SCREEN) { return; } // Make WebView invisible while loading URL @@ -93,12 +93,15 @@ public class SplashScreen extends CordovaPlugin { // Save initial orientation. orientation = cordova.getActivity().getResources().getConfiguration().orientation; + if (firstShow) { + boolean autoHide = preferences.getBoolean("AutoHideSplashScreen", true); + loadSpinner(); + showSplashScreen(autoHide); + } + if (preferences.getBoolean("SplashShowOnlyFirstTime", true)) { firstShow = false; } - - loadSpinner(); - showSplashScreen(true); } /**