From cf93c422b597d05299fbd05a1750a63efd119cd0 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 22 Mar 2010 12:03:53 +0100
Subject: [PATCH] fix proximity sensor crashes while exiting

---
 AndroidManifest.xml                    | 2 +-
 src/org/linphone/DialerActivity.java   | 5 +----
 src/org/linphone/LinphoneActivity.java | 7 +++++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b556f3c10..a655f64dd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,9 +3,9 @@
       package="org.linphone"
       android:versionCode="1"
       android:versionName="1.0">
+    <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/linphone2" android:label="@string/app_name" android:debuggable = "true">
          
-        <uses-sdk android:minSdkVersion="3" />
          
         <activity android:name=".LinphoneActivity"
                   android:label="@string/app_name"
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 9c750fe35..5958fb6ed 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -21,9 +21,7 @@ package org.linphone;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
-import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
-import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.LinphoneCore.GeneralState;
 
 import android.app.Activity;
@@ -86,7 +84,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 	
 	/**
 	 * 
-	 * @return nul if not ready yet
+	 * @return null if not ready yet
 	 */
 	public static DialerActivity getDialer() {
 		if (theDialer == null) {
@@ -351,7 +349,6 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 			break;
 		}
 		case GSTATE_CALL_ERROR: {
-
 			Toast toast = Toast.makeText(this
 					,String.format(getString(R.string.call_error),lc.getRemoteAddress())
 					, Toast.LENGTH_LONG);
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 8b9e8dc12..c9667e45f 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -139,6 +139,9 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
+		if (isFinishing()) {
+			if (mSensorManager!=null) mSensorManager.unregisterListener(this);
+		}
 
 	}
 	@Override
@@ -146,8 +149,6 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 		// Inflate the currently selected menu XML resource.
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.linphone_activity_menu, menu);
-
-
 		return true;
 	}
 
@@ -207,6 +208,8 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	}
 
 	public void onSensorChanged(SensorEvent event) {
+		if (LinphoneService.isready() == false) return; //nop nothing to do 
+		
 		WindowManager.LayoutParams lAttrs =getWindow().getAttributes(); 
 		if (LinphoneService.instance().getLinphoneCore().isIncall() && event.values[0] == 0) {
 			lAttrs.flags |= WindowManager.LayoutParams.FLAG_FULLSCREEN;