From 30d294466b33b2472f8d6c838a9802270117070f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Fri, 31 May 2013 11:28:53 +0200
Subject: [PATCH] Some fixes

---
 src/org/linphone/BluetoothManager.java  |  5 ++---
 src/org/linphone/LinphoneManager.java   | 17 ++++++++++++-----
 src/org/linphone/VideoCallFragment.java |  9 +++++++--
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/org/linphone/BluetoothManager.java b/src/org/linphone/BluetoothManager.java
index 50fb942a1..66fe063f7 100644
--- a/src/org/linphone/BluetoothManager.java
+++ b/src/org/linphone/BluetoothManager.java
@@ -32,12 +32,11 @@ import android.os.Build;
  */
 @TargetApi(Build.VERSION_CODES.HONEYCOMB)
 public class BluetoothManager extends BroadcastReceiver {
-	 @SuppressWarnings("deprecation")
+	@SuppressWarnings("deprecation")
 	public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
         LinphoneManager lm = LinphoneManager.getInstance();
         
-        String actionScoConnected = AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED;
         if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
             Log.e("Bluetooth Received Event" + " ACTION_ACL_DISCONNECTED" );
             
@@ -53,7 +52,7 @@ public class BluetoothManager extends BroadcastReceiver {
             	lm.scoConnected();
             }
         } 
-        else if (actionScoConnected.equals(action)) {
+        else if (AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED.equals(action)) {
         	int state = intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, 0);
     		Log.e("Bluetooth sco state changed : " + state);
         	if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) {
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 8d142d956..8bd9fc296 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -18,7 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
-import static android.media.AudioManager.MODE_NORMAL;
 import static android.media.AudioManager.MODE_RINGTONE;
 import static android.media.AudioManager.STREAM_RING;
 import static android.media.AudioManager.STREAM_VOICE_CALL;
@@ -253,6 +252,7 @@ public class LinphoneManager implements LinphoneCoreListener {
 	}
 	
 	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+	@SuppressWarnings("deprecation")
 	public void startBluetooth() {
 		mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
 		if (mBluetoothAdapter.isEnabled()) {
@@ -277,9 +277,11 @@ public class LinphoneManager implements LinphoneCoreListener {
 				};
 				mBluetoothAdapter.getProfileProxy(mServiceContext, mProfileListener, BluetoothProfile.HEADSET);
 			} else {
-				@SuppressWarnings("deprecation")
-				String actionScoConnected = AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED;
-				Intent currentValue = mServiceContext.registerReceiver(bluetoothReiceiver, new IntentFilter(actionScoConnected));
+				try {
+					mServiceContext.unregisterReceiver(bluetoothReiceiver);
+				} catch (Exception e) {}
+				
+				Intent currentValue = mServiceContext.registerReceiver(bluetoothReiceiver, new IntentFilter(AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED));
 				int state = currentValue == null ? 0 : currentValue.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, 0);
 	        	if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) {
 	        		isBluetoothScoConnected = true;
@@ -970,6 +972,10 @@ public class LinphoneManager implements LinphoneCoreListener {
 			chatStorage.close();
 			chatStorage = null;
 		}
+
+		try {
+			mServiceContext.unregisterReceiver(bluetoothReiceiver);
+		} catch (Exception e) {}
 		
 		try {
 			if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30))
@@ -1226,7 +1232,7 @@ public class LinphoneManager implements LinphoneCoreListener {
 			if (activity != null) {
 				TelephonyManager tm = (TelephonyManager) activity.getSystemService(Context.TELEPHONY_SERVICE);
 				if (tm.getCallState() == TelephonyManager.CALL_STATE_IDLE) {
-					mAudioManager.setMode(MODE_NORMAL);
+					mAudioManager.setMode(AudioManager.MODE_NORMAL);
 				}
 			}
 		}
@@ -1256,6 +1262,7 @@ public class LinphoneManager implements LinphoneCoreListener {
 			} else {
 				Log.i("New call active while incall (CPU only) wake lock already active");
 			}
+			mAudioManager.setMode(AudioManager.MODE_IN_CALL);
 		}
 		mListenerDispatcher.onCallStateChanged(call, state, message);
 	}
diff --git a/src/org/linphone/VideoCallFragment.java b/src/org/linphone/VideoCallFragment.java
index 5cb9f76ba..cb32628b5 100644
--- a/src/org/linphone/VideoCallFragment.java
+++ b/src/org/linphone/VideoCallFragment.java
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 import org.linphone.compatibility.Compatibility;
 import org.linphone.compatibility.CompatibilityScaleGestureDetector;
 import org.linphone.compatibility.CompatibilityScaleGestureListener;
+import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCore;
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
@@ -177,8 +178,12 @@ public class VideoCallFragment extends Fragment implements OnGestureListener, On
 		float landscapeZoomFactor = ((float) mVideoView.getWidth()) / (float) ((3 * mVideoView.getHeight()) / 4);
     	mZoomFactor = Math.max(0.1f, Math.min(mZoomFactor, Math.max(portraitZoomFactor, landscapeZoomFactor)));
 
-    	LinphoneManager.getLc().getCurrentCall().zoomVideo(mZoomFactor, mZoomCenterX, mZoomCenterY);
-        return true;
+    	LinphoneCall currentCall = LinphoneManager.getLc().getCurrentCall();
+    	if (currentCall != null) {
+    		currentCall.zoomVideo(mZoomFactor, mZoomCenterX, mZoomCenterY);
+            return true;
+    	}
+        return false;
     }
 
 	@Override