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

Fix bis function on dialer start call/add call/transfer call buttons

Browse source
This commit is contained in:
Sylvain Berfini 2019-05-03 17:56:26 +02:00
parent 76df95c9fb
commit 630876fa8d
2 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/org/linphone/activities/DialerActivity.java
View file

@ -77,37 +77,13 @@ public class DialerActivity extends MainActivity implements AddressText.AddressC
mStartCall = findViewById(R.id.start_call);
mStartCall.setAddressWidget(mAddress);
mStartCall.setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View v) {
LinphoneManager.getCallManager().newOutgoingCall(mAddress);
}
});
mAddCall = findViewById(R.id.add_call);
mAddCall.setAddressWidget(mAddress);
mAddCall.setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View v) {
LinphoneManager.getCallManager().newOutgoingCall(mAddress);
}
});
mTransferCall = findViewById(R.id.transfer_call);
mTransferCall.setAddressWidget(mAddress);
mTransferCall.setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View v) {
Core core = LinphoneManager.getCore();
if (core.getCurrentCall() == null) {
return;
}
core.transferCall(core.getCurrentCall(), mAddress.getText().toString());
}
});
mTransferCall.setIsTransfer(true);
mNumpad = findViewById(R.id.numpad);
if (mNumpad != null) {

20
app/src/main/java/org/linphone/views/CallButton.java
View file

@ -2,7 +2,7 @@ package org.linphone.views;
/*
CallButton.java
Copyright (C) 2017 Belledonne Communications, Grenoble, France
Copyright (C) 2017 Belledonne Communications, Grenoble, France
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -34,11 +34,13 @@ import org.linphone.settings.LinphonePreferences;
@SuppressLint("AppCompatCustomView")
public class CallButton extends ImageView implements OnClickListener, AddressAware {
private AddressText mAddress;
private boolean mIsTransfer;
public CallButton(Context context, AttributeSet attrs) {
super(context, attrs);
mIsTransfer = false;
setOnClickListener(this);
}
@ -46,9 +48,21 @@ public class CallButton extends ImageView implements OnClickListener, AddressAwa
mAddress = a;
}
public void setIsTransfer(boolean isTransfer) {
mIsTransfer = isTransfer;
}
public void onClick(View v) {
if (mAddress.getText().length() > 0) {
LinphoneManager.getCallManager().newOutgoingCall(mAddress);
if (mIsTransfer) {
Core core = LinphoneManager.getCore();
if (core.getCurrentCall() == null) {
return;
}
core.transferCall(core.getCurrentCall(), mAddress.getText().toString());
} else {
LinphoneManager.getCallManager().newOutgoingCall(mAddress);
}
} else {
if (LinphonePreferences.instance().isBisFeatureEnabled()) {
Core core = LinphoneManager.getCore();