wireapp/wire-androidPublic

NotificationsYou must be signed in to change notification settings
Fork39
Star179

Commitc4ba37b

authored

feat: move either/flow to common module (#WPB-16073) (#3874)

1 parent7a31fd0 commitc4ba37bCopy full SHA for c4ba37b

File tree

103 files changed

+189

-189

lines changed

app/src
- androidTest/kotlin/com/wire/android
  - WireActivityTest.kt
- main/kotlin/com/wire/android
  - WireApplication.kt
  - migration
  - model
    - TriState.kt
  - notification/broadcastreceivers
    - NotificationReplyReceiver.kt
  - services
    - CallService.kt
  - ui
    - authentication
      - create
        code
        CreateAccountCodeViewState.kt
        common/handle
        HandleUpdateErrorState.kt
        details
        CreateAccountDetailsViewState.kt
        email
        CreateAccountEmailViewState.kt
      - devices
        register
        RegisterDeviceState.kt
        remove
        RemoveDeviceState.kt
      - login
        LoginState.kt
        sso
        LoginSSOViewModel.kt
    - calling
      - SharedCallingViewModel.kt
    - common
      - error
        CoreFailureErrorDialog.kt
      - topappbar
        Connectivity.kt
        ConnectivityUIState.kt
    - connection
      - ConnectionActionButtonViewModel.kt
    - debug
    - e2eiEnrollment
    - home
      - appLock/forgot
        ForgotLockCodeViewState.kt
        ForgotLockScreenViewModel.kt
      - conversations
        ConversationScreen.kt
        delete
        DeleteMessageDialogsState.kt
        details
        GroupConversationDetailsViewModel.kt
        editguestaccess
        EditGuestAccessViewModel.kt
        createPasswordProtectedGuestLink
        CreatePasswordGuestLinkState.kt
        options
        GroupConversationOptionsState.kt
        info
        ConversationInfoViewModel.kt
        messages
        ConversationMessagesViewModel.kt
        sendmessage
        SendMessageViewModel.kt
      - gallery
        MediaGalleryViewModel.kt
      - settings/account
        MyAccountViewModel.kt
      - sync
        FeatureFlagNotificationViewModel.kt
    - legalhold/dialog/requested
      - LegalHoldRequestedState.kt
    - settings/devices
      - DeviceDetailsScreen.kt
      - DeviceDetailsViewModel.kt
    - userprofile
      - avatarpicker
        AvatarPickerViewModel.kt
      - self
        SelfUserProfileViewModel.kt
      - service
        ServiceDetailsViewModel.kt
  - util
    - CoreFailureUtil.kt
    - lifecycle
      - ConnectionPolicyManager.kt
    - ui
      - AssetImageFetcher.kt
  - workmanager/worker
    - DeleteConversationLocallyWorker.kt
- test/kotlin/com/wire/android
  - GlobalObserversManagerTest.kt
  - analytics
    - ObserveCurrentSessionAnalyticsUseCaseTest.kt
  - migration
  - ui
    - WireActivityViewModelTest.kt
    - authentication
      - create/username
        CreateAccountUsernameViewModelTest.kt
      - devices
        register
        RegisterDeviceViewModelTest.kt
        remove
        RemoveDeviceViewModelTest.kt
      - login
        email
        LoginEmailViewModelTest.kt
        sso
        LoginSSOViewModelTest.kt
    - calling
      - SharedCallingViewModelTest.kt
    - common/bottomsheet/folder
      - ChangeConversationFavoriteVMTest.kt
      - NewFolderViewModelTest.kt
    - connection
      - ConnectionActionButtonViewModelTest.kt
    - home
      - appLock/forgot
        ForgotLockScreenViewModelTest.kt
      - conversations
        details
        GroupConversationDetailsViewModelTest.kt
        editguestaccess
        CreatePasswordGuestLinkViewModelTest.kt
        EditGuestAccessViewModelTest.kt
        info
        ConversationInfoViewModelArrangement.kt
        ConversationInfoViewModelTest.kt
        messages
        ConversationMessagesViewModelArrangement.kt
        ConversationMessagesViewModelTest.kt
        sendmessage
        SendMessageViewModelArrangement.kt
      - gallery
        MediaGalleryViewModelTest.kt
      - newconversation
        NewConversationViewModelArrangement.kt
      - settings
        account
        MyAccountViewModelTest.kt
        displayname
        ChangeDisplayNameViewModelTest.kt
        email
        ChangeEmailViewModelTest.kt
        handle
        ChangeHandleViewModelTest.kt
        home
        BackupAndRestoreViewModelTest.kt
    - joinDeepLink
      - JoinConversationViaCodeViewModelTest.kt
    - legalhold/dialog
      - deactivated
        LegalHoldDeactivatedViewModelTest.kt
      - requested
        LegalHoldRequestedViewModelTest.kt
    - settings
      - debug
        DebugDataOptionsViewModelTest.kt
      - devices
        DeviceDetailsViewModelTest.kt
    - userprofile
      - image
        AvatarPickerViewModelTest.kt
      - other
        OtherUserProfileScreenViewModelTest.kt
      - self
        SelfUserProfileViewModelArrangement.kt
      - service
        ServiceDetailsViewModelTest.kt
      - teammigration
        TeamMigrationViewModelTest.kt
  - util
    - lifecycle
      - ConnectionPolicyManagerTest.kt
    - ui
      - AssetImageFetcherTest.kt
kalium

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+189

-189

lines changed

`‎app/src/androidTest/kotlin/com/wire/android/WireActivityTest.kt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ import com.wire.android.ui.WireActivity`
`33`	`33`	`importcom.wire.android.util.DataDogLogger`
`34`	`34`	`importcom.wire.kalium.logger.KaliumLogLevel`
`35`	`35`	`importcom.wire.kalium.logger.KaliumLogger`
`36`		`-importcom.wire.kalium.logic.CoreLogger`
	`36`	`+importcom.wire.kalium.common.logger.CoreLogger`
`37`	`37`	`importdagger.hilt.android.testing.HiltAndroidRule`
`38`	`38`	`importdagger.hilt.android.testing.HiltAndroidTest`
`39`	`39`	`importkotlinx.coroutines.test.runTest`

`‎app/src/main/kotlin/com/wire/android/WireApplication.kt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ import com.wire.android.util.lifecycle.ConnectionPolicyManager`
`46`	`46`	`importcom.wire.android.workmanager.WireWorkerFactory`
`47`	`47`	`importcom.wire.kalium.logger.KaliumLogLevel`
`48`	`48`	`importcom.wire.kalium.logger.KaliumLogger`
`49`		`-importcom.wire.kalium.logic.CoreLogger`
	`49`	`+importcom.wire.kalium.common.logger.CoreLogger`
`50`	`50`	`importcom.wire.kalium.logic.CoreLogic`
`51`	`51`	`importcom.wire.kalium.logic.feature.session.CurrentSessionResult`
`52`	`52`	`importdagger.Lazy`

`‎app/src/main/kotlin/com/wire/android/migration/MigrationManager.kt`

Lines changed: 14 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,21 +46,21 @@ import com.wire.android.notification.openMigrationLoginPendingIntent`
`46`	`46`	`importcom.wire.android.util.EMPTY`
`47`	`47`	`importcom.wire.android.util.ui.stringWithBoldArgs`
`48`	`48`	`importcom.wire.kalium.logger.obfuscateId`
`49`		`-importcom.wire.kalium.logic.CoreFailure`
`50`		`-importcom.wire.kalium.logic.EncryptionFailure`
`51`		`-importcom.wire.kalium.logic.MLSFailure`
`52`		`-importcom.wire.kalium.logic.NetworkFailure`
`53`		`-importcom.wire.kalium.logic.ProteusFailure`
`54`		`-importcom.wire.kalium.logic.StorageFailure`
	`49`	`+importcom.wire.kalium.common.error.CoreFailure`
	`50`	`+importcom.wire.kalium.common.error.EncryptionFailure`
	`51`	`+importcom.wire.kalium.common.error.MLSFailure`
	`52`	`+importcom.wire.kalium.common.error.NetworkFailure`
	`53`	`+importcom.wire.kalium.common.error.ProteusFailure`
	`54`	`+importcom.wire.kalium.common.error.StorageFailure`
`55`	`55`	`importcom.wire.kalium.logic.data.user.UserId`
`56`		`-importcom.wire.kalium.logic.functional.Either`
`57`		`-importcom.wire.kalium.logic.functional.flatMap`
`58`		`-importcom.wire.kalium.logic.functional.fold`
`59`		`-importcom.wire.kalium.logic.functional.isLeft`
`60`		`-importcom.wire.kalium.logic.functional.isRight`
`61`		`-importcom.wire.kalium.logic.functional.map`
`62`		`-importcom.wire.kalium.logic.functional.onFailure`
`63`		`-importcom.wire.kalium.logic.functional.onSuccess`
	`56`	`+importcom.wire.kalium.common.functional.Either`
	`57`	`+importcom.wire.kalium.common.functional.flatMap`
	`58`	`+importcom.wire.kalium.common.functional.fold`
	`59`	`+importcom.wire.kalium.common.functional.isLeft`
	`60`	`+importcom.wire.kalium.common.functional.isRight`
	`61`	`+importcom.wire.kalium.common.functional.map`
	`62`	`+importcom.wire.kalium.common.functional.onFailure`
	`63`	`+importcom.wire.kalium.common.functional.onSuccess`
`64`	`64`	`importdagger.hilt.android.qualifiers.ApplicationContext`
`65`	`65`	`importkotlinx.coroutines.CoroutineDispatcher`
`66`	`66`	`importkotlinx.coroutines.CoroutineScope`

`‎app/src/main/kotlin/com/wire/android/migration/MigrationReport.kt`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,14 @@ package com.wire.android.migration`
`20`	`20`	`importcom.wire.android.migration.feature.MigrateActiveAccountsUseCase`
`21`	`21`	`importcom.wire.android.migration.userDatabase.ScalaConversationData`
`22`	`22`	`importcom.wire.kalium.logger.obfuscateId`
`23`		`-importcom.wire.kalium.logic.CoreFailure`
	`23`	`+importcom.wire.kalium.common.error.CoreFailure`
`24`	`24`	`importcom.wire.kalium.logic.configuration.server.ServerConfig`
`25`	`25`	`importcom.wire.kalium.logic.data.user.UserId`
`26`		`-importcom.wire.kalium.logic.functional.Either`
`27`		`-importcom.wire.kalium.logic.functional.fold`
`28`		`-importcom.wire.kalium.logic.functional.isLeft`
`29`		`-importcom.wire.kalium.logic.functional.map`
`30`		`-importcom.wire.kalium.logic.functional.mapLeft`
	`26`	`+importcom.wire.kalium.common.functional.Either`
	`27`	`+importcom.wire.kalium.common.functional.fold`
	`28`	`+importcom.wire.kalium.common.functional.isLeft`
	`29`	`+importcom.wire.kalium.common.functional.map`
	`30`	`+importcom.wire.kalium.common.functional.mapLeft`
`31`	`31`
`32`	`32`	`classMigrationReport {`
`33`	`33`	`privateval report:MutableMap<String,Either<CoreFailure,Any>>=mutableMapOf()`

`‎app/src/main/kotlin/com/wire/android/migration/failure/MigrationFailure.kt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`packagecom.wire.android.migration.failure`
`20`	`20`
`21`		`-importcom.wire.kalium.logic.CoreFailure`
	`21`	`+importcom.wire.kalium.common.error.CoreFailure`
`22`	`22`
`23`	`23`	`sealedclassMigrationFailure :CoreFailure.FeatureFailure() {`
`24`	`24`	`object InvalidRefreshToken : MigrationFailure()`

`‎app/src/main/kotlin/com/wire/android/migration/feature/MigrateActiveAccountsUseCase.kt`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,18 +24,18 @@ import com.wire.android.migration.failure.MigrationFailure`
`24`	`24`	`importcom.wire.android.migration.globalDatabase.ScalaActiveAccountsEntity`
`25`	`25`	`importcom.wire.android.migration.globalDatabase.ScalaAppDataBaseProvider`
`26`	`26`	`importcom.wire.android.migration.userDatabase.ScalaUserDatabaseProvider`
`27`		`-importcom.wire.kalium.logic.CoreFailure`
	`27`	`+importcom.wire.kalium.common.error.CoreFailure`
`28`	`28`	`importcom.wire.kalium.logic.CoreLogic`
`29`	`29`	`importcom.wire.kalium.logic.configuration.server.ServerConfig`
`30`	`30`	`importcom.wire.kalium.logic.data.auth.AccountTokens`
`31`	`31`	`importcom.wire.kalium.logic.data.user.UserId`
`32`	`32`	`importcom.wire.kalium.logic.feature.auth.AddAuthenticatedUserUseCase`
`33`	`33`	`importcom.wire.kalium.logic.feature.auth.sso.SSOLoginSessionResult`
`34`		`-importcom.wire.kalium.logic.functional.Either`
`35`		`-importcom.wire.kalium.logic.functional.flatMap`
`36`		`-importcom.wire.kalium.logic.functional.getOrNull`
`37`		`-importcom.wire.kalium.logic.functional.map`
`38`		`-importcom.wire.kalium.logic.functional.mapLeft`
	`34`	`+importcom.wire.kalium.common.functional.Either`
	`35`	`+importcom.wire.kalium.common.functional.flatMap`
	`36`	`+importcom.wire.kalium.common.functional.getOrNull`
	`37`	`+importcom.wire.kalium.common.functional.map`
	`38`	`+importcom.wire.kalium.common.functional.mapLeft`
`39`	`39`	`importjavax.inject.Inject`
`40`	`40`	`importjavax.inject.Singleton`
`41`	`41`

`‎app/src/main/kotlin/com/wire/android/migration/feature/MigrateClientsDataUseCase.kt`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,17 +24,17 @@ import com.wire.android.di.KaliumCoreLogic`
`24`	`24`	`importcom.wire.android.migration.failure.MigrationFailure`
`25`	`25`	`importcom.wire.android.migration.userDatabase.ScalaUserDatabaseProvider`
`26`	`26`	`importcom.wire.android.migration.util.ScalaCryptoBoxDirectoryProvider`
`27`		`-importcom.wire.kalium.logic.CoreFailure`
	`27`	`+importcom.wire.kalium.common.error.CoreFailure`
`28`	`28`	`importcom.wire.kalium.logic.CoreLogic`
`29`		`-importcom.wire.kalium.logic.NetworkFailure`
	`29`	`+importcom.wire.kalium.common.error.NetworkFailure`
`30`	`30`	`importcom.wire.kalium.logic.data.conversation.ClientId`
`31`	`31`	`importcom.wire.kalium.logic.data.user.UserId`
`32`	`32`	`importcom.wire.kalium.logic.feature.client.RegisterClientResult`
`33`	`33`	`importcom.wire.kalium.logic.feature.client.RegisterClientUseCase.RegisterClientParam`
`34`		`-importcom.wire.kalium.logic.functional.Either`
`35`		`-importcom.wire.kalium.logic.functional.flatMap`
`36`		`-importcom.wire.kalium.logic.functional.fold`
`37`		`-importcom.wire.kalium.logic.functional.onSuccess`
	`34`	`+importcom.wire.kalium.common.functional.Either`
	`35`	`+importcom.wire.kalium.common.functional.flatMap`
	`36`	`+importcom.wire.kalium.common.functional.fold`
	`37`	`+importcom.wire.kalium.common.functional.onSuccess`
`38`	`38`	`importkotlinx.coroutines.withTimeoutOrNull`
`39`	`39`	`importjava.io.File`
`40`	`40`	`importjavax.inject.Inject`

`‎app/src/main/kotlin/com/wire/android/migration/feature/MigrateConversationsUseCase.kt`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ import com.wire.android.di.KaliumCoreLogic`
`22`	`22`	`importcom.wire.android.migration.MigrationMapper`
`23`	`23`	`importcom.wire.android.migration.userDatabase.ScalaConversationData`
`24`	`24`	`importcom.wire.android.migration.userDatabase.ScalaUserDatabaseProvider`
`25`		`-importcom.wire.kalium.logic.CoreFailure`
	`25`	`+importcom.wire.kalium.common.error.CoreFailure`
`26`	`26`	`importcom.wire.kalium.logic.CoreLogic`
`27`	`27`	`importcom.wire.kalium.logic.data.user.UserId`
`28`		`-importcom.wire.kalium.logic.functional.Either`
`29`		`-importcom.wire.kalium.logic.functional.flatMap`
`30`		`-importcom.wire.kalium.logic.functional.map`
	`28`	`+importcom.wire.kalium.common.functional.Either`
	`29`	`+importcom.wire.kalium.common.functional.flatMap`
	`30`	`+importcom.wire.kalium.common.functional.map`
`31`	`31`	`importjavax.inject.Inject`
`32`	`32`	`importjavax.inject.Singleton`
`33`	`33`

`‎app/src/main/kotlin/com/wire/android/migration/feature/MigrateMessagesUseCase.kt`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,13 @@ import com.wire.android.migration.userDatabase.ScalaConversationData`
`24`	`24`	`importcom.wire.android.migration.userDatabase.ScalaMessageDAO`
`25`	`25`	`importcom.wire.android.migration.userDatabase.ScalaUserDAO`
`26`	`26`	`importcom.wire.android.migration.userDatabase.ScalaUserDatabaseProvider`
`27`		`-importcom.wire.kalium.logic.CoreFailure`
	`27`	`+importcom.wire.kalium.common.error.CoreFailure`
`28`	`28`	`importcom.wire.kalium.logic.CoreLogic`
`29`	`29`	`importcom.wire.kalium.logic.data.user.UserId`
`30`		`-importcom.wire.kalium.logic.functional.flatMap`
`31`		`-importcom.wire.kalium.logic.functional.getOrNull`
`32`		`-importcom.wire.kalium.logic.functional.map`
`33`		`-importcom.wire.kalium.logic.functional.onFailure`
	`30`	`+importcom.wire.kalium.common.functional.flatMap`
	`31`	`+importcom.wire.kalium.common.functional.getOrNull`
	`32`	`+importcom.wire.kalium.common.functional.map`
	`33`	`+importcom.wire.kalium.common.functional.onFailure`
`34`	`34`	`importkotlinx.coroutines.CoroutineScope`
`35`	`35`	`importjavax.inject.Inject`
`36`	`36`	`importjavax.inject.Singleton`

`‎app/src/main/kotlin/com/wire/android/migration/feature/MigrateServerConfigUseCase.kt`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,16 +21,16 @@ package com.wire.android.migration.feature`
`21`	`21`	`importcom.wire.android.di.KaliumCoreLogic`
`22`	`22`	`importcom.wire.android.migration.preference.ScalaServerConfig`
`23`	`23`	`importcom.wire.android.migration.preference.ScalaServerConfigDAO`
`24`		`-importcom.wire.kalium.logic.CoreFailure`
	`24`	`+importcom.wire.kalium.common.error.CoreFailure`
`25`	`25`	`importcom.wire.kalium.logic.CoreLogic`
`26`		`-importcom.wire.kalium.logic.StorageFailure`
	`26`	`+importcom.wire.kalium.common.error.StorageFailure`
`27`	`27`	`importcom.wire.kalium.logic.configuration.server.CommonApiVersionType`
`28`	`28`	`importcom.wire.kalium.logic.configuration.server.ServerConfig`
`29`	`29`	`importcom.wire.kalium.logic.failure.ServerConfigFailure`
`30`	`30`	`importcom.wire.kalium.logic.feature.auth.autoVersioningAuth.AutoVersionAuthScopeUseCase`
`31`	`31`	`importcom.wire.kalium.logic.feature.server.GetServerConfigResult`
`32`	`32`	`importcom.wire.kalium.logic.feature.server.StoreServerConfigResult`
`33`		`-importcom.wire.kalium.logic.functional.Either`
	`33`	`+importcom.wire.kalium.common.functional.Either`
`34`	`34`	`importjavax.inject.Inject`
`35`	`35`	`importjavax.inject.Singleton`
`36`	`36`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc4ba37b

File tree

103 files changed

Some content is hidden

103 files changed

`‎app/src/androidTest/kotlin/com/wire/android/WireActivityTest.kt`

`‎app/src/main/kotlin/com/wire/android/WireApplication.kt`

`‎app/src/main/kotlin/com/wire/android/migration/MigrationManager.kt`

`‎app/src/main/kotlin/com/wire/android/migration/MigrationReport.kt`

`‎app/src/main/kotlin/com/wire/android/migration/failure/MigrationFailure.kt`

`‎app/src/main/kotlin/com/wire/android/migration/feature/MigrateActiveAccountsUseCase.kt`

`‎app/src/main/kotlin/com/wire/android/migration/feature/MigrateClientsDataUseCase.kt`

`‎app/src/main/kotlin/com/wire/android/migration/feature/MigrateConversationsUseCase.kt`

`‎app/src/main/kotlin/com/wire/android/migration/feature/MigrateMessagesUseCase.kt`

`‎app/src/main/kotlin/com/wire/android/migration/feature/MigrateServerConfigUseCase.kt`

0 commit comments