Rename CONVERSATION_MODE for consistency and remove mailSettings test

The test that checks that UpdateSettingsJob "saves" mailSettings on
userManager after updating them was removed as after rebasing on the
latest develop which incorporates "User ID Migration" changes, this way
of storing MailSettings is not valid anymore.

MAILAND-1436

app/src/main/java/ch/protonmail/android/activities/AccountSettingsActivity.kt

@@ -20,9 +20,9 @@ package ch.protonmail.android.activities
 
 import android.os.Bundle
 import android.text.TextUtils
+import android.view.View
 import androidx.lifecycle.lifecycleScope
 import ch.protonmail.android.BuildConfig
-import android.view.View
 import ch.protonmail.android.R
 import ch.protonmail.android.activities.settings.BaseSettingsActivity
 import ch.protonmail.android.activities.settings.SettingsEnum
@@ -39,10 +39,10 @@ import com.squareup.otto.Subscribe
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
 import me.proton.core.util.kotlin.EMPTY_STRING
 import me.proton.core.util.kotlin.equalsNoCase
+import timber.log.Timber
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class AccountSettingsActivity : BaseSettingsActivity() {
@@ -151,12 +151,12 @@ class AccountSettingsActivity : BaseSettingsActivity() {
      */
     private fun showCurrentViewModeSetting(mailSettings: MailSettings?) {
         Timber.d("MailSettings ViewMode = ${mailSettings?.viewMode}")
-        setEnabled(SettingsEnum.CONVERSATION_MODE_TOGGLE, mailSettings?.viewMode == 0)
+        setEnabled(SettingsEnum.CONVERSATION_MODE, mailSettings?.viewMode == 0)
     }
 
     private fun setupViewModeChangedListener(mailSettings: MailSettings?) {
         setToggleListener(
-            SettingsEnum.CONVERSATION_MODE_TOGGLE,
+            SettingsEnum.CONVERSATION_MODE,
             object : (View, Boolean) -> Unit {
                 override fun invoke(view: View, isEnabled: Boolean) {
                     mailSettings?.viewMode = if (isEnabled) 0 else 1

app/src/main/java/ch/protonmail/android/activities/settings/SettingsEnum.kt

@@ -42,7 +42,7 @@ enum class SettingsEnum {
         override fun getHint(context: Context): String = ""
         override fun getHeader(context: Context): String = context.resources.getString(R.string.storage)
     },
-    CONVERSATION_MODE_TOGGLE {
+    CONVERSATION_MODE {
         override fun getHint(context: Context): String = ""
         override fun getHeader(context: Context): String = context.resources.getString(R.string.enable_conversation_mode)
     },

app/src/test/java/ch/protonmail/android/jobs/UpdateSettingsJobTest.kt

@@ -72,16 +72,6 @@ class UpdateSettingsJobTest {
         every { jobEntryPoint.userManager() } returns mockUserManager
     }
 
-    @Test
-    fun jobSavesMailSettingsToUserManagerWhenMailSettingsAreValid() {
-        val mailSettings = MailSettings()
-        updateSettings = UpdateSettingsJob(mailSettings = mailSettings)
-
-        updateSettings.onRun()
-
-        verify { mockUserManager.mailSettings = mailSettings }
-    }
-
     @Test
     fun jobCallsApiToUpdateAutoShowImagesSettingWhenMailSettingsAreValidAndNotificationEmailDidNotChange() {
         val mailSettings = MailSettings()