cordova-plugin-salus-call 0.2.0 → 0.2.1

package/README.md

@@ -7,7 +7,7 @@ Plugin proprietário do Salus para integrar a interface Cordova ao ciclo de vida
 ## Instalação
 
 ```xml
-<plugin name="cordova-plugin-salus-call" spec="0.2.0" />
+<plugin name="cordova-plugin-salus-call" spec="0.2.1" />
 ```
 
 ## API

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-salus-call",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Integração nativa de chamadas VoIP para o aplicativo Salus.",
   "license": "UNLICENSED",
   "private": false,
@@ -29,7 +29,7 @@
   },
   "engines": {
     "cordovaDependencies": {
-      "0.2.0": {
+      "0.2.1": {
         "cordova": ">=12.0.0",
         "cordova-android": ">=14.0.0"
       }

package/plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-salus-call"
-        version="0.2.0">
+        version="0.2.1">
     <name>Salus Call</name>
     <description>Ponte nativa para chamadas de interfone do Salus.</description>
     <license>UNLICENSED</license>

package/src/android/SalusCallActionReceiver.java

@@ -24,13 +24,8 @@ public class SalusCallActionReceiver extends BroadcastReceiver {
             SalusCallPlugin.dispatchEvent(context, event);
 
             if (answered) {
-                Intent launch = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
-                if (launch != null) {
-                    launch.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    launch.putExtra(SalusCallNotificationManager.EXTRA_CALL, call.toString());
-                    launch.putExtra("salus_call_action", "answer");
-                    context.startActivity(launch);
-                }
+                Intent launch = SalusCallNotificationManager.launchIntent(context, call, "answer");
+                context.startActivity(launch);
             }
         } catch (Exception ignored) {}
     }

package/src/android/SalusCallNotificationManager.java

@@ -32,7 +32,7 @@ public final class SalusCallNotificationManager {
         int notificationId = notificationId(callId);
 
         Person caller = new Person.Builder().setName(callerName).setImportant(true).build();
-        PendingIntent answer = actionIntent(context, ACTION_ANSWER, call, notificationId + 1);
+        PendingIntent answer = answerIntent(context, call, notificationId + 1);
         PendingIntent reject = actionIntent(context, ACTION_REJECT, call, notificationId + 2);
         PendingIntent open = openAppIntent(context, call, notificationId + 3);
 
@@ -100,13 +100,24 @@ public final class SalusCallNotificationManager {
         return PendingIntent.getBroadcast(context, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 
+    private static PendingIntent answerIntent(Context context, JSONObject call, int requestCode) {
+        Intent intent = launchIntent(context, call, "answer");
+        intent.setAction(ACTION_ANSWER);
+        return PendingIntent.getActivity(context, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+    }
+
     private static PendingIntent openAppIntent(Context context, JSONObject call, int requestCode) {
+        Intent intent = launchIntent(context, call, "open");
+        return PendingIntent.getActivity(context, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+    }
+
+    static Intent launchIntent(Context context, JSONObject call, String action) {
         Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
         if (intent == null) intent = new Intent();
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
         intent.putExtra(EXTRA_CALL, call.toString());
-        intent.putExtra("salus_call_action", "open");
-        return PendingIntent.getActivity(context, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+        intent.putExtra("salus_call_action", action);
+        return intent;
     }
 
     private static int notificationId(String callId) {

package/src/android/SalusCallPlugin.java

@@ -20,6 +20,7 @@ public class SalusCallPlugin extends CordovaPlugin {
     public void initialize(CordovaInterface cordova, CordovaWebView webView) {
         super.initialize(cordova, webView);
         activeInstance = this;
+        handleLaunchIntent(cordova.getActivity().getIntent());
     }
 
     @Override
@@ -103,6 +104,7 @@ public class SalusCallPlugin extends CordovaPlugin {
 
     @Override
     public void onNewIntent(Intent intent) {
+        handleLaunchIntent(intent);
         emitPendingEvents();
     }
 
@@ -127,4 +129,34 @@ public class SalusCallPlugin extends CordovaPlugin {
         event.put("timestamp", System.currentTimeMillis());
         emitEvent(event);
     }
+
+    private void handleLaunchIntent(Intent intent) {
+        if (intent == null) return;
+
+        String action = intent.getStringExtra("salus_call_action");
+        String callJson = intent.getStringExtra(SalusCallNotificationManager.EXTRA_CALL);
+        if (action == null || callJson == null || callJson.isEmpty()) return;
+
+        intent.removeExtra("salus_call_action");
+        intent.removeExtra(SalusCallNotificationManager.EXTRA_CALL);
+
+        try {
+            JSONObject call = new JSONObject(callJson);
+            String callId = call.optString("callId", "");
+            SalusCallNotificationManager.cancel(cordova.getContext(), callId);
+
+            JSONObject event = new JSONObject();
+            if ("answer".equals(action)) {
+                event.put("type", "answered");
+                event.put("reason", "system_answer");
+            } else {
+                event.put("type", "opened");
+                event.put("reason", "notification_open");
+            }
+            event.put("callId", callId);
+            event.put("call", call);
+            event.put("timestamp", System.currentTimeMillis());
+            dispatchEvent(cordova.getContext(), event);
+        } catch (Exception ignored) {}
+    }
 }