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

Fix conference details activity launch issue

Browse source
This commit is contained in:
Sylvain Berfini 2012-05-24 16:56:53 +02:00
parent b0ba6158e4
commit 49ba1f44ba
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -76,7 +76,7 @@
<!-- android:launchMode="singleTask"--> <!-- android:launchMode="singleTask"-->
<activity android:name="org.linphone.IncallActivity" <activity android:name="org.linphone.IncallActivity"
android:theme="@android:style/Theme.NoTitleBar" android:theme="@android:style/Theme.NoTitleBar"
android:launchMode="singleInstance" android:launchMode="singleTask"
android:configChanges="keyboardHidden|orientation"> android:configChanges="keyboardHidden|orientation">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

13
src/org/linphone/IncallActivity.java
View file

@ -42,7 +42,6 @@ import org.linphone.ui.Numpad;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
@ -386,12 +385,12 @@ public class IncallActivity extends AbstractCalleesActivity implements
} }
} }
private void doTransfer() { // private void doTransfer() {
LinphoneCall tCall = lc().getCurrentCall(); // LinphoneCall tCall = lc().getCurrentCall();
if (tCall != null) { // if (tCall != null) {
prepareForTransferingExistingOrNewCall(tCall); // prepareForTransferingExistingOrNewCall(tCall);
} // }
} // }
private void prepareForTransferingExistingOrNewCall(final LinphoneCall call) { private void prepareForTransferingExistingOrNewCall(final LinphoneCall call) {
// Include inconf calls // Include inconf calls