Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ object ApiRepository : ApiRepositoryCore() {
return callApi(ApiRoutes.quotas(mailboxHostingId, mailboxName), GET)
}

suspend fun getPermissions(mailboxLinkId: Int, mailboxHostingId: Int): ApiResponse<MailboxPermissions> {
return callApi(ApiRoutes.permissions(mailboxLinkId, mailboxHostingId), GET)
suspend fun getPermissions(mailboxAccessId: String, mailboxHostingId: Int): ApiResponse<MailboxPermissions> {
return callApi(ApiRoutes.permissions(mailboxAccessId, mailboxHostingId), GET)
}

//region Unsubscribe list diffusion
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/infomaniak/mail/data/api/ApiRoutes.kt
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ object ApiRoutes {
return "${mailbox()}?with=aliases,unseen"
}

fun permissions(linkId: Int, mailboxHostingId: Int): String {
return "${mailbox()}/permissions?user_mailbox_id=$linkId&product_id=$mailboxHostingId"
fun permissions(accessId: String, mailboxHostingId: Int): String {
return "${mailbox()}/permissions?access_id=$accessId&product_id=$mailboxHostingId"
}

fun quotas(mailboxHostingId: Int, mailboxName: String): String {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ object RealmDatabase {

//region Configurations versions
const val USER_INFO_SCHEMA_VERSION = 5L
const val MAILBOX_INFO_SCHEMA_VERSION = 17L
const val MAILBOX_INFO_SCHEMA_VERSION = 18L
const val MAILBOX_CONTENT_SCHEMA_VERSION = 36L
//endregion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ class Mailbox : RealmObject {
var mailboxId: Int = -3 // AppSettings.DEFAULT_ID
@SerialName("hosting_id")
var hostingId: Int = 0
@SerialName("link_id")
var linkId: Int = 0
@SerialName("access_id")
var accessId: String = ""
@SerialName("is_primary")
var isPrimary: Boolean = false
@SerialName("is_locked")
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ class MainViewModel @Inject constructor(

private fun updatePermissions(mailbox: Mailbox) = viewModelScope.launch(ioCoroutineContext) {
SentryLog.d(TAG, "Force refresh Permissions")
with(ApiRepository.getPermissions(mailbox.linkId, mailbox.hostingId)) {
with(ApiRepository.getPermissions(mailbox.accessId, mailbox.hostingId)) {
if (isSuccess()) {
mailboxController.updateMailbox(mailbox.objectId) {
it.permissions = data
Expand Down