From a3931bf307eeccfaf45826bc94bd7179e7882129 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Thu, 19 Jul 2012 17:01:22 +0200
Subject: [PATCH] Hide exit button from statusbar while in call

---
 src/org/linphone/InCallActivity.java            |  2 +-
 src/org/linphone/LinphoneManager.java           |  2 +-
 src/org/linphone/StatusFragment.java            | 14 +++++++++-----
 src/org/linphone/compatibility/ApiFivePlus.java |  3 ---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java
index dd07030ed..2fa56546b 100644
--- a/src/org/linphone/InCallActivity.java
+++ b/src/org/linphone/InCallActivity.java
@@ -548,7 +548,7 @@ public class InCallActivity extends FragmentActivity implements
 	public void onCallEncryptionChanged(LinphoneCall call, boolean encrypted,
 			String authenticationToken) {
 		if (status != null) {
-			status.refreshEncryptionIcon();
+			status.refreshStatusItems();
 		}
 	}
 	
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 02b612a55..d1a1e3f06 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -969,7 +969,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			} 
 		}
 
-		if (state == IncomingReceived || (state == state.CallIncomingEarlyMedia && mR.getBoolean(R.bool.allow_ringing_while_early_media))) {
+		if (state == IncomingReceived || (state == State.CallIncomingEarlyMedia && mR.getBoolean(R.bool.allow_ringing_while_early_media))) {
 			// Brighten screen for at least 10 seconds
 			WakeLock wl = mPowerManager.newWakeLock(
 					PowerManager.ACQUIRE_CAUSES_WAKEUP
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index c6046f9c9..be607da73 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -40,7 +40,7 @@ public class StatusFragment extends Fragment {
 	private static StatusFragment instance;
 	private Handler mHandler = new Handler();
 	private Handler refreshHandler = new Handler();
-	private TextView statusText;
+	private TextView statusText, exit;
 	private ImageView statusLed, callQuality, encryption;
 	private SlidingDrawer drawer;
 	private Runnable mCallQualityUpdater;
@@ -58,7 +58,8 @@ public class StatusFragment extends Fragment {
 		encryption = (ImageView) view.findViewById(R.id.encryption);
 		
 		drawer = (SlidingDrawer) view.findViewById(R.id.statusBar);
-		view.findViewById(R.id.exit).setOnClickListener(new OnClickListener() {
+		exit = (TextView) view.findViewById(R.id.exit);
+		exit.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				LinphoneActivity.instance().exit();
@@ -191,7 +192,7 @@ public class StatusFragment extends Fragment {
 		
 		if (isInCall) {
 			startCallQuality();
-			refreshEncryptionIcon();
+			refreshStatusItems();
 			
 			// We are obviously connected
 			statusLed.setImageResource(R.drawable.led_connected);
@@ -219,11 +220,12 @@ public class StatusFragment extends Fragment {
 		}
 	}
 
-	public void refreshEncryptionIcon() {
+	public void refreshStatusItems() {
 		LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
 		if (call != null && encryption != null) {
 			MediaEncryption mediaEncryption = call.getCurrentParamsCopy().getMediaEncryption();
-			
+
+			exit.setVisibility(View.GONE);
 			encryption.setVisibility(View.VISIBLE);
 			
 			if (mediaEncryption == MediaEncryption.SRTP || (mediaEncryption == MediaEncryption.ZRTP && call.isAuthenticationTokenVerified())) {
@@ -233,6 +235,8 @@ public class StatusFragment extends Fragment {
 			} else {
 				encryption.setImageResource(R.drawable.security_ko);
 			}
+		} else {
+			exit.setVisibility(View.VISIBLE);
 		}
 	}
 }
diff --git a/src/org/linphone/compatibility/ApiFivePlus.java b/src/org/linphone/compatibility/ApiFivePlus.java
index d7beff7c9..51add338c 100644
--- a/src/org/linphone/compatibility/ApiFivePlus.java
+++ b/src/org/linphone/compatibility/ApiFivePlus.java
@@ -8,7 +8,6 @@ import java.util.Set;
 
 import org.linphone.Contact;
 import org.linphone.core.LinphoneAddress;
-import org.linphone.core.Log;
 import org.linphone.mediastream.Version;
 
 import android.annotation.TargetApi;
@@ -137,7 +136,6 @@ public class ApiFivePlus {
 		return list;
 	}
 	
-	@TargetApi(11)
 	public static Cursor getContactsCursor(ContentResolver cr) {
 		String req = Data.MIMETYPE + " = '" + CommonDataKinds.Phone.CONTENT_ITEM_TYPE
                 + "' AND " + CommonDataKinds.Phone.NUMBER + " IS NOT NULL";
@@ -261,7 +259,6 @@ public class ApiFivePlus {
 		String username = address.getUserName();
 		String domain = address.getDomain();
 		String sipUri = username + "@" + domain;
-		Log.e("Looking for " + sipUri);
 		
 		Cursor cursor = getSIPContactCursor(cr, sipUri);
 		Contact contact = getContact(cr, cursor, 0);