From 3bf0b8a222808d213514c1f613116faa722ea768 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 12 Jan 2018 14:53:51 +0100 Subject: [PATCH] Quick fixes --- src/android/org/linphone/LinphoneManager.java | 2 +- src/android/org/linphone/chat/GroupChatFragment.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index fe58a9425..8dbd52c39 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -1490,7 +1490,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou public void isAccountWithAlias(){ if(LinphoneManager.getLc().getDefaultProxyConfig() != null) { 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) { accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex())); accountCreator.isAccountExist(); diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java index 79fe34ef4..e132a61c9 100644 --- a/src/android/org/linphone/chat/GroupChatFragment.java +++ b/src/android/org/linphone/chat/GroupChatFragment.java @@ -364,9 +364,9 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con //TODO error return; } - Address proxyConfigContact = lc.getDefaultProxyConfig().getContact(); + Address proxyConfigContact = core.getDefaultProxyConfig().getContact(); if (proxyConfigContact != null) { - mChatRoom = lc.findOneToOneChatRoom(proxyConfigContact, mRemoteSipAddress); + mChatRoom = core.findOneToOneChatRoom(proxyConfigContact, mRemoteSipAddress); } if (mChatRoom == null) { mChatRoom = core.getChatRoomFromUri(mRemoteSipAddress.asStringUriOnly());