Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(MyKSuite-07): Clean data field #2188

Merged
merged 1 commit into from
Feb 20, 2025
Merged

feat(MyKSuite-07): Clean data field #2188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Core
Open in desktop
Submodule Core updated 7 files
+5 −65 MykSuite/schemas/com.infomaniak.core.myksuite.ui.data.MyKSuiteDatabase/1.json
+0 −51 MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/KSuitePack.kt
+4 −18 MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/MyKSuiteData.kt
+0 −4 MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/MyKSuiteDataDao.kt
+7 −6 MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/MyKSuiteDataManager.kt
+1 −0 MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/data/kSuiteMail.kt
+1 −2 MykSuite/src/main/java/com/infomaniak/core/myksuite/ui/network/ApiRoutes.kt
3 changes: 0 additions & 3 deletions app/src/main/java/com/infomaniak/mail/data/cache/RealmDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ object RealmDatabase {
private object RealmConfig {

//region Configurations versions
const val APP_SETTINGS_SCHEMA_VERSION = 2L
const val USER_INFO_SCHEMA_VERSION = 2L
const val MAILBOX_INFO_SCHEMA_VERSION = 8L
const val MAILBOX_CONTENT_SCHEMA_VERSION = 21L
Expand Down Expand Up @@ -209,8 +208,6 @@ object RealmDatabase {
val appSettings = RealmConfiguration
.Builder(appSettingsSet)
.name(appSettingsDbName)
.schemaVersion(APP_SETTINGS_SCHEMA_VERSION)
.migration(APP_SETTINGS_MIGRATION)
.build()

val userInfo
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/com/infomaniak/mail/data/cache/RealmMigrations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ import io.realm.kotlin.dynamic.getValue
import io.realm.kotlin.migration.AutomaticSchemaMigration
import io.realm.kotlin.migration.AutomaticSchemaMigration.MigrationContext

val APP_SETTINGS_MIGRATION = AutomaticSchemaMigration { migrationContext ->
SentryDebug.addMigrationBreadcrumb(migrationContext)
}

val USER_INFO_MIGRATION = AutomaticSchemaMigration { migrationContext ->
SentryDebug.addMigrationBreadcrumb(migrationContext)
migrationContext.deleteRealmFromFirstMigration()
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/infomaniak/mail/data/models/AppSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ class AppSettings : RealmObject {

var currentUserId: Int = DEFAULT_ID
var currentMailboxId: Int = DEFAULT_ID
var myKSuiteId: Int = DEFAULT_ID

companion object {
const val DEFAULT_ID = -1
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class SettingsFragment : Fragment() {
private fun setupMyKSuiteLayout(myKSuiteData: MyKSuiteData) = with(binding) {
observeMyKSuiteMailbox()

myKSuiteData.kSuitePack.type?.displayNameRes?.let(myKSuiteSettingsTitle::setText)
myKSuiteSettingsTitle.setText(myKSuiteData.name)

myKSuiteViewModel.getMyKSuiteMailbox(myKSuiteData.mail.mailboxId)

Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/infomaniak/mail/utils/LogoutUser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class LogoutUser @Inject constructor(

user.logoutToken()
AccountUtils.removeUser(user)
MyKSuiteDataUtils.deleteKSuiteData(user.id)
RealmDatabase.removeUserData(appContext, user.id)
mailboxController.deleteUserMailboxes(user.id)
localSettings.removeRegisteredFirebaseUser(userId = user.id)
Expand Down
14 changes: 1 addition & 13 deletions app/src/main/java/com/infomaniak/mail/utils/MyKSuiteDataUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ import com.infomaniak.core.myksuite.ui.data.MyKSuiteDataManager
import com.infomaniak.lib.core.networking.HttpClient
import com.infomaniak.lib.core.utils.SentryLog
import com.infomaniak.mail.data.api.ApiRepository
import com.infomaniak.mail.data.cache.appSettings.AppSettingsController
import com.infomaniak.mail.data.models.AppSettings
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.MissingFieldException
import kotlin.coroutines.cancellation.CancellationException
Expand All @@ -32,19 +30,9 @@ object MyKSuiteDataUtils : MyKSuiteDataManager() {

private val TAG = MyKSuiteDataUtils::class.simpleName.toString()

override val userId get() = AccountUtils.currentUserId

override var myKSuiteId: Int = AppSettingsController.getAppSettings().myKSuiteId
set(myKSuiteId) {
field = myKSuiteId
AppSettingsController.updateAppSettings { appSettings -> appSettings.myKSuiteId = myKSuiteId }
}
override val currentUserId get() = AccountUtils.currentUserId

override var myKSuite: MyKSuiteData? = null
set(myKSuiteData) {
field = myKSuiteData
myKSuiteId = myKSuiteData?.id ?: AppSettings.DEFAULT_ID
}

suspend fun fetchMyKSuiteData(): MyKSuiteData? = runCatching {
MyKSuiteDataUtils.requestKSuiteData()
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/infomaniak/mail/utils/MyKSuiteUiUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package com.infomaniak.mail.utils
import android.content.Context
import androidx.fragment.app.Fragment
import androidx.navigation.NavController
import com.infomaniak.core.myksuite.ui.components.MyKSuiteTier
import com.infomaniak.core.myksuite.ui.data.MyKSuiteData
import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
import com.infomaniak.core.myksuite.ui.screens.MyKSuiteDashboardScreenData
Expand Down Expand Up @@ -51,7 +50,7 @@ object MyKSuiteUiUtils {

fun getDashboardData(context: Context, myKSuiteData: MyKSuiteData): MyKSuiteDashboardScreenData {
return MyKSuiteDashboardScreenData(
myKSuiteTier = if (myKSuiteData.isMyKSuitePlus) MyKSuiteTier.Plus else MyKSuiteTier.Free,
myKSuiteTier = myKSuiteData.tier,
email = myKSuiteData.mail.email,
avatarUri = AccountUtils.currentUser?.avatar ?: "",
dailySendingLimit = myKSuiteData.mail.dailyLimitSent.toString(),
Expand Down
Loading