commit f9c88b8ab8280df920dc0de8e101a3abe599a353
author russa <aaron.russ@dfki.de> Thu Jan 25 18:10:50 2018 +0100
committer russa <aaron.russ@dfki.de> Thu Jan 25 18:18:40 2018 +0100
tree 623505283290d4649b67b524fad5b91c3765ca90
parent 9a6ff2700885cb4a15c96c0439112f3953e28420

CB-12277: (android) avoid NullPointerException on splashImageView when removing splashscreen

src/android/SplashScreen.java

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 @@
     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 @@
 
                             @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;