Merge pull request #14 from linhvovan29546/fix/prevent-open-app-actio…

…n-endcall

Fix/prevent open app action end call

android/src/main/java/com/reactnativefullscreennotificationincomingcall/IncomingCallService.java

@@ -17,7 +17,8 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.util.Log;
-
+import android.content.BroadcastReceiver;
+import android.content.IntentFilter;
 
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
@@ -41,6 +42,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     if (action != null) {
       if (action.equals(Constants.ACTION_SHOW_INCOMING_CALL)) {
         NotificationReceiverHandler.updateCanClick(true);
+        registerBroadcastPressEvent();
         Bundle bundle = intent.getExtras();
         uuid= bundle.getString("uuid");
         if(bundle.containsKey("timeout")){
@@ -75,6 +77,11 @@ public void onTaskRemoved(Intent rootIntent) {
 
 
   private PendingIntent onButtonNotificationClick(int id, String action,String eventName) {
+    if(action == Constants.ACTION_PRESS_DECLINE_CALL){
+      Intent  buttonIntent= new Intent();
+      buttonIntent.setAction(action);
+      return PendingIntent.getBroadcast(this,id , buttonIntent, PendingIntent.FLAG_IMMUTABLE);
+    }
     Intent emptyScreenIntent = new Intent(this, NotificationReceiverActivity.class);
     emptyScreenIntent.setAction(action);
     emptyScreenIntent.putExtras(bundleData);
@@ -161,6 +168,20 @@ public void onDestroy() {
     stopForeground(true);
   }
 
+  public void registerBroadcastPressEvent() {
+    if (isRegistered) return;
+    IntentFilter filter = new IntentFilter();
+    filter.addAction(Constants.ACTION_PRESS_DECLINE_CALL);
+    getApplicationContext().registerReceiver(mReceiver, filter);
+    isRegistered = true;
+  }
+
+  public void unregisterBroadcastPressEvent() {
+    if (!isRegistered) return;
+    getApplicationContext().unregisterReceiver(mReceiver);
+    isRegistered = false;
+  }
+
   public  void setTimeOutEndCall(String uuid) {
     callhandle=new Handler();
     handleTimeout=new Runnable() {
@@ -201,6 +222,31 @@ private int getColorForResourceName(Context context, String colorPath){
 
     return desiredColor;
   }
+
+  private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      String action = intent.getAction();
+      if (action != null) {
+        if(action.equals(Constants.ACTION_PRESS_DECLINE_CALL)){
+          boolean canClick=NotificationReceiverHandler.getStatusClick();
+          if(!canClick)return;
+          NotificationReceiverHandler.disableClick();
+          cancelTimer();
+          if (IncomingCallActivity.active) {
+            IncomingCallActivity.getInstance().destroyActivity(false);
+          }
+          WritableMap params = Arguments.createMap();
+          params.putString("callUUID", uuid);
+          params.putString("endAction", Constants.ACTION_REJECTED_CALL);
+          FullScreenNotificationIncomingCallModule.sendEventToJs(Constants.RNNotificationEndCallAction,params);
+          stopForeground(true);
+        }
+      }
+    }
+  };
+
+
 }
 
 

android/src/main/java/com/reactnativefullscreennotificationincomingcall/NotificationReceiverHandler.java

@@ -23,6 +23,14 @@ static void updateCanClick(Boolean status){
     openedInComing=status;
   }
 
+  static void disableClick(){
+    canClick=false;
+  }
+
+  static Boolean getStatusClick(){
+    return canClick;
+  }
+
   private static void handleNotificationIntent(Context context, Intent intent) {
     if(!canClick) return;
     String action= intent.getAction();
@@ -32,7 +40,6 @@ private static void handleNotificationIntent(Context context, Intent intent) {
         canClick=false;
         handleNotificationPressIntent(context, intent);
         break;
-      case Constants.ACTION_PRESS_DECLINE_CALL:
       case Constants.ACTION_PRESS_ANSWER_CALL:
         canClick=false;
         handleNotificationActionIntent(context,intent);

example/package.json

@@ -11,6 +11,7 @@
   "dependencies": {
     "react": "17.0.2",
     "react-native": "0.65.1",
+    "react-native-background-timer": "^2.4.1",
     "uuid-random": "^1.3.2"
   },
   "devDependencies": {
@@ -19,4 +20,4 @@
     "babel-plugin-module-resolver": "^4.0.0",
     "metro-react-native-babel-preset": "^0.66.0"
   }
-}
+}

example/src/App.tsx

@@ -2,17 +2,18 @@ import * as React from 'react';
 import RNNotificationCall from '../../src/index'
 import { StyleSheet, View, Text, TouchableOpacity } from 'react-native';
 import ramdomUuid from 'uuid-random';
+import BackgroundTimer from 'react-native-background-timer';
 
 export default function App() {
   React.useEffect(() => {
 
     RNNotificationCall.addEventListener("answer", (payload) => {
       console.log('press answer', payload.callUUID)
-
     })
     RNNotificationCall.addEventListener("endCall", (payload) => {
       console.log('press endCall', payload.callUUID)
     })
+
     return () => {
       RNNotificationCall.removeEventListener("answer")
       RNNotificationCall.removeEventListener("endCall")
@@ -24,23 +25,33 @@ export default function App() {
     return ramdomUuid().toLowerCase();
   };
   const display = () => {
-    const uid = getCurrentCallId()
-    console.log('uid', uid)
-    RNNotificationCall.displayNotification(
-      uid,
-      null,
-      30000,
-      {
-        channelId: "com.abc.incomingcall",
-        channelName: "Incoming video call",
-        notificationIcon: "ic_launcher",//mipmap
-        notificationTitle: "Linh Vo",
-        notificationBody: "Incoming video call",
-        answerText: "Answer",
-        declineText: "Decline",
-        notificationColor: 'colorAccent'//path color in android
-      }
-    )
+    // Start a timer that runs once after X milliseconds
+    const timeoutId = BackgroundTimer.setTimeout(() => {
+      // this will be executed once after 10 seconds
+      // even when app is the the background
+      const uid = getCurrentCallId()
+      console.log('uid', uid)
+      RNNotificationCall.displayNotification(
+        uid,
+        null,
+        30000,
+        {
+          channelId: "com.abc.incomingcall",
+          channelName: "Incoming video call",
+          notificationIcon: "ic_launcher",//mipmap
+          notificationTitle: "Linh Vo",
+          notificationBody: "Incoming video call",
+          answerText: "Answer",
+          declineText: "Decline",
+          notificationColor: 'colorAccent'//path color in android
+        }
+      )
+      // Cancel the timeout if necessary
+      BackgroundTimer.clearTimeout(timeoutId);
+    }, 1000);
+
+    //rest of code will be performing for iOS on background too
+
   }
   const onHide = () => {
     RNNotificationCall.hideNotification()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-full-screen-notification-incoming-call",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Android full screen notification incoming call for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",