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

Merge branch 'master' of git.linphone.org:linphone-android into obiane_new

Browse source
This commit is contained in:
Erwan Croze 2018-07-12 09:16:59 +02:00
commit a230b2ed13
6 changed files with 37 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -48,6 +48,9 @@ WORK
.d
google-services.json
.*clang*
linphone.iml
**/*.iml
src/linphone-wrapper
liblinphone_tester/res/raw/
**/.classpath
**/.project
**/*.kdev4

2
gradle.properties
View file

@ -4,4 +4,4 @@ RELEASE_STORE_PASSWORD=
RELEASE_KEY_ALIAS=
RELEASE_KEY_PASSWORD=
#source:https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

1
liblinphone-sdk/build.gradle
View file

@ -113,6 +113,7 @@ android {
assets.srcDirs = ["${buildDir}/sdk-assets/assets/"]
renderscript.srcDirs = srcDir
jniLibs.srcDirs = ['../libs']
resources.srcDir("res")
java.excludes = ['**/mediastream/MediastreamerActivity.java']

12
prepare.py
View file

@ -268,7 +268,8 @@ copy-libs:
\t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs/armeabi; \\
\tfi
\tif test -f "liblinphone-sdk/android-arm/lib/wrap.sh"; then \\
\t\tcp -f liblinphone-sdk/android-arm/lib/wrap.sh libs/armeabi; \\
\t\tmkdir -p liblinphone-sdk/res/lib/armeabi && \\
\t\tcp -f liblinphone-sdk/android-arm/lib/wrap.sh liblinphone-sdk/res/lib/armeabi; \\
\tfi
\trm -rf libs-debug/armeabi-v7a
\trm -rf libs/armeabi-v7a
@ -288,7 +289,8 @@ copy-libs:
\t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\
\tfi
\tif test -f "liblinphone-sdk/android-armv7/lib/wrap.sh"; then \\
\t\tcp -f liblinphone-sdk/android-armv7/lib/wrap.sh libs/armeabi-v7a; \\
\t\tmkdir -p liblinphone-sdk/res/lib/armeabi-v7a && \\
\t\tcp -f liblinphone-sdk/android-armv7/lib/wrap.sh liblinphone-sdk/res/lib/armeabi-v7a; \\
\tfi
\trm -rf libs-debug/arm64-v8a
\trm -rf libs/arm64-v8a
@ -308,7 +310,8 @@ copy-libs:
\t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs/arm64-v8a; \\
\tfi
\tif test -f "liblinphone-sdk/android-arm64/lib/wrap.sh"; then \\
\t\tcp -f liblinphone-sdk/android-arm64/lib/wrap.sh libs/arm64-v8a; \\
\t\tmkdir -p liblinphone-sdk/res/lib/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/lib/wrap.sh liblinphone-sdk/res/lib/arm64-v8a; \\
\tfi
\trm -rf libs-debug/x86
\trm -rf libs/x86
@ -328,7 +331,8 @@ copy-libs:
\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\
\tfi
\tif test -f "liblinphone-sdk/android-x86/lib/wrap.sh"; then \\
\t\tcp -f liblinphone-sdk/android-x86/lib/wrap.sh libs/x86; \\
\t\tmkdir -p liblinphone-sdk/res/lib/x86 && \\
\t\tcp -f liblinphone-sdk/android-x86/lib/wrap.sh liblinphone-sdk/res/lib/x86; \\
\tfi
copy-libs-mediastreamer:

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

@ -2,7 +2,7 @@ package org.linphone;
/*
LinphoneManager.java
Copyright (C) 2017 Belledonne Communications, Grenoble, France
Copyright (C) 2018 Belledonne Communications, Grenoble, France
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

43
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -387,28 +387,29 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
ChatMessage message = event.getChatMessage();
String messageId = message.getMessageId();
switch(item.getItemId()) {
case R.id.resend:
mEventsAdapter.removeItem(info.position);
message.resend();
return true;
case R.id.imdn_infos:
LinphoneActivity.instance().goToChatMessageImdnInfos(getRemoteSipUri(), messageId);
return true;
case R.id.copy_text:
if (message.hasTextContent()) {
ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText("Message", message.getTextContent());
clipboard.setPrimaryClip(clip);
}
return true;
case R.id.delete_message:
mChatRoom.deleteMessage(message);
mEventsAdapter.removeItem(info.position);
return true;
default:
return super.onContextItemSelected(item);
if (item.getItemId() == R.id.resend) {
mEventsAdapter.removeItem(info.position);
message.resend();
return true;
}
if (item.getItemId() == R.id.imdn_infos) {
LinphoneActivity.instance().goToChatMessageImdnInfos(getRemoteSipUri(), messageId);
return true;
}
if (item.getItemId() == R.id.copy_text) {
if (message.hasTextContent()) {
ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText("Message", message.getTextContent());
clipboard.setPrimaryClip(clip);
}
return true;
}
if (item.getItemId() == R.id.delete_message) {
mChatRoom.deleteMessage(message);
mEventsAdapter.removeItem(info.position);
return true;
}
return super.onContextItemSelected(item);
}
/**