diff --git a/audiocall/build.gradle b/audiocall/build.gradle index 5aeb7fd..d66ca89 100644 --- a/audiocall/build.gradle +++ b/audiocall/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2021, Zingaya, Inc. All rights reserved. + * Copyright (c) 2011 - 2024, Zingaya, Inc. All rights reserved. */ plugins { @@ -22,7 +22,7 @@ android { targetSdk 33 multiDexEnabled true versionCode 1 - versionName "1.6.0" + versionName "1.6.1" vectorDrawables.useSupportLibrary = true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/build.gradle b/build.gradle index 246ea29..389aa54 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2011 - 2024, Zingaya, Inc. All rights reserved. + */ + // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { @@ -8,7 +12,7 @@ buildscript { firebase_crashlytics_version = '2.9.9' firebase_bom_version = '32.3.1' - voximplant_sdk_version = '2.39.0' + voximplant_sdk_version = '2.40.1' material_version = '1.9.0' appcompat_version = '1.6.1' diff --git a/shared/src/main/java/com/voximplant/demos/kotlin/services/VoximplantCallManager.kt b/shared/src/main/java/com/voximplant/demos/kotlin/services/VoximplantCallManager.kt index 2ba780d..4a91f8d 100644 --- a/shared/src/main/java/com/voximplant/demos/kotlin/services/VoximplantCallManager.kt +++ b/shared/src/main/java/com/voximplant/demos/kotlin/services/VoximplantCallManager.kt @@ -23,8 +23,8 @@ import com.voximplant.sdk.call.* import com.voximplant.sdk.client.IClient import com.voximplant.sdk.client.IClientIncomingCallListener import com.voximplant.sdk.hardware.* -import org.webrtc.RendererCommon.RendererEvents -import org.webrtc.VideoSink +import com.voximplant.webrtc.RendererCommon.RendererEvents +import com.voximplant.webrtc.VideoSink import java.util.* import kotlin.concurrent.scheduleAtFixedRate diff --git a/shared/src/main/java/com/voximplant/demos/kotlin/utils/Shared.kt b/shared/src/main/java/com/voximplant/demos/kotlin/utils/Shared.kt index be0fd72..b0f2c47 100644 --- a/shared/src/main/java/com/voximplant/demos/kotlin/utils/Shared.kt +++ b/shared/src/main/java/com/voximplant/demos/kotlin/utils/Shared.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2021, Zingaya, Inc. All rights reserved. + * Copyright (c) 2011 - 2024, Zingaya, Inc. All rights reserved. */ package com.voximplant.demos.kotlin.utils @@ -9,7 +9,7 @@ import android.telecom.PhoneAccount import com.voximplant.demos.kotlin.services.AuthService import com.voximplant.demos.kotlin.services.VoximplantCallManager import com.voximplant.sdk.hardware.ICameraManager -import org.webrtc.EglBase +import com.voximplant.webrtc.EglBase object Shared { var appInForeground: Boolean = false diff --git a/videocall-deepar/build.gradle b/videocall-deepar/build.gradle index 308b1d2..28ffc1a 100644 --- a/videocall-deepar/build.gradle +++ b/videocall-deepar/build.gradle @@ -1,5 +1,9 @@ apply plugin: 'com.android.application' +/* + * Copyright (c) 2011 - 2024, Zingaya, Inc. All rights reserved. + */ + // Uncomment this line to enable push notifications // google-services.json file is required //apply plugin: 'com.google.gms.google-services' @@ -20,7 +24,7 @@ android { targetSdk 33 multiDexEnabled true versionCode 1 - versionName "1.4.0" + versionName "1.4.1" vectorDrawables.useSupportLibrary = true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/VideoCallApplication.kt b/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/VideoCallApplication.kt index 6743ce2..3872017 100644 --- a/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/VideoCallApplication.kt +++ b/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/VideoCallApplication.kt @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2011 - 2024, Zingaya, Inc. All rights reserved. + */ + package com.voximplant.demos.kotlin.videocall_deepar import android.Manifest @@ -21,7 +25,7 @@ import com.voximplant.demos.kotlin.videocall_deepar.stories.incoming_call.Incomi import com.voximplant.sdk.Voximplant import com.voximplant.sdk.call.VideoFlags import com.voximplant.sdk.client.ClientConfig -import org.webrtc.EglBase +import com.voximplant.webrtc.EglBase import java.util.concurrent.Executors @SuppressLint("StaticFieldLeak") diff --git a/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/stories/call/CallActivity.kt b/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/stories/call/CallActivity.kt index 2471923..01b45f0 100644 --- a/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/stories/call/CallActivity.kt +++ b/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/stories/call/CallActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2021, Zingaya, Inc. All rights reserved. + * Copyright (c) 2011 - 2024, Zingaya, Inc. All rights reserved. */ package com.voximplant.demos.kotlin.videocall_deepar.stories.call @@ -19,8 +19,8 @@ import com.voximplant.demos.kotlin.videocall_deepar.databinding.ActivityCallBind import com.voximplant.demos.kotlin.videocall_deepar.stories.call_failed.CallFailedActivity import com.voximplant.demos.kotlin.videocall_deepar.stories.main.MainActivity import com.voximplant.sdk.hardware.AudioDevice -import org.webrtc.RendererCommon.ScalingType.SCALE_ASPECT_FILL -import org.webrtc.RendererCommon.ScalingType.SCALE_ASPECT_FIT +import com.voximplant.webrtc.RendererCommon.ScalingType.SCALE_ASPECT_FILL +import com.voximplant.webrtc.RendererCommon.ScalingType.SCALE_ASPECT_FIT class CallActivity : BaseActivity(CallViewModel::class.java) { private lateinit var binding: ActivityCallBinding diff --git a/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/stories/call/CallViewModel.kt b/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/stories/call/CallViewModel.kt index 139b155..2569b0d 100644 --- a/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/stories/call/CallViewModel.kt +++ b/videocall-deepar/src/main/java/com/voximplant/demos/kotlin/videocall_deepar/stories/call/CallViewModel.kt @@ -20,7 +20,7 @@ import com.voximplant.demos.kotlin.videocall_deepar.deepARHelper import com.voximplant.sdk.Voximplant import com.voximplant.sdk.hardware.AudioDevice import com.voximplant.sdk.hardware.ICustomVideoSourceListener -import org.webrtc.SurfaceTextureHelper +import com.voximplant.webrtc.SurfaceTextureHelper import java.text.SimpleDateFormat import java.util.* diff --git a/videocall-deepar/src/main/res/layout/activity_call.xml b/videocall-deepar/src/main/res/layout/activity_call.xml index b7337b8..35f5cac 100644 --- a/videocall-deepar/src/main/res/layout/activity_call.xml +++ b/videocall-deepar/src/main/res/layout/activity_call.xml @@ -20,7 +20,7 @@ android:layout_height="match_parent" tools:context=".stories.call.CallActivity"> - - (CallViewModel::class.java) { private lateinit var binding: ActivityCallBinding diff --git a/videocall/src/main/res/layout/activity_call.xml b/videocall/src/main/res/layout/activity_call.xml index 3e7800d..5ad4ea1 100644 --- a/videocall/src/main/res/layout/activity_call.xml +++ b/videocall/src/main/res/layout/activity_call.xml @@ -20,7 +20,7 @@ android:layout_height="match_parent" tools:context=".stories.call.CallActivity"> - -