mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-18 03:48:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'bc/master' into obiane_new

Browse source
This commit is contained in:
Erwan Croze 2018-08-21 11:53:21 +02:00
commit 301b59701c
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -8,9 +8,9 @@ Linphone is a free VoIP and video softphone based on the SIP protocol.
1. Download the Android sdk (API 28.0.0 at max) with platform-tools and tools updated to latest revision, then add both 'tools' and 'platform-tools' folders in your path and the android-sdk folder to ANDROID_HOME environment variable.
2. Download the Android ndk (version 16) from google and add it to your path (no symlink !!!) and ANDROID_NDK environment variable.
2. Download the Android NDK 17 from google and add it to your path (no symlink !!!) and ANDROID_NDK environment variable.
3. Install _yasm_, _nasm_ (For OpenH224 support only), _python_, _pkg_config_ and _cmake(>=3.10)_.
3. Install _yasm_, _nasm_ (For OpenH224 support only), _python_, _pkg_config_ and _cmake(>=3.12)_.
* On 64 bits linux systems you'll need the _ia32-libs_ package.
* With the latest Debian (multiarch), you need this:
* `dpkg --add-architecture i386`

1
res/values/non_localizable_custom.xml
View file

@ -81,6 +81,7 @@
<bool name="disable_chat_send_file">false</bool>
<string name="temp_photo_name">linphone-android-photo-temp</string>
<string name="temp_photo_name_with_date">linphone-android-photo-%s</string>
<bool name="lower_space_between_chat_bubbles_if_same_person">true</bool>
<!-- Contacts -->
<bool name="hide_contact_phone_numbers">false</bool>

2
src/android/org/linphone/chat/ChatEventsAdapter.java
View file

@ -208,7 +208,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
holder.bubbleLayout.setVisibility(View.VISIBLE);
final ChatMessage message = event.getChatMessage();
if (i > 0) {
if (i > 0 && mContext.getResources().getBoolean(R.bool.lower_space_between_chat_bubbles_if_same_person)) {
EventLog previousEvent = (EventLog)getItem(i-1);
if (previousEvent.getType() == EventLog.Type.ConferenceChatMessage) {
ChatMessage previousMessage = previousEvent.getChatMessage();