center/cordova-plugin-splashscreen2
center/cordova-plugin-splashscreen2
13
0
Fork 0
forked from public/cordova-plugin-splashscreen
Code Pull Requests Activity

Merge pull request #149 from mmig/CB-12277

Browse Source 
CB-12277: (android) avoid NullPointerException  when removing splash-screen
This commit is contained in:
jcesarmobile 2018-07-31 00:22:48 +02:00 committed by GitHub
commit 91a8210890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/SplashScreen.java
View File

@ -219,7 +219,7 @@ public class SplashScreen extends CordovaPlugin {
private void removeSplashScreen(final boolean forceHideImmediately) { private void removeSplashScreen(final boolean forceHideImmediately) {
cordova.getActivity().runOnUiThread(new Runnable() { cordova.getActivity().runOnUiThread(new Runnable() {
public void run() { 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(); final int fadeSplashScreenDuration = getFadeDuration();
// CB-10692 If the plugin is being paused/destroyed, skip the fading and hide it immediately // CB-10692 If the plugin is being paused/destroyed, skip the fading and hide it immediately
if (fadeSplashScreenDuration > 0 && forceHideImmediately == false) { if (fadeSplashScreenDuration > 0 && forceHideImmediately == false) {
@ -238,7 +238,7 @@ public class SplashScreen extends CordovaPlugin {
@Override @Override
public void onAnimationEnd(Animation animation) { 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.dismiss();
splashDialog = null; splashDialog = null;
splashImageView = null; splashImageView = null;