react-native-bootsplash 4.0.1 → 4.0.2

package/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashModule.java

@@ -21,7 +21,6 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.module.annotations.ReactModule;
 
-import java.util.Stack;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -40,7 +39,7 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
   @Nullable
   private static SplashScreen mSplashScreen = null;
 
-  private static final Stack<RNBootSplashTask> mTaskStack = new Stack<>();
+  private static final RNBootSplashQueue<RNBootSplashTask> mTaskQueue = new RNBootSplashQueue<>();
   private static Status mStatus = Status.HIDDEN;
   private static boolean mIsAppInForeground = true;
   private static boolean mShouldFade = false;
@@ -114,11 +113,12 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
   }
 
   private void shiftNextTask() {
-    if (mStatus != Status.TRANSITIONING &&
-        mIsAppInForeground &&
-        mTaskStack.size() > 0) {
-      RNBootSplashTask task = mTaskStack.pop();
-      hideWithTask(task);
+    if (mStatus != Status.TRANSITIONING && mIsAppInForeground) {
+      RNBootSplashTask task = mTaskQueue.shift();
+
+      if (task != null) {
+        hideWithTask(task);
+      }
     }
   }
 
@@ -182,7 +182,7 @@ public class RNBootSplashModule extends ReactContextBaseJavaModule implements Li
     if (mSplashScreen == null || mStatus == Status.HIDDEN) {
       promise.resolve(true);
     } else {
-      mTaskStack.push(new RNBootSplashTask(fade, promise));
+      mTaskQueue.push(new RNBootSplashTask(fade, promise));
       shiftNextTask();
     }
   }

package/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashQueue.java

@@ -0,0 +1,31 @@
+package com.zoontek.rnbootsplash;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Vector;
+
+/**
+ * Represents a first-in-first-out (FIFO) thread safe queue of objects.
+ * Its source code is based on Java internal <code>Stack</code>.
+ */
+public class RNBootSplashQueue<E> extends Vector<E> {
+
+  public RNBootSplashQueue() {}
+
+  @Nullable
+  public synchronized E shift() {
+    if (size() == 0) {
+      return null;
+    }
+
+    E item = elementAt(0);
+    removeElementAt(0);
+
+    return item;
+  }
+
+  public void push(@NonNull E item) {
+    addElement(item);
+  }
+}

package/ios/RNBootSplash.m

@@ -3,7 +3,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTUtils.h>
 
-static NSMutableArray<RNBootSplashTask *> *_taskStack = nil;
+static NSMutableArray<RNBootSplashTask *> *_taskQueue = nil;
 static RCTRootView *_rootView = nil;
 static RNBootSplashStatus _status = RNBootSplashStatusHidden;
 
@@ -37,7 +37,7 @@ RCT_EXPORT_MODULE();
                   rootView:(RCTRootView * _Nonnull)rootView {
   _rootView = rootView;
   _status = RNBootSplashStatusVisible;
-  _taskStack = [[NSMutableArray alloc] init];
+  _taskQueue = [[NSMutableArray alloc] init];
 
   UIStoryboard *storyboard = [UIStoryboard storyboardWithName:storyboardName bundle:nil];
   [_rootView setLoadingView:[[storyboard instantiateInitialViewController] view]];
@@ -86,10 +86,10 @@ RCT_EXPORT_MODULE();
 
 + (void)shiftNextTask {
   if (_status != RNBootSplashStatusTransitioning &&
-      [_taskStack count] > 0 &&
+      [_taskQueue count] > 0 &&
       [[UIApplication sharedApplication] applicationState] != UIApplicationStateBackground) {
-    RNBootSplashTask *task = [_taskStack objectAtIndex:0];
-    [_taskStack removeObjectAtIndex:0];
+    RNBootSplashTask *task = [_taskQueue objectAtIndex:0];
+    [_taskQueue removeObjectAtIndex:0];
 
     [self hideWithTask:task];
   }
@@ -141,7 +141,7 @@ RCT_REMAP_METHOD(hide,
   RNBootSplashTask *task = [[RNBootSplashTask alloc] initWithFade:fade
                                                          resolver:resolve];
 
-  [_taskStack addObject:task];
+  [_taskQueue addObject:task];
   [RNBootSplash shiftNextTask];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bootsplash",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "license": "MIT",
   "description": "Display a bootsplash on your app starts. Hide it when you want.",
   "author": "Mathieu Acthernoene <zoontek@gmail.com>",