mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 18:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation issue after merge develop

Browse source
This commit is contained in:
Benoit Marty 2021-12-13 23:23:18 +01:00
parent 10182902af
commit ea9a524048
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt
View file

@ -29,7 +29,7 @@ class DebugAnalyticsActivity : VectorBaseActivity<ActivitySimpleBinding>() {
override fun initUiAndData() { override fun initUiAndData() {
if (isFirstCreation()) { if (isFirstCreation()) {
addFragment( addFragment(
views.simpleFragmentContainer.id, views.simpleFragmentContainer,
DebugAnalyticsFragment::class.java DebugAnalyticsFragment::class.java
) )
} }

3
vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt
View file

@ -18,7 +18,6 @@ package im.vector.app.features.analytics.ui.consent
import com.airbnb.mvrx.viewModel import com.airbnb.mvrx.viewModel
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R
import im.vector.app.core.extensions.addFragment import im.vector.app.core.extensions.addFragment
import im.vector.app.core.extensions.exhaustive import im.vector.app.core.extensions.exhaustive
import im.vector.app.core.platform.VectorBaseActivity import im.vector.app.core.platform.VectorBaseActivity
@ -38,7 +37,7 @@ class AnalyticsOptInActivity : VectorBaseActivity<ActivitySimpleBinding>() {
override fun initUiAndData() { override fun initUiAndData() {
if (isFirstCreation()) { if (isFirstCreation()) {
addFragment(R.id.simpleFragmentContainer, AnalyticsOptInFragment::class.java) addFragment(views.simpleFragmentContainer, AnalyticsOptInFragment::class.java)
} }
viewModel.observeViewEvents { viewModel.observeViewEvents {