Skip to content

Commit e9d1de8

Browse files
committed
Fix compilation issue after rebase.
1 parent 7b1724f commit e9d1de8

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

vector/src/main/java/im/vector/app/core/platform/VectorBaseDialogFragment.kt

+13-6
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ import android.view.View
2323
import android.view.ViewGroup
2424
import androidx.annotation.CallSuper
2525
import androidx.fragment.app.DialogFragment
26+
import androidx.lifecycle.Lifecycle
2627
import androidx.lifecycle.ViewModelProvider
2728
import androidx.lifecycle.lifecycleScope
29+
import androidx.lifecycle.repeatOnLifecycle
2830
import androidx.viewbinding.ViewBinding
2931
import com.airbnb.mvrx.MavericksView
3032
import dagger.hilt.android.EntryPointAccessors
@@ -37,6 +39,7 @@ import im.vector.app.features.analytics.plan.MobileScreen
3739
import im.vector.app.features.themes.ThemeUtils
3840
import kotlinx.coroutines.flow.launchIn
3941
import kotlinx.coroutines.flow.onEach
42+
import kotlinx.coroutines.launch
4043
import reactivecircus.flowbinding.android.view.clicks
4144
import timber.log.Timber
4245

@@ -145,11 +148,15 @@ abstract class VectorBaseDialogFragment<VB : ViewBinding> : DialogFragment(), Ma
145148
* ========================================================================================== */
146149

147150
protected fun <T : VectorViewEvents> VectorViewModel<*, *, T>.observeViewEvents(observer: (T) -> Unit) {
148-
viewEvents
149-
.stream()
150-
.onEach {
151-
observer(it)
152-
}
153-
.launchIn(viewLifecycleOwner.lifecycleScope)
151+
val tag = this@VectorBaseDialogFragment::class.simpleName.toString()
152+
lifecycleScope.launch {
153+
repeatOnLifecycle(Lifecycle.State.RESUMED) {
154+
viewEvents
155+
.stream(tag)
156+
.collect {
157+
observer(it)
158+
}
159+
}
160+
}
154161
}
155162
}

0 commit comments

Comments
 (0)