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

Merge remote-tracking branch 'origin/master' into dev_in_app_purchase

Browse source
This commit is contained in:
Sylvain Berfini 2015-06-03 14:14:54 +02:00
commit 390c34387d
9 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -33,7 +33,7 @@
url = git://git.linphone.org/msamr url = git://git.linphone.org/msamr
[submodule "submodules/externals/libvpx"] [submodule "submodules/externals/libvpx"]
path = submodules/externals/libvpx path = submodules/externals/libvpx
url = http://git.chromium.org/webm/libvpx.git url = https://chromium.googlesource.com/webm/libvpx
ignore = dirty ignore = dirty
[submodule "submodules/bzrtp"] [submodule "submodules/bzrtp"]
path = submodules/bzrtp path = submodules/bzrtp

1
liblinphone_tester/custom_rules.xml
View file

@ -42,6 +42,7 @@
<resourcecontains resource="${output.file}" substring="Native crash" /> <resourcecontains resource="${output.file}" substring="Native crash" />
<resourcecontains resource="${output.file}" substring="longMsg=junit.framework.AssertionFailedError: View with id: '" /> <resourcecontains resource="${output.file}" substring="longMsg=junit.framework.AssertionFailedError: View with id: '" />
<resourcecontains resource="${output.file}" substring="longMsg=java.lang.RuntimeException:" /> <resourcecontains resource="${output.file}" substring="longMsg=java.lang.RuntimeException:" />
<resourcecontains resource="${output.file}" substring="longMsg=java.lang.NullPointerException:" />
</or> </or>
</condition> </condition>
<exec executable="bash" unless:set="has.crashed"> <exec executable="bash" unless:set="has.crashed">

1
liblinphone_tester/src/org/linphone/tester/LogsActivity.java
View file

@ -29,6 +29,7 @@ public class LogsActivity extends Activity {
list.addAll(Arrays.asList(mArgs)); list.addAll(Arrays.asList(mArgs));
String[] array = list.toArray(new String[list.size()]); String[] array = list.toArray(new String[list.size()]);
tester.run(array); tester.run(array);
Tester.clearAccounts();
mLogsActivity.runOnUiThread(new Runnable() { mLogsActivity.runOnUiThread(new Runnable() {
public void run() { public void run() {
mLogsActivity.done(); mLogsActivity.done();

1
liblinphone_tester/src/org/linphone/tester/Tester.java
View file

@ -25,6 +25,7 @@ public class Tester {
} }
static { static {
System.loadLibrary("cunit");
List<String> cpuabis=Version.getCpuAbis(); List<String> cpuabis=Version.getCpuAbis();
String ffmpegAbi; String ffmpegAbi;
boolean libLoaded=false; boolean libLoaded=false;

6
src/org/linphone/LinphoneManager.java
View file

@ -715,9 +715,11 @@ public class LinphoneManager implements LinphoneCoreListener {
} }
try { try {
Contact contact = ContactsManager.getInstance().findContactWithAddress(mServiceContext.getContentResolver(),from); Contact contact = ContactsManager.getInstance().findContactWithAddress(mServiceContext.getContentResolver(), from);
if (!mServiceContext.getResources().getBoolean(R.bool.disable_chat__message_notification)) { if (!mServiceContext.getResources().getBoolean(R.bool.disable_chat__message_notification)) {
if(LinphoneActivity.isInstanciated() && LinphoneActivity.instance().displayChatMessageNotification(from.asStringUriOnly())) { if (LinphoneActivity.isInstanciated() && !LinphoneActivity.instance().displayChatMessageNotification(from.asStringUriOnly())) {
return;
} else {
if (contact != null) { if (contact != null) {
LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), contact.getName(), textMessage); LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), contact.getName(), textMessage);
} else { } else {

15
src/org/linphone/compatibility/ApiFivePlus.java
View file

@ -268,14 +268,15 @@ public class ApiFivePlus {
String sipUri = username + "@" + domain; String sipUri = username + "@" + domain;
Cursor cursor = getSIPContactCursor(cr, sipUri); Cursor cursor = getSIPContactCursor(cr, sipUri);
Contact contact = getContact(cr, cursor, 0); if(cursor != null) {
if (contact != null && contact.getNumbersOrAddresses().contains(sipUri)) { Contact contact = getContact(cr, cursor, 0);
address.setDisplayName(contact.getName()); if (contact != null && contact.getNumbersOrAddresses().contains(sipUri)) {
address.setDisplayName(contact.getName());
cursor.close();
return contact.getPhotoUri();
}
cursor.close(); cursor.close();
return contact.getPhotoUri();
} }
cursor.close();
return null; return null;
} }
@ -286,8 +287,6 @@ public class ApiFivePlus {
cursor.close(); cursor.close();
return contactDisplayName; return contactDisplayName;
} }
cursor.close();
return null; return null;
} }

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 6fd479005cf9e9be15449cab34717fe17bda6dc5 Subproject commit 1ffd890571879bba9a58251dfe7dd5249c011517

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2cfc9ecfd8c3d670e54fc6d4a75e6982bf42f74e Subproject commit ad1d7c12c9b459660b34d63408b144bf5890f3b6

2
tests/custom_rules.xml
View file

@ -34,8 +34,8 @@
<resourcecontains resource="${output.file}" substring="Native crash" /> <resourcecontains resource="${output.file}" substring="Native crash" />
<resourcecontains resource="${output.file}" substring="longMsg=junit.framework.AssertionFailedError: View with id: '" /> <resourcecontains resource="${output.file}" substring="longMsg=junit.framework.AssertionFailedError: View with id: '" />
<resourcecontains resource="${output.file}" substring="longMsg=java.lang.RuntimeException:" /> <resourcecontains resource="${output.file}" substring="longMsg=java.lang.RuntimeException:" />
<resourcecontains resource="${output.file}" substring="longMsg=java.lang.NullPointerException:" />
</or> </or>
</condition> </condition>
<exec executable="bash" unless:set="has.crashed"> <exec executable="bash" unless:set="has.crashed">
<arg value="-c"/> <arg value="-c"/>