Merge pull request #49 from Kikketer/master

Update the isAvailable to return a boolean

Author: jdnichollsc

README.md

@@ -241,7 +241,7 @@ Thanks goes to these wonderful people:
 <!-- CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 | [<img alt="jdnichollsc" src="https://avatars3.githubusercontent.com/u/2154886?v=3" width="100" /><br /><sub><b>Juan Nicholls</b></sub>](https://github.com/jdnichollsc)<br />[✉](mailto:[email protected]) | [<img alt="EQuimper" src="https://avatars3.githubusercontent.com/u/15819498?v=3" width="100" /><br /><sub><b>Emanuel Quimper</b></sub>](https://github.com/EQuimper)<br />[✉](mailto:[email protected]) | [<img alt="bonesyblue" src="https://avatars3.githubusercontent.com/u/7486722?v=3" width="100" /><br /><sub><b>Jonathan Bones</b></sub>](https://github.com/bonesyblue)<br />[✉](mailto:[email protected]) | [<img alt="mlazari" src="https://avatars3.githubusercontent.com/u/4928274?v=3" width="100" /><br /><sub><b>Mihai Lazari</b></sub>](https://github.com/mlazari) | [<img alt="maestor" src="https://avatars3.githubusercontent.com/u/3604902?v=3" width="100" /><br /><sub><b>Kalle Haavisto</b></sub>](https://github.com/maestor)<br />[✉](mailto:[email protected]) | [<img alt="plamworapot" src="https://avatars3.githubusercontent.com/u/4770354?v=3" width="100" /><br /><sub><b>Worapot Pengsuk</b></sub>](https://github.com/plamworapot) | [<img alt="adammcarth" src="https://avatars3.githubusercontent.com/u/3016455?v=3" width="100" /><br /><sub><b>Adam McArthur</b></sub>](https://github.com/adammcarth)<br />[✉](mailto:[email protected]) |
 | :---: | :---: |:---: | :---: | :---: | :---: | :---: |
-| [<img alt="SnaiNeR" src="https://avatars3.githubusercontent.com/u/39980963?v=3" width="100" /><br /><sub><b>Artem Emelyanov</b></sub>](https://github.com/SnaiNeR)<br />[✉](mailto:[email protected]) | [<img alt="rbscott" src="https://avatars2.githubusercontent.com/u/882258?v=4&s=117" width="100" /><br /><sub><b>Robert Scott</b></sub>](https://github.com/rbscott) |
+| [<img alt="SnaiNeR" src="https://avatars3.githubusercontent.com/u/39980963?v=3" width="100" /><br /><sub><b>Artem Emelyanov</b></sub>](https://github.com/SnaiNeR)<br />[✉](mailto:[email protected]) | [<img alt="rbscott" src="https://avatars2.githubusercontent.com/u/882258?v=4&s=117" width="100" /><br /><sub><b>Robert Scott</b></sub>](https://github.com/rbscott) | [<img alt="Kikketer" src="https://avatars0.githubusercontent.com/u/958042?s=460&v=4" width="100" /><br /><sub><b>Chris Weed</b></sub>](https://github.com/kikketer) |
 <!-- CONTRIBUTORS-LIST:END -->
 
 ## Supporting 🍻

example/App.js

@@ -6,15 +6,15 @@
  * @flow
  */
 
-import React, {Component} from 'react'
+import React, { Component } from 'react'
 import {
-  Platform, 
-  StyleSheet, 
-  Text, 
-  View, 
-  Button, 
-  Alert, 
-  TextInput, 
+  Platform,
+  StyleSheet,
+  Text,
+  View,
+  Button,
+  Alert,
+  TextInput,
   StatusBar,
 } from 'react-native'
 import InAppBrowser from 'react-native-inappbrowser-reborn'
@@ -37,38 +37,39 @@ export default class App extends Component {
   }
   sleep = m => new Promise(r => setTimeout(r, m))
   async openLink() {
-    try {
-      await InAppBrowser.isAvailable()
-      StatusBar.setBarStyle('light-content')
-      const response = await InAppBrowser.open(this.state.url, {
-        // iOS Properties
-        dismissButtonStyle: 'cancel',
-        preferredBarTintColor: 'gray',
-        preferredControlTintColor: 'white',
-        readerMode: false,
-        // Android Properties
-        showTitle: true,
-        toolbarColor: '#6200EE',
-        secondaryToolbarColor: 'black',
-        enableUrlBarHiding: true,
-        enableDefaultShare: true,
-        forceCloseOnRedirection: false,
-        // Specify full animation resource identifier(package:anim/name)
-        // or only resource name(in case of animation bundled with app).
-        animations: {
-          startEnter: 'slide_in_right',
-          startExit: 'slide_out_left',
-          endEnter: 'slide_in_right',
-          endExit: 'slide_out_left',
-        },
-        headers: {
-          'my-custom-header': 'my custom header value'
-        },
-      })
-      await this.sleep(800)
-      Alert.alert('Response', JSON.stringify(response))
-    } catch (error) {
-      Alert.alert(error.message)
+    if (await InAppBrowser.isAvailable()) {
+      try {
+        StatusBar.setBarStyle('light-content')
+        const response = await InAppBrowser.open(this.state.url, {
+          // iOS Properties
+          dismissButtonStyle: 'cancel',
+          preferredBarTintColor: 'gray',
+          preferredControlTintColor: 'white',
+          readerMode: false,
+          // Android Properties
+          showTitle: true,
+          toolbarColor: '#6200EE',
+          secondaryToolbarColor: 'black',
+          enableUrlBarHiding: true,
+          enableDefaultShare: true,
+          forceCloseOnRedirection: false,
+          // Specify full animation resource identifier(package:anim/name)
+          // or only resource name(in case of animation bundled with app).
+          animations: {
+            startEnter: 'slide_in_right',
+            startExit: 'slide_out_left',
+            endEnter: 'slide_in_right',
+            endExit: 'slide_out_left',
+          },
+          headers: {
+            'my-custom-header': 'my custom header value'
+          },
+        })
+        await this.sleep(800)
+        Alert.alert('Response', JSON.stringify(response))
+      } catch (error) {
+        Alert.alert(error.message)
+      }
     }
   }
 
@@ -80,7 +81,7 @@ export default class App extends Component {
         <Text style={styles.instructions}>Type the url</Text>
         <TextInput
           style={styles.urlInput}
-          onChangeText={(text) => this.setState({url: text})}
+          onChangeText={(text) => this.setState({ url: text })}
           value={this.state.url}
         />
         <View style={styles.openButton}>
@@ -111,9 +112,9 @@ const styles = StyleSheet.create({
     marginBottom: 5,
   },
   urlInput: {
-    height: 40, 
+    height: 40,
     width: '100%',
-    borderColor: 'gray', 
+    borderColor: 'gray',
     borderWidth: 1,
   },
   openButton: {

index.js

@@ -122,7 +122,7 @@ function _waitForRedirectAsync(returnUrl: string): Promise<RedirectResult> {
 
 async function isAvailable(): Promise<void> {
   if (Platform.OS === 'android') {
-    return Promise.resolve();
+    return Promise.resolve(true);
   }
   else {
     return RNInAppBrowser.isAvailable();

ios/RNInAppBrowser.m

@@ -181,7 +181,7 @@ - (void)_close
     // SafariView is available
     resolve(@YES);
   } else {
-    reject(@"E_SAFARI_VIEW_UNAVAILABLE", @"SafariView is unavailable", nil);
+    resolve(@NO);
   }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-inappbrowser-reborn",
-  "version": "1.3.13",
+  "version": "2.0.0",
   "description": "InAppBrowser for React Native",
   "main": "index.js",
   "readmeFilename": "README.md",
@@ -36,4 +36,4 @@
     "babel-core": "^6.26.0",
     "flow-bin": "^0.80.0"
   }
-}
+}