Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed broken transfer & fixed video resolution setting

Browse source
This commit is contained in:
Sylvain Berfini 2014-01-28 15:14:14 +01:00
parent 1d06570576
commit f16f5597c7
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -89,7 +89,7 @@
<activity android:name="org.linphone.InCallActivity" <activity android:name="org.linphone.InCallActivity"
android:theme="@style/FullScreen" android:theme="@style/FullScreen"
android:noHistory="true" android:noHistory="true"
android:launchMode="singleTask"> android:launchMode="singleTop">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> </intent-filter>

8
src/org/linphone/LinphoneActivity.java
View file

@ -92,7 +92,7 @@ public class LinphoneActivity extends FragmentActivity implements
public static final String PREF_FIRST_LAUNCH = "pref_first_launch"; public static final String PREF_FIRST_LAUNCH = "pref_first_launch";
private static final int SETTINGS_ACTIVITY = 123; private static final int SETTINGS_ACTIVITY = 123;
private static final int FIRST_LOGIN_ACTIVITY = 101; 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; private static LinphoneActivity instance;
@ -887,14 +887,14 @@ public class LinphoneActivity extends FragmentActivity implements
Intent intent = new Intent(this, InCallActivity.class); Intent intent = new Intent(this, InCallActivity.class);
intent.putExtra("VideoEnabled", true); intent.putExtra("VideoEnabled", true);
startOrientationSensor(); startOrientationSensor();
startActivityForResult(intent, callActivity); startActivityForResult(intent, CALL_ACTIVITY);
} }
public void startIncallActivity(LinphoneCall currentCall) { public void startIncallActivity(LinphoneCall currentCall) {
Intent intent = new Intent(this, InCallActivity.class); Intent intent = new Intent(this, InCallActivity.class);
intent.putExtra("VideoEnabled", false); intent.putExtra("VideoEnabled", false);
startOrientationSensor(); startOrientationSensor();
startActivityForResult(intent, callActivity); startActivityForResult(intent, CALL_ACTIVITY);
} }
/** /**
@ -1227,7 +1227,7 @@ public class LinphoneActivity extends FragmentActivity implements
changeCurrentFragment(newFragment, null, true); changeCurrentFragment(newFragment, null, true);
selectMenu(newFragment); 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); boolean callTransfer = data == null ? false : data.getBooleanExtra("Transfer", false);
if (LinphoneManager.getLc().getCallsNb() > 0) { if (LinphoneManager.getLc().getCallsNb() > 0) {
initInCallMenuLayout(callTransfer); initInCallMenuLayout(callTransfer);

15
src/org/linphone/LinphonePreferences.java
View file

@ -492,20 +492,11 @@ public class LinphonePreferences {
public void setPreferredVideoSize(String preferredVideoSize) { public void setPreferredVideoSize(String preferredVideoSize) {
int bandwidth = 512; int bandwidth = 512;
if (preferredVideoSize.equals(getString(R.string.pref_preferred_video_size_hd_key))) { if (preferredVideoSize.equals("720p")) {
preferredVideoSize = "720p";
bandwidth = 1024 + 128; bandwidth = 1024 + 128;
} else if (preferredVideoSize.equals(getString(R.string.pref_preferred_video_size_vga_key))) { } else if (preferredVideoSize.equals("qvga")) {
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";
bandwidth = 380; bandwidth = 380;
} else if (preferredVideoSize.equals(getString(R.string.pref_preferred_video_size_qcif_key))) { } else if (preferredVideoSize.equals("qcif")) {
preferredVideoSize = "qcif";
bandwidth = 256; bandwidth = 256;
} }