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

Fixed normalizedPhoneNumber use

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-29 10:16:52 +01:00
parent d579948c7f
commit 0e13ceb15d
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -566,16 +566,14 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso
} }
} }
ProxyConfig lpc = getLc().getDefaultProxyConfig();
/*if (lpc != null) {
to = lpc.normalizePhoneNumber(to);
}*/
Address lAddress; Address lAddress;
lAddress = mLc.interpretUrl(to); lAddress = mLc.interpretUrl(to); // InterpretUrl does normalizePhoneNumber
if (lAddress == null) { if (lAddress == null) {
Log.e("Couldn't convert to String to Address : " + to);
return; return;
} }
ProxyConfig lpc = mLc.getDefaultProxyConfig();
if (mR.getBoolean(R.bool.forbid_self_call) && lpc != null && lAddress.asStringUriOnly().equals(lpc.getIdentityAddress())) { if (mR.getBoolean(R.bool.forbid_self_call) && lpc != null && lAddress.asStringUriOnly().equals(lpc.getIdentityAddress())) {
return; return;
} }

6
src/android/org/linphone/contacts/ContactDetailsFragment.java
View file

@ -144,9 +144,11 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
ProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig(); ProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig();
if (lpc != null && !noa.isSIPAddress()) { if (lpc != null) {
String username = lpc.normalizePhoneNumber(displayednumberOrAddress); String username = lpc.normalizePhoneNumber(displayednumberOrAddress);
value = LinphoneUtils.getFullAddressFromUsername(username); if (username != null) {
value = LinphoneUtils.getFullAddressFromUsername(username);
}
} }
String contactAddress = contact.getPresenceModelForUriOrTel(noa.getValue()); String contactAddress = contact.getPresenceModelForUriOrTel(noa.getValue());

1
src/android/org/linphone/contacts/ContactsManager.java
View file

@ -231,6 +231,7 @@ public class ContactsManager extends ContentObserver {
} }
if (lpc == null) return null; if (lpc == null) return null;
String normalized = lpc.normalizePhoneNumber(phoneNumber); String normalized = lpc.normalizePhoneNumber(phoneNumber);
if (normalized == null) normalized = phoneNumber;
Address addr = lpc.normalizeSipUri(normalized); Address addr = lpc.normalizeSipUri(normalized);
if (addr == null) { if (addr == null) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 94a51d3ec1b7dd69fd595e1eab50fda72c33dbda Subproject commit 447076eadcd364815cc105578676d5579b358aa0