From d2d195b69820c3125f67af3cc8ec85f036bd31c9 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 19 Apr 2011 14:10:50 +0200
Subject: [PATCH] Fix key presses disabled by softvolume.

---
 src/org/linphone/SoftVolumeActivity.java | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/org/linphone/SoftVolumeActivity.java b/src/org/linphone/SoftVolumeActivity.java
index f8c731f5f..4975bf880 100644
--- a/src/org/linphone/SoftVolumeActivity.java
+++ b/src/org/linphone/SoftVolumeActivity.java
@@ -34,21 +34,19 @@ public class SoftVolumeActivity extends Activity {
 
 	
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (keyCode != KeyEvent.KEYCODE_VOLUME_UP && keyCode != KeyEvent.KEYCODE_VOLUME_DOWN) {
-			return false;
+		if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)
+				&& (Hacks.needSoftvolume() || LinphonePreferenceManager.getInstance().useSoftvolume())) {
+
+			if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+				LinphoneManager.getInstance().adjustSoftwareVolume(1);
+			} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+				LinphoneManager.getInstance().adjustSoftwareVolume(-1);
+			}
 		}
-
-		if (!Hacks.needSoftvolume() && !LinphonePreferenceManager.getInstance().useSoftvolume())
-			return false;
-
 		
-		if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-			LinphoneManager.getInstance().adjustSoftwareVolume(1);
-		} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-			LinphoneManager.getInstance().adjustSoftwareVolume(-1);
-		} 
-		
-		return preventVolumeBarToDisplay;
+		if (!preventVolumeBarToDisplay) {
+			return super.onKeyDown(keyCode, event);
+		} else return true;
 	}