Fixed RestComm#395: Sometimes a live call in Olympus cannot be opened…

… from the Notifications drawer
tadhackkl16 · Sep 19, 2016 · 1048ad8 · 1048ad8
1 parent ddb1150
commit 1048ad8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/Examples/restcomm-olympus/.idea/misc.xml b/Examples/restcomm-olympus/.idea/misc.xml
diff --git a/Examples/restcomm-olympus/.idea/modules.xml b/Examples/restcomm-olympus/.idea/modules.xml
diff --git a/Examples/restcomm-olympus/app/olympus-version.properties b/Examples/restcomm-olympus/app/olympus-version.properties
@@ -1,2 +1,2 @@
-#Fri Sep 16 17:29:02 EEST 2016
-VERSION_CODE=1226
+#Mon Sep 19 10:28:34 EEST 2016
+VERSION_CODE=1239
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 16 17:29:02 EEST 2016
-VERSION_CODE=1246
+#Mon Sep 19 10:28:34 EEST 2016
+VERSION_CODE=1259
diff --git a/restcomm.android.sdk/restcomm.android.sdk.iml b/restcomm.android.sdk/restcomm.android.sdk.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":restcomm.android.sdk" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../Examples/restcomm-helloworld" external.system.id="GRADLE" external.system.module.group="restcomm-helloworld" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":restcomm.android.sdk" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../Examples/restcomm-olympus" external.system.id="GRADLE" external.system.module.group="restcomm-olympus" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -64,14 +64,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />

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
@@ -1426,9 +1426,9 @@ private void notificationHandleForegroundUpdate(RCConnection connection)
                   .setSmallIcon(R.drawable.ic_phone_in_talk_24dp)
                   .setContentTitle(peerUsername)
                   .setContentText("Tap to return to call")
-                  .addAction(resId, muteString, PendingIntent.getService(getApplicationContext(), 0, serviceIntentMute, PendingIntent.FLAG_ONE_SHOT))
-                  .addAction(R.drawable.ic_call_end_24dp, "Hang up", PendingIntent.getService(getApplicationContext(), 0, serviceIntentDisconnect, PendingIntent.FLAG_ONE_SHOT))
-                  .setContentIntent(PendingIntent.getActivity(getApplicationContext(), 0, callIntent, PendingIntent.FLAG_ONE_SHOT));
+                  .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));
 
       startForeground(ONCALL_NOTIFICATION_ID, builder.build());
    }