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

Quick fixes

Browse source
This commit is contained in:
Sylvain Berfini 2018-01-12 14:53:51 +01:00
parent 3ea8fce282
commit 3bf0b8a222
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/android/org/linphone/LinphoneManager.java
View file

@ -1490,7 +1490,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
public void isAccountWithAlias(){ public void isAccountWithAlias(){
if(LinphoneManager.getLc().getDefaultProxyConfig() != null) { if(LinphoneManager.getLc().getDefaultProxyConfig() != null) {
long now = new Timestamp(new Date().getTime()).getTime(); long now = new Timestamp(new Date().getTime()).getTime();
if (LinphonePreferences.instance().getLinkPopupTime() == null if (accountCreator != null && LinphonePreferences.instance().getLinkPopupTime() == null
|| Long.parseLong(LinphonePreferences.instance().getLinkPopupTime()) < now) { || Long.parseLong(LinphonePreferences.instance().getLinkPopupTime()) < now) {
accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex())); accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex()));
accountCreator.isAccountExist(); accountCreator.isAccountExist();

4
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -364,9 +364,9 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
//TODO error //TODO error
return; return;
} }
Address proxyConfigContact = lc.getDefaultProxyConfig().getContact(); Address proxyConfigContact = core.getDefaultProxyConfig().getContact();
if (proxyConfigContact != null) { if (proxyConfigContact != null) {
mChatRoom = lc.findOneToOneChatRoom(proxyConfigContact, mRemoteSipAddress); mChatRoom = core.findOneToOneChatRoom(proxyConfigContact, mRemoteSipAddress);
} }
if (mChatRoom == null) { if (mChatRoom == null) {
mChatRoom = core.getChatRoomFromUri(mRemoteSipAddress.asStringUriOnly()); mChatRoom = core.getChatRoomFromUri(mRemoteSipAddress.asStringUriOnly());