Fixes #100: When a message arrives to Messenger the Call activity is opened by mistake

Author: atsakiridis

Examples/restcomm-messenger/app/src/main/java/com/telestax/restcomm_messenger/MainActivity.java

@@ -81,8 +81,8 @@ public void onError(Exception exception) {
 
         // TODO: we don't support capability tokens yet so let's use an empty string
         device = RCClient.createDevice("", this);
-        Intent intent = new Intent(getApplicationContext(), CallActivity.class);
-        device.setIncomingIntent(intent);
+        device.setPendingIntents(new Intent(getApplicationContext(), CallActivity.class),
+                new Intent(getApplicationContext(), MainActivity.class));
 
         params = new HashMap<String, String>();
 
@@ -175,21 +175,6 @@ public void onPresenceChanged(RCDevice device, RCPresenceEvent presenceEvent)
 
     }
 
-    public void onIncomingConnection(RCDevice device, RCConnection connection)
-    {
-    }
-
-    public void onIncomingMessage(RCDevice device, String message, HashMap<String, String> parameters)
-    {
-        Log.i(TAG, "Message arrived: " + message);
-        int result = audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
-        if (result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
-            messagePlayer.start();
-        }
-        // put new text on the bottom
-        txtWall.append(parameters.get("username") + ": " + message + "\n");
-    }
-
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -280,7 +265,7 @@ protected void onResume() {
             if (list.size() != 0) {
                 RCDevice device = list.get(0);
                 RCConnection pendingConnection = device.getPendingConnection();
-                onIncomingConnection(device, pendingConnection);
+                handleIncomingConnection(device, pendingConnection);
             }
         }
         if (intent.getAction() == RCDevice.INCOMING_MESSAGE) {
@@ -290,10 +275,26 @@ protected void onResume() {
                 RCConnection pendingConnection = device.getPendingConnection();
                 HashMap<String, String> parms = (HashMap)intent.getSerializableExtra("MESSAGE_PARMS");
                 String message = (String)intent.getSerializableExtra("MESSAGE");
-                onIncomingMessage(device, message, parms);
+                handleIncomingMessage(device, message, parms);
             }
         }
     }
+
+    public void handleIncomingConnection(RCDevice device, RCConnection connection)
+    {
+    }
+
+    public void handleIncomingMessage(RCDevice device, String message, HashMap<String, String> parameters)
+    {
+        Log.i(TAG, "Message arrived: " + message);
+        int result = audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
+        if (result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+            messagePlayer.start();
+        }
+        // put new text on the bottom
+        txtWall.append(parameters.get("username") + ": " + message + "\n");
+    }
+
     @Override
     protected void onPause() {
         super.onPause();

restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/client/sdk/RCDevice.java

@@ -115,7 +115,8 @@ public enum DeviceCapability {
     public static String EXTRA_SDP = "com.telestax.restcomm_messenger.SDP";
     //public static String EXTRA_DEVICE = "com.telestax.restcomm.android.client.sdk.extra-device";
     //public static String EXTRA_CONNECTION = "com.telestax.restcomm.android.client.sdk.extra-connection";
-    PendingIntent pendingIntent;
+    PendingIntent pendingCallIntent;
+    PendingIntent pendingMessageIntent;
     public RCConnection incomingConnection;
 
 
@@ -262,8 +263,9 @@ public void setDeviceListener(RCDeviceListener listener) {
 
     }
 
-    public void setIncomingIntent(Intent intent) {
-        pendingIntent = PendingIntent.getActivity(RCClient.getInstance().context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    public void setPendingIntents(Intent callIntent, Intent messageIntent) {
+        pendingCallIntent = PendingIntent.getActivity(RCClient.getInstance().context, 0, callIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        pendingMessageIntent = PendingIntent.getActivity(RCClient.getInstance().context, 0, messageIntent, PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
     public RCConnection getPendingConnection() {
@@ -372,7 +374,7 @@ public void run() {
                     Intent dataIntent = new Intent();
                     dataIntent.setAction(INCOMING_CALL);
                     dataIntent.putExtra(RCDevice.EXTRA_DID, from);
-                    pendingIntent.send(RCClient.getInstance().context, 0, dataIntent);
+                    pendingCallIntent.send(RCClient.getInstance().context, 0, dataIntent);
 
                 } catch (PendingIntent.CanceledException e) {
                     e.printStackTrace();
@@ -401,7 +403,7 @@ public void run() {
                     dataIntent.setAction(INCOMING_MESSAGE);
                     dataIntent.putExtra("MESSAGE_PARMS", finalParameters);
                     dataIntent.putExtra("MESSAGE", finalContent);
-                    pendingIntent.send(RCClient.getInstance().context, 0, dataIntent);
+                    pendingMessageIntent.send(RCClient.getInstance().context, 0, dataIntent);
                 } catch (PendingIntent.CanceledException e) {
                     e.printStackTrace();
                 }

restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/client/sdk/RCDeviceListener.java

@@ -53,22 +53,21 @@ public interface RCDeviceListener {
      */
     public abstract void onStopListening(RCDevice device, int errorCode, String errorText);
 
-    // TODO: this should be removed and handled via Android Intents, but to make some tests let's leave it as-is for now
     /**
      *  RCDevice received incoming connection
      *
      *  @param device     Device of interest
      *  @param connection Newly established connection
      */
-    public abstract void onIncomingConnection(RCDevice device, RCConnection connection);
+    //public abstract void onIncomingConnection(RCDevice device, RCConnection connection);
 
     /**
      * Text message received
      * @param device  Device of interest
      * @param message  Tex message
      * @param parameters  Parameters, such as 'username' designating the username who sent the message
      */
-    public abstract void onIncomingMessage(RCDevice device, String message, HashMap<String, String> parameters);
+    //public abstract void onIncomingMessage(RCDevice device, String message, HashMap<String, String> parameters);
 
     /**
      *  Called to query whether the application wants to retrieve presence events. Return false to indicate that the application isn't interested (<b>Not implemented yet</b>)