From f16f5597c71e73ceb215fd8b468d2b57c815668f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 28 Jan 2014 15:14:14 +0100
Subject: [PATCH] Fixed broken transfer & fixed video resolution setting

---
 AndroidManifest.xml                       |  2 +-
 src/org/linphone/LinphoneActivity.java    |  8 ++++----
 src/org/linphone/LinphonePreferences.java | 15 +++------------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3952f5cdc..10cc42474 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -89,7 +89,7 @@
         <activity android:name="org.linphone.InCallActivity"
 		   android:theme="@style/FullScreen"
            android:noHistory="true"
-           android:launchMode="singleTask">
+           android:launchMode="singleTop">
 		<intent-filter>
                <action android:name="android.intent.action.MAIN" />
            </intent-filter>
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 6f48f9d4d..33a3652be 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -92,7 +92,7 @@ public class LinphoneActivity extends FragmentActivity implements
 	public static final String PREF_FIRST_LAUNCH = "pref_first_launch";
 	private static final int SETTINGS_ACTIVITY = 123;
 	private static final int FIRST_LOGIN_ACTIVITY = 101;
-	private static final int callActivity = 19;
+	private static final int CALL_ACTIVITY = 19;
 
 	private static LinphoneActivity instance;
 
@@ -887,14 +887,14 @@ public class LinphoneActivity extends FragmentActivity implements
 		Intent intent = new Intent(this, InCallActivity.class);
 		intent.putExtra("VideoEnabled", true);
 		startOrientationSensor();
-		startActivityForResult(intent, callActivity);
+		startActivityForResult(intent, CALL_ACTIVITY);
 	}
 
 	public void startIncallActivity(LinphoneCall currentCall) {
 		Intent intent = new Intent(this, InCallActivity.class);
 		intent.putExtra("VideoEnabled", false);
 		startOrientationSensor();
-		startActivityForResult(intent, callActivity);
+		startActivityForResult(intent, CALL_ACTIVITY);
 	}
 
 	/**
@@ -1227,7 +1227,7 @@ public class LinphoneActivity extends FragmentActivity implements
 				changeCurrentFragment(newFragment, null, true);
 				selectMenu(newFragment);
 			}
-		} else if (requestCode == callActivity) {
+		} else if (resultCode == Activity.RESULT_FIRST_USER && requestCode == CALL_ACTIVITY) {
 			boolean callTransfer = data == null ? false : data.getBooleanExtra("Transfer", false);
 			if (LinphoneManager.getLc().getCallsNb() > 0) {
 				initInCallMenuLayout(callTransfer);
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index 7a71ea1b0..38cc5d4f0 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -492,20 +492,11 @@ public class LinphonePreferences {
 	
 	public void setPreferredVideoSize(String preferredVideoSize) {
 		int bandwidth = 512;
-		if (preferredVideoSize.equals(getString(R.string.pref_preferred_video_size_hd_key))) {
-			preferredVideoSize = "720p";
+		if (preferredVideoSize.equals("720p")) {
 			bandwidth = 1024 + 128;
-		} else if (preferredVideoSize.equals(getString(R.string.pref_preferred_video_size_vga_key))) {
-			preferredVideoSize = "vga";
-			bandwidth = 512;
-		} else if (preferredVideoSize.equals(getString(R.string.pref_preferred_video_size_cif_key))) {
-			preferredVideoSize = "cif";
-			bandwidth = 512;
-		} else if (preferredVideoSize.equals(getString(R.string.pref_preferred_video_size_qvga_key))) {
-			preferredVideoSize = "qvga";
+		} else if (preferredVideoSize.equals("qvga")) {
 			bandwidth = 380;
-		}  else if (preferredVideoSize.equals(getString(R.string.pref_preferred_video_size_qcif_key))) {
-			preferredVideoSize = "qcif";
+		}  else if (preferredVideoSize.equals("qcif")) {
 			bandwidth = 256;
 		}