Merge pull request #29 from AgoraIO-Community/meher-dev

Update RTC + RTM
AgoraIO-Community · Nov 23, 2022 · 2f70031 · 2f70031
2 parents 7b5f143 + bdf2ff0
commit 2f70031
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 # Agora VideoUIKit for Android
 
 <p align="center">
-	<a href="https://jitpack.io/#AgoraIO-Community/Android-UIKit">
-    <img src="https://jitpack.io/v/AgoraIO-Community/Android-UIKit.svg"/></a>
-	<img src="https://github.com/AgoraIO-Community/Android-UIKit/workflows/Build/badge.svg"/>
-  <img src="https://img.shields.io/github/license/AgoraIO-Community/Android-UIKit"/>
+	<a href="https://jitpack.io/#AgoraIO-Community/VideoUIKit-Android">
+    <img src="https://jitpack.io/v/AgoraIO-Community/VideoUIKit-Android.svg"/></a>
+	<img src="https://github.com/AgoraIO-Community/VideoUIKit-Android/workflows/Build/badge.svg"/>
+  <img src="https://img.shields.io/github/license/AgoraIO-Community/VideoUIKit-Android"/>
   <a href="https://www.agora.io/en/join-slack/">
     <img src="https://img.shields.io/badge/slack-@RTE%20Dev-blue.svg?logo=slack">
   </a>
@@ -16,6 +16,7 @@ Instantly integrate Agora in your own Android application or prototype.
 <p align="center"><img src="https://camo.githubusercontent.com/affd109caf06f0014a55bc411b66b34b8dc68f8d86befe6a2f27dad1fc7c6a5b/68747470733a2f2f692e6962622e636f2f5853576d57397a2f4e65772d50726f6a6563742d372e706e67"/>
 </p>
 
+
 ## Requirements
 
 - Android 24+

diff --git a/agorauikit_android/build.gradle.kts b/agorauikit_android/build.gradle.kts
@@ -62,8 +62,8 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
     implementation("androidx.core:core-ktx:1.7.0")
     implementation("androidx.appcompat:appcompat:1.4.1")
-    api("io.agora.rtc:full-sdk:4.0.0.5")
-    api("io.agora.rtm:rtm-sdk:1.4.10")
+    api("io.agora.rtc:full-sdk:4.0.1")
+    api("io.agora.rtm:rtm-sdk:1.5.3")
     implementation("com.squareup.okhttp3:okhttp:4.10.0")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
     testImplementation("junit:junit:4.13.2")

diff --git a/...id/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmChannelHandler.kt b/...id/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmChannelHandler.kt
@@ -4,8 +4,6 @@ import io.agora.agorauikit_android.AgoraVideoViewer
 import io.agora.rtm.RtmChannelAttribute
 import io.agora.rtm.RtmChannelListener
 import io.agora.rtm.RtmChannelMember
-import io.agora.rtm.RtmFileMessage
-import io.agora.rtm.RtmImageMessage
 import io.agora.rtm.RtmMessage
 import java.util.logging.Level
 import java.util.logging.Logger
@@ -33,15 +31,7 @@ open class AgoraRtmChannelHandler(private val hostView: AgoraVideoViewer) : RtmC
         AgoraRtmController.messageReceived(rtmMessage.text, hostView)
         this.hostView.rtmChannelOverrideHandler?.onMessageReceived(rtmMessage, rtmChannelMember)
     }
-    override fun onImageMessageReceived(
-        p0: RtmImageMessage?,
-        p1: RtmChannelMember?
-    ) {
-        this.hostView.rtmChannelOverrideHandler?.onImageMessageReceived(p0, p1)
-    }
-    override fun onFileMessageReceived(p0: RtmFileMessage?, p1: RtmChannelMember?) {
-        this.hostView.rtmChannelOverrideHandler?.onFileMessageReceived(p0, p1)
-    }
+
     override fun onMemberJoined(rtmChannelMember: RtmChannelMember) {
         Logger.getLogger("AgoraVideoUIKit").log(Level.SEVERE, "RTM member : ${rtmChannelMember.userId}  joined channel : ${rtmChannelMember.channelId}")
         AgoraRtmController.sendUserData(toChannel = false, peerRtmId = rtmChannelMember.userId, hostView = this.hostView)

diff --git a/...oid/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmClientHandler.kt b/...oid/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmClientHandler.kt
@@ -2,9 +2,6 @@ package io.agora.agorauikit_android.AgoraRtmController
 
 import io.agora.agorauikit_android.AgoraVideoViewer
 import io.agora.rtm.RtmClientListener
-import io.agora.rtm.RtmFileMessage
-import io.agora.rtm.RtmImageMessage
-import io.agora.rtm.RtmMediaOperationProgress
 import io.agora.rtm.RtmMessage
 import java.util.logging.Level
 import java.util.logging.Logger
@@ -28,32 +25,14 @@ class AgoraRtmClientHandler(private val hostView: AgoraVideoViewer) : RtmClientL
         this.hostView.rtmClientOverrideHandler?.onMessageReceived(rtmMessage, peerId)
     }
 
-    override fun onImageMessageReceivedFromPeer(p0: RtmImageMessage?, p1: String?) {
-        this.hostView.rtmClientOverrideHandler?.onImageMessageReceivedFromPeer(p0, p1)
-    }
-
-    override fun onFileMessageReceivedFromPeer(p0: RtmFileMessage?, p1: String?) {
-        this.hostView.rtmClientOverrideHandler?.onFileMessageReceivedFromPeer(p0, p1)
-    }
-
-    override fun onMediaUploadingProgress(
-        p0: RtmMediaOperationProgress?,
-        p1: Long
-    ) {
-        this.hostView.rtmClientOverrideHandler?.onMediaUploadingProgress(p0, p1)
-    }
-
-    override fun onMediaDownloadingProgress(
-        p0: RtmMediaOperationProgress?,
-        p1: Long
-    ) {
-        this.hostView.rtmClientOverrideHandler?.onMediaDownloadingProgress(p0, p1)
-    }
-
     override fun onTokenExpired() {
         this.hostView.rtmClientOverrideHandler?.onTokenExpired()
     }
 
+    override fun onTokenPrivilegeWillExpire() {
+        this.hostView.rtmClientOverrideHandler?.onTokenPrivilegeWillExpire()
+    }
+
     override fun onPeersOnlineStatusChanged(peerStatus: MutableMap<String, Int>?) {
         Logger.getLogger("AgoraVideoUIKit").log(Level.INFO, "onPeerOnlineStatusChanged: $peerStatus")
 

diff --git a/...ain/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+MuteRequest.kt b/...ain/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+MuteRequest.kt
@@ -50,7 +50,7 @@ data class UIKitData(
     @SerialName("version") var version: String,
 ) : java.io.Serializable {
     companion object {
-        val current: UIKitData = UIKitData("android", "native", "2.1.0")
+        val current: UIKitData = UIKitData("android", "native", "4.0.1")
     }
 }
 
@@ -87,7 +87,6 @@ fun AgoraRtmController.Companion.sendUserData(
     Logger.getLogger("AgoraVideoUIKit").log(Level.INFO, message.text)
 
     val option = SendMessageOptions()
-    option.enableOfflineMessaging = true
 
     if (!toChannel) {
         hostView.agRtmClient.sendMessageToPeer(
@@ -142,7 +141,6 @@ fun AgoraRtmController.Companion.sendMuteRequest(
     val message: RtmMessage = hostView.agRtmClient.createMessage(data)
 
     val option = SendMessageOptions()
-    option.enableOfflineMessaging = true
 
     if (peerRtcId == hostView.userID) {
         Logger.getLogger("AgoraVideoUIKit").log(Level.SEVERE, "Can't send message to local user")