Merge pull request #1722 from Infomaniak/cleaning

Cleaning

Author: KevinBoulongne

app/src/main/java/com/infomaniak/mail/data/cache/RealmDatabase.kt

@@ -116,12 +116,12 @@ object RealmDatabase {
     //endregion
 
     //region Reset Realms
-    fun backUpPreviousRealms() {
+    fun backupPreviousRealms() {
         oldUserInfo = WeakReference(_userInfo)
-        backUpPreviousMailboxContent()
+        backupPreviousMailboxContent()
     }
 
-    fun backUpPreviousMailboxContent() {
+    fun backupPreviousMailboxContent() {
         oldMailboxContent = WeakReference(_mailboxContent)
     }
 

app/src/main/java/com/infomaniak/mail/ui/login/IntroViewModel.kt

@@ -17,19 +17,17 @@
  */
 package com.infomaniak.mail.ui.login
 
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.LocalSettings.AccentColor
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
 class IntroViewModel @Inject constructor(
-    application: Application,
     localSettings: LocalSettings,
-) : AndroidViewModel(application) {
+) : ViewModel() {
 
     var updatedAccentColor: MutableLiveData<Pair<AccentColor, AccentColor>> = MutableLiveData(
         localSettings.accentColor to localSettings.accentColor,

app/src/main/java/com/infomaniak/mail/ui/main/thread/PrintMailFragment.kt

@@ -55,10 +55,13 @@ class PrintMailFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?): Unit = with(threadViewModel) {
         super.onViewCreated(view, savedInstanceState)
+
         setupAdapter()
+
         messagesLive.observe(viewLifecycleOwner) { (items, _) ->
             threadAdapter.submitList(items.filter { it is Message && it.uid == navigationArgs.messageUid })
         }
+
         navigationArgs.openThreadUid?.let {
             reassignThreadLive(it)
             reassignMessagesLive(it)

app/src/main/java/com/infomaniak/mail/ui/main/thread/PrintMailViewModel.kt

@@ -18,7 +18,6 @@
 
 package com.infomaniak.mail.ui.main.thread
 
-import android.app.Application
 import android.content.Context
 import android.os.Bundle
 import android.os.CancellationSignal
@@ -28,33 +27,37 @@ import android.print.PrintAttributes
 import android.print.PrintDocumentAdapter
 import android.print.PrintManager
 import android.webkit.WebView
-import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class PrintMailViewModel(application: Application) : AndroidViewModel(application) {
+class PrintMailViewModel : ViewModel() {
 
-    fun startPrintingService(activityContext: Context, subject: String?, webView: WebView, onFinish: () -> Unit) {
-        viewModelScope.launch(Dispatchers.Main) {
-            subject?.let { subject ->
-                val webViewPrintAdapter = PrintAdapterWrapper(webView.createPrintDocumentAdapter(subject), onFinish)
-                val printManager = activityContext.getSystemService(Context.PRINT_SERVICE) as PrintManager
-                printManager.print(subject, webViewPrintAdapter, null)
-            }
+    fun startPrintingService(
+        activityContext: Context,
+        subject: String?,
+        webView: WebView,
+        onFinish: () -> Unit,
+    ) = viewModelScope.launch(Dispatchers.Main) {
+        subject?.let { subject ->
+            val webViewPrintAdapter = PrintAdapterWrapper(webView.createPrintDocumentAdapter(subject), onFinish)
+            val printManager = activityContext.getSystemService(Context.PRINT_SERVICE) as PrintManager
+            printManager.print(subject, webViewPrintAdapter, null)
         }
     }
 
     private class PrintAdapterWrapper(
         private val printAdapter: PrintDocumentAdapter,
-        private val onFinish: () -> Unit
+        private val onFinish: () -> Unit,
     ) : PrintDocumentAdapter() {
+
         override fun onLayout(
             oldAttributes: PrintAttributes?,
             newAttributes: PrintAttributes?,
             cancellationSignal: CancellationSignal?,
             callback: LayoutResultCallback?,
-            extras: Bundle?
+            extras: Bundle?,
         ) {
             printAdapter.onLayout(oldAttributes, newAttributes, cancellationSignal, callback, extras)
         }
@@ -63,7 +66,7 @@ class PrintMailViewModel(application: Application) : AndroidViewModel(applicatio
             pages: Array<out PageRange>?,
             destination: ParcelFileDescriptor?,
             cancellationSignal: CancellationSignal?,
-            callback: WriteResultCallback?
+            callback: WriteResultCallback?,
         ) {
             printAdapter.onWrite(pages, destination, cancellationSignal, callback)
         }

app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadAdapter.kt

@@ -756,15 +756,15 @@ class ThreadAdapter(
                     onBlockedResourcesDetected = ::promptUserForDistantImages,
                     navigateToNewMessageActivity = navigateToNewMessageActivity,
                     onPageFinished = onPageFinished,
-                    onWebViewFinishedLoading = onWebViewFinishedLoading
+                    onWebViewFinishedLoading = onWebViewFinishedLoading,
                 )
                 _fullMessageWebViewClient = binding.fullMessageWebView.initWebViewClientAndBridge(
                     attachments = message.attachments,
                     messageUid = message.uid,
                     shouldLoadDistantResources = shouldLoadDistantResources,
                     onBlockedResourcesDetected = ::promptUserForDistantImages,
                     navigateToNewMessageActivity = navigateToNewMessageActivity,
-                    onWebViewFinishedLoading = onWebViewFinishedLoading
+                    onWebViewFinishedLoading = onWebViewFinishedLoading,
                 )
             }
         }

app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt

@@ -198,6 +198,7 @@ class ThreadFragment : Fragment() {
     }
 
     private fun setupAdapter() = with(binding.messagesList) {
+
         adapter = ThreadAdapter(
             shouldLoadDistantResources = shouldLoadDistantResources(),
             isCalendarEventExpandedMap = threadViewModel.isCalendarEventExpandedMap,
@@ -298,6 +299,7 @@ class ThreadFragment : Fragment() {
                 shouldIgnoreView = { view -> view.tag == ThreadAdapter.IGNORE_DIVIDER_TAG },
             ),
         )
+
         recycledViewPool.setMaxRecycledViews(0, 0)
         threadAdapter.stateRestorationPolicy = StateRestorationPolicy.PREVENT_WHEN_EMPTY
     }

app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/AttachmentActionsViewModel.kt

@@ -17,19 +17,17 @@
  */
 package com.infomaniak.mail.ui.main.thread.actions
 
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
 import com.infomaniak.mail.data.cache.mailboxContent.AttachmentController
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
 class AttachmentActionsViewModel @Inject constructor(
-    application: Application,
     attachmentController: AttachmentController,
     private val savedStateHandle: SavedStateHandle,
-) : AndroidViewModel(application) {
+) : ViewModel() {
 
     private val attachmentResource
         inline get() = savedStateHandle.get<String>(AttachmentActionsBottomSheetDialogArgs::attachmentResource.name)!!

app/src/main/java/com/infomaniak/mail/ui/main/user/SwitchUserViewModel.kt

@@ -28,6 +28,7 @@ import com.infomaniak.mail.data.cache.mailboxInfo.MailboxController
 import com.infomaniak.mail.data.models.AppSettings
 import com.infomaniak.mail.di.IoDispatcher
 import com.infomaniak.mail.utils.AccountUtils
+import com.infomaniak.mail.utils.extensions.context
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
@@ -40,14 +41,12 @@ class SwitchUserViewModel @Inject constructor(
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : AndroidViewModel(application) {
 
-    private inline val context get() = getApplication<Application>()
-
     val allUsers = AccountUtils.getAllUsers().map { users -> users.sortedBy { it.displayName } }
 
     fun switchAccount(user: User) = viewModelScope.launch(ioDispatcher) {
         if (user.id != AccountUtils.currentUserId) {
             context.trackAccountEvent("switch")
-            RealmDatabase.backUpPreviousRealms()
+            RealmDatabase.backupPreviousRealms()
             AccountUtils.currentUser = user
             AccountUtils.currentMailboxId = mailboxController.getFirstValidMailbox(user.id)?.mailboxId ?: AppSettings.DEFAULT_ID
             AccountUtils.reloadApp?.invoke()

app/src/main/java/com/infomaniak/mail/utils/AccountUtils.kt

@@ -81,7 +81,7 @@ object AccountUtils : CredentialManager() {
     var currentMailboxEmail: String? = null
 
     suspend fun switchToMailbox(mailboxId: Int) {
-        RealmDatabase.backUpPreviousMailboxContent()
+        RealmDatabase.backupPreviousMailboxContent()
         currentMailboxId = mailboxId
         reloadApp?.invoke()
     }

app/src/test/java/com/infomaniak/mail/AppVersionCheckingTest.kt

@@ -39,7 +39,7 @@ class AppVersionCheckingTest {
     private val greatVersion = "1.2.2"
     private val greaterVersion = "1.3.0"
     private val invalidCommaVersion = "1.2,9"
-    private val invalidParseVersion = "toto"
+    private val invalidParseVersion = "invalid_parse_version"
     private val invalidEmptyVersion = ""
 
     private val defaultAppVersion = AppVersion(