From 4a2d9e5309971e3b916b29a083821d087e8540e7 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Wed, 22 May 2019 15:24:55 +0300
Subject: [PATCH] - Fixed restoring of volume to original level if default call
 volume is in use.

---
 app/build.gradle                                         | 4 ++--
 app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt | 8 ++++----
 fastlane/metadata/android/en-US/changelogs/8.0.1.txt     | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/8.0.1.txt

diff --git a/app/build.gradle b/app/build.gradle
index 358b9651..f09fc41a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId = 'com.tutpro.baresip'
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode = 62
-        versionName = '8.0.0'
+        versionCode = 63
+        versionName = '8.0.1'
         externalNativeBuild {
             cmake {
                 cFlags '-DHAVE_INTTYPES_H'
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 3976af8f..a8dd8834 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -41,7 +41,7 @@ class BaresipService: Service() {
     internal var rtTimer: Timer? = null
     internal var audioFocusRequest: AudioFocusRequest? = null
     internal var audioFocused = false
-    internal var origCallVolume = 0
+    internal var origCallVolume = -1
 
     override fun onCreate() {
 
@@ -393,7 +393,7 @@ class BaresipService: Service() {
                             requestAudioFocus(AudioManager.STREAM_VOICE_CALL)
                         }
                         if (callVolume != 0) {
-                            origCallVolume = am.getStreamMaxVolume(am.mode)
+                            origCallVolume = am.getStreamVolume(am.mode)
                             am.setStreamVolume(am.mode,
                                     (callVolume * 0.1 * am.getStreamMaxVolume(am.mode)).roundToInt(),
                                     0)
@@ -480,9 +480,9 @@ class BaresipService: Service() {
                         }
                         if (Call.calls().size == 0) {
                             abandonAudioFocus()
-                            if (origCallVolume != 0) {
+                            if (origCallVolume != -1) {
                                 am.setStreamVolume(am.mode, origCallVolume, 0)
-                                origCallVolume = 0
+                                origCallVolume = -1
                             }
                             Log.d(LOG_TAG, "Call volume of stream ${am.mode} is ${am.getStreamVolume(am.mode)}")
                             am.mode = AudioManager.MODE_NORMAL
diff --git a/fastlane/metadata/android/en-US/changelogs/8.0.1.txt b/fastlane/metadata/android/en-US/changelogs/8.0.1.txt
new file mode 100644
index 00000000..55226bef
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/8.0.1.txt
@@ -0,0 +1 @@
+- Fixed restoring of volume to original level if default call volume is in use.