Add part of missing imports

app/src/gplay/java/org/futo/circles/notifications/FirebaseMessagingService.kt

@@ -2,11 +2,11 @@ package org.futo.circles.notifications
 
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import org.futo.circles.core.provider.MatrixSessionProvider
 import org.futo.circles.feature.notifications.FcmHelper
 import org.futo.circles.feature.notifications.PushHandler
 import org.futo.circles.feature.notifications.PushersManager
 import org.futo.circles.model.PushData
-import org.futo.circles.provider.MatrixSessionProvider
 import org.koin.android.ext.android.inject
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.extensions.tryOrNull

app/src/gplay/java/org/futo/circles/notifications/GoogleFcmHelper.kt

@@ -6,9 +6,9 @@ import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.firebase.messaging.FirebaseMessaging
 import org.futo.circles.R
+import org.futo.circles.core.provider.PreferencesProvider
 import org.futo.circles.feature.notifications.FcmHelper
 import org.futo.circles.feature.notifications.PushersManager
-import org.futo.circles.provider.PreferencesProvider
 
 class GoogleFcmHelper(
     private val context: Context,

app/src/gplay/java/org/futo/circles/notifications/test/NotificationTestTokenRegistration.kt

@@ -2,10 +2,10 @@ package org.futo.circles.notifications.test
 
 import android.content.Context
 import org.futo.circles.R
+import org.futo.circles.core.provider.MatrixSessionProvider
 import org.futo.circles.feature.notifications.FcmHelper
 import org.futo.circles.feature.notifications.test.task.BaseNotificationTest
 import org.futo.circles.model.NotificationTestStatus
-import org.futo.circles.provider.MatrixSessionProvider
 import org.matrix.android.sdk.api.session.pushers.PusherState
 
 class NotificationTestTokenRegistration(

app/src/main/java/org/futo/circles/App.kt

@@ -6,10 +6,10 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import com.vanniktech.emoji.EmojiManager
 import com.vanniktech.emoji.google.GoogleEmojiProvider
+import org.futo.circles.core.provider.MatrixSessionProvider
 import org.futo.circles.di.applicationModules
 import org.futo.circles.feature.notifications.FcmHelper
 import org.futo.circles.feature.notifications.NotificationUtils
-import org.futo.circles.provider.MatrixSessionProvider
 import org.koin.android.ext.android.inject
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin

app/src/main/java/org/futo/circles/MainActivity.kt

@@ -9,8 +9,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.futo.circles.core.BaseActivity
-import org.futo.circles.provider.MatrixSessionListenerProvider
-import org.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.provider.MatrixSessionListenerProvider
+import org.futo.circles.core.provider.MatrixSessionProvider
 
 
 class MainActivity : BaseActivity(R.layout.activity_main) {

app/src/main/java/org/futo/circles/core/Constants.kt

 package org.futo.circles.core
 
 import org.futo.circles.BuildConfig
-import org.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.provider.MatrixSessionProvider
 
 const val FILE_PROVIDER_AUTHORITY_EXTENSION = ".provider"
 
-const val REGISTRATION_TOKEN_TYPE = "m.login.registration_token"
-const val REGISTRATION_SUBSCRIPTION_TYPE = "org.futo.subscription.google_play"
-const val REGISTRATION_EMAIL_REQUEST_TOKEN_TYPE = "m.enroll.email.request_token"
-const val REGISTRATION_EMAIL_SUBMIT_TOKEN_TYPE = "m.enroll.email.submit_token"
-const val REGISTRATION_USERNAME_TYPE = "m.enroll.username"
-const val REGISTRATION_PASSWORD_TYPE = "m.enroll.password"
-const val REGISTRATION_BSSPEKE_OPRF_TYPE = "m.enroll.bsspeke-ecc.oprf"
-const val REGISTRATION_BSSPEKE_SAVE_TYPE = "m.enroll.bsspeke-ecc.save"
-
-const val LOGIN_PASSWORD_TYPE = "m.login.password"
-const val DIRECT_LOGIN_PASSWORD_TYPE = "m.login.password.direct"
-const val LOGIN_BSSPEKE_OPRF_TYPE = "m.login.bsspeke-ecc.oprf"
-const val LOGIN_BSSPEKE_VERIFY_TYPE = "m.login.bsspeke-ecc.verify"
-
 const val ROOM_BACKUP_EVENT_TYPE = "m.room.media_backup"
 const val ROOM_BACKUP_DATE_MODIFIED_EVENT_TYPE = "m.room.media_backup.date_modified"
 
-const val LOGIN_PASSWORD_USER_ID_TYPE = "m.id.user"
-
 const val DEFAULT_USER_PREFIX = "@notices:"
 
 const val SYSTEM_NOTICES_TAG = "m.server_notice"
 
-const val TYPE_PARAM_KEY = "type"
-
-const val CREATE_ROOM_DELAY = 1000L
-
 const val PUSHER_APP_ID = "${BuildConfig.APPLICATION_ID}.android"
 
 const val READ_ONLY_ROLE = -10

app/src/main/java/org/futo/circles/core/utils/UserUtils.kt

 package org.futo.circles.core.utils
 
-import org.futo.circles.provider.MatrixSessionProvider
+import org.futo.circles.core.provider.MatrixSessionProvider
 
 object UserUtils {
 

app/src/main/java/org/futo/circles/di/data_source/AuthDsModule.kt

 package org.futo.circles.di.data_source
 
-import org.futo.circles.core.matrix.auth.AuthConfirmationProvider
-import org.futo.circles.feature.log_in.LoginDataSource
-import org.futo.circles.feature.log_in.stages.LoginStagesDataSource
-import org.futo.circles.feature.log_in.stages.password.DirectLoginPasswordDataSource
-import org.futo.circles.feature.log_in.stages.password.LoginBsSpekeDataSource
-import org.futo.circles.feature.log_in.stages.password.LoginPasswordDataSource
-import org.futo.circles.feature.log_in.stages.terms.LoginAcceptTermsDataSource
-import org.futo.circles.feature.reauth.ReAuthStagesDataSource
-import org.futo.circles.feature.settings.active_sessions.CrossSigningDataSource
-import org.futo.circles.feature.sign_up.SignUpDataSource
-import org.futo.circles.feature.sign_up.password.SignupBsSpekeDataSource
-import org.futo.circles.feature.sign_up.password.SignupPasswordDataSource
+import org.futo.circles.auth.feature.cross_signing.CrossSigningDataSource
+import org.futo.circles.auth.feature.log_in.LoginDataSource
+import org.futo.circles.auth.feature.log_in.stages.LoginStagesDataSource
+import org.futo.circles.auth.feature.log_in.stages.password.DirectLoginPasswordDataSource
+import org.futo.circles.auth.feature.log_in.stages.password.LoginBsSpekeDataSource
+import org.futo.circles.auth.feature.log_in.stages.password.LoginPasswordDataSource
+import org.futo.circles.auth.feature.log_in.stages.terms.LoginAcceptTermsDataSource
+import org.futo.circles.auth.feature.reauth.AuthConfirmationProvider
+import org.futo.circles.auth.feature.reauth.ReAuthStagesDataSource
+import org.futo.circles.auth.feature.sign_up.SignUpDataSource
+import org.futo.circles.auth.feature.sign_up.password.SignupBsSpekeDataSource
+import org.futo.circles.auth.feature.sign_up.password.SignupPasswordDataSource
+import org.futo.circles.auth.feature.sign_up.setup_profile.SetupProfileDataSource
+import org.futo.circles.auth.feature.sign_up.sign_up_type.SelectSignUpTypeDataSource
+import org.futo.circles.auth.feature.sign_up.subscription_stage.SubscriptionStageDataSource
+import org.futo.circles.auth.feature.sign_up.terms.SignupAcceptTermsDataSource
+import org.futo.circles.auth.feature.sign_up.validate_email.ValidateEmailDataSource
+import org.futo.circles.auth.feature.sign_up.validate_token.ValidateTokenDataSource
 import org.futo.circles.feature.sign_up.setup_circles.SetupCirclesDataSource
-import org.futo.circles.feature.sign_up.setup_profile.SetupProfileDataSource
-import org.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeDataSource
-import org.futo.circles.feature.sign_up.subscription_stage.SubscriptionStageDataSource
-import org.futo.circles.feature.sign_up.terms.SignupAcceptTermsDataSource
-import org.futo.circles.feature.sign_up.validate_email.ValidateEmailDataSource
-import org.futo.circles.feature.sign_up.validate_token.ValidateTokenDataSource
 import org.koin.dsl.module
 
 val authDsModule = module {

app/src/main/java/org/futo/circles/di/data_source/RoomDsModule.kt

 package org.futo.circles.di.data_source
 
-import org.futo.circles.core.matrix.room.CoreSpacesTreeBuilder
-import org.futo.circles.core.matrix.room.CreateRoomDataSource
-import org.futo.circles.core.matrix.room.RoomRelationsBuilder
+import org.futo.circles.core.room.CoreSpacesTreeBuilder
+import org.futo.circles.core.room.CreateRoomDataSource
+import org.futo.circles.core.room.RoomRelationsBuilder
 import org.futo.circles.feature.circles.CirclesDataSource
 import org.futo.circles.feature.circles.accept_invite.AcceptCircleInviteDataSource
 import org.futo.circles.feature.groups.GroupsDataSource
@@ -14,9 +14,6 @@ import org.futo.circles.model.CircleRoomTypeArg
 import org.koin.dsl.module
 
 val roomDSModule = module {
-    factory { CreateRoomDataSource(get(), get()) }
-    factory { RoomRelationsBuilder() }
-    factory { CoreSpacesTreeBuilder(get(), get()) }
     factory { (roomId: String) -> UpdateRoomDataSource(roomId, get(), get()) }
     factory { GroupsDataSource(get()) }
     factory { CirclesDataSource() }
@@ -24,4 +21,9 @@ val roomDSModule = module {
     factory { PeopleDataSource(get()) }
     factory { (roomType: CircleRoomTypeArg) -> SelectRoomsDataSource(roomType) }
     factory { RoomAccountDataSource() }
+
+    ///-----
+    factory { CreateRoomDataSource(get(), get()) }
+    factory { RoomRelationsBuilder() }
+    factory { CoreSpacesTreeBuilder(get(), get()) }
 }
\ No newline at end of file

app/src/main/java/org/futo/circles/di/ui/SettingsUiModule.kt

 package org.futo.circles.di.ui
 
+import org.futo.circles.auth.feature.sign_up.username.UsernameViewModel
 import org.futo.circles.feature.home.SystemNoticesCountSharedViewModel
 import org.futo.circles.feature.notices.SystemNoticesTimelineViewModel
 import org.futo.circles.feature.people.user.UserViewModel
@@ -10,7 +11,6 @@ import org.futo.circles.feature.settings.active_sessions.verify.VerifySessionVie
 import org.futo.circles.feature.settings.change_password.ChangePasswordViewModel
 import org.futo.circles.feature.settings.profile.edit.EditProfileViewModel
 import org.futo.circles.feature.settings.profile.share.ShareProfileViewModel
-import org.futo.circles.feature.sign_up.username.UsernameViewModel
 import org.futo.circles.model.CircleRoomTypeArg
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.parameter.parametersOf