ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgraded Core Modules.

This commit is contained in:
Neil Marietta 2021-08-18 18:56:35 +02:00
parent 71f837c99d
commit 082bae7dd4
7 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle.kts
View File

@ -306,6 +306,7 @@ dependencies {
`Proton-account-manager`,
`Proton-account-manager-data-db`,
`Proton-user`,
`Proton-user-settings`,
`Proton-mail-settings`,
`Proton-key`,
`Proton-human-verification`,

6
app/src/main/java/ch/protonmail/android/di/CoreAppModule.kt
View File

@ -20,12 +20,14 @@ package ch.protonmail.android.di
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.ProcessLifecycleOwner
import ch.protonmail.android.core.Constants
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import me.proton.core.account.domain.entity.AccountType
import me.proton.core.domain.entity.Product
import me.proton.core.user.data.DefaultDomainHost
import javax.inject.Singleton
@Module
@ -40,6 +42,10 @@ object CoreAppModule {
@Singleton
fun provideRequiredAccountType(): AccountType = AccountType.Internal
@Provides
@DefaultDomainHost
fun provideDefaultDomainHost() = Constants.MAIL_DOMAIN_COM
@Provides
@Singleton
@AppProcessLifecycleOwner

4
app/src/main/java/ch/protonmail/android/di/CoreDatabaseModule.kt
View File

@ -33,6 +33,7 @@ import me.proton.core.key.data.db.PublicAddressDatabase
import me.proton.core.mailsettings.data.db.MailSettingsDatabase
import me.proton.core.user.data.db.AddressDatabase
import me.proton.core.user.data.db.UserDatabase
import me.proton.core.usersettings.data.db.UserSettingsDatabase
import javax.inject.Singleton
@Module
@ -68,4 +69,7 @@ abstract class AppDatabaseBindsModule {
@Binds
abstract fun provideMailSettingsDatabase(db: AccountManagerDatabase): MailSettingsDatabase
@Binds
abstract fun provideUserSettingsDatabase(db: AccountManagerDatabase): UserSettingsDatabase
}

7
app/src/main/java/ch/protonmail/android/di/CoreHumanVerificationModule.kt
View File

@ -36,7 +36,6 @@ import me.proton.core.humanverification.domain.repository.HumanVerificationRepos
import me.proton.core.humanverification.domain.repository.UserVerificationRepository
import me.proton.core.humanverification.presentation.HumanVerificationOrchestrator
import me.proton.core.network.data.ApiProvider
import me.proton.core.network.domain.client.ClientIdProvider
import me.proton.core.network.domain.humanverification.HumanVerificationListener
import me.proton.core.network.domain.humanverification.HumanVerificationProvider
import javax.inject.Singleton
@ -83,11 +82,9 @@ object HumanVerificationModule {
@Provides
@Singleton
fun provideUserVerificationRepository(
apiProvider: ApiProvider,
clientIdProvider: ClientIdProvider,
humanVerificationRepository: HumanVerificationRepository
apiProvider: ApiProvider
): UserVerificationRepository =
UserVerificationRepositoryImpl(apiProvider, clientIdProvider, humanVerificationRepository)
UserVerificationRepositoryImpl(apiProvider)
}
@Module

15
app/src/main/java/ch/protonmail/android/di/CoreUserModule.kt
View File

@ -33,6 +33,7 @@ import me.proton.core.key.domain.repository.KeySaltRepository
import me.proton.core.key.domain.repository.PrivateKeyRepository
import me.proton.core.key.domain.repository.PublicAddressRepository
import me.proton.core.network.data.ApiProvider
import me.proton.core.user.data.DefaultDomainHost
import me.proton.core.user.data.UserAddressKeySecretProvider
import me.proton.core.user.data.UserAddressManagerImpl
import me.proton.core.user.data.UserManagerImpl
@ -41,14 +42,16 @@ import me.proton.core.user.data.db.UserDatabase
import me.proton.core.user.data.repository.DomainRepositoryImpl
import me.proton.core.user.data.repository.UserAddressRepositoryImpl
import me.proton.core.user.data.repository.UserRepositoryImpl
import me.proton.core.user.data.repository.UserSettingRepositoryImpl
import me.proton.core.user.domain.UserAddressManager
import me.proton.core.user.domain.UserManager
import me.proton.core.user.domain.entity.Domain
import me.proton.core.user.domain.repository.DomainRepository
import me.proton.core.user.domain.repository.PassphraseRepository
import me.proton.core.user.domain.repository.UserAddressRepository
import me.proton.core.user.domain.repository.UserRepository
import me.proton.core.user.domain.repository.UserSettingRepository
import me.proton.core.usersettings.data.db.UserSettingsDatabase
import me.proton.core.usersettings.data.repository.UserSettingsRepositoryImpl
import me.proton.core.usersettings.domain.repository.UserSettingsRepository
import javax.inject.Singleton
@Module
@ -84,15 +87,17 @@ object UserManagerModule {
@Provides
@Singleton
fun provideUserSettingRepository(
fun provideUserSettingsRepository(
db: UserSettingsDatabase,
provider: ApiProvider
): UserSettingRepository = UserSettingRepositoryImpl(provider)
): UserSettingsRepository = UserSettingsRepositoryImpl(db, provider)
@Provides
@Singleton
fun provideDomainRepository(
@DefaultDomainHost defaultDomain: Domain,
provider: ApiProvider
): DomainRepository = DomainRepositoryImpl(provider)
): DomainRepository = DomainRepositoryImpl(defaultDomain, provider)
@Provides
@Singleton

1
buildSrc/src/main/kotlin/libraries.kt
View File

@ -48,6 +48,7 @@ val DependencyHandler.`Proton-plan` get() = proton("plan
val DependencyHandler.`Proton-presentation` get() = proton("presentation") version `Proton-presentation version`
val DependencyHandler.`Proton-user` get() = proton("user") version `Proton-user version`
val DependencyHandler.`Proton-user-domain` get() = proton("user-domain") version `Proton-user version`
val DependencyHandler.`Proton-user-settings` get() = proton("user-settings") version `Proton-user-settings version`
fun DependencyHandler.protonTest(moduleSuffix: String, version: String? = null) =
proton("test", moduleSuffix, version)

27
buildSrc/src/main/kotlin/versionsConfig.kt
View File

@ -71,22 +71,23 @@ const val `Proton-android-test version` = "0.4.3" // Released: Mar
const val `Proton-android-instr-test version` = "0.3.3" // Released: Mar 22, 2021
const val `Proton-kotlin-test version` = "0.2" // Released: Oct 21, 2020
// Feature
const val `Proton-account version` = "1.3.1" // Released: Jul 22, 2021
const val `Proton-account-manager version` = "1.3.1" // Released: Jul 22, 2021
const val `Proton-auth version` = "1.4" // Released: Jul 22, 2021
const val `Proton-country version` = "0.1.5" // Released: Jun 09, 2021
const val `Proton-crypto version` = "1.1.2" // Released: Jun 21, 2021
const val `Proton-account version` = "1.5.2" // Released: Aug 16, 2021
const val `Proton-account-manager version` = "1.5.1" // Released: Aug 05, 2021
const val `Proton-auth version` = "1.5.2" // Released: Aug 16, 2021
const val `Proton-country version` = "0.1.6" // Released: Aug 05, 2021
const val `Proton-crypto version` = "1.1.5" // Released: Jul 30, 2021
const val `Proton-data version` = "1.3.1" // Released: Jul 22, 2021
const val `Proton-data-room version` = "1.3.1" // Released: Jul 22, 2021
const val `Proton-domain version` = "1.0.3" // Released: Jun 09, 2021
const val `Proton-human-verification version` = "1.3.1" // Released: Jul 13, 2021
const val `Proton-key version` = "1.3.1" // Released: Jul 22, 2021
const val `Proton-domain version` = "1.0.4" // Released: Jul 07, 2021
const val `Proton-human-verification version` = "1.5.2" // Released: Aug 16, 2021
const val `Proton-key version` = "1.3.2" // Released: Jul 30, 2021
const val `Proton-mail-settings version` = "1.3.2" // Released: Jul 28, 2021
const val `Proton-network version` = "1.5.4" // Released: Aug 19, 2021
const val `Proton-payment version` = "0.1.10" // Released: Jul 13, 2021
const val `Proton-plan version` = "0.0.3" // Released: Jul 13, 2021
const val `Proton-presentation version` = "0.9.9" // Released: Jul 26, 2021
const val `Proton-user version` = "1.3.2" // Released: Jul 23, 2021
const val `Proton-network version` = "1.5.3" // Released: Aug 18, 2021
const val `Proton-payment version` = "0.2.3" // Released: Aug 05, 2021
const val `Proton-plan version` = "1.5.2" // Released: Aug 16, 2021
const val `Proton-presentation version` = "1.5.3" // Released: Aug 16, 2021
const val `Proton-user version` = "1.5.2" // Released: Aug 16, 2021
const val `Proton-user-settings version` = "1.5.1" // Released: Jul 30, 2021
@Suppress("unused") const val `composer version` = "1.0-beta-3" // Released: Feb 12, 2020