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

Removed java cache for contacts, use the one in the library

Browse source
This commit is contained in:
Sylvain Berfini 2017-02-16 15:13:54 +01:00
parent 234983f0af
commit b4e5b5c0d7
2 changed files with 18 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/ChatFragment.java
View file

@ -18,7 +18,6 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
@ -42,7 +41,6 @@ import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneCoreFactory;
import org.linphone.core.LinphoneCoreListenerBase;
import org.linphone.mediastream.Log;
import org.linphone.ui.AddressText;
import android.Manifest;
import android.annotation.SuppressLint;

69
src/org/linphone/ContactsManager.java
View file

@ -31,6 +31,8 @@ import java.util.concurrent.TimeUnit;
import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneCoreException;
import org.linphone.core.LinphoneCoreFactory;
import org.linphone.core.LinphoneFriend;
import org.linphone.core.LinphoneFriendImpl;
import org.linphone.core.LinphoneProxyConfig;
@ -65,9 +67,7 @@ public class ContactsManager extends ContentObserver {
private boolean preferLinphoneContacts = false, isContactPresenceDisabled = true, hasContactAccess = false;
private ContentResolver contentResolver;
private Context context;
private HashMap<String, LinphoneContact> contactsCache;
private HashMap<String, LinphoneContact> androidContactsCache;
private LinphoneContact contactNotFound;
private Bitmap defaultAvatar;
private static ArrayList<ContactsUpdatedListener> contactsUpdatedListeners;
@ -88,8 +88,6 @@ public class ContactsManager extends ContentObserver {
private ContactsManager(Handler handler) {
super(handler);
defaultAvatar = BitmapFactory.decodeResource(LinphoneService.instance().getResources(), R.drawable.avatar);
contactNotFound = new LinphoneContact();
contactsCache = new HashMap<String, LinphoneContact>();
androidContactsCache = new HashMap<String, LinphoneContact>();
contactsUpdatedListeners = new ArrayList<ContactsUpdatedListener>();
contacts = new ArrayList<LinphoneContact>();
@ -223,64 +221,34 @@ public class ContactsManager extends ContentObserver {
public LinphoneContact findContactFromAddress(LinphoneAddress address) {
String sipUri = address.asStringUriOnly();
String username = address.getUserName();
LinphoneContact cache = contactsCache.get(sipUri);
if (cache != null) {
if (cache == contactNotFound) return null;
return cache;
}
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
LinphoneProxyConfig lpc = null;
if (lc != null) {
lpc = lc.getDefaultProxyConfig();
LinphoneFriend lf = lc.findFriendByAddress(sipUri);
if (lf != null) {
LinphoneContact contact = (LinphoneContact)((LinphoneFriendImpl)lf).getUserData();
return contact;
}
for (LinphoneContact c: getContacts()) {
for (LinphoneNumberOrAddress noa: c.getNumbersOrAddresses()) {
String normalized = null;
if (lpc != null) {
normalized = lpc.normalizePhoneNumber(noa.getValue());
}
String alias = c.getPresenceModelForUri(noa.getValue());
if ((noa.isSIPAddress() && noa.getValue().equals(sipUri)) || (alias != null && alias.equals(sipUri)) || (normalized != null && !noa.isSIPAddress() && normalized.equals(username)) || (!noa.isSIPAddress() && noa.getValue().equals(username))) {
contactsCache.put(sipUri, c);
return c;
}
}
}
contactsCache.put(sipUri, contactNotFound);
return null;
}
public LinphoneContact findContactFromPhoneNumber(String phoneNumber) {
LinphoneContact cache = contactsCache.get(phoneNumber);
if (cache != null) {
if (cache == contactNotFound) return null;
return cache;
}
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
LinphoneProxyConfig lpc = null;
if (lc != null) {
lpc = lc.getDefaultProxyConfig();
}
for (LinphoneContact c: getContacts()) {
for (LinphoneNumberOrAddress noa: c.getNumbersOrAddresses()) {
String normalized = null;
if (lpc != null) {
normalized = lpc.normalizePhoneNumber(noa.getValue());
}
if (noa.getValue().equals(phoneNumber) || (normalized != null && normalized.equals(phoneNumber))) {
contactsCache.put(phoneNumber, c);
return c;
}
}
String normalized = lpc.normalizePhoneNumber(phoneNumber);
LinphoneAddress addr = null;
try {
addr = LinphoneCoreFactory.instance().createLinphoneAddress(normalized);
} catch (LinphoneCoreException e) {
return null;
}
LinphoneFriend lf = lc.findFriendByAddress(addr.asStringUriOnly());
if (lf != null) {
LinphoneContact contact = (LinphoneContact)((LinphoneFriendImpl)lf).getUserData();
return contact;
}
contactsCache.put(phoneNumber, contactNotFound);
return null;
}
@ -450,7 +418,6 @@ public class ContactsManager extends ContentObserver {
Collections.sort(sipContacts);
setContacts(contacts);
setSipContacts(sipContacts);
contactsCache.clear();
LinphoneManager.getLc().getFriendLists()[0].updateSubscriptions();
for (ContactsUpdatedListener listener : contactsUpdatedListeners) {