MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Read full css into memory for MarkdownWindow

Browse Source
This commit is contained in:
topjohnwu 2017-12-20 00:40:19 +08:00
parent f17792380b
commit d34bd47bea
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/topjohnwu/magisk/asyncs/MarkDownWindow.java
View File

@ -38,12 +38,12 @@ public class MarkDownWindow extends ParallelTask<Void, Void, String> {
@Override @Override
protected String doInBackground(Void... voids) { protected String doInBackground(Void... voids) {
MagiskManager mm = MagiskManager.get();
String md; String md;
if (mUrl != null) { if (mUrl != null) {
md = WebService.getString(mUrl); md = WebService.getString(mUrl);
} else { } else {
ByteArrayOutputStream out = new ByteArrayOutputStream(); try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
try {
Utils.inToOut(is, out); Utils.inToOut(is, out);
md = out.toString(); md = out.toString();
is.close(); is.close();
@ -52,12 +52,21 @@ public class MarkDownWindow extends ParallelTask<Void, Void, String> {
return ""; return "";
} }
} }
String css;
try (
InputStream in = mm.getAssets().open(mm.isDarkTheme ? "dark.css" : "light.css");
ByteArrayOutputStream out = new ByteArrayOutputStream()
) {
Utils.inToOut(in, out);
css = out.toString();
} catch (IOException e) {
e.printStackTrace();
return "";
}
Parser parser = Parser.builder().build(); Parser parser = Parser.builder().build();
HtmlRenderer renderer = HtmlRenderer.builder().build(); HtmlRenderer renderer = HtmlRenderer.builder().build();
Node doc = parser.parse(md); Node doc = parser.parse(md);
return String.format( return String.format("<style>%s</style>%s", css, renderer.render(doc));
"<link rel='stylesheet' type='text/css' href='file:///android_asset/%s.css'/> %s",
MagiskManager.get().isDarkTheme ? "dark" : "light", renderer.render(doc));
} }
@Override @Override