Android: implement Twilio Programmable Voice Android SDK 4.5.0

- handle Call `onReconnecting` and Call `onReconnected`

Author: fabriziomoscon

README.md

@@ -4,14 +4,14 @@ This is a React Native wrapper for Twilio Programmable Voice SDK that lets you m
 
 # Twilio Programmable Voice SDK
 
-- Android 3.3.0 (bundled within this library)
+- Android 4.5.0 (bundled within this library)
 - iOS 2.1.0 (specified by the app's own podfile)
 
 ## Breaking changes in v4.0.0
 
 It implements [react-native autolinking](https://github.com/react-native-community/cli/blob/master/docs/autolinking.md) as many other native libraries > react-native 0.60.0
 
-Android: update Firebase Messaging to 17.3.4. Remove the following block from your application's `AndroidManifest.xml`
+Android: update Firebase Messaging to 17.6.+. Remove the following block from your application's `AndroidManifest.xml`
 ```xml
     <!-- [START instanceId_listener] -->
     <service
@@ -268,6 +268,12 @@ TwilioVoice.addEventListener('connectionDidConnect', function(data) {
     //     call_to: string,   // "client:bob"
     // }
 })
+TwilioVoice.addEventListener('connectionIsReconnecting', function(data) {
+    // empty data
+})
+TwilioVoice.addEventListener('connectionDidReconnect', function(data) {
+    // empty data
+})
 TwilioVoice.addEventListener('connectionDidDisconnect', function(data: mixed) {
     //   | null
     //   | {

android/build.gradle

@@ -6,8 +6,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.google.gms:google-services:4.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -54,9 +54,9 @@ dependencies {
     def supportLibVersion = rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPORT_LIB_VERSION
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.twilio:voice-android:3.3.0'
+    implementation 'com.twilio:voice-android:4.5.0'
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.google.firebase:firebase-messaging:17.+'
+    implementation 'com.google.firebase:firebase-messaging:17.6.+'
     testImplementation 'junit:junit:4.12'
 }

android/src/main/java/com/hoxfon/react/RNTwilioVoice/EventManager.java

@@ -23,6 +23,8 @@ public class EventManager {
     public static final String EVENT_DEVICE_DID_RECEIVE_INCOMING = "deviceDidReceiveIncoming";
     public static final String EVENT_CALL_STATE_RINGING = "callStateRinging";
     public static final String EVENT_CALL_INVITE_CANCELLED = "callInviteCancelled";
+    public static final String EVENT_CONNECTION_IS_RECONNECTING = "connectionIsReconnecting";
+    public static final String EVENT_CONNECTION_DID_RECONNECT = "connectionDidReconnect";
 
 
     public EventManager(ReactApplicationContext context) {

android/src/main/java/com/hoxfon/react/RNTwilioVoice/TwilioVoiceModule.java

@@ -64,6 +64,8 @@
 import static com.hoxfon.react.RNTwilioVoice.EventManager.EVENT_DEVICE_READY;
 import static com.hoxfon.react.RNTwilioVoice.EventManager.EVENT_CALL_STATE_RINGING;
 import static com.hoxfon.react.RNTwilioVoice.EventManager.EVENT_CALL_INVITE_CANCELLED;
+import static com.hoxfon.react.RNTwilioVoice.EventManager.EVENT_CONNECTION_IS_RECONNECTING;
+import static com.hoxfon.react.RNTwilioVoice.EventManager.EVENT_CONNECTION_DID_RECONNECT;
 
 public class TwilioVoiceModule extends ReactContextBaseJavaModule implements ActivityEventListener, LifecycleEventListener {
 
@@ -249,7 +251,6 @@ public void onRinging(Call call) {
                 if (call != null) {
                     params.putString("call_sid",   call.getSid());
                     params.putString("call_from",  call.getFrom());
-                    params.putString("call_state", call.getState().name());
                 }
                 eventManager.sendEvent(EVENT_CALL_STATE_RINGING, params);
             }
@@ -282,26 +283,42 @@ public void onConnected(Call call) {
                 eventManager.sendEvent(EVENT_CONNECTION_DID_CONNECT, params);
             }
 
-//            Prepare methods Twilio for v4
-//            @Override
-//            public void onReconnecting(Call call, CallException callException) {
-//                if (BuildConfig.DEBUG) {
-//                    Log.d(TAG, "CALL RECONNECTING callListener().onReconnecting call state = "+call.getState());
-//                }
-//                // TODO implement
-////                eventManager.sendEvent(XXX, params);
-//
-//            }
-//
-//            @Override
-//            public void onReconnected(Call call) {
-//                if (BuildConfig.DEBUG) {
-//                    Log.d(TAG, "CALL RECONNECTED callListener().onReconnected call state = "+call.getState());
-//                }
-//
-//                // TODO implement
-////                eventManager.sendEvent(XXX, params);
-//            }
+            /**
+             * `onReconnecting()` callback is raised when a network change is detected and Call is already in `CONNECTED`
+             * `Call.State`. If the call is in `CONNECTING` or `RINGING` when network change happened the SDK will continue
+             * attempting to connect, but a reconnect event will not be raised.
+             */
+            @Override
+            public void onReconnecting(@NonNull Call call, @NonNull CallException callException) {
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "CALL RECONNECTING callListener().onReconnecting call state = "+call.getState());
+                }
+                WritableMap params = Arguments.createMap();
+                if (call != null) {
+                    params.putString("call_sid",   call.getSid());
+                    params.putString("call_from", call.getFrom());
+                    params.putString("call_to", call.getTo());
+                }
+                eventManager.sendEvent(EVENT_CONNECTION_IS_RECONNECTING, params);
+
+            }
+
+            /**
+             * The call is successfully reconnected after reconnecting attempt.
+             */
+            @Override
+            public void onReconnected(@NonNull Call call) {
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "CALL RECONNECTED callListener().onReconnected call state = "+call.getState());
+                }
+                WritableMap params = Arguments.createMap();
+                if (call != null) {
+                    params.putString("call_sid",   call.getSid());
+                    params.putString("call_from", call.getFrom());
+                    params.putString("call_to", call.getTo());
+                }
+                eventManager.sendEvent(EVENT_CONNECTION_DID_RECONNECT, params);
+            }
 
             @Override
             public void onDisconnected(Call call, CallException error) {
@@ -605,7 +622,9 @@ public void accept() {
             if (BuildConfig.DEBUG) {
                 Log.d(TAG, "accept()");
             }
-            AcceptOptions acceptOptions = new AcceptOptions.Builder().build();
+            AcceptOptions acceptOptions = new AcceptOptions.Builder()
+                    .enableDscp(true)
+                    .build();
             activeCallInvite.accept(getReactApplicationContext(), acceptOptions, callListener);
             clearIncomingNotification(activeCallInvite.getCallSid());
 
@@ -711,6 +730,7 @@ public void connect(ReadableMap params) {
         }
 
         ConnectOptions connectOptions = new ConnectOptions.Builder(accessToken)
+            .enableDscp(true)
             .params(twiMLParams)
             .build();
 

index.js

@@ -16,6 +16,8 @@ const _eventHandlers = {
     deviceNotReady: new Map(),
     deviceDidReceiveIncoming: new Map(),
     connectionDidConnect: new Map(),
+    connectionIsReconnecting: new Map(),
+    connectionDidReconnect: new Map(),
     connectionDidDisconnect: new Map(),
     callStateRinging: new Map(),
     callInviteCancelled: new Map(),