Merge pull request #4 from vinayagasundar/fix/contentImportBlackScreen

Issue #SB-3714 fix : handled black screen while Ecar import
project-sunbird · May 26, 2018 · 14b0aeb · 14b0aeb
2 parents eb9a1ba + a3eb861
commit 14b0aeb
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/android/org/sunbird/SplashScreen.java b/src/android/org/sunbird/SplashScreen.java
@@ -173,6 +173,12 @@ public Object onMessage(String id, Object data) {
     }
 
     private void hide() {
+
+        // To avoid black screen while content importing
+        if (importingInProgress) {
+            return;
+        }
+
         this.hideSplashScreen(false);
         getView().setVisibility(View.VISIBLE);
     }
@@ -193,6 +199,11 @@ public void onConfigurationChanged(Configuration newConfig) {
     }
 
     private void hideSplashScreen(final boolean forceHideImmediately) {
+        // To avoid black screen while content importing
+        if (importingInProgress) {
+            return;
+        }
+
         cordova.getActivity().runOnUiThread(new Runnable() {
             public void run() {
                 if (splashDialog != null) {
@@ -464,11 +475,13 @@ public void onImportFailure(ContentImportStatus status) {
 
                     @Override
                     public void onOutDatedEcarFound() {
+                        importingInProgress = false;
                         hide();
                     }
                 }, intent, true);
 
                 if (isImport) {
+                    displaySplashScreen();
                     importingInProgress = true;
                     importStatusTextView.setText("Importing lesson...");
                 }