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

Bump core libs versions.

This commit is contained in:
Zorica Stojchevska 2021-06-16 18:45:52 +02:00
parent cf2eab3b8a
commit 391bb3ab2e
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View File

@ -366,7 +366,8 @@
android:windowSoftInputMode="adjustResize" />
<activity
android:name="me.proton.core.auth.presentation.ui.AddAccountActivity"
android:windowSoftInputMode="adjustResize" />
android:windowSoftInputMode="adjustResize"
android:theme="@style/ProtonTheme.Mail.AddAccount"/>
<activity
android:name="me.proton.core.auth.presentation.ui.LoginActivity"
android:windowSoftInputMode="adjustResize" />

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

@ -56,8 +56,9 @@ object UserManagerModule {
@Singleton
fun provideUserRepositoryImpl(
db: AccountManagerDatabase,
provider: ApiProvider
): UserRepositoryImpl = UserRepositoryImpl(db, provider)
provider: ApiProvider,
cryptoContext: CryptoContext
): UserRepositoryImpl = UserRepositoryImpl(db, provider, cryptoContext)
@Provides
@Singleton

4
app/src/main/java/ch/protonmail/android/feature/account/CoreAccountManagerMigration.kt
View File

@ -175,7 +175,7 @@ private fun Keys.toCoreUserKey(userId: UserId, passphrase: EncryptedByteArray?)
version = 0,
activation = activation,
keyId = KeyId(id),
privateKey = PrivateKey(privateKey, isPrimary, passphrase)
privateKey = PrivateKey(privateKey, isPrimary, passphrase = passphrase)
)
private fun Address.toCoreUserAddress(userId: UserId, passphrase: EncryptedByteArray?) = UserAddress(
@ -202,5 +202,5 @@ private fun Keys.toCoreUserAddressKey(addressId: AddressId, passphrase: Encrypte
activation = activation,
active = active.toBooleanOrFalse(),
keyId = KeyId(id),
privateKey = PrivateKey(privateKey, isPrimary, passphrase)
privateKey = PrivateKey(privateKey, isPrimary, passphrase = passphrase)
)

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

@ -72,17 +72,17 @@ const val `Proton-android-instr-test version` = "0.3.3" // Released: Mar
const val `Proton-kotlin-test version` = "0.2" // Released: Oct 21, 2020
const val `Proton-domain version` = "1.0.3" // Released: Jun 09, 2021
const val `Proton-presentation version` = "0.8.6" // Released: Jun 09, 2021
const val `Proton-presentation version` = "0.8.7" // Released: Jun 15, 2021
const val `Proton-data version` = "1.0.3" // Released: Mar 22, 2021
const val `Proton-network version` = "1.1.4" // Released: Jun 21, 2021
const val `Proton-human-verification version` = "1.2.3" // Released: Jun 10, 2021
const val `Proton-crypto version` = "1.1.2" // Released: Jun 21, 2021
const val `Proton-country version` = "0.1.5" // Released: Jun 09, 2021
const val `Proton-auth version` = "1.1.5" // Released: Jun 09, 2021
const val `Proton-auth version` = "1.1.6" // Released: Jun 15, 2021
const val `Proton-account version` = "1.1" // Released: May 12, 2021
const val `Proton-account-manager version` = "1.1.5" // Released: Jun 09, 2021
const val `Proton-user version` = "1.1.2" // Released: Jun 04, 2021
const val `Proton-key version` = "1.1.2" // Released: Jun 04, 2021
const val `Proton-user version` = "1.1.4" // Released: Jun 11, 2021
const val `Proton-key version` = "1.1.4" // Released: Jun 11, 2021
@Suppress("unused") const val `composer version` = "1.0-beta-3" // Released: Feb 12, 2020