TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 11:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review feedback

Browse Source
This commit is contained in:
ThomasSession 2024-07-10 14:19:09 +10:00
parent eec45aea3d
commit 503f361f63
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
View File

@ -81,7 +81,7 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity(), SensorEventLis
}
private var hangupReceiver: BroadcastReceiver? = null
private lateinit var sensorManager: SensorManager
private var sensorManager: SensorManager? = null
private var rotationVectorSensor: Sensor? = null
private var lastOrientation = Orientation.UNKNOWN
@ -111,7 +111,7 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity(), SensorEventLis
sensorManager = getSystemService(SENSOR_SERVICE) as SensorManager
// Initialize the sensors
rotationVectorSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR)
rotationVectorSensor = sensorManager!!.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR)
}
binding = ActivityWebrtcBinding.inflate(layoutInflater)
@ -233,17 +233,13 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity(), SensorEventLis
override fun onResume() {
super.onResume()
rotationVectorSensor?.also { sensor ->
sensorManager.registerListener(this, sensor, SensorManager.SENSOR_DELAY_UI)
sensorManager?.registerListener(this, sensor, SensorManager.SENSOR_DELAY_UI)
}
}
override fun onPause() {
super.onPause()
try {
sensorManager.unregisterListener(this)
} catch (e: Exception) {
// the unregister can throw if the activity dies too quickly and the sensorManager is not initialised yet
}
sensorManager?.unregisterListener(this)
}
/**

25
app/src/main/java/org/thoughtcrime/securesms/webrtc/CallManager.kt
View File

@ -7,11 +7,13 @@ import androidx.core.content.ContextCompat
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.JsonPrimitive
import kotlinx.serialization.json.boolean
import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.jsonPrimitive
import kotlinx.serialization.json.put
import nl.komponents.kovenant.Promise
import nl.komponents.kovenant.functional.bind
@ -371,7 +373,7 @@ class CallManager(
val byteArray = ByteArray(buffer.data.remaining()) { buffer.data[it] }
val json = Json.parseToJsonElement(byteArray.decodeToString()) as JsonObject
if (json.containsKey("video")) {
_videoState.value = _videoState.value.copy(remoteVideoEnabled = (json["video"] as JsonPrimitive).boolean)
_videoState.update { it.copy(remoteVideoEnabled = json["video"]?.jsonPrimitive?.boolean ?: false) }
handleMirroring()
} else if (json.containsKey("hangup")) {
peerConnectionObservers.forEach(WebRtcListener::onHangup)
@ -625,17 +627,17 @@ class CallManager(
videoSwapped = !videoSwapped
// update the state
_videoState.value = _videoState.value.copy(swapped = videoSwapped)
_videoState.update { it.copy(swapped = videoSwapped) }
handleMirroring()
if (!videoSwapped) {
if (videoSwapped) {
peerConnection?.rotationVideoSink?.setSink(fullscreenRenderer)
floatingRenderer?.let{remoteRotationSink?.setSink(it) }
} else {
peerConnection?.rotationVideoSink?.apply {
setSink(floatingRenderer)
}
fullscreenRenderer?.let{ remoteRotationSink?.setSink(it) }
} else {
peerConnection?.rotationVideoSink?.setSink(fullscreenRenderer)
floatingRenderer?.let{remoteRotationSink?.setSink(it) }
}
}
@ -672,7 +674,7 @@ class CallManager(
}
fun handleSetMuteVideo(muted: Boolean, lockManager: LockManager) {
_videoState.value = _videoState.value.copy(userVideoEnabled = !muted)
_videoState.update { it.copy(userVideoEnabled = !muted) }
handleMirroring()
val connection = peerConnection ?: return
@ -712,11 +714,10 @@ class CallManager(
fun setDeviceOrientation(orientation: Orientation) {
// set rotation to the video based on the device's orientation and the camera facing direction
val rotation = when{
orientation == Orientation.PORTRAIT -> 0
orientation == Orientation.LANDSCAPE && isCameraFrontFacing() -> 90
orientation == Orientation.LANDSCAPE && !isCameraFrontFacing() -> -90
orientation == Orientation.REVERSED_LANDSCAPE -> 270
val rotation = when (orientation) {
Orientation.PORTRAIT -> 0
Orientation.LANDSCAPE -> if (isCameraFrontFacing()) 90 else -90
Orientation.REVERSED_LANDSCAPE -> 270
else -> 0
}