feat: My ksuite (#2198)

app/build.gradle

@@ -89,6 +89,7 @@ dependencies {
     implementation project(':Core:Legacy:BugTracker')
     implementation project(':Core:Legacy:Confetti')
     implementation project(':Core:Legacy:Stores')
+    implementation project(':Core:MyKSuite')
     implementation project(':HtmlCleaner')
 
     implementation libs.rich.html.editor
@@ -120,6 +121,9 @@ dependencies {
 
     implementation libs.coil.svg
 
+    // Compose
+    implementation libs.compose.ui.android
+
     // Test
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit

app/src/main/java/com/infomaniak/mail/MainApplication.kt

@@ -125,11 +125,13 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
         if (BuildConfig.DEBUG) configureDebugMode()
         configureSentry()
         enforceAppTheme()
-        configureAccountUtils()
+        configureRoomDatabases()
         configureAppReloading()
         configureInfomaniakCore()
         notificationUtils.initNotificationChannel()
         configureHttpClient()
+
+        localSettings.storageBannerDisplayAppLaunches++
     }
 
     override fun onStart(owner: LifecycleOwner) {
@@ -217,8 +219,9 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
         AppCompatDelegate.setDefaultNightMode(localSettings.theme.mode)
     }
 
-    private fun configureAccountUtils() {
+    private fun configureRoomDatabases() {
         AccountUtils.init(this)
+        MyKSuiteDataUtils.initDatabase(this)
     }
 
     private fun configureAppReloading() {

app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt

@@ -70,6 +70,8 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     var showWebViewOutdated by sharedValue("showWebViewOutdatedKey", true)
     var accessTokenApiCallRecord by sharedValue<ApiCallRecord>("accessTokenApiCallRecordKey", null)
     var lastSelectedScheduleEpoch by sharedValue<Long>("lastSelectedScheduleEpochKey", null)
+    var storageBannerDisplayAppLaunches by sharedValue("storageBannerDisplayAppLaunchesKey", 0)
+    var hasClosedStorageBanner by sharedValue("hasClosedStorageBannerKey", false)
 
     fun removeSettings() = sharedPreferences.transaction { clear() }
 
@@ -93,6 +95,11 @@ class LocalSettings private constructor(context: Context) : SharedValues {
         firebaseRegisteredUsers = mutableSetOf()
     }
 
+    fun resetStorageBannerAppLaunches() {
+        hasClosedStorageBanner = true
+        storageBannerDisplayAppLaunches = 0
+    }
+
     enum class EmailForwarding(@StringRes val localisedNameRes: Int) {
         IN_BODY(R.string.settingsTransferInBody),
         AS_ATTACHMENT(R.string.settingsTransferAsAttachment),

app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt

@@ -17,6 +17,7 @@
  */
 package com.infomaniak.mail.data.api
 
+import com.infomaniak.core.myksuite.ui.data.MyKSuiteData
 import com.infomaniak.core.utils.FORMAT_FULL_DATE_WITH_HOUR
 import com.infomaniak.core.utils.format
 import com.infomaniak.lib.core.InfomaniakCore
@@ -64,6 +65,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import java.util.Date
+import com.infomaniak.core.myksuite.ui.network.ApiRoutes as MyKSuiteApiRoutes
 
 object ApiRepository : ApiRepositoryCore() {
 
@@ -449,6 +451,15 @@ object ApiRepository : ApiRepositoryCore() {
         return callApi(url = ApiRoutes.shareLink(mailboxUuid, folderId, mailId), method = POST)
     }
 
+    fun getMyKSuiteData(okHttpClient: OkHttpClient): ApiResponse<MyKSuiteData> {
+        return ApiController.callApi(
+            url = MyKSuiteApiRoutes.myKSuiteData(),
+            method = ApiController.ApiMethod.GET,
+            okHttpClient = okHttpClient,
+            useKotlinxSerialization = true,
+        )
+    }
+
     /**
      * Create batches of the given values to perform the given request
      * @param values Data to batch

app/src/main/java/com/infomaniak/mail/data/models/Quotas.kt

@@ -31,7 +31,9 @@ class Quotas : EmbeddedRealmObject {
     @SerialName("size")
     private var _size: Long = 0L
 
-    val size: Long get() = _size * 1_000L // Convert from KiloOctets to Octets
+    val size: Long get() = _size * 1_024L // Convert from KiloOctets to Octets
+
+    val isFull get() = getProgress() >= 100
 
     fun getText(context: Context): String {
 

app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt

@@ -37,6 +37,8 @@ import androidx.navigation.NavDestination
 import androidx.navigation.fragment.NavHostFragment
 import androidx.work.Data
 import com.airbnb.lottie.LottieAnimationView
+import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
+import com.infomaniak.core.myksuite.ui.utils.MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet
 import com.infomaniak.core.utils.FORMAT_SCHEDULE_MAIL
 import com.infomaniak.core.utils.year
 import com.infomaniak.lib.core.MatomoCore.TrackerAction
@@ -269,16 +271,30 @@ class MainActivity : BaseActivity() {
                     with(workInfo.outputData) {
                         refreshDraftFolderIfNeeded()
                         val errorRes = getInt(DraftsActionsWorker.ERROR_MESSAGE_RESID_KEY, 0)
-                        if (errorRes > 0) {
-                            showSendingSnackbarTimer.cancel()
-                            snackbarManager.setValue(getString(errorRes))
-                        }
+                        displayError(errorRes)
                     }
                 }
             }
         }
     }
 
+    private fun displayError(errorRes: Int) {
+        if (errorRes > 0) {
+            showSendingSnackbarTimer.cancel()
+
+            val hasLimitBeenReached = errorRes == ErrorCode.getTranslateResForDrafts(ErrorCode.SEND_LIMIT_EXCEEDED) ||
+                    errorRes == ErrorCode.getTranslateResForDrafts(ErrorCode.SEND_DAILY_LIMIT_REACHED)
+
+            if (mainViewModel.currentMailbox.value?.isFreeMailbox == true && hasLimitBeenReached) {
+                snackbarManager.setValue(getString(errorRes), buttonTitle = R.string.buttonUpgrade) {
+                    navController.openMyKSuiteUpgradeBottomSheet(KSuiteApp.Mail)
+                }
+            } else {
+                snackbarManager.setValue(getString(errorRes))
+            }
+        }
+    }
+
     private fun Data.displayCompletedDraftWorkerResults() {
         getString(DraftsActionsWorker.RESULT_DRAFT_ACTION_KEY)?.let { draftAction ->
             when (draftAction.toEnumOrThrow<DraftAction>()) {

app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt

@@ -28,6 +28,7 @@ import com.infomaniak.lib.core.utils.SentryLog
 import com.infomaniak.lib.core.utils.SingleLiveEvent
 import com.infomaniak.mail.MatomoMail.trackMultiSelectionEvent
 import com.infomaniak.mail.R
+import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.api.ApiRepository
 import com.infomaniak.mail.data.api.ApiRoutes
 import com.infomaniak.mail.data.cache.RealmDatabase
@@ -54,18 +55,16 @@ import com.infomaniak.mail.di.IoDispatcher
 import com.infomaniak.mail.di.MailboxInfoRealm
 import com.infomaniak.mail.ui.main.SnackbarManager
 import com.infomaniak.mail.ui.main.SnackbarManager.UndoData
-import com.infomaniak.mail.utils.AccountUtils
+import com.infomaniak.mail.utils.*
 import com.infomaniak.mail.utils.ContactUtils.getPhoneContacts
 import com.infomaniak.mail.utils.ContactUtils.mergeApiContactsIntoPhoneContacts
-import com.infomaniak.mail.utils.NotificationUtils
 import com.infomaniak.mail.utils.NotificationUtils.Companion.cancelNotification
-import com.infomaniak.mail.utils.SharedUtils
 import com.infomaniak.mail.utils.SharedUtils.Companion.updateSignatures
 import com.infomaniak.mail.utils.Utils.isPermanentDeleteFolder
 import com.infomaniak.mail.utils.Utils.runCatchingRealm
-import com.infomaniak.mail.utils.coroutineContext
 import com.infomaniak.mail.utils.extensions.*
 import com.infomaniak.mail.views.itemViews.AvatarMergedContactData
+import com.infomaniak.mail.views.itemViews.MyKSuiteStorageBanner.StorageLevel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.kotlin.Realm
 import io.realm.kotlin.ext.toRealmList
@@ -109,6 +108,9 @@ class MainViewModel @Inject constructor(
     private val ioCoroutineContext = viewModelScope.coroutineContext(ioDispatcher)
     private var refreshEverythingJob: Job? = null
 
+    @Inject
+    lateinit var localSettings: LocalSettings
+
     val isDownloadingChanges: MutableLiveData<Boolean> = MutableLiveData(false)
     val isMovedToNewFolder = SingleLiveEvent<Boolean>()
     val toggleLightThemeForMessage = SingleLiveEvent<Message>()
@@ -162,6 +164,22 @@ class MainViewModel @Inject constructor(
         it?.let(quotasController::getQuotasAsync) ?: emptyFlow()
     }.asLiveData(ioCoroutineContext)
 
+    val storageBannerStatus = currentQuotasLive.map { quotas ->
+        when {
+            quotas == null -> null
+            quotas.isFull -> StorageLevel.Full
+            quotas.getProgress() > StorageLevel.WARNING_THRESHOLD -> {
+                if (!localSettings.hasClosedStorageBanner || localSettings.storageBannerDisplayAppLaunches % 10 == 0) {
+                    localSettings.hasClosedStorageBanner = false
+                    StorageLevel.Warning
+                } else {
+                    StorageLevel.Normal
+                }
+            }
+            else -> StorageLevel.Normal
+        }
+    }
+
     val currentPermissionsLive = _currentMailboxObjectId.flatMapLatest {
         it?.let(permissionsController::getPermissionsAsync) ?: emptyFlow()
     }.asLiveData(ioCoroutineContext)
@@ -300,6 +318,9 @@ class MainViewModel @Inject constructor(
             // Refresh User
             AccountUtils.updateCurrentUser()
 
+            // Refresh My kSuite asynchronously, because it's not required for the threads list display
+            launch { MyKSuiteDataUtils.fetchData() }
+
             // Refresh Mailboxes
             SentryLog.d(TAG, "Refresh mailboxes from remote")
             with(ApiRepository.getMailboxes()) {

app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/ScheduleSendBottomSheetDialog.kt

@@ -17,20 +17,23 @@
  */
 package com.infomaniak.mail.ui.bottomSheetDialogs
 
+import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import com.infomaniak.lib.core.utils.safeNavigate
+import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
+import com.infomaniak.core.myksuite.ui.utils.MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet
 import com.infomaniak.lib.core.utils.setBackNavigationResult
 import com.infomaniak.mail.MatomoMail.trackScheduleSendEvent
 import com.infomaniak.mail.R
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
-
 @AndroidEntryPoint
 class ScheduleSendBottomSheetDialog @Inject constructor() : SelectScheduleOptionBottomSheet() {
 
     private val navigationArgs: ScheduleSendBottomSheetDialogArgs by navArgs()
 
+    override val isCurrentMailboxFree: Boolean by lazy { navigationArgs.isCurrentMailboxFree }
+
     // Navigation args does not support nullable primitive types, so we use 0L
     // as a replacement (corresponding to Thursday 1 January 1970 00:00:00 UT).
     override val lastSelectedEpoch: Long? by lazy { navigationArgs.lastSelectedScheduleEpoch.takeIf { it != 0L } }
@@ -51,10 +54,7 @@ class ScheduleSendBottomSheetDialog @Inject constructor() : SelectScheduleOption
 
     override fun onCustomScheduleOptionClicked() {
         if (navigationArgs.isCurrentMailboxFree) {
-            safeNavigate(
-                resId = R.id.upgradeProductBottomSheetDialog,
-                currentClassName = ScheduleSendBottomSheetDialog::class.java.name,
-            )
+            findNavController().openMyKSuiteUpgradeBottomSheet(KSuiteApp.Mail)
         } else {
             setBackNavigationResult(OPEN_DATE_AND_TIME_SCHEDULE_DIALOG, true)
         }