From ea9a5240483aeb762094300caa4ca9fbaa28cfb9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 13 Dec 2021 23:23:18 +0100
Subject: [PATCH] Fix compilation issue after merge develop

---
 .../app/features/debug/analytics/DebugAnalyticsActivity.kt     | 2 +-
 .../features/analytics/ui/consent/AnalyticsOptInActivity.kt    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt
index b25ae453ed..61883251ce 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt
@@ -29,7 +29,7 @@ class DebugAnalyticsActivity : VectorBaseActivity<ActivitySimpleBinding>() {
     override fun initUiAndData() {
         if (isFirstCreation()) {
             addFragment(
-                    views.simpleFragmentContainer.id,
+                    views.simpleFragmentContainer,
                     DebugAnalyticsFragment::class.java
             )
         }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt
index 3741a2035f..f6a06ebdb7 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.analytics.ui.consent
 
 import com.airbnb.mvrx.viewModel
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorBaseActivity
@@ -38,7 +37,7 @@ class AnalyticsOptInActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
     override fun initUiAndData() {
         if (isFirstCreation()) {
-            addFragment(R.id.simpleFragmentContainer, AnalyticsOptInFragment::class.java)
+            addFragment(views.simpleFragmentContainer, AnalyticsOptInFragment::class.java)
         }
 
         viewModel.observeViewEvents {