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

Unverified Commit 604873b6 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #5942 from k9mail/update_dependencies 

Update dependencies
parents 721273dd b9d60841

app/core/src/test/java/com/fsck/k9/message/html/HtmlHelper.kt

+2 −2
Original line number Diff line number Diff line 
package com.fsck.k9.message.html



import org.jsoup.Jsoup

import org.jsoup.safety.Whitelist as AllowList

import org.jsoup.safety.Safelist



object HtmlHelper {

    @JvmStatic

    fun extractText(html: String): String {

        return Jsoup.clean(html, AllowList.none())

        return Jsoup.clean(html, Safelist.none())

    }

}

app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package app.k9mail.html.cleaner 


import org.jsoup.nodes.Document

import org.jsoup.safety.Cleaner

import org.jsoup.safety.Whitelist as AllowList

import org.jsoup.safety.Safelist



internal class BodyCleaner {

    private val cleaner: Cleaner
@@ -12,7 +12,7 @@ internal class BodyCleaner { 
    )



    init {

        val allowList = AllowList.relaxed()

        val allowList = Safelist.relaxed()

            .addTags("font", "hr", "ins", "del", "center", "map", "area", "title")

            .addAttributes("font", "color", "face", "size")

            .addAttributes(

app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt

+3 −3
Original line number Diff line number Diff line
@@ -54,12 +54,12 @@ internal class CleaningVisitor( 
        if (source === elementToSkip) {

            elementToSkip = null

        } else if (source is Element && isSafeTag(source)) {

            destination = destination.parent()

            destination = destination.parent() ?: error("Missing parent")

        }

    }



    private fun isSafeTag(node: Node): Boolean {

        if (isMetaRefresh(node)) return false

    private fun isSafeTag(node: Node?): Boolean {

        if (node == null || isMetaRefresh(node)) return false



        val tag = node.nodeName().lowercase()

        return tag in ALLOWED_TAGS

app/ui/base/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ dependencies { 
    api "androidx.appcompat:appcompat:${versions.androidxAppCompat}"

    api "androidx.activity:activity:${versions.androidxActivity}"

    api "com.google.android.material:material:${versions.materialComponents}"

    api "androidx.navigation:navigation-fragment-ktx:${versions.androidxNavigation}"

    api "androidx.navigation:navigation-ui-ktx:${versions.androidxNavigation}"

    api "androidx.navigation:navigation-fragment:${versions.androidxNavigation}"

    api "androidx.navigation:navigation-ui:${versions.androidxNavigation}"

    api "androidx.lifecycle:lifecycle-livedata-ktx:${versions.androidxLifecycle}"



    implementation "androidx.core:core-ktx:${versions.androidxCore}"

app/ui/legacy/build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ dependencies { 
    implementation "de.cketti.library.changelog:ckchangelog-core:2.0.0-beta02"

    implementation "com.splitwise:tokenautocomplete:4.0.0-beta01"

    implementation "de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0"

    implementation 'com.mikepenz:materialdrawer:8.4.1'

    implementation 'com.mikepenz:materialdrawer-iconics:8.3.3'

    implementation 'com.mikepenz:materialdrawer:8.4.5'

    implementation 'com.mikepenz:materialdrawer-iconics:8.4.5'

    implementation 'com.mikepenz:fontawesome-typeface:5.9.0.0-kotlin@aar'

    implementation 'com.github.ByteHamster:SearchPreference:v2.0.0'

    implementation 'com.github.ByteHamster:SearchPreference:v2.1.0'

    implementation "com.mikepenz:fastadapter:${versions.fastAdapter}"

    implementation "com.mikepenz:fastadapter-extensions-drag:${versions.fastAdapter}"

    implementation "com.mikepenz:fastadapter-extensions-utils:${versions.fastAdapter}"