fix(android): only send the updateSystemBars message when the final splash screen has been drawn to prevent a flash between the native and the custom splash screen

Author: OS-kepatotorica

framework/src/org/apache/cordova/CoreAndroid.java

@@ -253,7 +253,7 @@ public void run() {
      */
     public void overrideBackbutton(boolean override) {
         LOG.i("App", "WARNING: Back Button Default Behavior will be overridden.  The backbutton event will be fired!");
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+        if (Build.VERSION.SDK_INT >= 36) { // Build.VERSION_CODES.BAKLAVA
             if (override) {
                 synchronized (backButtonHandlerLock) {
                     if (backCallback == null) {

framework/src/org/apache/cordova/SplashScreenPlugin.java

@@ -26,7 +26,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.graphics.Color;
@@ -54,8 +53,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.json.JSONException;
 
 import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
 
 @SuppressLint("LongLogTag")
 public class SplashScreenPlugin extends CordovaPlugin {
@@ -95,6 +92,8 @@ public class SplashScreenPlugin extends CordovaPlugin {
      */
     private int fadeDuration;
 
+    private static boolean hasCustomSplashscreens;
+
     // Internal variables
     /**
      * Boolean flag to determine if the splash screen remains visible.
@@ -125,7 +124,7 @@ protected void pluginInitialize() {
 
         Context context = cordova.getContext();
         boolean showSpinner = preferences.getBoolean("ShowSplashScreenSpinner", DEFAULT_SHOW_SPINNER);
-        boolean hasCustomSplashscreens = preferences.getBoolean("HasCustomSplashscreens", DEFAULT_HAS_CUSTOM_SPLASHSCREENS);
+        hasCustomSplashscreens = preferences.getBoolean("HasCustomSplashscreens", DEFAULT_HAS_CUSTOM_SPLASHSCREENS);
         if (!showSpinner && !hasCustomSplashscreens) {
             // Use only the Android Splashscreen API
             behaviours.registerBehaviour(new AndroidSplashScreenBehaviour(context, autoHide, delayTime, isFadeEnabled, fadeDuration, webView));
@@ -329,7 +328,9 @@ public void onAnimationEnd(Animator animation) {
                     }
                 });
             } else {
-                cordovaWebView.getPluginManager().postMessage("updateSystemBars", null);
+                if(!hasCustomSplashscreens){
+                    cordovaWebView.getPluginManager().postMessage("updateSystemBars", null);
+                }
             }
 
         }