Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Use LoggerTag.

Browse source
This commit is contained in:
Benoit Marty 2024-11-08 09:46:56 +01:00
parent f66193e317
commit 95cdd93013
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt
View file

@ -45,12 +45,13 @@ import io.element.android.features.call.impl.pip.PipView
import io.element.android.features.call.impl.services.CallForegroundService import io.element.android.features.call.impl.services.CallForegroundService
import io.element.android.features.call.impl.utils.CallIntentDataParser import io.element.android.features.call.impl.utils.CallIntentDataParser
import io.element.android.libraries.architecture.bindings import io.element.android.libraries.architecture.bindings
import io.element.android.libraries.core.log.logger.LoggerTag
import io.element.android.libraries.designsystem.theme.ElementThemeApp import io.element.android.libraries.designsystem.theme.ElementThemeApp
import io.element.android.libraries.preferences.api.store.AppPreferencesStore import io.element.android.libraries.preferences.api.store.AppPreferencesStore
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
private const val loggerTag = "ElementCallActivity" private val loggerTag = LoggerTag("ElementCallActivity")
class ElementCallActivity : class ElementCallActivity :
AppCompatActivity(), AppCompatActivity(),
@ -135,7 +136,7 @@ class ElementCallActivity :
DisposableEffect(Unit) { DisposableEffect(Unit) {
val listener = Runnable { val listener = Runnable {
if (requestPermissionCallback != null) { if (requestPermissionCallback != null) {
Timber.tag(loggerTag).w("Ignoring onUserLeaveHint event because user is asked to grant permissions") Timber.tag(loggerTag.value).w("Ignoring onUserLeaveHint event because user is asked to grant permissions")
} else { } else {
pipEventSink(PictureInPictureEvents.EnterPictureInPicture) pipEventSink(PictureInPictureEvents.EnterPictureInPicture)
} }
@ -149,7 +150,7 @@ class ElementCallActivity :
val onPictureInPictureModeChangedListener = Consumer { _: PictureInPictureModeChangedInfo -> val onPictureInPictureModeChangedListener = Consumer { _: PictureInPictureModeChangedInfo ->
pipEventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(isInPictureInPictureMode)) pipEventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(isInPictureInPictureMode))
if (!isInPictureInPictureMode && !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) { if (!isInPictureInPictureMode && !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
Timber.tag(loggerTag).d("Exiting PiP mode: Hangup the call") Timber.tag(loggerTag.value).d("Exiting PiP mode: Hangup the call")
eventSink?.invoke(CallScreenEvents.Hangup) eventSink?.invoke(CallScreenEvents.Hangup)
} }
} }
@ -193,18 +194,18 @@ class ElementCallActivity :
} }
val currentCallType = webViewTarget.value val currentCallType = webViewTarget.value
if (currentCallType == null && callType == null) { if (currentCallType == null && callType == null) {
Timber.tag(loggerTag).d("Re-opened the activity but we have no url to load or a cached one, finish the activity") Timber.tag(loggerTag.value).d("Re-opened the activity but we have no url to load or a cached one, finish the activity")
finish() finish()
} else if (currentCallType == null) { } else if (currentCallType == null) {
Timber.tag(loggerTag).d("Set the call type and create the presenter") Timber.tag(loggerTag.value).d("Set the call type and create the presenter")
webViewTarget.value = callType webViewTarget.value = callType
presenter = presenterFactory.create(callType!!, this) presenter = presenterFactory.create(callType!!, this)
} else if (callType != currentCallType) { } else if (callType != currentCallType) {
Timber.tag(loggerTag).d("User starts another call, restart the Activity") Timber.tag(loggerTag.value).d("User starts another call, restart the Activity")
setIntent(intent) setIntent(intent)
recreate() recreate()
} else { } else {
Timber.tag(loggerTag).d("Coming back from notification, do nothing") Timber.tag(loggerTag.value).d("Coming back from notification, do nothing")
} }
} }