refactor: import feature to resolve deprecations

Author: wmontwe

feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/SettingsImportModule.kt

@@ -4,11 +4,17 @@ import app.k9mail.feature.settings.import.ui.AuthViewModel
 import app.k9mail.feature.settings.import.ui.ImportAppFetcher
 import app.k9mail.feature.settings.import.ui.PickAppViewModel
 import app.k9mail.feature.settings.import.ui.SettingsImportViewModel
+import org.koin.android.ext.koin.androidContext
 import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
 
 val featureSettingsImportModule = module {
-    factory { ImportAppFetcher(context = get()) }
+    factory {
+        ImportAppFetcher(
+            context = androidContext(),
+            logger = get(),
+        )
+    }
 
     viewModel {
         SettingsImportViewModel(
@@ -17,6 +23,7 @@ val featureSettingsImportModule = module {
             accountActivator = get(),
             migrationManager = get(),
             importAppFetcher = get(),
+            logger = get(),
         )
     }
 
@@ -25,6 +32,7 @@ val featureSettingsImportModule = module {
             application = get(),
             accountManager = get(),
             getOAuthRequestIntent = get(),
+            logger = get(),
         )
     }
 

feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/AuthViewModel.kt

@@ -28,14 +28,17 @@ import net.openid.appauth.AuthorizationResponse
 import net.openid.appauth.AuthorizationService
 import net.thunderbird.core.android.account.LegacyAccountDto
 import net.thunderbird.core.android.account.LegacyAccountDtoManager
+import net.thunderbird.core.logging.Logger
 
 private const val KEY_AUTHORIZATION = "app.k9mail_auth"
+private const val TAG = "AuthViewModel"
 
 @Suppress("TooManyFunctions")
 internal class AuthViewModel(
     application: Application,
     private val accountManager: LegacyAccountDtoManager,
     private val getOAuthRequestIntent: GetOAuthRequestIntent,
+    private val logger: Logger,
 ) : AndroidViewModel(application) {
     private var authService: AuthorizationService? = null
     private val authState = AuthState()
@@ -73,14 +76,15 @@ internal class AuthViewModel(
             try {
                 startLogin(account)
             } catch (e: ActivityNotFoundException) {
+                logger.error(TAG, e) { "No browser found to start OAuth login flow." }
                 _uiState.update { AuthFlowState.BrowserNotFound }
             }
         }
     }
 
     private suspend fun startLogin(account: LegacyAccountDto) {
         val authRequestIntentResult = withContext(Dispatchers.IO) {
-            getOAuthRequestIntent.execute(account.incomingServerSettings.host!!, account.email)
+            getOAuthRequestIntent.execute(account.incomingServerSettings.host, account.email)
         }
 
         when (authRequestIntentResult) {

feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/ImportAppFetcher.kt

@@ -3,9 +3,14 @@ package app.k9mail.feature.settings.import.ui
 import android.content.Context
 import android.content.pm.PackageManager
 import androidx.annotation.WorkerThread
+import androidx.core.content.pm.PackageInfoCompat
+import net.thunderbird.core.logging.Logger
+
+private const val TAG = "ImportAppFetcher"
 
 internal class ImportAppFetcher(
     private val context: Context,
+    private val logger: Logger,
 ) {
     private val packageManager by lazy { context.packageManager }
 
@@ -23,6 +28,7 @@ internal class ImportAppFetcher(
             getApplicationInfo(packageName, 0)
             true
         } catch (e: PackageManager.NameNotFoundException) {
+            logger.error(TAG, e) { "App with package name $packageName is not installed." }
             false
         }
     }
@@ -37,17 +43,17 @@ internal class ImportAppFetcher(
             .toList()
     }
 
-    @Suppress("SwallowedException")
     private fun PackageManager.loadAppInfo(app: AppVersion): AppInfo? {
         return try {
             val packageInfo = getPackageInfo(app.packageName, 0)
-            val isImportSupported = packageInfo.versionCode >= app.minVersionCode
+            val isImportSupported = PackageInfoCompat.getLongVersionCode(packageInfo) >= app.minVersionCode
 
             val applicationInfo = getApplicationInfo(app.packageName, 0)
             val appName = packageManager.getApplicationLabel(applicationInfo).toString()
 
             AppInfo(app.packageName, appName, isImportSupported)
         } catch (e: PackageManager.NameNotFoundException) {
+            logger.error(TAG, e) { "Failed to load app info for package ${app.packageName}." }
             null
         }
     }

feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportViewModel.kt

@@ -28,10 +28,11 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
-import net.thunderbird.core.logging.legacy.Log
+import net.thunderbird.core.logging.Logger
 
 private typealias AccountUuid = String
 private typealias AccountNumber = Int
+private const val TAG = "SettingsImportViewModel"
 
 internal class SettingsImportViewModel(
     private val contentResolver: ContentResolver,
@@ -40,6 +41,7 @@ internal class SettingsImportViewModel(
     private val migrationManager: MigrationManager,
     private val importAppFetcher: ImportAppFetcher,
     private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
+    private val logger: Logger,
     viewModelScope: CoroutineScope = CoroutineScope(Dispatchers.Main.immediate + SupervisorJob()),
 ) : ViewModel(viewModelScope) {
     private val uiModelLiveData = MutableLiveData<SettingsImportUiModel>()
@@ -153,7 +155,11 @@ internal class SettingsImportViewModel(
                 null
             }
 
-            val savedAccountList = savedInstanceState.getParcelableArrayList<SavedAccountState>(STATE_ACCOUNT_LIST)!!
+            val savedAccountList = BundleCompat.getParcelableArrayList(
+                savedInstanceState,
+                STATE_ACCOUNT_LIST,
+                SavedAccountState::class.java,
+            ) ?: error("Saved account list is missing")
 
             savedAccountList.forEach { saved ->
                 accountsMap[saved.accountIndex] = saved.accountUuid
@@ -387,7 +393,7 @@ internal class SettingsImportViewModel(
                     initializeSettingsList(items)
                 }
             } catch (e: Exception) {
-                Log.e(e, "Error reading settings file")
+                logger.error(TAG, e) { "Error reading settings file" }
 
                 updateUiModel {
                     showReadFailureText()
@@ -423,7 +429,7 @@ internal class SettingsImportViewModel(
                     updateCloseButtonAndImportStatusText()
                 }
             } catch (e: Exception) {
-                Log.e(e, "Error importing settings")
+                logger.error(TAG, e) { "Error importing settings" }
 
                 updateUiModel {
                     showImportErrorText()

feature/settings/import/src/test/kotlin/app/k9mail/feature/settings/import/ui/ImportAppFetcherTest.kt

@@ -12,6 +12,7 @@ import assertk.assertions.isEmpty
 import assertk.assertions.isFalse
 import assertk.assertions.isTrue
 import kotlin.test.Test
+import net.thunderbird.core.logging.testing.TestLogger
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows.shadowOf
@@ -24,7 +25,10 @@ private const val MY_PACKAGE_NAME = "net.thunderbird.android"
 class ImportAppFetcherTest {
     private val appContext = ApplicationProvider.getApplicationContext<Context>()
     private val context = createPackageContext()
-    private val importAppFetcher = ImportAppFetcher(context)
+    private val importAppFetcher = ImportAppFetcher(
+        context,
+        logger = TestLogger(),
+    )
 
     @Test
     fun `isAtLeastOneAppInstalled() without any other apps installed`() {
@@ -102,6 +106,7 @@ class ImportAppFetcherTest {
                 this.applicationInfo = ApplicationInfo().apply {
                     this.name = name
                 }
+                @Suppress("DEPRECATION")
                 this.versionCode = versionCode
             },
         )

feature/settings/import/src/test/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportViewModelTest.kt

@@ -3,6 +3,7 @@ package app.k9mail.feature.settings.import.ui
 import android.app.Application
 import android.content.ContentResolver
 import androidx.core.net.toUri
+import androidx.lifecycle.viewmodel.compose.viewModel
 import app.k9mail.feature.settings.import.SettingsImportExternalContract.AccountActivator
 import assertk.all
 import assertk.assertThat
@@ -22,9 +23,7 @@ import com.fsck.k9.preferences.SettingsImporter
 import kotlin.test.Test
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.test.TestScope
-import net.thunderbird.core.logging.legacy.Log
 import net.thunderbird.core.logging.testing.TestLogger
-import org.junit.Before
 import org.junit.runner.RunWith
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.doThrow
@@ -50,13 +49,9 @@ class SettingsImportViewModelTest {
         importAppFetcher = importAppFetcher,
         backgroundDispatcher = Dispatchers.Unconfined,
         viewModelScope = testScope,
+        logger = TestLogger(),
     )
 
-    @Before
-    fun setUp() {
-        Log.logger = TestLogger()
-    }
-
     @Test
     fun `scanQrCodeButton and pickAppButton should be hidden when migration feature is disabled`() {
         migrationManager.featureIncluded = false