From f0941b1d49537aa070a68906d6e4abc853f2a4ed Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 11 Jul 2018 10:45:35 +0200 Subject: [PATCH 1/5] Fixed linphone-android-sdk compil --- liblinphone-sdk/liblinphone-sdk.iml | 130 ++++++++++++++++++ .../org/linphone/chat/GroupChatFragment.java | 43 +++--- 2 files changed, 152 insertions(+), 21 deletions(-) create mode 100644 liblinphone-sdk/liblinphone-sdk.iml diff --git a/liblinphone-sdk/liblinphone-sdk.iml b/liblinphone-sdk/liblinphone-sdk.iml new file mode 100644 index 000000000..3e15c3ec1 --- /dev/null +++ b/liblinphone-sdk/liblinphone-sdk.iml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java index b7b42af43..83c29c7d4 100644 --- a/src/android/org/linphone/chat/GroupChatFragment.java +++ b/src/android/org/linphone/chat/GroupChatFragment.java @@ -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); } /** From 525e4a14730db1c114a932df19d3479c912f8b2c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 11 Jul 2018 12:26:41 +0200 Subject: [PATCH 2/5] Increased gradle max memory --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a4996c82d..a1e7a7cb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 From c7e69c08e1e3b58883e471d6c93b26cf12a628b3 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 11 Jul 2018 17:13:29 +0200 Subject: [PATCH 3/5] Update prepare.py and sdk for sanitizer --- liblinphone-sdk/build.gradle | 1 + prepare.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/liblinphone-sdk/build.gradle b/liblinphone-sdk/build.gradle index 9889fe322..1151c0c8d 100644 --- a/liblinphone-sdk/build.gradle +++ b/liblinphone-sdk/build.gradle @@ -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'] diff --git a/prepare.py b/prepare.py index f29602f74..0b954b293 100755 --- a/prepare.py +++ b/prepare.py @@ -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: From ec23dd6ea3a01c7273b958e6ab24011a55cda9b0 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 12 Jul 2018 09:09:19 +0200 Subject: [PATCH 4/5] Update gitignore --- .gitignore | 5 +- liblinphone-sdk/liblinphone-sdk.iml | 130 ---------------------------- 2 files changed, 4 insertions(+), 131 deletions(-) delete mode 100644 liblinphone-sdk/liblinphone-sdk.iml diff --git a/.gitignore b/.gitignore index f1ed51c97..5a8923c0d 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,9 @@ WORK .d google-services.json .*clang* -linphone.iml +**/*.iml src/linphone-wrapper liblinphone_tester/res/raw/ +**/.classpath +**/.project +**/*.kdev4 diff --git a/liblinphone-sdk/liblinphone-sdk.iml b/liblinphone-sdk/liblinphone-sdk.iml deleted file mode 100644 index 3e15c3ec1..000000000 --- a/liblinphone-sdk/liblinphone-sdk.iml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 1de9d21ea1b7fc52fb6f9cfb377b2a349f1547c1 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 12 Jul 2018 09:13:59 +0200 Subject: [PATCH 5/5] Clean LinphoneManager header --- src/android/org/linphone/LinphoneManager.java | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index 677f41225..b157eb9e6 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -1,26 +1,8 @@ -/* -LinphoneManager.java -Copyright (C) 2010 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 -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ 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