github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-08-02 02:32:04 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

Update SDK to 3.0.0-7585-87e9ad18 (#7101)

Browse Source 
Co-authored-by: bw-ghapp[bot] <178206702+bw-ghapp[bot]@users.noreply.github.com>
This commit is contained in:
bw-ghapp[bot]
2026-06-30 15:21:48 +00:00
committed by GitHub
co-authored by bw-ghapp[bot] <178206702+bw-ghapp[bot]@users.noreply.github.com>
parent 04735a3796
commit fc0a150590
6 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/x8bit/bitwarden/data/auth/repository/util/SyncResponseJsonExtensions.kt
+1
View File
@@ -179,6 +179,7 @@ private fun OrganizationStatusType.toSdkOrganizationUserStatusType(): Organizati
OrganizationStatusType.INVITED -> OrganizationUserStatusType.INVITED
OrganizationStatusType.ACCEPTED -> OrganizationUserStatusType.ACCEPTED
OrganizationStatusType.CONFIRMED -> OrganizationUserStatusType.CONFIRMED
OrganizationStatusType.STAGED -> OrganizationUserStatusType.STAGED
}
private fun OrganizationType.toSdkOrganizationUserType(): OrganizationUserType =
app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/PolicyManagerImpl.kt
+2 -1
View File
@@ -133,7 +133,8 @@ class PolicyManagerImpl(
?.filter {
@Suppress("MaxLineLength")
it.organizationUserPolicyContext.usePolicies &&
it.organizationUserPolicyContext.status >= OrganizationUserStatusType.ACCEPTED &&
(it.organizationUserPolicyContext.status == OrganizationUserStatusType.ACCEPTED ||
it.organizationUserPolicyContext.status == OrganizationUserStatusType.CONFIRMED) &&
!it.isOrganizationExemptFromPolicies(policyType = type)
}
?.map { it.organizationUserPolicyContext.id }
app/src/main/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkOrganizationExtensions.kt
+1
View File
@@ -36,6 +36,7 @@ private val OrganizationStatusType.toSdkOrganizationUserStatusType: Organization
OrganizationStatusType.INVITED -> OrganizationUserStatusType.INVITED
OrganizationStatusType.ACCEPTED -> OrganizationUserStatusType.ACCEPTED
OrganizationStatusType.CONFIRMED -> OrganizationUserStatusType.CONFIRMED
OrganizationStatusType.STAGED -> OrganizationUserStatusType.STAGED
}
private val OrganizationType.toSdkOrganizationUserType: OrganizationUserType
app/src/test/kotlin/com/x8bit/bitwarden/data/vault/repository/util/VaultSdkOrganizationExtensionsTest.kt
+1
View File
@@ -64,6 +64,7 @@ private val STATUS_TYPE_MAP: Map<OrganizationStatusType, OrganizationUserStatusT
OrganizationStatusType.INVITED to OrganizationUserStatusType.INVITED,
OrganizationStatusType.ACCEPTED to OrganizationUserStatusType.ACCEPTED,
OrganizationStatusType.CONFIRMED to OrganizationUserStatusType.CONFIRMED,
OrganizationStatusType.STAGED to OrganizationUserStatusType.STAGED,
)
private val ORGANIZATION_TYPE_MAP: Map<OrganizationType, OrganizationUserType> = mapOf(
gradle/libs.versions.toml
+1 -1
View File
@@ -29,7 +29,7 @@ androidxRoom = "2.8.4"
androidxSecurityCrypto = "1.1.0"
androidxSplash = "1.2.0"
androidxWork = "2.11.2"
bitwardenSdk = "3.0.0-7536-159aed97"
bitwardenSdk = "3.0.0-7585-87e9ad18"
crashlytics = "3.0.7"
detekt = "1.23.8"
firebaseBom = "34.14.1"
network/src/main/kotlin/com/bitwarden/network/model/OrganizationStatusType.kt
+6
View File
@@ -33,6 +33,12 @@ enum class OrganizationStatusType {
*/
@SerialName("2")
CONFIRMED,
/**
* The user has been staged for provisioning but has not yet been invited.
*/
@SerialName("3")
STAGED,
}
@Keep