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

Cleaning.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-11-28 20:03:16 +01:00
parent ea894d9c6e
commit f1b8e27770
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AndroidManifest.xml
View file

@ -72,6 +72,7 @@
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> </intent-filter>
</activity> </activity>
<!-- 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:screenOrientation="portrait"> android:screenOrientation="portrait">

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

@ -22,7 +22,6 @@ package org.linphone;
import static android.content.Intent.ACTION_MAIN; import static android.content.Intent.ACTION_MAIN;
import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener; import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
import org.linphone.core.CallDirection;
import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCall;
import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore;
import org.linphone.core.Log; import org.linphone.core.Log;
@ -458,10 +457,8 @@ public class LinphoneActivity extends TabActivity implements
startActivityForResult(intent, incall_activity); startActivityForResult(intent, incall_activity);
} }
public void startIncomingCallActivity(LinphoneCall pendingCall) { public void startIncomingCallActivity() {
Intent intent = new Intent() Intent intent = new Intent().setClass(this, IncomingCallActivity.class);
.setClass(this, IncomingCallActivity.class)
.putExtra("stringUri", pendingCall.getRemoteAddress().asStringUriOnly());
startActivityForResult(intent, INCOMING_CALL_ACTIVITY); startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
} }
@ -476,7 +473,7 @@ public class LinphoneActivity extends TabActivity implements
} }
if (state==State.IncomingReceived) { if (state==State.IncomingReceived) {
startIncomingCallActivity(call); startIncomingCallActivity();
} }
if (state == State.OutgoingInit) { if (state == State.OutgoingInit) {
startIncallActivity(); startIncallActivity();
@ -542,7 +539,7 @@ public class LinphoneActivity extends TabActivity implements
super.onResume(); super.onResume();
LinphoneCall pendingCall = LinphoneManager.getInstance().getPendingIncomingCall(); LinphoneCall pendingCall = LinphoneManager.getInstance().getPendingIncomingCall();
if (pendingCall != null) { if (pendingCall != null) {
startIncomingCallActivity(pendingCall); startIncomingCallActivity();
} }
} }