From 5565ce11d0f6538047ed22e2b076f3aaae5bf7c5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Fri, 11 May 2012 10:33:34 +0200
Subject: [PATCH] Fix add call issue, numpad issue and videoCall FC

---
 res/layout/dialer.xml                   | 26 ++++++++++
 src/org/linphone/DialerActivity.java    | 64 ++++++++++++-------------
 src/org/linphone/VideoCallActivity.java |  4 +-
 src/org/linphone/ui/Digit.java          |  2 +-
 4 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index 116c4435f..53a91ca7a 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -47,6 +47,32 @@
 				    android:src="@drawable/startcall_green" 
 				    android:background="@drawable/clavier_bg" />
 				
+				<LinearLayout
+				    android:id="@+id/InCallControls"
+					android:layout_height="fill_parent" 
+					android:layout_width="fill_parent"
+					android:orientation="horizontal" 
+					android:visibility="gone"
+					android:layout_weight="3" >
+					
+	                <Button 
+					    android:id="@+id/AddCall"
+					    style="@style/DialerDigit"
+						android:layout_height="fill_parent" 
+						android:layout_width="fill_parent" 
+						android:layout_weight="1" 
+						android:text="@string/AddCallButtonText" />
+	                
+					<Button 
+					    android:id="@+id/Back"
+					    style="@style/DialerDigit"
+						android:layout_height="fill_parent" 
+						android:layout_width="fill_parent" 
+						android:layout_weight="1" 
+						android:text="@string/CancelButtonText" />
+					
+				</LinearLayout>
+				
 			</LinearLayout>
 			
 		</LinearLayout>
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index ee2002f19..9fa7d418d 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -222,6 +222,38 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
 		mInCallControls = (LinearLayout) findViewById(R.id.InCallControls);
 		mStatus =  (TextView) findViewById(R.id.status_label);
         
+		if (mBack != null) {
+			mBack.setOnClickListener(new OnClickListener() {
+				public void onClick(View v) {
+					LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
+					if (call.getCurrentParamsCopy().getVideoEnabled())
+						LinphoneActivity.instance().startVideoActivity(call, 0);
+					else
+						LinphoneActivity.instance().startIncallActivity();
+				}
+			});
+		}
+		
+		if (mAddCall != null) {
+			mAddCall.setOnClickListener(new OnClickListener() {
+				public void onClick(View v) {
+					LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
+					if (call != null && !call.isInConference()) {
+						LinphoneManager.getLc().pauseCall(call);
+					} else {
+						LinphoneManager.getLc().leaveConference();
+					}
+						
+					try {
+						LinphoneManager.getLc().invite(mAddress.getText().toString());
+					} catch (LinphoneCoreException e) {
+						Log.e(e);
+						Toast.makeText(DialerActivity.this, R.string.error_adding_new_call, Toast.LENGTH_LONG).show();
+					}
+				}
+			});
+		}
+		
 		if (Version.isXLargeScreen(this)) {
 			tryToInitTabletUI();
 		}
@@ -304,38 +336,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
 				}
 			});
 		}
-		
-		if (mBack != null) {
-			mBack.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
-					if (call.getCurrentParamsCopy().getVideoEnabled())
-						LinphoneActivity.instance().startVideoActivity(call, 0);
-					else
-						LinphoneActivity.instance().startIncallActivity();
-				}
-			});
-		}
-		
-		if (mAddCall != null) {
-			mAddCall.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
-					if (call != null && !call.isInConference()) {
-						LinphoneManager.getLc().pauseCall(call);
-					} else {
-						LinphoneManager.getLc().leaveConference();
-					}
-						
-					try {
-						LinphoneManager.getLc().invite(mAddress.getText().toString());
-					} catch (LinphoneCoreException e) {
-						Log.e(e);
-						Toast.makeText(DialerActivity.this, R.string.error_adding_new_call, Toast.LENGTH_LONG).show();
-					}
-				}
-			});
-		}
 	}
 
 	private void checkIfOutgoingCallIntentReceived() {
diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index 1ef985da6..42bd32e4d 100755
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -201,7 +201,9 @@ public class VideoCallActivity extends Activity implements
 		// Hack to force the redraw of the preview
 		// Camera will be re-enabled in onResume just after anyway
 		shouldRestartVideoOnResume = true;
-		LinphoneManager.getLc().getCurrentCall().enableCamera(false);
+		LinphoneCall currentCall = LinphoneManager.getLc().getCurrentCall();
+		if (currentCall != null)
+			currentCall.enableCamera(false);
 	}
 
 	void updateQualityOfSignalIcon(float quality) {
diff --git a/src/org/linphone/ui/Digit.java b/src/org/linphone/ui/Digit.java
index 75e833845..050a67d53 100644
--- a/src/org/linphone/ui/Digit.java
+++ b/src/org/linphone/ui/Digit.java
@@ -105,7 +105,7 @@ public class Digit extends Button implements AddressAware {
 				mIsDtmfStarted =false;
 				if (lc.isIncall()) {
 					lc.sendDtmf(mKeyCode.charAt(0));
-					return;
+//					return;
 				}
 			}