ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed remark lib from app/libs and added a dependency from maven. 

MAILAND-953
This commit is contained in:
Tomasz Giszczak 2020-09-16 16:35:15 +02:00
parent 32962efac6
commit 7f95ae4ee9
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle.kts
View File

@ -292,7 +292,8 @@ dependencies {
`timber`,
`trustKit`,
`viewStateStore`,
`viewStateStore-paging`
`viewStateStore-paging`,
`remark`
)
kapt(

BIN
app/libs/remark-1.1.0.jar
View File

Binary file not shown.

10
app/src/main/java/ch/protonmail/android/utils/HTMLToMDConverter.java
View File

@ -26,6 +26,8 @@ import org.commonmark.renderer.text.TextContentRenderer;
import java.util.Collections;
import timber.log.Timber;
public class HTMLToMDConverter {
private Remark remark;
@ -51,16 +53,16 @@ public class HTMLToMDConverter {
// remove trailing spaces we do not need them.
try {
return remark.convert(html).replaceAll(" *\n", "\n");
} catch (StackOverflowError e) {
// noop
} catch (StackOverflowError exception) {
Timber.w(exception);
}
try {
// the workaround below is for slow performance devices which Remark throws stack overflow exception
Parser parser = Parser.builder().build();
TextContentRenderer renderer = TextContentRenderer.builder().build();
return renderer.render(parser.parse(html));
} catch (Exception e) {
// noop
} catch (Exception exception) {
Timber.w(exception);
}
return "";
}

1
buildSrc/src/main/kotlin/libraries.kt
View File

@ -110,6 +110,7 @@ val DependencyHandler.`retrofit2-converter` get() = dependency("com.squa
val DependencyHandler.`fasterxml-jackson-core` get() = dependency("com.fasterxml.jackson.core", module = "jackson-core") version `jackson version`
val DependencyHandler.`fasterxml-jackson-anno` get() = dependency("com.fasterxml.jackson.core", module = "jackson-annotations") version `jackson version`
val DependencyHandler.`fasterxml-jackson-databind` get() = dependency("com.fasterxml.jackson.core", module = "jackson-databind") version `jackson version`
val DependencyHandler.`remark` get() = dependency("com.overzealous", module = "remark") version `remark version`
// endregion
// endregion

1
buildSrc/src/main/kotlin/versionsConfig.kt
View File

@ -114,3 +114,4 @@ const val `sonarQube version` = "2.7.1" // Released: May
const val `stetho version` = "1.5.1" // Released: Mar 18, 2019
const val `timber version` = "4.7.1" // Released:
const val `trustKit version` = "1.1.2" // Released: Jun 09, 2019
const val `remark version` = "1.1.0" // Released: Dec 08, 2016