voice-react-native-sdk 1.6.2-fork.22 → 1.6.2-fork.24-hack

package/android/build.gradle

@@ -3,7 +3,7 @@ buildscript {
     'java'               : JavaVersion.VERSION_11,
     'androidGradlePlugin': '7.4.2',
     'googleServices'     : '4.3.10',
-    'voiceAndroid'       : '6.7.1',
+    'voiceAndroid'       : '6.9.0',
     'androidxCore'       : '1.12.0',
     'androidxLifecycle'  : '2.2.0',
     'audioSwitch'        : '1.2.2',

package/android/src/main/AndroidManifest.xml

@@ -4,7 +4,6 @@
   <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-  <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
@@ -16,7 +15,7 @@
     <service
       android:name=".VoiceFirebaseMessagingService"
       android:stopWithTask="false"
-      android:exported="true"
+      android:exported="false"
       android:enabled="@bool/twiliovoicereactnative_firebasemessagingservice_enabled">
       <intent-filter>
         <action android:name="com.google.firebase.MESSAGING_EVENT" />

package/android/src/main/java/com/twiliovoicereactnative/CallListenerProxy.java

@@ -57,7 +57,11 @@ class CallListenerProxy implements Call.Listener {
     getAudioSwitchManager().getAudioSwitch().deactivate();
 
     // find call record & remove
-    CallRecord callRecord = Objects.requireNonNull(getCallRecordDatabase().remove(new CallRecord(uuid)));
+    //CallRecord callRecord = Objects.requireNonNull(getCallRecordDatabase().remove(new CallRecord(uuid)));
+    CallRecord callRecord = getCallRecordDatabase().remove(new CallRecord(uuid));
+    if (callRecord == null) {
+      return;
+    }
 
     // take down notification
     getVoiceServiceApi().cancelActiveCallNotification(callRecord);

package/android/src/main/java/com/twiliovoicereactnative/NotificationUtility.java

@@ -24,7 +24,6 @@ import androidx.core.app.Person;
 
 import com.twilio.voice.CallInvite;
 
-import static com.twiliovoicereactnative.ConfigurationProperties.isFullScreenNotificationEnabled;
 import static com.twiliovoicereactnative.Constants.VOICE_CHANNEL_DEFAULT_IMPORTANCE;
 import static com.twiliovoicereactnative.Constants.VOICE_CHANNEL_HIGH_IMPORTANCE;
 import static com.twiliovoicereactnative.Constants.VOICE_CHANNEL_LOW_IMPORTANCE;
@@ -166,18 +165,16 @@ class NotificationUtility {
       callRecord.getUuid());
     PendingIntent piAcceptIntent = constructPendingIntentForActivity(context, acceptIntent);
 
-    NotificationCompat.Builder builder = constructNotificationBuilder(context, channelImportance)
+    return constructNotificationBuilder(context, channelImportance)
       .setSmallIcon(notificationResource.getSmallIconId())
       .setCategory(Notification.CATEGORY_CALL)
       .setAutoCancel(true)
       .setContentIntent(piForegroundIntent)
+      .setFullScreenIntent(piForegroundIntent, true)
       .addPerson(incomingCaller)
       .setStyle(NotificationCompat.CallStyle.forIncomingCall(
-        incomingCaller, piRejectIntent, piAcceptIntent));
-    if (isFullscreenIntentEnabled(context)) {
-      builder.setFullScreenIntent(piForegroundIntent, true);
-    }
-    return builder.build();
+        incomingCaller, piRejectIntent, piAcceptIntent))
+      .build();
   }
 
   public static Notification createCallAnsweredNotificationWithLowImportance(@NonNull Context context,
@@ -205,18 +202,16 @@ class NotificationUtility {
       callRecord.getUuid());
     PendingIntent piEndCallIntent = constructPendingIntentForService(context, endCallIntent);
 
-    NotificationCompat.Builder builder = constructNotificationBuilder(context, Constants.VOICE_CHANNEL_LOW_IMPORTANCE)
+    return constructNotificationBuilder(context, Constants.VOICE_CHANNEL_LOW_IMPORTANCE)
       .setSmallIcon(notificationResource.getSmallIconId())
       .setCategory(Notification.CATEGORY_CALL)
       .setAutoCancel(false)
       .setContentIntent(piForegroundIntent)
+      .setFullScreenIntent(piForegroundIntent, true)
       .setOngoing(true)
       .addPerson(activeCaller)
-      .setStyle(NotificationCompat.CallStyle.forOngoingCall(activeCaller, piEndCallIntent));
-    if (isFullscreenIntentEnabled(context)) {
-      builder.setFullScreenIntent(piForegroundIntent, true);
-    }
-    return builder.build();
+      .setStyle(NotificationCompat.CallStyle.forOngoingCall(activeCaller, piEndCallIntent))
+      .build();
   }
 
   public static Notification createOutgoingCallNotificationWithLowImportance(@NonNull Context context,
@@ -244,18 +239,16 @@ class NotificationUtility {
       callRecord.getUuid());
     PendingIntent piEndCallIntent = constructPendingIntentForService(context, endCallIntent);
 
-    NotificationCompat.Builder builder = constructNotificationBuilder(context, Constants.VOICE_CHANNEL_LOW_IMPORTANCE)
+    return constructNotificationBuilder(context, Constants.VOICE_CHANNEL_LOW_IMPORTANCE)
       .setSmallIcon(notificationResource.getSmallIconId())
       .setCategory(Notification.CATEGORY_CALL)
       .setAutoCancel(false)
       .setContentIntent(piForegroundIntent)
+      .setFullScreenIntent(piForegroundIntent, true)
       .setOngoing(true)
       .addPerson(activeCaller)
-      .setStyle(NotificationCompat.CallStyle.forOngoingCall(activeCaller, piEndCallIntent));
-    if (isFullscreenIntentEnabled(context)) {
-      builder.setFullScreenIntent(piForegroundIntent, true);
-    }
-    return builder.build();
+      .setStyle(NotificationCompat.CallStyle.forOngoingCall(activeCaller, piEndCallIntent))
+      .build();
   }
 
   public static void createNotificationChannels(@NonNull Context context) {
@@ -279,11 +272,6 @@ class NotificationUtility {
     notificationManager.deleteNotificationChannelGroup(Constants.VOICE_CHANNEL_GROUP);
   }
 
-  public static boolean isFullscreenIntentEnabled(Context context) {
-    return isFullScreenNotificationEnabled(context) &&
-      NotificationManagerCompat.from(context).canUseFullScreenIntent();
-  }
-
   private static NotificationChannelCompat createNotificationChannel(@NonNull Context context,
                                                                      @NonNull final String voiceChannelId) {
     final int notificationImportance = getChannelImportance(voiceChannelId);
@@ -360,4 +348,4 @@ class NotificationUtility {
       .appendPath(String.valueOf(id))
     ).build();
   }
-}
+}

package/android/src/main/java/com/twiliovoicereactnative/TwilioVoiceReactNativeModule.java

@@ -646,6 +646,8 @@ public class TwilioVoiceReactNativeModule extends ReactContextBaseJavaModule {
 
   @ReactMethod
   public void system_requestFullScreenNotificationPermission(Promise promise) {
+    promise.resolve(null);
+    /*
     final boolean shouldStartActivity =
       Build.VERSION.SDK_INT > Build.VERSION_CODES.TIRAMISU &&
         isFullScreenNotificationEnabled(reactContext);
@@ -663,6 +665,7 @@ public class TwilioVoiceReactNativeModule extends ReactContextBaseJavaModule {
     }
 
     promise.resolve(null);
+    */
   }
 
   @Override

package/android/src/main/res/values/config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <bool name="twiliovoicereactnative_firebasemessagingservice_enabled">true</bool>
-  <bool name="twiliovoicereactnative_fullscreennotification_enabled">true</bool>
+  <bool name="twiliovoicereactnative_firebasemessagingservice_enabled">false</bool>
+  <bool name="twiliovoicereactnative_fullscreennotification_enabled">false</bool>
 </resources>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "voice-react-native-sdk",
-  "version": "1.6.2-fork.22",
+  "version": "1.6.2-fork.24-hack",
   "description": "Twilio Voice React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",