Merge pull request #2243 from GOVINDDIXIT/fixTypo

[TYPO] fix typo in infrastructure packages

app/src/main/java/chat/rocket/android/app/AppLifecycleObserver.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.common.model.UserStatus
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch

app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt

@@ -24,7 +24,7 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.SITE_URL
 import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.android.util.setupFabric
 import chat.rocket.common.RocketChatException

app/src/main/java/chat/rocket/android/authentication/infraestructure/SharedPreferencesMultiServerTokenRepository.kt → app/src/main/java/chat/rocket/android/authentication/infrastructure/SharedPreferencesMultiServerTokenRepository.kt

-package chat.rocket.android.authentication.infraestructure
+package chat.rocket.android.authentication.infrastructure
 
 import chat.rocket.android.authentication.domain.model.TokenModel
 import chat.rocket.android.dagger.scope.PerActivity

app/src/main/java/chat/rocket/android/authentication/infraestructure/SharedPreferencesTokenRepository.kt → app/src/main/java/chat/rocket/android/authentication/infrastructure/SharedPreferencesTokenRepository.kt

-package chat.rocket.android.authentication.infraestructure
+package chat.rocket.android.authentication.infrastructure
 
 import android.content.SharedPreferences
 import androidx.core.content.edit

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt

@@ -16,7 +16,7 @@ import chat.rocket.android.server.domain.isLdapAuthenticationEnabled
 import chat.rocket.android.server.domain.isPasswordResetEnabled
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.isEmail

app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsPresenter.kt

@@ -15,7 +15,7 @@ import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.favicon
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.serverLogoUrl

app/src/main/java/chat/rocket/android/authentication/onboarding/presentation/OnBoardingPresenter.kt

@@ -7,7 +7,7 @@ import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
 import chat.rocket.android.server.domain.SaveConnectingServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extension.launchUI
 import kotlinx.coroutines.Dispatchers

app/src/main/java/chat/rocket/android/authentication/registerusername/presentation/RegisterUsernamePresenter.kt

@@ -13,7 +13,7 @@ import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.favicon
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.serverLogoUrl

app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordPresenter.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.resetpassword.presentation
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException

app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt

@@ -8,7 +8,7 @@ import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
 import chat.rocket.android.server.domain.SaveConnectingServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.isValidUrl

app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupPresenter.kt

@@ -13,7 +13,7 @@ import chat.rocket.android.server.domain.SaveCurrentServerInteractor
 import chat.rocket.android.server.domain.favicon
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.privacyPolicyUrl

app/src/main/java/chat/rocket/android/authentication/twofactor/presentation/TwoFAPresenter.kt

@@ -14,7 +14,7 @@ import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.favicon
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.isEmail

app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt

@@ -4,7 +4,7 @@ import chat.rocket.android.chatdetails.domain.ChatDetails
 import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException

app/src/main/java/chat/rocket/android/chatinformation/presentation/MessageInfoPresenter.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.chatinformation.presentation
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -33,8 +33,8 @@ import chat.rocket.android.server.domain.UsersRepository
 import chat.rocket.android.server.domain.uploadMaxFileSize
 import chat.rocket.android.server.domain.uploadMimeTypeFilter
 import chat.rocket.android.server.domain.useRealName
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.state
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.state
 import chat.rocket.android.util.extension.getByteArray
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl

app/src/main/java/chat/rocket/android/chatroom/service/MessageService.kt

@@ -4,9 +4,9 @@ import android.app.job.JobParameters
 import android.app.job.JobService
 import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.server.domain.GetAccountsInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.DatabaseMessageMapper
-import chat.rocket.android.server.infraestructure.DatabaseMessagesRepository
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.DatabaseMessageMapper
+import chat.rocket.android.server.infrastructure.DatabaseMessagesRepository
 import chat.rocket.core.internal.rest.sendMessage
 import chat.rocket.core.model.Message
 import dagger.android.AndroidInjection

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt

@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extensions.addFragment
 import chat.rocket.android.util.extensions.textContent
 import dagger.android.AndroidInjection

app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt

@@ -30,7 +30,7 @@ import chat.rocket.android.server.domain.baseUrl
 import chat.rocket.android.server.domain.messageReadReceiptEnabled
 import chat.rocket.android.server.domain.messageReadReceiptStoreUsers
 import chat.rocket.android.server.domain.useRealName
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.isImage
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.ifNotNullNorEmpty

app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt

@@ -15,9 +15,9 @@ import chat.rocket.android.server.domain.PermissionsInteractor
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.infraestructure.ConnectionManager
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.ConnectionManager
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.core.RocketChatClient
 import dagger.Module
 import dagger.Provides

app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt

@@ -13,7 +13,7 @@ import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.SortingAndGroupingInteractor
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.domain.useSpecialCharsOnRoom
-import chat.rocket.android.server.infraestructure.ConnectionManager
+import chat.rocket.android.server.infrastructure.ConnectionManager
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryDB
 import chat.rocket.android.util.retryIO

app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt

@@ -9,7 +9,7 @@ import chat.rocket.android.chatrooms.adapter.LoadingItemHolder
 import chat.rocket.android.chatrooms.adapter.RoomUiModelMapper
 import chat.rocket.android.chatrooms.domain.FetchChatRoomsInteractor
 import chat.rocket.android.chatrooms.infrastructure.ChatRoomsRepository
-import chat.rocket.android.server.infraestructure.ConnectionManager
+import chat.rocket.android.server.infrastructure.ConnectionManager
 import chat.rocket.android.util.livedata.transform
 import chat.rocket.android.util.livedata.wrap
 import chat.rocket.android.util.retryIO

app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModelFactory.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModelProvider
 import chat.rocket.android.chatrooms.adapter.RoomUiModelMapper
 import chat.rocket.android.chatrooms.domain.FetchChatRoomsInteractor
 import chat.rocket.android.chatrooms.infrastructure.ChatRoomsRepository
-import chat.rocket.android.server.infraestructure.ConnectionManager
+import chat.rocket.android.server.infrastructure.ConnectionManager
 import javax.inject.Inject
 
 class ChatRoomsViewModelFactory @Inject constructor(

app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelPresenter.kt

@@ -4,7 +4,7 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.members.uimodel.MemberUiModelMapper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType

app/src/main/java/chat/rocket/android/dagger/AppComponent.kt

@@ -14,9 +14,15 @@ import dagger.android.support.AndroidSupportInjectionModule
 import javax.inject.Singleton
 
 @Singleton
-@Component(modules = [AndroidSupportInjectionModule::class,
-    AppModule::class, ActivityBuilder::class, ServiceBuilder::class, ReceiverBuilder::class,
-    AndroidWorkerInjectionModule::class])
+@Component(
+    modules = [
+        AndroidSupportInjectionModule::class,
+        AppModule::class,
+        ActivityBuilder::class,
+        ServiceBuilder::class,
+        ReceiverBuilder::class,
+        AndroidWorkerInjectionModule::class]
+)
 interface AppComponent {
 
     @Component.Builder

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -12,8 +12,8 @@ import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.AnswersAnalytics
 import chat.rocket.android.analytics.GoogleAnalyticsForFirebase
-import chat.rocket.android.authentication.infraestructure.SharedPreferencesMultiServerTokenRepository
-import chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
+import chat.rocket.android.authentication.infrastructure.SharedPreferencesMultiServerTokenRepository
+import chat.rocket.android.authentication.infrastructure.SharedPreferencesTokenRepository
 import chat.rocket.android.chatroom.service.MessageService
 import chat.rocket.android.dagger.qualifier.ForAuthentication
 import chat.rocket.android.dagger.qualifier.ForMessages
@@ -44,19 +44,19 @@ import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.SortingAndGroupingRepository
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.UsersRepository
-import chat.rocket.android.server.infraestructure.DatabaseMessageMapper
-import chat.rocket.android.server.infraestructure.DatabaseMessagesRepository
-import chat.rocket.android.server.infraestructure.JobSchedulerInteractorImpl
-import chat.rocket.android.server.infraestructure.MemoryChatRoomsRepository
-import chat.rocket.android.server.infraestructure.MemoryUsersRepository
-import chat.rocket.android.server.infraestructure.SharedPreferencesAccountsRepository
-import chat.rocket.android.server.infraestructure.SharedPreferencesPermissionsRepository
-import chat.rocket.android.server.infraestructure.SharedPreferencesSettingsRepository
-import chat.rocket.android.server.infraestructure.SharedPrefsAnalyticsTrackingRepository
-import chat.rocket.android.server.infraestructure.SharedPrefsBasicAuthRepository
-import chat.rocket.android.server.infraestructure.SharedPrefsConnectingServerRepository
-import chat.rocket.android.server.infraestructure.SharedPrefsCurrentServerRepository
-import chat.rocket.android.server.infraestructure.SharedPrefsSortingAndGroupingRepository
+import chat.rocket.android.server.infrastructure.DatabaseMessageMapper
+import chat.rocket.android.server.infrastructure.DatabaseMessagesRepository
+import chat.rocket.android.server.infrastructure.JobSchedulerInteractorImpl
+import chat.rocket.android.server.infrastructure.MemoryChatRoomsRepository
+import chat.rocket.android.server.infrastructure.MemoryUsersRepository
+import chat.rocket.android.server.infrastructure.SharedPreferencesAccountsRepository
+import chat.rocket.android.server.infrastructure.SharedPreferencesPermissionsRepository
+import chat.rocket.android.server.infrastructure.SharedPreferencesSettingsRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsAnalyticsTrackingRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsBasicAuthRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsConnectingServerRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsCurrentServerRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsSortingAndGroupingRepository
 import chat.rocket.android.util.AppJsonAdapterFactory
 import chat.rocket.android.util.BasicAuthenticatorInterceptor
 import chat.rocket.android.util.HttpLoggingInterceptor

app/src/main/java/chat/rocket/android/dagger/module/LocalModule.kt

@@ -6,7 +6,7 @@ import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.SharedPreferencesLocalRepository
 import chat.rocket.android.server.domain.CurrentServerRepository
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.SharedPrefsCurrentServerRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsCurrentServerRepository
 import chat.rocket.android.util.AppJsonAdapterFactory
 import chat.rocket.android.util.TimberLogger
 import chat.rocket.common.internal.FallbackSealedClassJsonAdapter

app/src/main/java/chat/rocket/android/directory/presentation/DirectoryPresenter.kt

@@ -7,7 +7,7 @@ import chat.rocket.android.db.model.ChatRoomEntity
 import chat.rocket.android.directory.uimodel.DirectoryUiModelMapper
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.main.presentation.MainNavigator
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf

app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.favoritemessages.presentation
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf

app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt

@@ -5,7 +5,7 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.files.uimodel.FileUiModel
 import chat.rocket.android.files.uimodel.FileUiModelMapper
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.main.presentation
 import chat.rocket.android.push.GroupedPush
 import chat.rocket.android.server.domain.RefreshPermissionsInteractor
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import javax.inject.Inject
 import javax.inject.Named
 

app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt

@@ -6,7 +6,7 @@ import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.members.uimodel.MemberUiModel
 import chat.rocket.android.members.uimodel.MemberUiModelMapper
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf

app/src/main/java/chat/rocket/android/mentions/presentention/MentionsPresenter.kt

@@ -2,7 +2,7 @@ package chat.rocket.android.mentions.presentention
 
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.util.ifNull

app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.pinnedmessages.presentation
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf

app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt

@@ -11,8 +11,8 @@ import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.RemoveAccountInteractor
 import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extension.compressImageAndGetByteArray
 import chat.rocket.android.util.extension.launchUI

app/src/main/java/chat/rocket/android/push/DirectReplyReceiver.kt

@@ -7,7 +7,7 @@ import android.content.Intent
 import androidx.core.app.RemoteInput
 import android.widget.Toast
 import chat.rocket.android.R
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.common.RocketChatException
 import chat.rocket.core.internal.rest.sendMessage
 import dagger.android.AndroidInjection

app/src/main/java/chat/rocket/android/server/domain/RefreshPermissionsInteractor.kt

 package chat.rocket.android.server.domain
 
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.internal.rest.permissions
 import kotlinx.coroutines.Dispatchers

app/src/main/java/chat/rocket/android/server/domain/RefreshSettingsInteractor.kt

 package chat.rocket.android.server.domain
 
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.internal.rest.settings
 import kotlinx.coroutines.Dispatchers

app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt → app/src/main/java/chat/rocket/android/server/infrastructure/ConnectionManager.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import androidx.lifecycle.MutableLiveData
 import chat.rocket.android.db.DatabaseManager

app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManagerFactory.kt → app/src/main/java/chat/rocket/android/server/infrastructure/ConnectionManagerFactory.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.db.DatabaseManagerFactory
 import timber.log.Timber

app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt → app/src/main/java/chat/rocket/android/server/infrastructure/DatabaseMessageMapper.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.model.*

app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessagesRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/DatabaseMessagesRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.Operation

app/src/main/java/chat/rocket/android/server/infraestructure/JobSchedulerInteractorImpl.kt → app/src/main/java/chat/rocket/android/server/infrastructure/JobSchedulerInteractorImpl.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.app.job.JobInfo
 import android.app.job.JobScheduler

app/src/main/java/chat/rocket/android/server/infraestructure/MemoryChatRoomsRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/MemoryChatRoomsRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.server.domain.ChatRoomsRepository
 import chat.rocket.core.model.ChatRoom

app/src/main/java/chat/rocket/android/server/infraestructure/MemoryUsersRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/MemoryUsersRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.server.domain.UsersRepository
 import chat.rocket.android.server.domain.UsersRepository.Query

app/src/main/java/chat/rocket/android/server/infraestructure/RocketChatClientFactory.kt → app/src/main/java/chat/rocket/android/server/infrastructure/RocketChatClientFactory.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.os.Build
 import chat.rocket.android.BuildConfig

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesAccountsRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesAccountsRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import androidx.core.content.edit

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesPermissionsRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesPermissionsRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.PermissionsRepository

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesSettingsRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesSettingsRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.LocalRepository.Companion.SETTINGS_KEY

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsAnalyticsTrackingRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsAnalyticsTrackingRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import chat.rocket.android.server.domain.AnalyticsTrackingRepository

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsBasicAuthRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsBasicAuthRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import androidx.core.content.edit

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsConnectingServerRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsConnectingServerRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import chat.rocket.android.server.domain.CurrentServerRepository

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsCurrentServerRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsCurrentServerRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import chat.rocket.android.server.domain.CurrentServerRepository

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsSortingAndGroupingRepository.kt → app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsSortingAndGroupingRepository.kt

-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import chat.rocket.android.server.domain.SortingAndGroupingRepository

app/src/main/java/chat/rocket/android/server/presentation/ChangeServerPresenter.kt

@@ -9,7 +9,7 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.SaveCurrentServerInteractor
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.util.ifNull
 import javax.inject.Inject

app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt

@@ -26,9 +26,9 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.RemoveAccountInteractor
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManager
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.ConnectionManager
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.VersionInfo
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.casUrl

app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt

@@ -4,7 +4,7 @@ import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException

app/src/main/java/chat/rocket/android/settings/presentation/SettingsPresenter.kt

@@ -9,8 +9,8 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.PermissionsInteractor
 import chat.rocket.android.server.domain.RemoveAccountInteractor
 import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extension.gethash
 import chat.rocket.android.util.extension.launchUI

app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt

@@ -9,7 +9,7 @@ import chat.rocket.android.db.model.UserEntity
 import chat.rocket.android.server.domain.CurrentServerRepository
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.isJitsiEnabled
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.retryIO

app/src/main/java/chat/rocket/android/util/extensions/RocketChatClient.kt

@@ -2,7 +2,7 @@ package chat.rocket.android.util.extensions
 
 import chat.rocket.android.db.model.MessageEntity
 import chat.rocket.android.server.domain.model.Account
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.internal.rest.registerPushToken
 import chat.rocket.core.model.Message

app/src/main/java/chat/rocket/android/videoconference/presenter/VideoConferencePresenter.kt

@@ -6,7 +6,7 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.JitsiHelper
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.*
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf

app/src/play/java/chat/rocket/android/push/worker/TokenRegistrationWorker.kt

@@ -5,7 +5,7 @@ import chat.rocket.android.dagger.injector.AndroidWorkerInjection
 import chat.rocket.android.extensions.await
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.GetAccountsInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.common.util.ifNull
 import com.google.firebase.iid.FirebaseInstanceId