mobile/element-android
mobile/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-01 13:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

VoIP: clean code

Browse source
This commit is contained in:
ganfra 2020-12-17 12:05:43 +01:00
parent 801f130ce6
commit b8649fa077
14 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
vector/src/main/java/im/vector/app/core/services/CallService.kt
View file

@ -309,7 +309,6 @@ class CallService : VectorService(), WiredHeadsetStateReceiver.HeadsetEventListe
ContextCompat.startForegroundService(context, intent)
}
fun onOutgoingCallRinging(context: Context,
callId: String) {
val intent = Intent(context, CallService::class.java)

2
vector/src/main/java/im/vector/app/core/ui/views/CurrentCallsView.kt
View file

@ -62,7 +62,7 @@ class CurrentCallsView @JvmOverloads constructor(
}
} else {
if (heldCalls.size > 1) {
currentCallsInfo.text = resources.getString(R.string.call_only_multiple_paused , heldCalls.size)
currentCallsInfo.text = resources.getString(R.string.call_only_multiple_paused, heldCalls.size)
} else if (heldCalls.size == 1) {
currentCallsInfo.text = resources.getString(R.string.call_active_and_single_paused, formattedDuration)
} else {

5
vector/src/main/java/im/vector/app/core/utils/CountUpTimer.kt
View file

@ -16,9 +16,7 @@
package im.vector.app.core.utils
import io.reactivex.Flowable
import io.reactivex.Observable
import io.reactivex.disposables.Disposable
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.atomic.AtomicLong
@ -37,7 +35,7 @@ class CountUpTimer(private val intervalInMs: Long) {
var tickListener: TickListener? = null
fun elapsedTime(): Long{
fun elapsedTime(): Long {
return elapsedTime.get()
}
@ -56,5 +54,4 @@ class CountUpTimer(private val intervalInMs: Long) {
interface TickListener {
fun onTick(milliseconds: Long)
}
}

4
vector/src/main/java/im/vector/app/features/call/SharedKnownCallsViewModel.kt
View file

@ -32,13 +32,13 @@ class SharedKnownCallsViewModel @Inject constructor(
val callListener = object : WebRtcCall.Listener {
override fun onStateUpdate(call: MxCall) {
//post it-self
// post it-self
liveKnownCalls.postValue(liveKnownCalls.value)
}
override fun onHoldUnhold() {
super.onHoldUnhold()
//post it-self
// post it-self
liveKnownCalls.postValue(liveKnownCalls.value)
}
}

10
vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
View file

@ -177,7 +177,7 @@ class VectorCallActivity : VectorBaseActivity(), CallControlsView.InteractionLis
when (callState) {
is CallState.Idle,
is CallState.CreateOffer,
is CallState.Dialing, -> {
is CallState.Dialing -> {
callVideoGroup.isInvisible = true
callInfoGroup.isVisible = true
callStatusText.setText(R.string.call_ring)
@ -262,7 +262,13 @@ class VectorCallActivity : VectorBaseActivity(), CallControlsView.InteractionLis
} else {
val otherCall = callManager.getCallById(state.otherKnownCallInfo.callId)
val colorFilter = ContextCompat.getColor(this, R.color.bg_call_screen)
avatarRenderer.renderBlur(state.otherKnownCallInfo.otherUserItem, otherKnownCallAvatarView, sampling = 20, rounded = false, colorFilter = colorFilter)
avatarRenderer.renderBlur(
matrixItem = state.otherKnownCallInfo.otherUserItem,
imageView = otherKnownCallAvatarView,
sampling = 20,
rounded = false,
colorFilter = colorFilter
)
otherKnownCallLayout.isVisible = true
otherSmallIsHeldIcon.isVisible = otherCall?.let { it.isLocalOnHold || it.remoteOnHold }.orFalse()
}

4
vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
View file

@ -558,11 +558,15 @@ class WebRtcCall(val mxCall: MxCall,
remoteOnHold = true
isLocalOnHold = true
direction = RtpTransceiver.RtpTransceiverDirection.INACTIVE
timer.pause()
} else {
remoteOnHold = false
isLocalOnHold = wasLocalOnHold
onCallBecomeActive(this@WebRtcCall)
direction = RtpTransceiver.RtpTransceiverDirection.SEND_RECV
if (!isLocalOnHold) {
timer.resume()
}
}
for (transceiver in peerConnection?.transceivers ?: emptyList()) {
transceiver.direction = direction

10
vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
View file

@ -206,6 +206,10 @@ class WebRtcCallManager @Inject constructor(
fun startOutgoingCall(signalingRoomId: String, otherUserId: String, isVideoCall: Boolean) {
Timber.v("## VOIP startOutgoingCall in room $signalingRoomId to $otherUserId isVideo $isVideoCall")
if (getCallsByRoomId(signalingRoomId).isNotEmpty()) {
Timber.w("## VOIP you already have a call in this room")
return
}
if (currentCall.get() != null && currentCall.get()?.mxCall?.state !is CallState.Connected || getCalls().size >= 2) {
Timber.w("## VOIP cannot start outgoing call")
// Just ignore, maybe we could answer from other session?
@ -276,7 +280,11 @@ class WebRtcCallManager @Inject constructor(
override fun onCallInviteReceived(mxCall: MxCall, callInviteContent: CallInviteContent) {
Timber.v("## VOIP onCallInviteReceived callId ${mxCall.callId}")
if (currentCall.get() != null && currentCall.get()?.mxCall?.state !is CallState.Connected || getCalls().size >= 2) {
if (getCallsByRoomId(mxCall.roomId).isNotEmpty()) {
Timber.w("## VOIP you already have a call in this room")
return
}
if ((currentCall.get() != null && currentCall.get()?.mxCall?.state !is CallState.Connected) || getCalls().size >= 2) {
Timber.w("## VOIP receiving incoming call but cannot handle it")
// Just ignore, maybe we could answer from other session?
return

2
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
View file

@ -805,7 +805,7 @@ class RoomDetailFragment @Inject constructor(
// resume existing if same room, if not prompt to kill and then restart new call?
if (currentCall.mxCall.roomId == roomDetailArgs.roomId) {
onTapToReturnToCall()
}else {
} else {
safeStartCall(isVideoCall)
}
} else if (!state.isAllowedToStartWebRTCCall) {

3
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
View file

@ -16,8 +16,6 @@
package im.vector.app.features.home.room.detail.timeline.factory
import android.content.Intent
import android.os.Parcelable
import android.text.SpannableStringBuilder
import android.text.Spanned
import android.text.TextPaint
@ -40,7 +38,6 @@ import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadSt
import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
import im.vector.app.features.home.room.detail.timeline.item.MessageBlockCodeItem

1
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
View file

@ -21,7 +21,6 @@ import im.vector.app.core.epoxy.VectorEpoxyModel
import im.vector.app.core.resources.StringProvider
import im.vector.app.core.resources.UserPreferencesProvider
import im.vector.app.features.home.room.detail.timeline.TimelineEventController
import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
import im.vector.app.features.home.room.detail.timeline.item.RoomCreateItem_
import me.gujun.android.span.span
import org.matrix.android.sdk.api.session.Session

1
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
View file

@ -24,7 +24,6 @@ import im.vector.app.features.home.room.detail.timeline.TimelineEventController
import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem
import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem_
import org.matrix.android.sdk.api.session.Session

3
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt
View file

@ -16,7 +16,6 @@
package im.vector.app.features.home.room.detail.timeline.helper
import im.vector.app.core.di.ScreenScope
import org.matrix.android.sdk.api.session.room.model.RoomSummary
import javax.inject.Inject
import javax.inject.Singleton
@ -36,7 +35,7 @@ class RoomSummaryHolder @Inject constructor() {
fun get(roomId: String) = roomSummaries[roomId]
fun remove(roomId: String)= roomSummaries.remove(roomId)
fun remove(roomId: String) = roomSummaries.remove(roomId)
fun clear() {
roomSummaries.clear()

1
vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
View file

@ -113,5 +113,4 @@ interface Navigator {
options: ((MutableList<Pair<View, String>>) -> Unit)?)
fun openSearch(context: Context, roomId: String)
}

2
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
View file

@ -297,7 +297,6 @@ class NotificationUtils @Inject constructor(private val context: Context,
.setLights(accentColor, 500, 500)
.setOngoing(true)
val contentIntent = VectorCallActivity.newIntent(
context = context,
mxCall = mxCall,
@ -391,7 +390,6 @@ class NotificationUtils @Inject constructor(private val context: Context,
@SuppressLint("NewApi")
fun buildPendingCallNotification(mxCall: MxCall,
title: String): Notification {
val builder = NotificationCompat.Builder(context, SILENT_NOTIFICATION_CHANNEL_ID)
.setContentTitle(ensureTitleNotEmpty(title))
.apply {