Updates the core libs to 7.1.6

app/build.gradle.kts

@@ -291,6 +291,7 @@ dependencies {
         `Proton-kotlin-util`,
         `Proton-shared-preferences`,
         `Proton-work-manager`,
+        `Proton-challenge`,
         `Proton-crypto`,
         `Proton-crypto-validator`,
         `Proton-auth`,

app/src/main/java/ch/protonmail/android/data/AppDatabase.kt

@@ -36,6 +36,9 @@ import me.proton.core.account.data.entity.AccountEntity
 import me.proton.core.account.data.entity.AccountMetadataEntity
 import me.proton.core.account.data.entity.SessionDetailsEntity
 import me.proton.core.account.data.entity.SessionEntity
+import me.proton.core.challenge.data.db.ChallengeConverters
+import me.proton.core.challenge.data.db.ChallengeDatabase
+import me.proton.core.challenge.data.entity.ChallengeFrameEntity
 import me.proton.core.contact.data.local.db.ContactConverters
 import me.proton.core.contact.data.local.db.ContactDatabase
 import me.proton.core.contact.data.local.db.entity.ContactCardEntity
@@ -96,6 +99,7 @@ import timber.log.Timber
         ContactEmailEntity::class,
         ContactEmailLabelEntity::class,
         FeatureFlagEntity::class,
+        ChallengeFrameEntity::class,
         // Mail
         LabelEntity::class,
         NotificationEntity::class
@@ -112,6 +116,7 @@ import timber.log.Timber
     HumanVerificationConverters::class,
     UserSettingsConverters::class,
     ContactConverters::class,
+    ChallengeConverters::class,
     // Mail
     ProtonMailConverters::class
 )
@@ -127,14 +132,15 @@ internal abstract class AppDatabase :
     PublicAddressDatabase,
     UserDatabase,
     UserSettingsDatabase,
-    FeatureFlagDatabase {
+    FeatureFlagDatabase,
+    ChallengeDatabase {
 
     abstract fun labelDao(): LabelDao
     abstract fun notificationDao(): NotificationDao
 
     companion object {
 
-        const val version = 4
+        const val version = 5
         private const val name = "proton-mail.db"
 
         private fun getDbCreationCallback(context: Context): Callback = object : Callback() {
@@ -157,6 +163,7 @@ internal abstract class AppDatabase :
                 AppDatabaseMigrations.MIGRATION_1_2,
                 AppDatabaseMigrations.MIGRATION_2_3,
                 AppDatabaseMigrations.MIGRATION_3_4,
+                AppDatabaseMigrations.MIGRATION_4_5
             )
             Timber.v("Db migrations list size ${migrations.size}")
             return migrations

app/src/main/java/ch/protonmail/android/data/AppDatabaseMigrations.kt

@@ -28,6 +28,7 @@ import me.proton.core.account.data.entity.AccountEntity
 import me.proton.core.account.data.entity.AccountMetadataEntity
 import me.proton.core.account.data.entity.SessionDetailsEntity
 import me.proton.core.account.data.entity.SessionEntity
+import me.proton.core.challenge.data.db.ChallengeDatabase
 import me.proton.core.contact.data.local.db.ContactDatabase
 import me.proton.core.featureflag.data.db.FeatureFlagDatabase
 import me.proton.core.humanverification.data.entity.HumanVerificationEntity
@@ -128,4 +129,10 @@ object AppDatabaseMigrations {
             NotificationDatabase.MIGRATION_0.migrate(database)
         }
     }
+
+    val MIGRATION_4_5 = object : Migration(4, 5) {
+        override fun migrate(database: SupportSQLiteDatabase) {
+            ChallengeDatabase.MIGRATION_0.migrate(database)
+        }
+    }
 }

app/src/main/java/ch/protonmail/android/di/CoreAuthModule.kt

@@ -30,6 +30,7 @@ import me.proton.core.auth.data.MissingScopeListenerImpl
 import me.proton.core.auth.data.repository.AuthRepositoryImpl
 import me.proton.core.auth.domain.repository.AuthRepository
 import me.proton.core.auth.domain.usecase.PostLoginAccountSetup
+import me.proton.core.auth.domain.usecase.signup.SignupChallengeConfig
 import me.proton.core.auth.presentation.AuthOrchestrator
 import me.proton.core.auth.presentation.ui.LoginActivity
 import me.proton.core.crypto.android.srp.GOpenPGPSrpCrypto
@@ -75,4 +76,8 @@ object CoreAuthModule {
     @Provides
     @Singleton
     fun provideLoginBlockingHelp(): LoginActivity.BlockingHelp? = null
+
+    @Provides
+    @Singleton
+    fun provideChallengeConfig(): SignupChallengeConfig = SignupChallengeConfig()
 }

app/src/main/java/ch/protonmail/android/di/CoreDatabaseBindsModule.kt

@@ -24,6 +24,7 @@ import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import me.proton.core.account.data.db.AccountDatabase
+import me.proton.core.challenge.data.db.ChallengeDatabase
 import me.proton.core.contact.data.local.db.ContactDatabase
 import me.proton.core.featureflag.data.db.FeatureFlagDatabase
 import me.proton.core.humanverification.data.db.HumanVerificationDatabase
@@ -71,4 +72,7 @@ internal abstract class CoreDatabaseBindsModule {
 
     @Binds
     abstract fun provideFeatureFlagDatabase(appDatabase: AppDatabase): FeatureFlagDatabase
+
+    @Binds
+    abstract fun provideChallengeDatabase(appDatabase: AppDatabase): ChallengeDatabase
 }

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

@@ -18,10 +18,12 @@
 
 package ch.protonmail.android.di
 
+import android.content.Context
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import me.proton.core.crypto.common.context.CryptoContext
 import me.proton.core.key.data.db.KeySaltDatabase
@@ -60,8 +62,9 @@ object UserManagerModule {
     fun provideUserRepositoryImpl(
         db: UserDatabase,
         provider: ApiProvider,
+        @ApplicationContext context: Context,
         cryptoContext: CryptoContext
-    ): UserRepositoryImpl = UserRepositoryImpl(db, provider, cryptoContext)
+    ): UserRepositoryImpl = UserRepositoryImpl(db, provider, context, cryptoContext)
 
     @Provides
     @Singleton

buildSrc/src/main/kotlin/libraries.kt

@@ -33,6 +33,7 @@ val DependencyHandler.`Proton-kotlin-test` get() =                  protonTest("
 val DependencyHandler.`Proton-account` get() =                      proton("account") version `Proton-core version`
 val DependencyHandler.`Proton-account-manager` get() =              proton("account-manager") version `Proton-core version`
 val DependencyHandler.`Proton-auth` get() =                         proton("auth") version `Proton-core version`
+val DependencyHandler.`Proton-challenge` get() =                    proton("challenge") version `Proton-core version`
 val DependencyHandler.`Proton-contact` get() =                      proton("contact") version `Proton-core version`
 val DependencyHandler.`Proton-country` get() =                      proton("country") version `Proton-core version`
 val DependencyHandler.`Proton-crypto` get() =                       proton("crypto") version `Proton-core version`

buildSrc/src/main/kotlin/versionsConfig.kt

@@ -62,7 +62,7 @@ fun initVersions() {
 }
 
 // Proton Core
-const val `Proton-core version` = "7.1.5"
+const val `Proton-core version` = "7.1.6"
 
 // Test
 const val `aerogear version` =                  "1.0.0"         // Released: Mar 23, 2013

proton-libs

@@ -1 +1 @@
-Subproject commit 80b38a97e59b0c65d8c440af2752068b26e13fa6
+Subproject commit 33fcd385df8b6be64118da8d60f92af9d33f2c1c