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

Commit 14654077 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge tag '6.703' into 1263-update_to_upstream_6_703

parents 0de486e6 0df1fa55

app-feature-preview/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -16,4 +16,5 @@ dependencies { 
    implementation(projects.core.ui.compose.designsystem)



    implementation(projects.feature.onboarding)

    implementation(projects.feature.account.setup)

}

app-feature-preview/src/main/java/app/k9mail/feature/preview/navigation/FeatureNavHost.kt

+9 −3
Original line number Diff line number Diff line
@@ -4,8 +4,10 @@ import androidx.compose.runtime.Composable 
import androidx.compose.ui.Modifier

import androidx.navigation.NavHostController

import androidx.navigation.compose.NavHost

import net.thunderbird.feature.onboarding.navigation.NAVIGATION_ROUTE_ONBOARDING

import net.thunderbird.feature.onboarding.navigation.onboardingScreen

import app.k9mail.feature.account.setup.navigation.accountSetupScreen

import app.k9mail.feature.account.setup.navigation.navigateToAccountSetup

import app.k9mail.feature.onboarding.navigation.NAVIGATION_ROUTE_ONBOARDING

import app.k9mail.feature.onboarding.navigation.onboardingScreen



@Composable

fun FeatureNavHost(
@@ -19,8 +21,12 @@ fun FeatureNavHost( 
        modifier = modifier,

    ) {

        onboardingScreen(

            onStartClick = { /* TODO */ },

            onStartClick = { navController.navigateToAccountSetup() },

            onImportClick = { /* TODO */ },

        )

        accountSetupScreen(

            onBackClick = navController::popBackStack,

            onFinishClick = { /* TODO */ },

        )

    }

}

app/core/src/main/java/com/fsck/k9/message/html/GenericUriParser.kt

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ import java.util.regex.Pattern 
 */

class GenericUriParser : UriParser {

    override fun parseUri(text: CharSequence, startPos: Int): UriMatch? {

        require(startPos in text.indices) { "Invalid 'startPos' value" }



        val matcher = PATTERN.matcher(text)

        if (!matcher.find(startPos) || matcher.start() != startPos) return null

app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ import kotlin.math.min 
 */

internal class HttpUriParser : UriParser {

    override fun parseUri(text: CharSequence, startPos: Int): UriMatch? {

        require(startPos in text.indices) { "Invalid 'startPos' value" }



        val matchResult = SCHEME_REGEX.find(text, startPos) ?: return null

        if (matchResult.range.first != startPos) return null

app/core/src/main/java/com/fsck/k9/preferences/Protocols.kt

+0 −1
Original line number Diff line number Diff line
@@ -3,6 +3,5 @@ package com.fsck.k9.preferences 
object Protocols {

    const val IMAP = "imap"

    const val POP3 = "pop3"

    const val WEBDAV = "webdav"

    const val SMTP = "smtp"

}