AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
Julian Raufelder 2021-10-20 12:26:13 +02:00
commit 1fedb10403
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
6 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -39,7 +39,7 @@ allprojects {
ext { ext {
androidApplicationId = 'org.cryptomator' androidApplicationId = 'org.cryptomator'
androidVersionCode = getVersionCode() androidVersionCode = getVersionCode()
androidVersionName = '1.6.1-SNAPSHOT' androidVersionName = '1.6.2-SNAPSHOT'
} }
repositories { repositories {
mavenCentral() mavenCentral()

3
data/src/main/java/org/cryptomator/data/cloud/crypto/VaultConfig.kt
View File

@ -14,6 +14,7 @@ import io.jsonwebtoken.JwsHeader
import io.jsonwebtoken.JwtException import io.jsonwebtoken.JwtException
import io.jsonwebtoken.Jwts import io.jsonwebtoken.Jwts
import io.jsonwebtoken.MissingClaimException import io.jsonwebtoken.MissingClaimException
import io.jsonwebtoken.SignatureAlgorithm
import io.jsonwebtoken.SigningKeyResolverAdapter import io.jsonwebtoken.SigningKeyResolverAdapter
import io.jsonwebtoken.security.Keys import io.jsonwebtoken.security.Keys
import io.jsonwebtoken.security.SignatureException import io.jsonwebtoken.security.SignatureException
@ -34,7 +35,7 @@ class VaultConfig private constructor(builder: VaultConfigBuilder) {
.claim(JSON_KEY_VAULTFORMAT, vaultFormat) // .claim(JSON_KEY_VAULTFORMAT, vaultFormat) //
.claim(JSON_KEY_CIPHERCONFIG, cipherCombo.name) // .claim(JSON_KEY_CIPHERCONFIG, cipherCombo.name) //
.claim(JSON_KEY_SHORTENING_THRESHOLD, shorteningThreshold) // .claim(JSON_KEY_SHORTENING_THRESHOLD, shorteningThreshold) //
.signWith(Keys.hmacShaKeyFor(rawKey)) // .signWith(Keys.hmacShaKeyFor(rawKey), SignatureAlgorithm.HS256) //
.compact() .compact()
} }

2
data/src/test/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProviderTest.kt
View File

@ -57,7 +57,7 @@ internal class MasterkeyCryptoCloudProviderTest {
private val masterkeyV7 = private val masterkeyV7 =
"{ \"version\": 7, \"scryptSalt\": \"AAAAAAAAAAA=\", \"scryptCostParam\": 32768, \"scryptBlockSize\": 8, \"primaryMasterKey\": \"D2kc+xBoAcVY+M7s74YBEy6l7ga2+Nz+HS5o0TQY3JMW1uQ5jTlLIQ==\", \"hmacMasterKey\": \"D2kc+xBoAcVY+M7s74YBEy6l7ga2+Nz+HS5o0TQY3JMW1uQ5jTlLIQ==\", \"versionMac\": \"cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g=\"}" "{ \"version\": 7, \"scryptSalt\": \"AAAAAAAAAAA=\", \"scryptCostParam\": 32768, \"scryptBlockSize\": 8, \"primaryMasterKey\": \"D2kc+xBoAcVY+M7s74YBEy6l7ga2+Nz+HS5o0TQY3JMW1uQ5jTlLIQ==\", \"hmacMasterKey\": \"D2kc+xBoAcVY+M7s74YBEy6l7ga2+Nz+HS5o0TQY3JMW1uQ5jTlLIQ==\", \"versionMac\": \"cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g=\"}"
private val vaultConfig = private val vaultConfig =
"eyJraWQiOiJtYXN0ZXJrZXlmaWxlOm1hc3RlcmtleS5jcnlwdG9tYXRvciIsImFsZyI6IkhTNTEyIn0.eyJmb3JtYXQiOjgsInNob3J0ZW5pbmdUaHJlc2hvbGQiOjIyMCwiY2lwaGVyQ29tYm8iOiJTSVZfQ1RSTUFDIn0.Evt5KXS_35pm53DynIwL3qvXWF56UkfqDZKv12n7SD288jzcdvvmtvu5sQhhqvxU6CPL4Q9v3yFQ_lvBynyrYA" "eyJraWQiOiJtYXN0ZXJrZXlmaWxlOm1hc3RlcmtleS5jcnlwdG9tYXRvciIsImFsZyI6IkhTMjU2In0.eyJmb3JtYXQiOjgsInNob3J0ZW5pbmdUaHJlc2hvbGQiOjIyMCwiY2lwaGVyQ29tYm8iOiJTSVZfQ1RSTUFDIn0.CLOGLhNPwGA84olG9qHoYnan5ju8VlRh3X2n2FwVOOc"
private var context: Context = mock() private var context: Context = mock()
private var cloud: Cloud = mock() private var cloud: Cloud = mock()

10
fastlane/metadata/android/de-DE/changelogs/default.txt
View File

@ -1,9 +1 @@
- Kompatibilität zur Tresor-Format 8 hinzugefügt - Kompatibilität zu Tresor-Format 8 verbessert
- Google-Login und geteilte Tresore in pCloud hinzugefügt
- Viele Übersetzungen hinzugefügt
- Minimale Android-Version auf 7 erhöht
- Auto-Updater des APK-Stores verbessert
- Tresorname in S3 kann wieder umbenannt werden
- Tresore in Google Drive können wieder auf allen Geräten erstellt/hinzugefügt werden
- Kompatibilität für schwache biometrische Authentifikatoren entfernt
- Deaktivierte Tracking-Library der Google-Cloud entfernt

10
fastlane/metadata/android/en-US/changelogs/default.txt
View File

@ -1,9 +1 @@
- Added compatibility to vault format 8 - Enhanced compatibility to vault format 8
- Added Google login and shared vaults in pCloud
- Added a ton of translations, kudos to our contributors
- Enhanced auto updater of APK store
- Increased min. Android version to 7 (Side note: Android 6 did not receive security updates for almost 2 years)
- Fixed rename vault name in S3
- Fixed add/create vault in Google Drive on some devices
- Dropped support for weak biometric authenticators
- Removed deactivated tracking library from the Google cloud

10
fastlane/release-notes.html
View File

@ -1,11 +1,3 @@
<ul> <ul>
<li>Added compatibility to vault format 8</li> <li>Enhanced compatibility to vault format 8</li>
<li>Added Google login and shared vaults in pCloud</li>
<li>Added a ton of translations, kudos to our contributors</li>
<li>Enhanced auto updater of APK store</li>
<li>Increased min. Android version to 7 (Side note: Android 6 did not receive security updates for almost 2 years)</li>
<li>Fixed rename vault name in S3</li>
<li>Fixed add/create vault in Google Drive on some devices</li>
<li>Dropped support for weak biometric authenticators</li>
<li>Removed deactivated tracking library from the Google cloud</li>
</ul> </ul>