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

Fixed missing space in chat list fragment

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-17 16:38:42 +01:00
parent f33c4b8000
commit b177d5181c
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/activities/LinphoneActivity.java
View file

@ -1079,7 +1079,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
return callTransfer; return callTransfer;
} }
private void initInCallMenuLayout(final boolean callTransfer) { private void initInCallMenuLayout() {
selectMenu(FragmentsAvailable.DIALER); selectMenu(FragmentsAvailable.DIALER);
DialerFragment dialerFragment = DialerFragment.instance(); DialerFragment dialerFragment = DialerFragment.instance();
if (dialerFragment != null) { if (dialerFragment != null) {
@ -1161,7 +1161,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
getIntent().putExtra("PreviousActivity", CALL_ACTIVITY); getIntent().putExtra("PreviousActivity", CALL_ACTIVITY);
callTransfer = data != null && data.getBooleanExtra("Transfer", false); callTransfer = data != null && data.getBooleanExtra("Transfer", false);
if (LinphoneManager.getLc().getCallsNb() > 0) { if (LinphoneManager.getLc().getCallsNb() > 0) {
initInCallMenuLayout(callTransfer); initInCallMenuLayout();
} else { } else {
resetClassicMenuLayoutAndGoBackToCallIfStillRunning(); resetClassicMenuLayoutAndGoBackToCallIfStillRunning();
} }

1
app/src/main/java/org/linphone/call/CallOutgoingActivity.java
View file

@ -268,7 +268,6 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
finish(); finish();
} }
private void checkAndRequestCallPermissions() { private void checkAndRequestCallPermissions() {
ArrayList<String> permissionsList = new ArrayList<String>(); ArrayList<String> permissionsList = new ArrayList<String>();

2
app/src/main/java/org/linphone/chat/ChatListFragment.java
View file

@ -197,7 +197,7 @@ public class ChatListFragment extends Fragment implements ContactsUpdatedListene
if (LinphoneManager.getLc().getCallsNb() > 0) { if (LinphoneManager.getLc().getCallsNb() > 0) {
mBackToCallButton.setVisibility(View.VISIBLE); mBackToCallButton.setVisibility(View.VISIBLE);
} else { } else {
mBackToCallButton.setVisibility(View.GONE); mBackToCallButton.setVisibility(View.INVISIBLE);
} }
if (LinphoneActivity.isInstanciated()) { if (LinphoneActivity.isInstanciated()) {