[Android] Make Linking.getInitialURL works properly even if current a…

…ctivity is not initialized
facebook · May 8, 2019 · a92f8b2 · a92f8b2
1 parent b79d7db
commit a92f8b2
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js
@@ -13,6 +13,7 @@
 const NativeEventEmitter = require('NativeEventEmitter');
 const NativeModules = require('NativeModules');
 const Platform = require('Platform');
+const InteractionManager = require('InteractionManager');
 
 const invariant = require('invariant');
 
@@ -87,7 +88,11 @@ class Linking extends NativeEventEmitter {
    * See https://facebook.github.io/react-native/docs/linking.html#getinitialurl
    */
   getInitialURL(): Promise<?string> {
-    return LinkingManager.getInitialURL();
+    return Platform.OS === 'android'
+      ? InteractionManager.runAfterInteractions().then(() =>
+          LinkingManager.getInitialURL(),
+        )
+      : LinkingManager.getInitialURL();
   }
 
   /*