add missing FLAG_IMMUTABLE flags / check for null activities

Author: enriqueviard

android/src/main/java/com/ngs/react/RNTwilioVideo/IncomingVideoCallFullscreenActivity.java

@@ -8,7 +8,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
@@ -65,15 +65,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         TextView caller = findViewById(R.id.caller);
         TextView appName = findViewById(R.id.app_name);
-        TextView incomingVoiceCall = (TextView) findViewById(R.id.incomingVoiceCall);
+        TextView incomingVideoCall = (TextView) findViewById(R.id.incomingVideoCall);
         TextView decline = (TextView) findViewById(R.id.decline_text);
         TextView answer = (TextView) findViewById(R.id.answer_text);
         TextView goOffline = (TextView) findViewById(R.id.go_offline_text);
 
         Context context = getApplicationContext();
         SharedPreferences sharedPref = context.getSharedPreferences("db", Context.MODE_PRIVATE);
 
-        incomingVoiceCall.setText(sharedPref.getString(LocalizedKeys.INCOMING_VIDEO_CALL, "Incoming video call"));
+        incomingVideoCall.setText(sharedPref.getString(LocalizedKeys.INCOMING_VIDEO_CALL, "Incoming video call"));
         decline.setText(sharedPref.getString(LocalizedKeys.DECLINE, "Decline"));
         answer.setText(sharedPref.getString(LocalizedKeys.ACCEPT, "Accept"));
         goOffline.setText(sharedPref.getString(LocalizedKeys.GO_OFFLINE, "Go offline"));
@@ -116,7 +116,7 @@ private View.OnClickListener answer() {
                     this,
                     0,
                     answerIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                    PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
             );
 
             try {
@@ -144,7 +144,7 @@ private View.OnClickListener decline() {
                     this,
                     1,
                     rejectIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                    PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
             );
 
             try {
@@ -172,7 +172,7 @@ private View.OnClickListener goOffline() {
                     this,
                     1,
                     rejectIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                    PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
             );
 
             try {

android/src/main/java/com/ngs/react/RNTwilioVideo/TwilioVideoModule.java

@@ -195,18 +195,23 @@ public void getActiveCall(Promise promise) {
 
     @ReactMethod
     public void getCallInvite(Promise promise) {
+        Log.d(TAG, "getCallInvite");
         Activity activity = getCurrentActivity();
-        Intent intent = activity.getIntent();
-        VideoCallInvite activeCallInvite = intent.getParcelableExtra(INCOMING_CALL_INVITE);
-
-        if (activeCallInvite != null) {
-            Log.d(TAG, "Call invite found " + activeCallInvite);
-            WritableMap params = Arguments.createMap();
-            for (Map.Entry<String, String> entry : activeCallInvite.getData().entrySet()) {
-                params.putString(entry.getKey(), entry.getValue());
+        if (activity != null) {
+            Intent intent = activity.getIntent();
+            VideoCallInvite activeCallInvite = intent.getParcelableExtra(INCOMING_CALL_INVITE);
+
+            if (activeCallInvite != null) {
+                Log.d(TAG, "Call invite found " + activeCallInvite);
+                WritableMap params = Arguments.createMap();
+                for (Map.Entry<String, String> entry : activeCallInvite.getData().entrySet()) {
+                    params.putString(entry.getKey(), entry.getValue());
+                }
+                promise.resolve(params);
+                return;
             }
-            promise.resolve(params);
-            return;
+        } else {
+            Log.d(TAG, "Warning! getCurrentActivity() is null");
         }
         promise.resolve(null);
     }

android/src/main/java/com/ngs/react/RNTwilioVoice/IncomingVoiceCallFullscreenActivity.java

@@ -8,7 +8,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
@@ -122,7 +122,7 @@ private View.OnClickListener answer() {
                     this,
                     0,
                     answerIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                    PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
             );
 
             try {
@@ -150,7 +150,7 @@ private View.OnClickListener decline() {
                     this,
                     1,
                     rejectIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                    PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
             );
 
             try {
@@ -178,7 +178,7 @@ private View.OnClickListener goOffline() {
                     this,
                     1,
                     rejectIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                    PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
             );
 
             try {

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

@@ -687,17 +687,21 @@ public void getCallInvite(Promise promise) {
         Log.d(TAG, "getCallInvite");
 
         Activity activity = getCurrentActivity();
-        Intent intent = activity.getIntent();
-        activeCallInvite = intent.getParcelableExtra(VoiceConstants.INCOMING_CALL_INVITE);
+        if (activity != null) {
+            Intent intent = activity.getIntent();
+            activeCallInvite = intent.getParcelableExtra(VoiceConstants.INCOMING_CALL_INVITE);
 
-        if (activeCallInvite != null) {
-            if (BuildConfig.DEBUG) {
-                Log.d(TAG, "Call invite found "+ activeCallInvite);
+            if (activeCallInvite != null) {
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "Call invite found "+ activeCallInvite);
+                }
+                intent.removeExtra(VoiceConstants.INCOMING_CALL_INVITE);
+                WritableMap params = buildRNNotification(activeCallInvite);
+                promise.resolve(params);
+                return;
             }
-            intent.removeExtra(VoiceConstants.INCOMING_CALL_INVITE);
-            WritableMap params = buildRNNotification(activeCallInvite);
-            promise.resolve(params);
-            return;
+        } else {
+            Log.d(TAG, "Warning! getCurrentActivity() is null");
         }
         promise.resolve(null);
     }