Fixed linphone-android-sdk compil
This commit is contained in:
parent
3935206f4e
commit
f0941b1d49
2 changed files with 152 additions and 21 deletions
130
liblinphone-sdk/liblinphone-sdk.iml
Normal file
130
liblinphone-sdk/liblinphone-sdk.iml
Normal file
|
@ -0,0 +1,130 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":liblinphone-sdk" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android-gradle" name="Android-Gradle">
|
||||
<configuration>
|
||||
<option name="GRADLE_PROJECT_PATH" value=":liblinphone-sdk" />
|
||||
</configuration>
|
||||
</facet>
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
|
||||
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
|
||||
<afterSyncTasks>
|
||||
<task>generateDebugSources</task>
|
||||
</afterSyncTasks>
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifestLibrary.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/bin/sdk-assets/assets" />
|
||||
<option name="PROJECT_TYPE" value="1" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager">
|
||||
<output url="file://$MODULE_DIR$/bin/intermediates/classes/debug" />
|
||||
<output-test url="file://$MODULE_DIR$/bin/intermediates/classes/test/debug" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/apt/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/r/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/aidl/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/rs/debug" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/res/rs/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/res/resValues/debug" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/res/rs/androidTest/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/res/resValues/androidTest/debug" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/generated/source/apt/test/debug" isTestSource="true" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/aidl" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/shaders" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/bin/sdk-assets/assets" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/android-arm64/share/linphonej/java/org/linphone/core" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/annotations" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/attr" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/blame" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/check-manifest" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/extractedTypedefs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/incremental" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/intermediate-jars" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/javaPrecompile" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/jniLibs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/library_and_local_jars_jni" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/lint" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/manifests" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/multi-dex" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/packaged-aidl" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/packaged-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/packagedAssets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/packaged_res" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/public_res" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/res" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/rs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/shaders" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/splits-support" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/symbols" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/tmp" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/intermediates/transforms" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/outputs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/sdk-assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/bin/tmp" />
|
||||
</content>
|
||||
<content url="file://$MODULE_DIR$/../submodules/linphone/wrappers/java/classes">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../submodules/linphone/wrappers/java/classes" isTestSource="false" />
|
||||
</content>
|
||||
<content url="file://$MODULE_DIR$/../submodules/mediastreamer2/java/src">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../submodules/mediastreamer2/java/src" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="com.android.support:multidex-1.0.2" level="project" />
|
||||
<orderEntry type="library" name="org.objenesis:objenesis:2.6@jar" level="project" />
|
||||
<orderEntry type="library" name="org.apache.commons:commons-compress:1.16.1@jar" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="com.android.support:multidex-instrumentation-1.0.2" level="project" />
|
||||
<orderEntry type="library" name="android-android-28" level="project" />
|
||||
</component>
|
||||
</module>
|
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue