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

Fixed call transfer button

Browse source
This commit is contained in:
Sylvain Berfini 2019-11-22 16:12:56 +01:00
parent 76e2d3bf97
commit 7d5ead8ba0
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/linphone/call/CallActivity.java
View file

@ -564,11 +564,6 @@ public class CallActivity extends LinphoneGenericActivity
super.onDestroy(); super.onDestroy();
} }
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
}
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
if (mAudioManager.onKeyVolumeAdjust(keyCode)) return true; if (mAudioManager.onKeyVolumeAdjust(keyCode)) return true;

15
app/src/main/java/org/linphone/dialer/DialerActivity.java
View file

@ -67,6 +67,8 @@ public class DialerActivity extends MainActivity implements AddressText.AddressC
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mInterfaceLoaded = false; mInterfaceLoaded = false;
mIsTransfer = false;
// Uses the fragment container layout to inflate the dialer view instead of using a fragment // Uses the fragment container layout to inflate the dialer view instead of using a fragment
new AsyncLayoutInflater(this) new AsyncLayoutInflater(this)
.inflate( .inflate(
@ -122,6 +124,8 @@ public class DialerActivity extends MainActivity implements AddressText.AddressC
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
super.onNewIntent(intent); super.onNewIntent(intent);
setIntent(intent);
handleIntentParams(intent); handleIntentParams(intent);
} }
@ -207,12 +211,6 @@ public class DialerActivity extends MainActivity implements AddressText.AddressC
} }
}); });
mIsTransfer = false;
if (getIntent() != null) {
mIsTransfer = getIntent().getBooleanExtra("Transfer", false);
mAddress.setText(getIntent().getStringExtra("SipUri"));
}
setUpNumpad(view); setUpNumpad(view);
updateLayout(); updateLayout();
enableVideoPreviewIfTablet(true); enableVideoPreviewIfTablet(true);
@ -282,6 +280,11 @@ public class DialerActivity extends MainActivity implements AddressText.AddressC
} }
} }
if (getIntent() != null) {
mIsTransfer = getIntent().getBooleanExtra("Transfer", false);
mAddress.setText(getIntent().getStringExtra("SipUri"));
}
mBackToCall.setVisibility(atLeastOneCall ? View.VISIBLE : View.GONE); mBackToCall.setVisibility(atLeastOneCall ? View.VISIBLE : View.GONE);
mAddCall.setVisibility(atLeastOneCall && !mIsTransfer ? View.VISIBLE : View.GONE); mAddCall.setVisibility(atLeastOneCall && !mIsTransfer ? View.VISIBLE : View.GONE);
mTransferCall.setVisibility(atLeastOneCall && mIsTransfer ? View.VISIBLE : View.GONE); mTransferCall.setVisibility(atLeastOneCall && mIsTransfer ? View.VISIBLE : View.GONE);