@react-native-firebase/app 26.3.2 → 26.4.0

package/android/src/test/java/io/invertase/firebase/common/RNFBHandleMapTest.java

@@ -0,0 +1,275 @@
+package io.invertase.firebase.common;
+
+/*
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * JVM coverage for {@link RNFBHandleMap}. Tests must not invoke methods on stored values — the map
+ * only moves pointers.
+ */
+public class RNFBHandleMapTest {
+
+  private RNFBHandleMap<Integer, Object> map;
+
+  @Before
+  public void setUp() {
+    map = new RNFBHandleMap<>();
+  }
+
+  @Test
+  public void putGetTake_happyPath() throws Exception {
+    Object handle = new Object();
+    map.put(1, handle);
+
+    assertSame(handle, map.get(1));
+    assertSame(handle, map.take(1));
+    assertNull(map.get(1));
+  }
+
+  @Test
+  public void take_missingKey_returnsNull() {
+    assertNull(map.take(99));
+    assertNull(map.get(99));
+  }
+
+  @Test
+  public void takeAll_returnsSnapshotAndLeavesMapEmpty() throws Exception {
+    Object a = new Object();
+    Object b = new Object();
+    map.put(1, a);
+    map.put(2, b);
+
+    List<Object> snapshot = map.takeAll();
+
+    assertEquals(2, snapshot.size());
+    assertTrue(snapshot.contains(a));
+    assertTrue(snapshot.contains(b));
+    assertNull(map.get(1));
+    assertNull(map.get(2));
+    assertTrue(map.takeAll().isEmpty());
+  }
+
+  @Test
+  public void put_occupiedId_throwsCollision() throws Exception {
+    Object first = new Object();
+    map.put(1, first);
+    try {
+      map.put(1, new Object());
+      fail("expected RNFBHandleCollisionException");
+    } catch (RNFBHandleCollisionException e) {
+      assertTrue(e.getMessage().contains("1"));
+      assertSame(first, map.get(1));
+    }
+  }
+
+  @Test
+  public void putIfAbsent_whenFree_storesAndReturnsTrue() throws Exception {
+    Object handle = new Object();
+    assertTrue(map.putIfAbsent(1, handle));
+    assertSame(handle, map.get(1));
+  }
+
+  @Test
+  public void putIfAbsent_whenOccupied_keepsExistingAndReturnsFalse() throws Exception {
+    Object first = new Object();
+    Object second = new Object();
+    map.put(1, first);
+    assertFalse(map.putIfAbsent(1, second));
+    assertSame(first, map.get(1));
+  }
+
+  @Test
+  public void putIfAbsentOrSame_whenAbsent_storesAndReturnsTrue() {
+    Object handle = new Object();
+    assertTrue(map.putIfAbsentOrSame(1, handle));
+    assertSame(handle, map.get(1));
+  }
+
+  @Test
+  public void putIfAbsentOrSame_whenSameInstance_returnsTrue() throws Exception {
+    Object handle = new Object();
+    map.put(1, handle);
+    assertTrue(map.putIfAbsentOrSame(1, handle));
+    assertSame(handle, map.get(1));
+  }
+
+  @Test
+  public void putIfAbsentOrSame_whenDifferent_returnsFalse() throws Exception {
+    Object first = new Object();
+    Object second = new Object();
+    map.put(1, first);
+    assertFalse(map.putIfAbsentOrSame(1, second));
+    assertSame(first, map.get(1));
+  }
+
+  @Test
+  public void putReplacing_whenFree_storesAndReturnsNull() throws Exception {
+    Object handle = new Object();
+    assertNull(map.putReplacing(1, handle));
+    assertSame(handle, map.get(1));
+  }
+
+  @Test
+  public void putReplacing_whenOccupied_replacesLastWins() throws Exception {
+    Object first = new Object();
+    Object second = new Object();
+    map.put(1, first);
+    assertSame(first, map.putReplacing(1, second));
+    assertSame(second, map.get(1));
+  }
+
+  @Test
+  public void put_afterTake_allowsReuse() throws Exception {
+    Object first = new Object();
+    Object second = new Object();
+    map.put(1, first);
+    assertSame(first, map.take(1));
+    map.put(1, second);
+    assertSame(second, map.get(1));
+  }
+
+  @Test
+  public void takeIf_whenPredicateTrue_removesAndReturns() throws Exception {
+    Object handle = new Object();
+    map.put(1, handle);
+    assertSame(handle, map.takeIf(1, v -> v == handle));
+    assertNull(map.get(1));
+  }
+
+  @Test
+  public void takeIf_whenPredicateFalse_leavesMapping() throws Exception {
+    Object handle = new Object();
+    map.put(1, handle);
+    assertNull(map.takeIf(1, v -> false));
+    assertSame(handle, map.get(1));
+  }
+
+  @Test
+  public void takeIf_whenMissing_returnsNull() {
+    assertNull(map.takeIf(99, v -> true));
+  }
+
+  @Test
+  public void take_sameIdFromTwoThreads_onlyOneReturnsNonNull() throws Exception {
+    Object handle = new Object();
+    map.put(1, handle);
+
+    CountDownLatch start = new CountDownLatch(1);
+    CountDownLatch done = new CountDownLatch(2);
+    AtomicReference<Object> first = new AtomicReference<>();
+    AtomicReference<Object> second = new AtomicReference<>();
+
+    Thread t1 =
+        new Thread(
+            () -> {
+              try {
+                start.await();
+                first.set(map.take(1));
+              } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+              } finally {
+                done.countDown();
+              }
+            });
+    Thread t2 =
+        new Thread(
+            () -> {
+              try {
+                start.await();
+                second.set(map.take(1));
+              } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+              } finally {
+                done.countDown();
+              }
+            });
+
+    t1.start();
+    t2.start();
+    start.countDown();
+    assertTrue(done.await(5, TimeUnit.SECONDS));
+
+    Object a = first.get();
+    Object b = second.get();
+    boolean onlyFirst = a == handle && b == null;
+    boolean onlySecond = b == handle && a == null;
+    assertTrue(onlyFirst || onlySecond);
+    assertNull(map.get(1));
+  }
+
+  @Test
+  public void putReplacing_sameIdFromTwoThreads_lastWins() throws Exception {
+    Object first = new Object();
+    Object second = new Object();
+    Object third = new Object();
+    map.put(1, first);
+
+    CountDownLatch start = new CountDownLatch(1);
+    CountDownLatch done = new CountDownLatch(2);
+    AtomicReference<Object> prevA = new AtomicReference<>();
+    AtomicReference<Object> prevB = new AtomicReference<>();
+
+    Thread t1 =
+        new Thread(
+            () -> {
+              try {
+                start.await();
+                prevA.set(map.putReplacing(1, second));
+              } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+              } finally {
+                done.countDown();
+              }
+            });
+    Thread t2 =
+        new Thread(
+            () -> {
+              try {
+                start.await();
+                prevB.set(map.putReplacing(1, third));
+              } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+              } finally {
+                done.countDown();
+              }
+            });
+
+    t1.start();
+    t2.start();
+    start.countDown();
+    assertTrue(done.await(5, TimeUnit.SECONDS));
+
+    Object winner = map.get(1);
+    assertTrue(winner == second || winner == third);
+    Object returnedFirst = prevA.get() == first ? prevA.get() : prevB.get();
+    assertSame(first, returnedFirst);
+  }
+}

package/android/src/test/java/io/invertase/firebase/common/ReactNativeFirebaseEventEmitterTest.java

@@ -65,7 +65,7 @@ import org.robolectric.shadows.ShadowLooper;
  * require the Detox/Jet harness.
  */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 34, application = ReactNativeFirebaseEventEmitterTest.HostApplication.class)
+@Config(application = ReactNativeFirebaseEventEmitterTest.HostApplication.class)
 public class ReactNativeFirebaseEventEmitterTest {
 
   private static final String EVENT = "auth_state_changed";

package/android/src/test/java/io/invertase/firebase/common/ReactNativeFirebaseJSONTest.java

@@ -0,0 +1,108 @@
+package io.invertase.firebase.common;
+
+/*
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import static org.junit.Assert.assertSame;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.List;
+import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.MockedStatic;
+
+/**
+ * Plain JUnit4 + Mockito (AndroidTest-AD-1). Covers {@link ReactNativeFirebaseJSON#getAll()}.
+ * JSONObject is mocked because Android's org.json stubs are not available on the JVM.
+ */
+public class ReactNativeFirebaseJSONTest {
+
+  private ReactNativeFirebaseJSON json;
+  private Field jsonObjectField;
+  private Object originalJsonObject;
+
+  @Before
+  public void setUp() throws Exception {
+    json = ReactNativeFirebaseJSON.getSharedInstance();
+    jsonObjectField = ReactNativeFirebaseJSON.class.getDeclaredField("jsonObject");
+    jsonObjectField.setAccessible(true);
+    originalJsonObject = jsonObjectField.get(json);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    jsonObjectField.set(json, originalJsonObject);
+  }
+
+  @Test
+  public void getAllReturnsEmptyMapWhenJsonObjectIsNull() throws Exception {
+    WritableMap emptyMap = mock(WritableMap.class);
+    jsonObjectField.set(json, null);
+
+    try (MockedStatic<Arguments> arguments = mockStatic(Arguments.class)) {
+      arguments.when(Arguments::createMap).thenReturn(emptyMap);
+
+      assertSame(emptyMap, json.getAll());
+      verifyNoInteractions(emptyMap);
+    }
+  }
+
+  @Test
+  public void getAllReturnsEmptyMapForEmptyJsonObject() throws Exception {
+    WritableMap emptyMap = mock(WritableMap.class);
+    JSONObject jsonObject = mock(JSONObject.class);
+    when(jsonObject.keys()).thenReturn(Collections.emptyIterator());
+    jsonObjectField.set(json, jsonObject);
+
+    try (MockedStatic<Arguments> arguments = mockStatic(Arguments.class)) {
+      arguments.when(Arguments::createMap).thenReturn(emptyMap);
+
+      assertSame(emptyMap, json.getAll());
+      verifyNoInteractions(emptyMap);
+    }
+  }
+
+  @Test
+  public void getAllMapsNonEmptyJsonObjectEntries() throws Exception {
+    WritableMap writableMap = mock(WritableMap.class);
+    JSONObject jsonObject = mock(JSONObject.class);
+    when(jsonObject.keys()).thenReturn(List.of("analytics_auto_collection_enabled").iterator());
+    when(jsonObject.get("analytics_auto_collection_enabled")).thenReturn(false);
+    jsonObjectField.set(json, jsonObject);
+
+    try (MockedStatic<Arguments> arguments = mockStatic(Arguments.class);
+        MockedStatic<SharedUtils> sharedUtils = mockStatic(SharedUtils.class)) {
+      arguments.when(Arguments::createMap).thenReturn(writableMap);
+
+      assertSame(writableMap, json.getAll());
+
+      sharedUtils.verify(
+          () ->
+              SharedUtils.mapPutValue(
+                  eq("analytics_auto_collection_enabled"), eq(false), eq(writableMap)));
+    }
+  }
+}

package/android/src/test/java/io/invertase/firebase/common/TaskExecutorServiceTest.java

@@ -0,0 +1,97 @@
+package io.invertase.firebase.common;
+
+/*
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.MockedStatic;
+
+/**
+ * Plain JUnit4 + Mockito (AndroidTest-AD-1). Constructor reads pool sizing from {@link
+ * ReactNativeFirebaseJSON}; stub that away so we never touch Android's unmocked {@code
+ * org.json.JSONObject}.
+ */
+public class TaskExecutorServiceTest {
+
+  private MockedStatic<ReactNativeFirebaseJSON> jsonStatic;
+
+  @Before
+  public void setUp() {
+    ReactNativeFirebaseJSON json = mock(ReactNativeFirebaseJSON.class);
+    when(json.getIntValue(anyString(), anyInt())).thenAnswer(inv -> inv.getArgument(1));
+    jsonStatic = mockStatic(ReactNativeFirebaseJSON.class);
+    jsonStatic.when(ReactNativeFirebaseJSON::getSharedInstance).thenReturn(json);
+  }
+
+  @After
+  public void tearDown() {
+    jsonStatic.close();
+  }
+
+  @Test
+  public void transactionalExecutorRunsSubmittedWork() throws Exception {
+    TaskExecutorService service = new TaskExecutorService("TestTransactionalRuns");
+    ExecutorService executor = service.getTransactionalExecutor();
+    CountDownLatch latch = new CountDownLatch(1);
+
+    executor.execute(latch::countDown);
+
+    assertTrue("work submitted before shutdown runs", latch.await(5, TimeUnit.SECONDS));
+    service.shutdown();
+  }
+
+  @Test
+  public void transactionalExecutorDiscardsWorkSubmittedAfterShutdown() {
+    TaskExecutorService service = new TaskExecutorService("TestTransactionalShutdown");
+    ExecutorService executor = service.getTransactionalExecutor();
+    service.shutdown();
+    AtomicBoolean ran = new AtomicBoolean(false);
+
+    // Must not throw RejectedExecutionException - this is the crash path hit when a
+    // play-services Task completes after module invalidation has shut the executor down.
+    executor.execute(() -> ran.set(true));
+
+    assertFalse("work submitted after shutdown is discarded", ran.get());
+  }
+
+  @Test
+  public void pooledExecutorDiscardsWorkSubmittedAfterShutdown() {
+    TaskExecutorService service = new TaskExecutorService("TestPooledShutdown");
+    ExecutorService executor = service.getExecutor(false, "");
+    service.shutdown();
+    AtomicBoolean ran = new AtomicBoolean(false);
+
+    // Exercises the executeInFallback handler's shutdown guard.
+    executor.execute(() -> ran.set(true));
+
+    assertFalse("work submitted after shutdown is discarded", ran.get());
+  }
+}

package/android/src/test/java/io/invertase/firebase/utils/NativeRNFBTurboUtilsTest.java

@@ -36,14 +36,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 /**
  * JVM coverage for {@link NativeRNFBTurboUtils} appVersion constant export branches (null, empty,
  * package-manager failure).
  */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = 34)
 public class NativeRNFBTurboUtilsTest {
 
   private ReactApplicationContext reactContext;

package/dist/module/common/Base64.js

@@ -19,7 +19,6 @@
 
 // @ts-expect-error - No type declarations available
 import binaryToBase64 from 'react-native/Libraries/Utilities/binaryToBase64';
-import { promiseDefer } from "./promise.js";
 const CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 
 /**
@@ -63,26 +62,19 @@ function atob(input) {
  */
 function fromData(data) {
   if (data instanceof Blob) {
-    const fileReader = new FileReader();
-    const {
-      resolve,
-      reject,
-      promise
-    } = promiseDefer();
-    fileReader.readAsDataURL(data);
-    fileReader.onloadend = () => {
-      if (fileReader?.result) {
-        resolve?.({
-          string: fileReader.result,
-          format: 'data_url'
-        });
-      }
-    };
-    fileReader.onerror = event => {
-      fileReader?.abort();
-      reject?.(event);
-    };
-    return promise;
+    return new Promise((resolve, reject) => {
+      const fileReader = new FileReader();
+      fileReader.onloadend = () => {
+        if (fileReader.result) {
+          resolve({
+            string: fileReader.result,
+            format: 'data_url'
+          });
+        }
+      };
+      fileReader.onerror = event => reject(event);
+      fileReader.readAsDataURL(data);
+    });
   }
   if (data instanceof ArrayBuffer || data instanceof Uint8Array) {
     return Promise.resolve({

package/dist/module/common/Base64.js.map

@@ -1 +1 @@
-{"version":3,"names":["binaryToBase64","promiseDefer","CHARS","btoa","input","map","i","block","output","charAt","charCode","charCodeAt","Error","atob","bc","bs","buffer","str","replace","length","String","fromCharCode","indexOf","fromData","data","Blob","fileReader","FileReader","resolve","reject","promise","readAsDataURL","onloadend","result","string","format","onerror","event","abort","ArrayBuffer","Uint8Array","Promise"],"sourceRoot":"../../../lib","sources":["common/Base64.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["binaryToBase64","CHARS","btoa","input","map","i","block","output","charAt","charCode","charCodeAt","Error","atob","bc","bs","buffer","str","replace","length","String","fromCharCode","indexOf","fromData","data","Blob","Promise","resolve","reject","fileReader","FileReader","onloadend","result","string","format","onerror","event","readAsDataURL","ArrayBuffer","Uint8Array"],"sourceRoot":"../../../lib","sources":["common/Base64.ts"],"mappings":"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","ignoreList":[]}

package/dist/module/common/index.js

@@ -26,20 +26,28 @@ export * from "./validate.js";
 export { default as Base64 } from "./Base64.js";
 export { default as ReferenceBase } from "./ReferenceBase.js";
 export function getDataUrlParts(dataUrlString) {
-  const isBase64 = dataUrlString.includes(';base64');
-  let [mediaType, base64String] = dataUrlString.split(',');
-  if (!mediaType || !base64String) {
+  const match = /^data:([^,]*?)(;base64)?,([\s\S]*)$/.exec(dataUrlString);
+  if (!match) {
     return {
       base64String: undefined,
       mediaType: undefined
     };
   }
-  mediaType = mediaType.replace('data:', '').replace(';base64', '');
-  if (base64String && base64String.includes('%')) {
-    base64String = decodeURIComponent(base64String);
-  }
-  if (!isBase64) {
-    base64String = Base64.btoa(base64String);
+  const mediaType = match[1] || undefined;
+  let base64String = match[3] ?? '';
+  try {
+    if (base64String.includes('%')) {
+      base64String = decodeURIComponent(base64String);
+    }
+    if (!match[2]) {
+      const binaryString = encodeURIComponent(base64String).replace(/%([0-9A-F]{2})/g, (_, hex) => String.fromCharCode(Number.parseInt(hex, 16)));
+      base64String = Base64.btoa(binaryString);
+    }
+  } catch (_) {
+    return {
+      base64String: undefined,
+      mediaType: undefined
+    };
   }
   return {
     base64String,

package/dist/module/common/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","Base64","isFunction","isObject","isString","default","ReferenceBase","getDataUrlParts","dataUrlString","isBase64","includes","mediaType","base64String","split","undefined","replace","decodeURIComponent","btoa","once","fn","context","onceResult","ranOnce","onceInner","args","apply","isError","value","Object","prototype","toString","call","Error","hasOwnProperty","target","property","stripTrailingSlash","string","endsWith","slice","isIOS","OS","isAndroid","isOther","tryJSONParse","JSON","parse","_","tryJSONStringify","data","stringify","parseListenerOrObserver","listenerOrObserver","next","bind"],"sourceRoot":"../../../lib","sources":["common/index.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Platform","Base64","isFunction","isObject","isString","default","ReferenceBase","getDataUrlParts","dataUrlString","match","exec","base64String","undefined","mediaType","includes","decodeURIComponent","binaryString","encodeURIComponent","replace","_","hex","String","fromCharCode","Number","parseInt","btoa","once","fn","context","onceResult","ranOnce","onceInner","args","apply","isError","value","Object","prototype","toString","call","Error","hasOwnProperty","target","property","stripTrailingSlash","string","endsWith","slice","isIOS","OS","isAndroid","isOther","tryJSONParse","JSON","parse","tryJSONStringify","data","stringify","parseListenerOrObserver","listenerOrObserver","next","bind"],"sourceRoot":"../../../lib","sources":["common/index.ts"],"mappings":"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","ignoreList":[]}

package/dist/module/internal/asyncStorage.js

@@ -28,11 +28,7 @@ const asyncStorageMemory = {
     return Promise.resolve();
   },
   getItem(key) {
-    const hasValue = memoryStorage.has(key);
-    if (hasValue) {
-      return Promise.resolve(memoryStorage.get(key) || null);
-    }
-    return Promise.resolve(null);
+    return Promise.resolve(memoryStorage.get(key) ?? null);
   },
   removeItem(key) {
     memoryStorage.delete(key);
@@ -57,17 +53,17 @@ export function isMemoryStorage() {
 }
 
 // Set an item in storage with the React Native Firebase prefix
-export async function setItem(key, value) {
-  return await asyncStorage.setItem(prefix + key, value);
+export function setItem(key, value) {
+  return asyncStorage.setItem(prefix + key, value);
 }
 
 // Get an item from storage with the React Native Firebase prefix
-export async function getItem(key) {
-  return await asyncStorage.getItem(prefix + key);
+export function getItem(key) {
+  return asyncStorage.getItem(prefix + key);
 }
 
 // Remove an item from storage with the React Native Firebase prefix
-export async function removeItem(key) {
-  return await asyncStorage.removeItem(prefix + key);
+export function removeItem(key) {
+  return asyncStorage.removeItem(prefix + key);
 }
 //# sourceMappingURL=asyncStorage.js.map