Fixed #405: When an incoming video call is answered as audio the loca…

…l screen goes black
RestComm · Sep 23, 2016 · 3048e9e · 3048e9e
1 parent eca15ce
commit 3048e9e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Examples/restcomm-olympus/app/olympus-version.properties b/Examples/restcomm-olympus/app/olympus-version.properties
@@ -1,2 +1,2 @@
-#Fri Sep 23 11:55:37 EEST 2016
-VERSION_CODE=1495
+#Fri Sep 23 14:26:47 EEST 2016
+VERSION_CODE=1500
diff --git a/restcomm.android.sdk/restcomm-android-sdk-version.properties b/restcomm.android.sdk/restcomm-android-sdk-version.properties
@@ -1,2 +1,2 @@
-#Fri Sep 23 11:55:37 EEST 2016
-VERSION_CODE=1518
+#Fri Sep 23 14:26:47 EEST 2016
+VERSION_CODE=1523
diff --git a/restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCConnection.java b/restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCConnection.java
@@ -1212,7 +1212,7 @@ else if (state == VideoViewState.REMOTE_VIEW_RECEIVED) {
          //remoteRender.setVisibility(View.VISIBLE);
       }
       else if (state == VideoViewState.ICE_CONNECTED) {
-         if (remoteVideoReceived) {
+         if (remoteVideoReceived && localMediaType == ConnectionMediaType.AUDIO_VIDEO) {
             remoteRender.setVisibility(View.VISIBLE);
 
             remoteRenderLayout.setPosition(REMOTE_X, REMOTE_Y, REMOTE_WIDTH, REMOTE_HEIGHT);

diff --git a/restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCDevice.java b/restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCDevice.java
@@ -1183,13 +1183,13 @@ void onNotificationCall(RCConnection connection, HashMap<String, String> customH
                   // Need this to show up as Heads-up Notification
                   .setPriority(NotificationCompat.PRIORITY_HIGH)
                   .setAutoCancel(true)  // cancel notification when user acts on it (Important: only applies to default notification area, not additional actions)
-                  .addAction(R.drawable.ic_videocam_24dp, "", PendingIntent.getService(getApplicationContext(), 0, serviceIntentVideo, PendingIntent.FLAG_ONE_SHOT))
-                  .addAction(R.drawable.ic_call_24dp, "", PendingIntent.getService(getApplicationContext(), 0, serviceIntentAudio, PendingIntent.FLAG_ONE_SHOT))
-                  .addAction(R.drawable.ic_call_end_24dp, "", PendingIntent.getService(getApplicationContext(), 0, serviceIntentDecline, PendingIntent.FLAG_ONE_SHOT))
+                  .addAction(R.drawable.ic_videocam_24dp, "", PendingIntent.getService(getApplicationContext(), 0, serviceIntentVideo, PendingIntent.FLAG_UPDATE_CURRENT))
+                  .addAction(R.drawable.ic_call_24dp, "", PendingIntent.getService(getApplicationContext(), 0, serviceIntentAudio, PendingIntent.FLAG_UPDATE_CURRENT))
+                  .addAction(R.drawable.ic_call_end_24dp, "", PendingIntent.getService(getApplicationContext(), 0, serviceIntentDecline, PendingIntent.FLAG_UPDATE_CURRENT))
                   .setVibrate(notificationVibrationPattern)
                   .setLights(notificationColor, notificationColorPattern[0], notificationColorPattern[1])
-                  .setContentIntent(PendingIntent.getService(getApplicationContext(), 0, serviceIntentDefault, PendingIntent.FLAG_ONE_SHOT))
-                  .setDeleteIntent(PendingIntent.getService(getApplicationContext(), 0, serviceIntentDelete, PendingIntent.FLAG_ONE_SHOT));
+                  .setContentIntent(PendingIntent.getService(getApplicationContext(), 0, serviceIntentDefault, PendingIntent.FLAG_UPDATE_CURRENT))
+                  .setDeleteIntent(PendingIntent.getService(getApplicationContext(), 0, serviceIntentDelete, PendingIntent.FLAG_UPDATE_CURRENT));
 
       Notification notification = builder.build();
       // Add FLAG_INSISTENT so that the notification rings repeatedly (FLAG_INSISTENT is not exposed via builder, let's add manually)