VBLOCKS-2485: Changes needed due to refactor of react native sdk

.circleci/config.yml

@@ -377,10 +377,7 @@ jobs:
       - app-install-dependencies
       - app-save-google-services-json
       - android/install-ndk:
-          version: "21.4.7075529"
-      # for aarch64
-      - android/install-ndk:
-          version: "24.0.8215888"
+          version: "25.2.9519653"
       - app-android-build
 
   app-detox-android:

CHANGELOG.md

@@ -5,7 +5,8 @@
 ### Changes
 * Refactored and simplified navigators. Now, movement between screens is more
 explicit and has finer control.
-* Upgraded Twilio Voice SDK to `1.0.0-rc8`.
+* Upgraded Twilio Voice SDK to `1.0.0-rc17`.
+* Refactored Android implementation to use newly refactored Android Voice React Native SDK
 
 ### Fixes
 * iOS call timer, no longer shows negative numbers

app/android/app/build.gradle

@@ -4,7 +4,6 @@ apply plugin: "com.android.application"
 apply plugin: 'com.google.gms.google-services'
 
 import com.android.build.OutputFile
-import org.apache.tools.ant.taskdefs.condition.Os
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -262,15 +261,11 @@ android {
 
 dependencies {
     androidTestImplementation('com.wix:detox:+')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-
+
     implementation fileTree(dir: "libs", include: ["*.jar"])
-
     //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-
+    implementation "com.facebook.react:react-native:+"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-
     implementation "com.microsoft.appcenter:appcenter-distribute:4.3.1"
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
@@ -339,7 +334,7 @@ def getLocalPropertyOrEnv(key) {
     return return_value;
 }
 
-def stringifyNull(var) {
+static def stringifyNull(var) {
     if (null == var) {
         return "\"null\""
     }

app/android/app/src/androidTest/java/com/twiliovoicereactnativereferenceapp/DetoxTest.java

@@ -1,5 +1,8 @@
 package com.twiliovoicereactnativereferenceapp;
 
+import android.Manifest;
+import android.os.Build;
+
 import com.wix.detox.Detox;
 import com.wix.detox.config.DetoxConfig;
 
@@ -10,12 +13,16 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
+import androidx.test.rule.GrantPermissionRule;
 
 @RunWith(AndroidJUnit4.class)
 @LargeTest
 public class DetoxTest {
+    private static final String[] permissionList;
     @Rule
     public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class, false, false);
+    @Rule
+    public GrantPermissionRule permissionRule = GrantPermissionRule.grant(permissionList);
 
     @Test
     public void runDetoxTests() {
@@ -26,4 +33,18 @@ public void runDetoxTests() {
 
         Detox.runTests(mActivityRule, detoxConfig);
     }
+
+    static {
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2) {
+            permissionList = new String[] {
+                    Manifest.permission.RECORD_AUDIO,
+                    Manifest.permission.BLUETOOTH_CONNECT,
+                    Manifest.permission.POST_NOTIFICATIONS };
+        } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
+            permissionList = new String[] {
+                    Manifest.permission.RECORD_AUDIO, Manifest.permission.BLUETOOTH_CONNECT };
+        } else {
+            permissionList = new String[] { Manifest.permission.RECORD_AUDIO };
+        }
+    }
 }

app/android/app/src/main/AndroidManifest.xml

@@ -1,10 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.twiliovoicereactnativereferenceapp">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.twiliovoicereactnativereferenceapp">
 
     <application
       android:name=".MainApplication"
@@ -13,11 +9,12 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme"
-      android:networkSecurityConfig="@xml/network_security_config">
+      android:networkSecurityConfig="@xml/network_security_config"
+        tools:targetApi="n"
+        tools:ignore="DataExtractionRules">
       <activity
         android:name=".MainActivity"
-        android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+          android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
         android:launchMode="singleTask"
         android:windowSoftInputMode="adjustPan"
         android:exported="true">
@@ -26,34 +23,5 @@
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
       </activity>
-      <!-- Twilio Voice -->
-      <!-- [START fcm_listener] -->
-      <service
-        android:name="com.twiliovoicereactnative.VoiceFirebaseMessagingService"
-        android:stopWithTask="false"
-        android:exported="true">
-        <intent-filter>
-          <action android:name="com.google.firebase.MESSAGING_EVENT" />
-        </intent-filter>
-      </service>
-      <service
-        android:enabled="true"
-        android:name="com.twiliovoicereactnative.IncomingCallNotificationService"
-	android:foregroundServiceType="microphone"
-        android:exported="true">
-        <intent-filter>
-          <action android:name="ACTION_ACCEPT" />
-          <action android:name="ACTION_REJECT" />
-        </intent-filter>
-      </service>
-      <activity
-        android:name="com.twiliovoicereactnative.NotificationProxyActivity"
-        android:parentActivityName=".MainActivity"
-        android:noHistory="true"
-        android:excludeFromRecents="true"
-        android:taskAffinity=""
-        android:launchMode="singleTask"
-        android:theme="@android:style/Theme.Translucent.NoTitleBar"
-        android:exported="true" />
     </application>
 </manifest>

app/android/app/src/main/java/com/twiliovoicereactnativereferenceapp/MainActivity.java

@@ -3,37 +3,58 @@
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactRootView;
+import com.twiliovoicereactnative.VoiceActivityProxy;
 
 import android.Manifest;
-import android.content.pm.PackageManager;
+import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
+import android.widget.Toast;
 
 public class MainActivity extends ReactActivity {
-  private static final String TAG = "MainActivity";
-  private static final int MIC_PERMISSION_REQUEST_CODE = 1;
+  public static class MainActivityDelegate extends ReactActivityDelegate {
+    public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
+      super(activity, mainComponentName);
+    }
 
-  private boolean checkPermissionForMicrophone() {
-    int resultMic = ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO);
-    return resultMic == PackageManager.PERMISSION_GRANTED;
-  }
+    @Override
+    protected ReactRootView createRootView() {
+      ReactRootView reactRootView = new ReactRootView(getContext());
+      // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+      reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
+      return reactRootView;
+    }
 
-  private void requestPermissionForMicrophone() {
-    if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.RECORD_AUDIO)) {
-      Log.d(TAG, "Microphone permissions needed. Please allow in your application settings.");
-    } else {
-      ActivityCompat.requestPermissions(
-        this,
-        new String[]{Manifest.permission.RECORD_AUDIO},
-        MIC_PERMISSION_REQUEST_CODE);
+    @Override
+    protected boolean isConcurrentRootEnabled() {
+      // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18).
+      // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html
+      return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
     }
   }
 
+  private final VoiceActivityProxy activityProxy = new VoiceActivityProxy(
+          this,
+          permission -> {
+            if (Manifest.permission.RECORD_AUDIO.equals(permission)) {
+              Toast.makeText(
+                      MainActivity.this,
+                      "Microphone permissions needed. Please allow in your application settings.",
+                      Toast.LENGTH_LONG).show();
+            } else if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) &&
+                    Manifest.permission.BLUETOOTH_CONNECT.equals(permission)) {
+              Toast.makeText(
+                      MainActivity.this,
+                      "Bluetooth permissions needed. Please allow in your application settings.",
+                      Toast.LENGTH_LONG).show();
+            } else if ((Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2) &&
+                    Manifest.permission.POST_NOTIFICATIONS.equals(permission)) {
+              Toast.makeText(
+                      MainActivity.this,
+                      "Notification permissions needed. Please allow in your application settings.",
+                      Toast.LENGTH_LONG).show();
+            }
+          });
   /**
    * Returns the name of the main component registered from JavaScript. This is used to schedule
    * rendering of the component.
@@ -56,30 +77,18 @@ protected ReactActivityDelegate createReactActivityDelegate() {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-
-    if (!checkPermissionForMicrophone()) {
-      requestPermissionForMicrophone();
-    }
+    activityProxy.onCreate(savedInstanceState);
   }
 
-  public static class MainActivityDelegate extends ReactActivityDelegate {
-    public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
-      super(activity, mainComponentName);
-    }
-
-    @Override
-    protected ReactRootView createRootView() {
-      ReactRootView reactRootView = new ReactRootView(getContext());
-      // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-      reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
-      return reactRootView;
-    }
+  @Override
+  public void onDestroy() {
+    activityProxy.onDestroy();
+    super.onDestroy();
+  }
 
-    @Override
-    protected boolean isConcurrentRootEnabled() {
-      // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18).
-      // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html
-      return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-    }
+  @Override
+  public void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    activityProxy.onNewIntent(intent);
   }
 }