Update Core to 9.1.2

app/build.gradle.kts

@@ -316,7 +316,6 @@ dependencies {
         `Proton-plan`,
         `Proton-contact`,
         `Proton-country`,
-        `Proton-payment`,
         `Proton-plan`,
         `Proton-report`,
         `Proton-feature-flag`,

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

@@ -60,6 +60,8 @@ import me.proton.core.key.data.entity.PublicAddressEntity
 import me.proton.core.key.data.entity.PublicAddressKeyEntity
 import me.proton.core.mailsettings.data.db.MailSettingsDatabase
 import me.proton.core.mailsettings.data.entity.MailSettingsEntity
+import me.proton.core.payment.data.local.db.PaymentDatabase
+import me.proton.core.payment.data.local.entity.GooglePurchaseEntity
 import me.proton.core.user.data.db.AddressDatabase
 import me.proton.core.user.data.db.UserConverters
 import me.proton.core.user.data.db.UserDatabase
@@ -100,6 +102,7 @@ import timber.log.Timber
         ContactEmailLabelEntity::class,
         FeatureFlagEntity::class,
         ChallengeFrameEntity::class,
+        GooglePurchaseEntity::class,
         // Mail
         LabelEntity::class,
         NotificationEntity::class
@@ -133,14 +136,15 @@ internal abstract class AppDatabase :
     UserDatabase,
     UserSettingsDatabase,
     FeatureFlagDatabase,
-    ChallengeDatabase {
+    ChallengeDatabase,
+    PaymentDatabase {
 
     abstract fun labelDao(): LabelDao
     abstract fun notificationDao(): NotificationDao
 
     companion object {
 
-        const val version = 8
+        const val version = 9
         private const val name = "proton-mail.db"
 
         private fun getDbCreationCallback(context: Context): Callback = object : Callback() {
@@ -166,7 +170,8 @@ internal abstract class AppDatabase :
                 AppDatabaseMigrations.MIGRATION_4_5,
                 AppDatabaseMigrations.MIGRATION_5_6,
                 AppDatabaseMigrations.MIGRATION_6_7,
-                AppDatabaseMigrations.MIGRATION_7_8
+                AppDatabaseMigrations.MIGRATION_7_8,
+                AppDatabaseMigrations.MIGRATION_8_9
             )
             Timber.v("Db migrations list size ${migrations.size}")
             return migrations

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

@@ -38,6 +38,7 @@ import me.proton.core.key.data.entity.KeySaltEntity
 import me.proton.core.key.data.entity.PublicAddressEntity
 import me.proton.core.key.data.entity.PublicAddressKeyEntity
 import me.proton.core.mailsettings.data.entity.MailSettingsEntity
+import me.proton.core.payment.data.local.db.PaymentDatabase
 import me.proton.core.user.data.db.AddressDatabase
 import me.proton.core.user.data.db.UserDatabase
 import me.proton.core.user.data.entity.AddressEntity
@@ -158,4 +159,10 @@ object AppDatabaseMigrations {
             HumanVerificationDatabase.MIGRATION_2.migrate(database)
         }
     }
+
+    val MIGRATION_8_9 = object : Migration(8, 9) {
+        override fun migrate(database: SupportSQLiteDatabase) {
+            PaymentDatabase.MIGRATION_0.migrate(database)
+        }
+    }
 }

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

@@ -32,6 +32,7 @@ import me.proton.core.humanverification.data.db.HumanVerificationDatabase
 import me.proton.core.key.data.db.KeySaltDatabase
 import me.proton.core.key.data.db.PublicAddressDatabase
 import me.proton.core.mailsettings.data.db.MailSettingsDatabase
+import me.proton.core.payment.data.local.db.PaymentDatabase
 import me.proton.core.user.data.db.AddressDatabase
 import me.proton.core.user.data.db.UserDatabase
 import me.proton.core.usersettings.data.db.OrganizationDatabase
@@ -76,4 +77,7 @@ internal abstract class CoreDatabaseBindsModule {
 
     @Binds
     abstract fun provideChallengeDatabase(appDatabase: AppDatabase): ChallengeDatabase
+
+    @Binds
+    abstract fun providePaymentDatabase(appDatabase: AppDatabase): PaymentDatabase
 }

buildSrc/src/main/kotlin/versionsConfig.kt

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

proton-libs

@@ -1 +1 @@
-Subproject commit a2e9026f57a0d58afb03d1be579c53e14cdb46e3
+Subproject commit 3f00767c045209a56d3e0565e425936e971b49ac