Merge pull request #13 from opentok/0.3.5

0.3.5

README.md

@@ -54,11 +54,11 @@
 
 5. Open XCode
 
-6. Open <YourProjectName>.xcworkspace file in XCode. This file can be found in the `ios` folder. 
+6. Open `<YourProjectName>.xcworkspace` file in XCode. This file can be found in the `ios` folder of your React Native project. 
 
 7. Click `File` and `Add Files to`
 
-8. Add the following files to the project:
+8. Add the following files from `../node_modules/opentok-react-native/ios` to the project:
   * `OTPublisher.h`
   * `OTPublisher.m`
   * `OTPublisherManager.swift`
@@ -70,10 +70,11 @@
   * `OTSubscriber.m`
   * `OTSubscriberManager.swift`
   * `OTSubscriberView.swift`
-  * `<YourProjectName>-Bridging-Header.h`
 
 9. Click `Create Bridging Header` when you're prompted with the following modal: `Would you like to configure an Objective-C bridging header?`
 
+10. Add the contents from the `Bridging-Header.h` file in `../node_modules/opentok-react-native/ios` to `<YourProjectName>-Bridging-Header.h`
+
 ### Android Installation
 
 1. In you terminal, change into your project directory.

android/build.gradle

@@ -1,4 +1,3 @@
-
 apply plugin: 'com.android.library'
 
 android {
@@ -10,16 +9,11 @@ android {
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
     }
 }
 
 dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:23.0.1"
     compile "com.facebook.react:react-native:+"  // From node_modules
     compile 'com.opentok.android:opentok-android-sdk:2.13.0'
-    compile 'com.android.volley:volley:1.1.0'
 }

package.json

@@ -1,12 +1,11 @@
 {
   "name": "opentok-react-native",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "React Native components for OpenTok iOS and Android SDKs",
   "main": "src/index.js",
   "homepage": "www.tokbox.com",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "node ./scripts/postInstall"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
     "opentok",

src/OTSession.js

@@ -58,12 +58,12 @@ export default class OTSession extends Component {
   }
   disconnectSession() {
     OT.disconnectSession((disconnectError) => {
-      if (disconnectError) {
+      if (!disconnectError) {
         this.setState({
           sessionInfo: null,
         });
       } else {
-        handleError(error);
+        handleError(disconnectError);
       }
     });
   }