Fixed #397: Ringing sound takes too long to kick in

Author: Antonis Tsakiridis

Examples/restcomm-olympus/app/olympus-version.properties

@@ -1,2 +1,2 @@
-#Mon Sep 19 12:31:43 EEST 2016
-VERSION_CODE=1263
+#Mon Sep 19 12:37:17 EEST 2016
+VERSION_CODE=1267

restcomm.android.sdk/restcomm-android-sdk-version.properties

@@ -1,2 +1,2 @@
-#Mon Sep 19 12:31:43 EEST 2016
-VERSION_CODE=1283
+#Mon Sep 19 12:37:17 EEST 2016
+VERSION_CODE=1287

restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/MediaClient/AppRTCAudioManager.java

@@ -237,7 +237,7 @@ public void run()
 
       // Request audio focus before making any device switch.
       audioManager.requestAudioFocus(null, AudioManager.STREAM_VOICE_CALL,
-            AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
+            AudioManager.AUDIOFOCUS_GAIN);
 
       // Start by setting MODE_IN_COMMUNICATION as default audio mode. It is
       // required to be in this mode when playout and/or recording starts for

restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/RCConnection.java

@@ -333,14 +333,6 @@ private RCConnection(Builder builder)
          remoteMediaType = RCConnection.sdp2Mediatype(builder.incomingCallSdp);
       }
       peer = builder.peer;
-
-      audioManager.startCallMedia();
-      /*
-      if (incoming) {
-         audioManager.playRingingSound();
-      }
-      */
-
       timeoutHandler = new Handler(device.getMainLooper());
    }
 
@@ -1468,6 +1460,7 @@ public void run()
 
             // stop any calling or ringing sound
             audioManager.stop();
+            audioManager.startCallMedia();
 
             // we 're connected, cancel any pending timeout timers
             timeoutHandler.removeCallbacksAndMessages(null);

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

@@ -949,7 +949,7 @@ public void onCallArrivedEvent(String jobId, String peer, String sdpOffer, HashM
    {
       RCLogger.i(TAG, "onCallArrivedEvent(): id: " + jobId + ", peer: " + peer);
 
-      audioManager.playRingingSound();
+      //audioManager.playRingingSound();
 
       // filter out potential '<' and '>' and leave just the SIP URI
       String peerSipUri = peer.replaceAll("^<", "").replaceAll(">$", "");
@@ -966,6 +966,7 @@ public void onCallArrivedEvent(String jobId, String peer, String sdpOffer, HashM
       state = DeviceState.BUSY;
 
       if (isServiceAttached) {
+         audioManager.playRingingSound();
          // Service is attached to an activity, let's send the intent normally that will open the call activity
          callIntent.setAction(ACTION_INCOMING_CALL);
          callIntent.putExtra(RCDevice.EXTRA_DID, peerSipUri);
@@ -1116,7 +1117,7 @@ void onNotificationCall(RCConnection connection, HashMap<String, String> customH
                   .setSmallIcon(R.drawable.ic_call_24dp)
                   .setContentTitle(peerUsername)
                   .setContentText(text)
-                  //.setSound(Uri.parse("android.resource://" + getPackageName() + "/" + audioManager.getResourceIdForKey(ParameterKeys.RESOURCE_SOUND_RINGING)))
+                  .setSound(Uri.parse("android.resource://" + getPackageName() + "/" + audioManager.getResourceIdForKey(ParameterKeys.RESOURCE_SOUND_RINGING)))
                   // 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)
@@ -1130,7 +1131,7 @@ void onNotificationCall(RCConnection connection, HashMap<String, String> customH
 
       Notification notification = builder.build();
       // Add FLAG_INSISTENT so that the notification rings repeatedly (FLAG_INSISTENT is not exposed via builder, let's add manually)
-      //notification.flags = notification.flags | Notification.FLAG_INSISTENT;
+      notification.flags = notification.flags | Notification.FLAG_INSISTENT;
 
       boolean notificationIdExists = true;
       Integer activeNotificationId = callNotifications.get(peerUsername);