Added some more debugging logs for sounds

Author: Antonis Tsakiridis

Examples/restcomm-olympus/.idea/misc.xml

@@ -1,2 +1,2 @@
-#Mon Sep 19 10:28:34 EEST 2016
-VERSION_CODE=1239
+#Mon Sep 19 12:31:43 EEST 2016
+VERSION_CODE=1263

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

@@ -1,2 +1,2 @@
-#Mon Sep 19 10:28:34 EEST 2016
-VERSION_CODE=1259
+#Mon Sep 19 12:31:43 EEST 2016
+VERSION_CODE=1283

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

@@ -270,9 +270,9 @@ public void abandonFocus()
 
    }
 
-   public void endCall()
+   public void endCallMedia()
    {
-      RCLogger.d(TAG, "endCall");
+      RCLogger.d(TAG, "endCallMedia");
       if (!callAudioInitialized) {
          return;
       }

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

@@ -27,12 +27,15 @@ public class MediaPlayerWrapper implements MediaPlayer.OnCompletionListener {
 
    MediaPlayerWrapper(Context androidContext)
    {
+      RCLogger.v(TAG, "MediaPlayerWrapper()");
       this.androidContext = androidContext;
    }
 
    void play(int resid, boolean loop)
    {
+      RCLogger.v(TAG, "MediaPlayerWrapper.play(): " + resid);
       if (mediaPlayer != null) {
+         RCLogger.v(TAG, "MediaPlayerWrapper.play(): reset");
          mediaPlayer.stop();
          mediaPlayer.release();
          mediaPlayer = null;
@@ -54,7 +57,9 @@ void play(int resid, boolean loop)
 
    void stop()
    {
+      RCLogger.v(TAG, "MediaPlayerWrapper.stop()");
       if (mediaPlayer != null) {
+         RCLogger.v(TAG, "MediaPlayerWrapper.stop(): stopping");
          mediaPlayer.stop();
          mediaPlayer.release();
          mediaPlayer = null;
@@ -65,6 +70,7 @@ void stop()
 
    void close()
    {
+      RCLogger.v(TAG, "MediaPlayerWrapper.close()");
       if (mediaPlayer != null) {
          mediaPlayer.stop();
          mediaPlayer.release();
@@ -76,12 +82,15 @@ void close()
 
    public void onCompletion(MediaPlayer mediaPlayer)
    {
-      RCLogger.i(TAG, "onCompletion()");
+      RCLogger.v(TAG, "onCompletion()");
       ((AudioManager) androidContext.getSystemService(Context.AUDIO_SERVICE)).abandonAudioFocus(null);
 
-      this.mediaPlayer.stop();
-      //   mediaPlayer.reset();
-      this.mediaPlayer.release();
-      this.mediaPlayer = null;
+      if (this.mediaPlayer != null) {
+         RCLogger.v(TAG, "onCompletion(): reset");
+         this.mediaPlayer.stop();
+         //   mediaPlayer.reset();
+         this.mediaPlayer.release();
+         this.mediaPlayer = null;
+      }
    }
 }

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

@@ -1268,7 +1268,7 @@ private void disconnectWebrtc()
       }
 
       releaseVideo();
-      audioManager.endCall();
+      audioManager.endCallMedia();
    }
 
    private void releaseVideo()

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

@@ -1426,6 +1426,8 @@ private void notificationHandleForegroundUpdate(RCConnection connection)
                   .setSmallIcon(R.drawable.ic_phone_in_talk_24dp)
                   .setContentTitle(peerUsername)
                   .setContentText("Tap to return to call")
+                  // Notice that for some reason using FLAG_UPDATE_CURRENT doesn't work. The problem is that the intent creates a new Call Activity instead of
+                  // taking us to the existing.
                   .addAction(resId, muteString, PendingIntent.getService(getApplicationContext(), 0, serviceIntentMute, PendingIntent.FLAG_CANCEL_CURRENT))
                   .addAction(R.drawable.ic_call_end_24dp, "Hang up", PendingIntent.getService(getApplicationContext(), 0, serviceIntentDisconnect, PendingIntent.FLAG_CANCEL_CURRENT))
                   .setContentIntent(PendingIntent.getActivity(getApplicationContext(), 0, callIntent, PendingIntent.FLAG_CANCEL_CURRENT));