PeterCxy/cheogram
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: PeterCxy:3096f859ac15703e8106f6e09ecb47fc8127e4ad
Branches Tags
PeterCxy:peter-dev
PeterCxy:for-singpolyma
PeterCxy:peter-dev-bak
..
compare: PeterCxy:3ee45952fc398d93ba71e66b7980f9fdcc8eec69
Branches Tags
PeterCxy:peter-dev
PeterCxy:for-singpolyma
PeterCxy:peter-dev-bak

No commits in common. "3096f859ac15703e8106f6e09ecb47fc8127e4ad" and "3ee45952fc398d93ba71e66b7980f9fdcc8eec69" have entirely different histories.
3096f859ac ... 3ee45952fc

1 changed files with 1 additions and 9 deletions
Show stats Expand all files Collapse all files

10
src/cheogram/java/com/cheogram/android/ConnectionService.java
View file

@ -22,8 +22,6 @@ import android.telecom.TelecomManager;
import android.telephony.PhoneNumberUtils;
import android.Manifest;
import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import android.content.ComponentName;
import android.content.Context;
@ -55,7 +53,6 @@ import eu.siacs.conversations.xmpp.jingle.JingleRtpConnection;
import eu.siacs.conversations.xmpp.jingle.Media;
import eu.siacs.conversations.xmpp.jingle.RtpEndUserState;
@RequiresApi(Build.VERSION_CODES.M)
public class ConnectionService extends android.telecom.ConnectionService {
public XmppConnectionService xmppConnectionService = null;
protected ServiceConnection mConnection = new ServiceConnection() {
@ -238,7 +235,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
findRtpConnection();
}
String statusLabel = null;
setStatusHints(new StatusHints(null, gatewayIcon, null));
if (state == RtpEndUserState.FINDING_DEVICE) {
setInitialized();
@ -249,10 +246,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
} else if (state == RtpEndUserState.CONNECTING) {
xmppConnectionService.setDiallerIntegrationActive(true);
setActive();
statusLabel = getString(R.string.rtp_state_connecting);
} else if (state == RtpEndUserState.CONNECTED) {
xmppConnectionService.setDiallerIntegrationActive(true);
setActive();
postDial();
} else if (state == RtpEndUserState.DECLINED_OR_BUSY) {
close(new DisconnectCause(DisconnectCause.BUSY));
@ -263,8 +257,6 @@ public class ConnectionService extends android.telecom.ConnectionService {
} else if (RtpSessionActivity.END_CARD.contains(state)) {
close(new DisconnectCause(DisconnectCause.ERROR));
}
setStatusHints(new StatusHints(statusLabel, gatewayIcon, null));
}
@Override