Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit a3e91cd3 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Fix lint errors

parent 27db462e

feature/migration/provider/src/main/kotlin/app/k9mail/feature/migration/provider/SettingsProvider.kt

+5 −5
Original line number Diff line number Diff line
@@ -148,13 +148,13 @@ class SettingsProvider : ContentProvider(), KoinComponent { 
        val packageInfo = packageManager.getPackageInfo(callerPackage, PackageManager.GET_SIGNATURES)



        // We don't expect our callers to have multiple signers, so we don't service such requests.

        if (packageInfo.signatures.size != 1) {

        if (packageInfo.signatures?.size != 1) {

            return null

        }



        // In case of signature rotation, this will report the oldest used certificate, pretending that the signature

        // rotation never took place. We can only rely on our allowlist being up-to-date in this case.

        return packageInfo.signatures[0]

        return packageInfo.signatures?.firstOrNull()

    }



    @TargetApi(Build.VERSION_CODES.P)
@@ -164,15 +164,15 @@ class SettingsProvider : ContentProvider(), KoinComponent { 
        val packageInfo = packageManager.getPackageInfo(callerPackage, PackageManager.GET_SIGNING_CERTIFICATES)



        // We don't expect our callers to have multiple signers, so we don't service such requests.

        if (packageInfo.signingInfo.hasMultipleSigners()) {

        if (packageInfo.signingInfo?.hasMultipleSigners() == true) {

            return null

        }



        // We currently don't support servicing requests from callers that performed certificate rotation.

        if (packageInfo.signingInfo.hasPastSigningCertificates()) {

        if (packageInfo.signingInfo?.hasPastSigningCertificates() == true) {

            return null

        }



        return packageInfo.signingInfo.signingCertificateHistory[0]

        return packageInfo.signingInfo?.signingCertificateHistory?.firstOrNull()

    }

}

legacy/common/src/main/AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ 
    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />

    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />

    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"

        tools:ignore="ProtectedPermissions"

        />



    <application

        android:allowTaskReparenting="false"

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ class AboutFragment : Fragment() { 
        titleTextView.text = getString(R.string.about_title, appNameProvider.appName)



        val versionTextView = view.findViewById<MaterialTextView>(R.id.version)

        versionTextView.text = getVersionNumber()

        versionTextView.text = getVersionNumber() ?: "?"



        val versionLayout = view.findViewById<View>(R.id.versionLayout)

        versionLayout.setOnClickListener { displayChangeLog() }
@@ -78,14 +78,14 @@ class AboutFragment : Fragment() { 
        findNavController().navigate(R.id.action_aboutScreen_to_changelogScreen)

    }



    private fun getVersionNumber(): String {

    private fun getVersionNumber(): String? {

        return try {

            val context = requireContext()

            val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)

            packageInfo.versionName

        } catch (e: PackageManager.NameNotFoundException) {

            Timber.e(e, "Error getting PackageInfo")

            "?"

            null

        }

    }

legacy/ui/legacy/src/main/res/xml/account_settings.xml

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"

    android:key="main"

    android:title="@string/account_settings_title_fmt"

    >
@@ -370,12 +371,14 @@ 
                android:key="open_notification_settings_messages"

                android:summary="@string/account_settings_open_notification_settings_messages_summary"

                android:title="@string/notification_channel_messages_title"

                tools:targetApi="o"

                />



            <com.fsck.k9.ui.settings.account.NotificationsPreference

                android:key="open_notification_settings_miscellaneous"

                android:summary="@string/account_settings_open_notification_settings_miscellaneous_summary"

                android:title="@string/notification_channel_miscellaneous_title"

                tools:targetApi="o"

                />



        </PreferenceCategory>