Remove LegacySessionImporter, and the dialog which explains that Riot is now Element.

vector-app/src/main/java/im/vector/app/VectorApplication.kt

@@ -54,7 +54,6 @@ import im.vector.app.core.resources.BuildMeta
 import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.configuration.VectorConfiguration
-import im.vector.app.features.disclaimer.DisclaimerDialog
 import im.vector.app.features.invite.InvitesAcceptor
 import im.vector.app.features.lifecycle.VectorActivityLifecycleCallbacks
 import im.vector.app.features.notifications.NotificationDrawerManager
@@ -71,7 +70,6 @@ import im.vector.application.R
 import org.jitsi.meet.sdk.log.JitsiMeetDefaultLogHandler
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.auth.AuthenticationService
-import org.matrix.android.sdk.api.legacy.LegacySessionImporter
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -86,7 +84,6 @@ class VectorApplication :
         WorkConfiguration.Provider {
 
     lateinit var appContext: Context
-    @Inject lateinit var legacySessionImporter: LegacySessionImporter
     @Inject lateinit var authenticationService: AuthenticationService
     @Inject lateinit var vectorConfiguration: VectorConfiguration
     @Inject lateinit var emojiCompatFontProvider: EmojiCompatFontProvider
@@ -111,7 +108,6 @@ class VectorApplication :
     @Inject lateinit var buildMeta: BuildMeta
     @Inject lateinit var leakDetector: LeakDetector
     @Inject lateinit var vectorLocale: VectorLocale
-    @Inject lateinit var disclaimerDialog: DisclaimerDialog
 
     // font thread handler
     private var fontThreadHandler: Handler? = null
@@ -170,13 +166,6 @@ class VectorApplication :
 
         notificationUtils.createNotificationChannels()
 
-        // It can takes time, but do we care?
-        val sessionImported = legacySessionImporter.process()
-        if (!sessionImported) {
-            // Do not display the name change popup
-            disclaimerDialog.doNotShowDisclaimerDialog()
-        }
-
         ProcessLifecycleOwner.get().lifecycle.addObserver(object : DefaultLifecycleObserver {
             override fun onResume(owner: LifecycleOwner) {
                 Timber.i("App entered foreground")

vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt

@@ -73,7 +73,6 @@ import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.SyncConfig
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
-import org.matrix.android.sdk.api.legacy.LegacySessionImporter
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.sync.filter.SyncFilterParams
@@ -176,11 +175,6 @@ import javax.inject.Singleton
         return activeSessionHolder.getActiveSession()
     }
 
-    @Provides
-    fun providesLegacySessionImporter(matrix: Matrix): LegacySessionImporter {
-        return matrix.legacySessionImporter()
-    }
-
     @Provides
     fun providesAuthenticationService(matrix: Matrix): AuthenticationService {
         return matrix.authenticationService()