Skip to content

Commit 6cea55d

Browse files
committed
reformated kotlin_client package
1 parent dbb76e6 commit 6cea55d

18 files changed

+58
-51
lines changed

kotlin_client/src/main/java/com/huddle01/kotlin_client/HuddleClient.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.huddle01.kotlin_client
22

33
import RequestOuterClass.Request
44
import android.content.Context
5-
import com.huddle01.kotlin_client.core.Room
65
import com.huddle01.kotlin_client.core.LocalPeer
6+
import com.huddle01.kotlin_client.core.Room
77
import com.huddle01.kotlin_client.core.Socket
88
import com.huddle01.kotlin_client.models.enum_class.ConnectionState
99
import com.huddle01.kotlin_client.models.enum_class.RoomStates
@@ -79,7 +79,7 @@ class HuddleClient(projectId: String, context: Context) {
7979

8080
init {
8181
enableLogs()
82-
initSDKConnection(application = context.applicationContext as android.app.Application)
82+
initSDKConnection(application = context.applicationContext as android.app.Application)
8383
Timber.i("✅ Initializing HuddleClient")
8484
this.projectId = projectId
8585
_socket = Socket.getInstance()
@@ -158,7 +158,7 @@ class HuddleClient(projectId: String, context: Context) {
158158
Timber.plant(Timber.DebugTree())
159159
}
160160

161-
private fun initSDKConnection(application: android.app.Application) {
161+
private fun initSDKConnection(application: android.app.Application) {
162162
MediasoupClient.initialize(
163163
context = application,
164164
logHandler = object : LogHandler {

kotlin_client/src/main/java/com/huddle01/kotlin_client/common/EnhancedMap.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.huddle01.kotlin_client.common
22

33
class EnhancedMap<T>(
4-
private val compareFn: (String, String) -> Boolean = ::defaultCompareFn
4+
private val compareFn: (String, String) -> Boolean = ::defaultCompareFn,
55
) {
66
private val map: MutableMap<String, T> = mutableMapOf()
77

kotlin_client/src/main/java/com/huddle01/kotlin_client/common/ProtoParsing.kt

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package com.huddle01.kotlin_client.common
22

3+
import AppDataOuterClass
34
import RtpCapabilities
5+
import RtpParameters
6+
import SctpCapabilities
7+
import SdpInfo
48
import com.huddle01.kotlin_client.utils.JsonUtils
59
import org.json.JSONObject
610
import org.webrtc.MediaStreamTrack
@@ -136,7 +140,7 @@ object ProtoParsing {
136140
}
137141

138142
fun getParsedDtlsParameters(
139-
protoDtlsParametersList: List<SdpInfo.ProtoDtlsFingerPrints>, role: String
143+
protoDtlsParametersList: List<SdpInfo.ProtoDtlsFingerPrints>, role: String,
140144
): String {
141145
val fingerprints = protoDtlsParametersList.joinToString(",") { protoDtlsParams ->
142146
"""{"algorithm":"${protoDtlsParams.algorithm}","value":"${protoDtlsParams.value}"}"""
@@ -239,7 +243,7 @@ object ProtoParsing {
239243

240244
fun parseRtpCapabilities(
241245
codecs: List<RtpCapabilities.ProtoRtpCodecCapability>,
242-
headerExtensions: List<RtpCapabilities.ProtoRtpHeaderExtension>
246+
headerExtensions: List<RtpCapabilities.ProtoRtpHeaderExtension>,
243247
): String {
244248
fun parseCodec(codec: RtpCapabilities.ProtoRtpCodecCapability): String {
245249

@@ -307,7 +311,7 @@ object ProtoParsing {
307311
headerExtensions: List<RtpParameters.ProtoHeaderExtensionParameters>,
308312
encodings: List<RtpParameters.ProtoEncodings>,
309313
rtcp: RtpParameters.RtcpParameters,
310-
mid: String
314+
mid: String,
311315
): String {
312316
val codecsJson = codecs.joinToString(",", "\"codecs\":[", "]", transform = ::parseCodec)
313317
val headerExtensionsJson = headerExtensions.joinToString(

kotlin_client/src/main/java/com/huddle01/kotlin_client/core/LocalPeer.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import android.content.Context
2525
import android.media.MediaRecorder.AudioSource
2626
import android.os.Handler
2727
import android.os.Looper
28+
import com.google.gson.Gson
29+
import com.google.gson.reflect.TypeToken
2830
import com.huddle01.kotlin_client.common.EnhancedMap
2931
import com.huddle01.kotlin_client.common.ProtoParsing
3032
import com.huddle01.kotlin_client.constants.maxDataMessageSize
@@ -39,8 +41,6 @@ import com.huddle01.kotlin_client.types.TransportType
3941
import com.huddle01.kotlin_client.types.estimateSize
4042
import com.huddle01.kotlin_client.utils.EventEmitter
4143
import com.huddle01.kotlin_client.utils.PeerConnectionUtils
42-
import com.google.gson.Gson
43-
import com.google.gson.reflect.TypeToken
4444
import io.github.crow_misia.mediasoup.Consumer
4545
import io.github.crow_misia.mediasoup.Device
4646
import io.github.crow_misia.mediasoup.Producer
@@ -76,7 +76,7 @@ import java.util.Locale
7676
* Where Client Means the currently Running Application.
7777
*/
7878
class LocalPeer(
79-
context: Context
79+
context: Context,
8080
) : EventEmitter() {
8181

8282
private val scope = CoroutineScope(Job() + Dispatchers.Main)
@@ -432,7 +432,7 @@ class LocalPeer(
432432

433433

434434
suspend fun produce(
435-
label: String, audioTrack: AudioTrack?, videoTrack: VideoTrack?, appData: String?
435+
label: String, audioTrack: AudioTrack?, videoTrack: VideoTrack?, appData: String?,
436436
) {
437437
Timber.i("produce called")
438438
try {
@@ -642,7 +642,7 @@ class LocalPeer(
642642
* @returns Consumer?; Returns null if consumer is not found
643643
*/
644644
fun getConsumer(
645-
label: String, peerId: String
645+
label: String, peerId: String,
646646
): Consumer? {
647647
val consumer = consumers.get(label, peerId)
648648
return consumer
@@ -1520,7 +1520,7 @@ class LocalPeer(
15201520
}
15211521

15221522
override fun onProduce(
1523-
transport: Transport, kind: String, rtpParameters: String, appData: String?
1523+
transport: Transport, kind: String, rtpParameters: String, appData: String?,
15241524
): String {
15251525
try {
15261526
socket.publish(
@@ -1544,7 +1544,7 @@ class LocalPeer(
15441544
sctpStreamParameters: String,
15451545
label: String,
15461546
protocol: String,
1547-
appData: String?
1547+
appData: String?,
15481548
): String {
15491549
TODO("Not yet implemented")
15501550
}
@@ -1582,7 +1582,7 @@ class LocalPeer(
15821582
dtlsParameters: String,
15831583
sctpParameters: String? = null,
15841584
rtcConfig: PeerConnection.RTCConfiguration? = null,
1585-
appData: String? = null
1585+
appData: String? = null,
15861586
): Transport? {
15871587
Timber.i("createDeviceTransport called for $transportType")
15881588
val transport = when (transportType) {
@@ -1618,7 +1618,7 @@ class LocalPeer(
16181618
}
16191619

16201620
private fun connectionStateChangeHandler(
1621-
transport: Transport?, state: String, transportType: String
1621+
transport: Transport?, state: String, transportType: String,
16221622
) {
16231623
try {
16241624
Timber.d("🔔 $transportType Transport Connection State Changed, state: $state")
@@ -1715,7 +1715,7 @@ class LocalPeer(
17151715
* Helper function to close the consumer of a remote peer
17161716
*/
17171717
private fun closeRemotePeerConsumer(
1718-
peerId: String, label: String
1718+
peerId: String, label: String,
17191719
) {
17201720
try {
17211721
val remotePeer = room.getRemotePeerById(peerId)

kotlin_client/src/main/java/com/huddle01/kotlin_client/core/RemotePeer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class RemotePeer(
106106
* Adds label data and manages consumption based on auto-consume setting
107107
*/
108108
fun addLabelData(
109-
label: String, producerId: String, context: Context
109+
label: String, producerId: String, context: Context,
110110
) {
111111
_labelsToProducerId[label] = mutableMapOf("producerId" to producerId)
112112
try {

kotlin_client/src/main/java/com/huddle01/kotlin_client/core/Room.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.huddle01.kotlin_client.core
22

33
import RequestOuterClass.Request
4-
import com.huddle01.kotlin_client.utils.JsonUtils
4+
import ResponseOuterClass
55
import com.huddle01.kotlin_client.models.LobbyPeer
66
import com.huddle01.kotlin_client.models.RoomConfig
77
import com.huddle01.kotlin_client.models.RoomStats
88
import com.huddle01.kotlin_client.models.enum_class.RoomControlType
99
import com.huddle01.kotlin_client.models.enum_class.RoomStates
1010
import com.huddle01.kotlin_client.utils.EventEmitter
11+
import com.huddle01.kotlin_client.utils.JsonUtils
1112
import org.json.JSONException
1213
import org.json.JSONObject
1314
import timber.log.Timber
@@ -161,7 +162,7 @@ class Room(
161162
*/
162163
fun setNewLobbyPeers(
163164
peers: List<ResponseOuterClass.LobbyPeers>? = null,
164-
newLobbyPeer: ResponseOuterClass.NewLobbyPeer? = null
165+
newLobbyPeer: ResponseOuterClass.NewLobbyPeer? = null,
165166
) {
166167
peers?.forEach { peerMap ->
167168
peerMap.peerId?.let { peerId ->

kotlin_client/src/main/java/com/huddle01/kotlin_client/core/Socket.kt

+18-17
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
package com.huddle01.kotlin_client.core
22

3-
import RequestOuterClass.ConnectRoom
3+
import RequestOuterClass.CloseConsumer
4+
import RequestOuterClass.CloseProducer
45
import RequestOuterClass.CloseRoom
5-
import RequestOuterClass.Request
6-
import ResponseOuterClass.Response
7-
import RequestOuterClass.UpdateRoomMetadata
8-
import RequestOuterClass.KickPeer
6+
import RequestOuterClass.ConnectRoom
7+
import RequestOuterClass.ConnectTransport
8+
import RequestOuterClass.Consume
9+
import RequestOuterClass.CreateTransport
910
import RequestOuterClass.DenyLobbyPeer
10-
import RequestOuterClass.UpdatePeerRole
11-
import RequestOuterClass.SyncMeetingState
11+
import RequestOuterClass.KickPeer
12+
import RequestOuterClass.Produce
13+
import RequestOuterClass.Request
1214
import RequestOuterClass.RestartTransportIce
1315
import RequestOuterClass.ResumeConsumer
14-
import RequestOuterClass.CreateTransport
15-
import RequestOuterClass.ConnectTransport
16-
import RequestOuterClass.Produce
17-
import RequestOuterClass.Consume
18-
import RequestOuterClass.CloseProducer
19-
import RequestOuterClass.CloseConsumer
2016
import RequestOuterClass.SendData
17+
import RequestOuterClass.SyncMeetingState
2118
import RequestOuterClass.UpdatePeerMetadata
19+
import RequestOuterClass.UpdatePeerRole
20+
import RequestOuterClass.UpdateRoomMetadata
21+
import ResponseOuterClass.Response
2222
import com.huddle01.kotlin_client.common.ProtoParsing
23-
import com.huddle01.kotlin_client.utils.JsonUtils
2423
import com.huddle01.kotlin_client.models.GeoData
25-
import com.huddle01.kotlin_client.utils.EventEmitter
2624
import com.huddle01.kotlin_client.models.GeoLocation
2725
import com.huddle01.kotlin_client.models.enum_class.ConnectionState
2826
import com.huddle01.kotlin_client.types.ESocketCloseCode
29-
import java.net.HttpURLConnection
30-
import java.net.URL
27+
import com.huddle01.kotlin_client.utils.EventEmitter
28+
import com.huddle01.kotlin_client.utils.JsonUtils
3129
import kotlinx.coroutines.CoroutineScope
3230
import kotlinx.coroutines.Dispatchers
3331
import kotlinx.coroutines.launch
@@ -37,7 +35,9 @@ import org.java_websocket.client.WebSocketClient
3735
import org.java_websocket.enums.ReadyState
3836
import org.java_websocket.handshake.ServerHandshake
3937
import timber.log.Timber
38+
import java.net.HttpURLConnection
4039
import java.net.URI
40+
import java.net.URL
4141
import java.nio.ByteBuffer
4242
import java.util.Timer
4343
import kotlin.concurrent.schedule
@@ -497,6 +497,7 @@ class Socket : EventEmitter() {
497497
connection?.disconnect()
498498
}
499499
}
500+
500501
/**
501502
* Handle the incoming message from the server based on the events received from the server and call the subscribed event handler
502503
*/

kotlin_client/src/main/java/com/huddle01/kotlin_client/live_data/SupplierMutableLiveData.kt

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ class SupplierMutableLiveData<T>(supplier: () -> T) : MutableLiveData<T>() {
1010
}
1111

1212
}
13+
1314
init {
1415
value = supplier()
1516
}

kotlin_client/src/main/java/com/huddle01/kotlin_client/live_data/store/RoomStore.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.huddle01.kotlin_client.live_data.store
22

33
import androidx.lifecycle.ViewModel
4+
import com.huddle01.kotlin_client.live_data.SupplierMutableLiveData
45
import com.huddle01.kotlin_client.live_data.store.models.Me
56
import com.huddle01.kotlin_client.live_data.store.models.Peers
67
import com.huddle01.kotlin_client.live_data.store.models.RoomInfo
78
import com.huddle01.kotlin_client.models.enum_class.RoomStates
8-
import com.huddle01.kotlin_client.live_data.SupplierMutableLiveData
99
import io.github.crow_misia.mediasoup.Consumer
1010
import org.json.JSONObject
1111

kotlin_client/src/main/java/com/huddle01/kotlin_client/live_data/store/models/Peers.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.huddle01.kotlin_client.live_data.store.models
33
import io.github.crow_misia.mediasoup.Consumer
44
import org.json.JSONObject
55
import timber.log.Timber
6-
import java.util.*
6+
import java.util.Collections
77

88
class Peers {
99
private val peersInfo = Collections.synchronizedMap(LinkedHashMap<String, Peer>())

kotlin_client/src/main/java/com/huddle01/kotlin_client/live_data/store/models/RoomInfo.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ import com.huddle01.kotlin_client.models.enum_class.RoomStates
44

55
class RoomInfo(
66
var roomId: String = "",
7-
var connectionState: RoomStates = RoomStates.IDLE
7+
var connectionState: RoomStates = RoomStates.IDLE,
88
)

kotlin_client/src/main/java/com/huddle01/kotlin_client/models/GeoData.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package com.huddle01.kotlin_client.models
22

33
data class GeoData(
44
var region: String,
5-
val country: String
5+
val country: String,
66
)

kotlin_client/src/main/java/com/huddle01/kotlin_client/models/Reason.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ package com.huddle01.kotlin_client.models
33
data class Reason(
44
val code: Int,
55
val tag: String,
6-
val message: String
6+
val message: String,
77
)

kotlin_client/src/main/java/com/huddle01/kotlin_client/models/RoomConfig.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ data class RoomConfig(
55
var allowProduce: Boolean = true,
66
var allowProduceSources: ProduceSources = ProduceSources(cam = true, mic = true, screen = true),
77
var allowConsume: Boolean = true,
8-
var allowSendData: Boolean = true
8+
var allowSendData: Boolean = true,
99
)
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package com.huddle01.kotlin_client.models
22

33
data class RoomStats(
4-
val startTime: Long
4+
val startTime: Long,
55
)

kotlin_client/src/main/java/com/huddle01/kotlin_client/models/SendData.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ package com.huddle01.kotlin_client.models
33
data class SendData(
44
val to: ArrayList<String>,
55
val payload: String,
6-
val label: String?
6+
val label: String?,
77
)

kotlin_client/src/main/java/com/huddle01/kotlin_client/utils/EventEmitter.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ open class EventEmitter : EventEmitterInterface {
3030

3131
@Throws(Exception::class)
3232
override fun on(
33-
eventName: String, listener: (args: Array<out Any>) -> Unit
33+
eventName: String, listener: (args: Array<out Any>) -> Unit,
3434
): EventEmitterInterface {
3535
return addListener(eventName, listener)
3636
}
3737

3838

3939
@Throws(Exception::class)
4040
override fun once(
41-
eventName: String, listener: (args: Array<out Any>) -> Unit
41+
eventName: String, listener: (args: Array<out Any>) -> Unit,
4242
): EventEmitterInterface {
4343
return addListener(eventName, listener, true)
4444
}
4545

4646

4747
override fun addListener(
48-
eventName: String, listener: (args: Array<out Any>) -> Unit, isOnce: Boolean
48+
eventName: String, listener: (args: Array<out Any>) -> Unit, isOnce: Boolean,
4949
): EventEmitterInterface {
5050
if (defaultMaxListeners != 0 && listenerCount(eventName) >= defaultMaxListeners) {
5151
//maxListeners exception
@@ -60,7 +60,7 @@ open class EventEmitter : EventEmitterInterface {
6060

6161

6262
override fun removeListener(
63-
eventName: String, listener: (args: Array<out Any>) -> Unit
63+
eventName: String, listener: (args: Array<out Any>) -> Unit,
6464
): EventEmitterInterface {
6565
if (events.containsKey(eventName)) {
6666
val removeListeners: LinkedList<Listener> = LinkedList()

kotlin_client/src/main/java/com/huddle01/kotlin_client/utils/EventEmitterInterface.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ interface EventEmitterInterface {
1515
fun once(eventName: String, listener: (args: Array<out Any>) -> Unit): EventEmitterInterface
1616

1717
fun addListener(
18-
eventName: String, listener: (args: Array<out Any>) -> Unit, isOnce: Boolean = false
18+
eventName: String, listener: (args: Array<out Any>) -> Unit, isOnce: Boolean = false,
1919
): EventEmitterInterface
2020

2121

2222
fun removeListener(
23-
eventName: String, listener: (args: Array<out Any>) -> Unit
23+
eventName: String, listener: (args: Array<out Any>) -> Unit,
2424
): EventEmitterInterface
2525

2626
fun removeAllListeners(eventName: String): EventEmitterInterface

0 commit comments

Comments
 (0)