diff --git a/.gitignore b/.gitignore index 115c07a..5a93b88 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # OSX # ios/.DS_Store - +.DS_Store .idea xcuserdata Pods diff --git a/android/build.gradle b/android/build.gradle index f1b2b4f..4f4b402 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,5 +34,5 @@ android { dependencies { compile 'com.facebook.react:react-native:+' // from node_modules - compile 'com.twilio:client-android:1.2.16' + compile 'com.twilio:client-android:+' } diff --git a/android/proguard-rules.pro.groovy b/android/proguard-rules.pro.groovy new file mode 100644 index 0000000..4a1104c --- /dev/null +++ b/android/proguard-rules.pro.groovy @@ -0,0 +1,5 @@ +# Twilio Client +-keep class com.twilio.** { *; } + +# Apache HttpClient +-dontwarn org.apache.http.** \ No newline at end of file diff --git a/android/src/main/java/com/rogchap/react/modules/twilio/TwilioModule.java b/android/src/main/java/com/rogchap/react/modules/twilio/TwilioModule.java index 342804c..f2bcc04 100644 --- a/android/src/main/java/com/rogchap/react/modules/twilio/TwilioModule.java +++ b/android/src/main/java/com/rogchap/react/modules/twilio/TwilioModule.java @@ -67,7 +67,7 @@ public void onReceive(Context context, Intent intent) { intent.removeExtra(Device.EXTRA_CONNECTION); _pendingConnection = incomingConnection; - + _pendingConnection.setConnectionListener(this._cl); Map connParams = _pendingConnection.getParameters(); params = Arguments.createMap(); if (connParams != null) { @@ -216,7 +216,6 @@ public void disconnect() { @ReactMethod public void accept() { _pendingConnection.accept(); - _pendingConnection.setConnectionListener(_receiver._cl); _connection = _pendingConnection; _pendingConnection = null; } diff --git a/ios/libs/TwilioSDK/Libraries/libTwilioClient.a.zip b/ios/libs/TwilioSDK/Libraries/libTwilioClient.a.zip index 135a5cb..284ea02 100644 Binary files a/ios/libs/TwilioSDK/Libraries/libTwilioClient.a.zip and b/ios/libs/TwilioSDK/Libraries/libTwilioClient.a.zip differ diff --git a/ios/libs/TwilioSDK/readme.html b/ios/libs/TwilioSDK/readme.html deleted file mode 100644 index d99da6c..0000000 --- a/ios/libs/TwilioSDK/readme.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - - Twilio Client iOS README - - - - - - - - - - - - - - -
- -

Twilio Client iOS README

- -

Ahoy hoy and welcome to Twilio Client iOS! In just a few minutes you'll -be adding telephony features to your iOS app.

- -

We recommend going through the Quickstart to get yourself familiar with -the SDK along with this guide. And you'll want to get yourself a Twilio -account by heading to -https://www.twilio.com/try-twilio -if you don't have one already.

- -

Here's an overview of the SDK contents:

- - - -

-Happy coding!
--Team Twilio -

-
- - - - - diff --git a/readme.md b/readme.md index f83ebee..d974a6d 100644 --- a/readme.md +++ b/readme.md @@ -11,6 +11,11 @@ Run `npm install react-native-twilio --save` in your project directory 1. Open your project in XCode, right click on `Libraries` and click `Add Files to "Your Project Name"` 2. Within `node_modules`, find `react-native-twilio/ios` and add RCTTwilio.xcodeproj to your project. 3. Add `libRCTTwilio.a` to `Build Phases -> Link Binary With Libraries` +4. Add the lib to `info.plist` +``` +NSMicrophoneUsageDescription +Need microphone to voice when making a call +``` ## Installation Android