From 91d41634855304bda84aff300986cffc3c83f7d1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 14 Dec 2012 16:39:15 +0100
Subject: [PATCH] Fixes for Market release

---
 AndroidManifest.xml                       |  2 +-
 res/values/non_localizable_custom.xml     |  2 +-
 src/org/linphone/ContactFragment.java     |  6 ++--
 src/org/linphone/InCallActivity.java      |  2 +-
 src/org/linphone/PreferencesFragment.java | 36 ++++++++++++-----------
 submodules/linphone                       |  2 +-
 6 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7754ba8e0..71ec72069 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
-      android:versionCode="2000" android:versionName="2.0" android:installLocation="auto"> 
+      android:versionCode="2001" android:versionName="2.0.1" android:installLocation="auto"> 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
     
     <!-- Permissions for Push Notification -->
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 4d8e32235..3a556ae75 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -49,7 +49,7 @@
 	<bool name="allow_edit_in_dialer">true</bool>
 	<bool name="forbid_self_call">false</bool>
 	<bool name="disable_chat">false</bool>
-	<bool name="disable_all_security_features_for_markets">false</bool>
+	<bool name="disable_all_security_features_for_markets">true</bool>
 	
 	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
 </resources>
diff --git a/src/org/linphone/ContactFragment.java b/src/org/linphone/ContactFragment.java
index e18a31946..2c0edd580 100644
--- a/src/org/linphone/ContactFragment.java
+++ b/src/org/linphone/ContactFragment.java
@@ -47,14 +47,16 @@ public class ContactFragment extends Fragment implements OnClickListener {
 	private OnClickListener dialListener = new OnClickListener() {
 		@Override
 		public void onClick(View v) {
-			LinphoneActivity.instance().setAddresGoToDialerAndCall(v.getTag().toString(), contact.getName(), contact.getPhotoUri());
+			if (LinphoneActivity.isInstanciated())
+				LinphoneActivity.instance().setAddresGoToDialerAndCall(v.getTag().toString(), contact.getName(), contact.getPhotoUri());
 		}
 	};
 	
 	private OnClickListener chatListener = new OnClickListener() {
 		@Override
 		public void onClick(View v) {
-			LinphoneActivity.instance().displayChat(v.getTag().toString());
+			if (LinphoneActivity.isInstanciated())
+				LinphoneActivity.instance().displayChat(v.getTag().toString());
 		}
 	};
 	
diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java
index 984c52189..4bad3763b 100644
--- a/src/org/linphone/InCallActivity.java
+++ b/src/org/linphone/InCallActivity.java
@@ -567,7 +567,7 @@ public class InCallActivity extends FragmentActivity implements
 		}
 		mControls = null;
 		
-		if (isVideoEnabled) {
+		if (isVideoEnabled && mControlsHandler != null) {
 			mControlsHandler.postDelayed(mControls = new Runnable() {
 				public void run() {
 					hideNumpad();
diff --git a/src/org/linphone/PreferencesFragment.java b/src/org/linphone/PreferencesFragment.java
index b5a067879..d95814b84 100644
--- a/src/org/linphone/PreferencesFragment.java
+++ b/src/org/linphone/PreferencesFragment.java
@@ -366,24 +366,26 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
 	}
 	
 	private void updateAccountLed(final LedPreference me, final String username, final String domain) {
-		for (LinphoneProxyConfig lpc : LinphoneManager.getLc().getProxyConfigList()) {
-			if (lpc.getIdentity().contains(username) && lpc.getIdentity().contains(domain)) {
-				if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationOk) {
-					me.setLed(R.drawable.led_connected);
-				} else if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationFailed) {
-					me.setLed(R.drawable.led_error);
-				} else if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationProgress) {
-					me.setLed(R.drawable.led_inprogress);
-					mHandler.postDelayed(new Runnable() {
-						@Override
-						public void run() {
-							updateAccountLed(me, username, domain);
-						}
-					}, 1500);
-				} else {
-					me.setLed(R.drawable.led_disconnected);
+		if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
+			for (LinphoneProxyConfig lpc : LinphoneManager.getLc().getProxyConfigList()) {
+				if (lpc.getIdentity().contains(username) && lpc.getIdentity().contains(domain)) {
+					if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationOk) {
+						me.setLed(R.drawable.led_connected);
+					} else if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationFailed) {
+						me.setLed(R.drawable.led_error);
+					} else if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationProgress) {
+						me.setLed(R.drawable.led_inprogress);
+						mHandler.postDelayed(new Runnable() {
+							@Override
+							public void run() {
+								updateAccountLed(me, username, domain);
+							}
+						}, 1500);
+					} else {
+						me.setLed(R.drawable.led_disconnected);
+					}
+					break;
 				}
-				break;
 			}
 		}
 	}
diff --git a/submodules/linphone b/submodules/linphone
index 2817a36f1..d03b0d01b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2817a36f1dd129278489d88acd29c2ee1f5176ff
+Subproject commit d03b0d01bedf71d153371c58ea3259a3a1cafb11