Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
aad9aced
Commit
aad9aced
authored
Dec 23, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Render Markdown natively
Stop using problematic WebView
parent
dd2c9eea
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
103 additions
and
90 deletions
+103
-90
build.gradle
app/build.gradle
+2
-1
proguard-rules.pro
app/proguard-rules.pro
+3
-0
AndroidManifest.xml
app/src/full/AndroidManifest.xml
+1
-0
AboutActivity.java
app/src/full/java/com/topjohnwu/magisk/AboutActivity.java
+2
-2
ReposAdapter.java
...full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
+1
-1
MagiskInstallDialog.java
.../com/topjohnwu/magisk/components/MagiskInstallDialog.java
+1
-1
ManagerInstallDialog.java
...com/topjohnwu/magisk/components/ManagerInstallDialog.java
+1
-2
MarkDownWindow.java
.../java/com/topjohnwu/magisk/components/MarkDownWindow.java
+78
-57
markdown_window.xml
app/src/full/res/layout/markdown_window.xml
+14
-0
ParallelTask.java
.../src/main/java/com/topjohnwu/core/tasks/ParallelTask.java
+0
-26
No files found.
app/build.gradle
View file @
aad9aced
...
...
@@ -80,8 +80,9 @@ dependencies {
fullImplementation
"androidx.cardview:cardview:${rootProject.ext.androidXVersion}"
fullImplementation
"com.google.android.material:material:${rootProject.ext.androidXVersion}"
fullImplementation
'com.github.topjohnwu:libsu:2.1.2'
fullImplementation
'com.atlassian.commonmark:commonmark:0.11.0'
fullImplementation
'org.kamranzafar:jtar:2.3'
fullImplementation
'ru.noties:markwon:2.0.1'
fullImplementation
'com.caverock:androidsvg-aar:1.3'
def
butterKnifeVersion
=
'9.0.0-rc2'
if
(
properties
.
containsKey
(
'android.injected.invoked.from.ide'
))
{
...
...
app/proguard-rules.pro
View file @
aad9aced
...
...
@@ -26,6 +26,9 @@
-
keepclassmembers
class
com
.
topjohnwu
.
core
.
utils
.
ISafetyNetHelper
{
*
;
}
-
keepclassmembers
class
com
.
topjohnwu
.
core
.
utils
.
BootSigner
{
*
;
}
# SVG
-
dontwarn
com
.
caverock
.
androidsvg
.
SVGAndroidRenderer
# Strip logging
-
assumenosideeffects
class
com
.
topjohnwu
.
core
.
utils
.
Logger
{
public
***
debug
(...);
...
...
app/src/full/AndroidManifest.xml
View file @
aad9aced
...
...
@@ -11,6 +11,7 @@
<application
android:name=
"a.q"
android:theme=
"@style/AppTheme"
android:usesCleartextTraffic=
"true"
tools:ignore=
"GoogleAppIndexingWarning"
>
<!-- Activities -->
...
...
app/src/full/java/com/topjohnwu/magisk/AboutActivity.java
View file @
aad9aced
...
...
@@ -52,8 +52,8 @@ public class AboutActivity extends BaseActivity {
BuildConfig
.
VERSION_NAME
,
BuildConfig
.
VERSION_CODE
,
getPackageName
()));
appChangelog
.
setOnClickListener
(
v
->
{
new
MarkDownWind
ow
(
this
,
getString
(
R
.
string
.
app_changelog
),
getResources
().
openRawResource
(
R
.
raw
.
changelog
))
.
exec
()
;
MarkDownWindow
.
sh
ow
(
this
,
getString
(
R
.
string
.
app_changelog
),
getResources
().
openRawResource
(
R
.
raw
.
changelog
));
});
String
translators
=
getString
(
R
.
string
.
translators
);
...
...
app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
View file @
aad9aced
...
...
@@ -101,7 +101,7 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
holder
.
updateTime
.
setText
(
context
.
getString
(
R
.
string
.
updated_on
,
repo
.
getLastUpdateString
()));
holder
.
infoLayout
.
setOnClickListener
(
v
->
new
MarkDownWindow
((
BaseActivity
)
context
,
null
,
repo
.
getDetailUrl
()).
exec
(
));
MarkDownWindow
.
show
((
BaseActivity
)
context
,
null
,
repo
.
getDetailUrl
()
));
holder
.
downloadImage
.
setOnClickListener
(
v
->
{
new
CustomAlertDialog
((
BaseActivity
)
context
)
...
...
app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java
View file @
aad9aced
...
...
@@ -41,7 +41,7 @@ public class MagiskInstallDialog extends CustomAlertDialog {
// Open forum links in browser
AppUtils
.
openLink
(
a
,
Uri
.
parse
(
Data
.
magiskNoteLink
));
}
else
{
new
MarkDownWindow
(
a
,
null
,
Data
.
magiskNoteLink
).
exec
(
);
MarkDownWindow
.
show
(
a
,
null
,
Data
.
magiskNoteLink
);
}
});
}
...
...
app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java
View file @
aad9aced
...
...
@@ -21,8 +21,7 @@ public class ManagerInstallDialog extends CustomAlertDialog {
setPositiveButton
(
R
.
string
.
install
,
(
d
,
i
)
->
DownloadApp
.
upgrade
(
name
));
setNegativeButton
(
R
.
string
.
no_thanks
,
null
);
if
(!
TextUtils
.
isEmpty
(
Data
.
managerNoteLink
))
{
setNeutralButton
(
R
.
string
.
app_changelog
,
(
d
,
i
)
->
new
MarkDownWindow
(
a
,
null
,
Data
.
managerNoteLink
).
exec
());
setNeutralButton
(
R
.
string
.
app_changelog
,
(
d
,
i
)
->
MarkDownWindow
.
show
(
a
,
null
,
Data
.
managerNoteLink
));
}
}
}
app/src/full/java/com/topjohnwu/magisk/components/MarkDownWindow.java
View file @
aad9aced
package
com
.
topjohnwu
.
magisk
.
components
;
import
android.app.Activity
;
import
android.webkit.WebView
;
import
android.graphics.Bitmap
;
import
android.graphics.Canvas
;
import
android.graphics.drawable.BitmapDrawable
;
import
android.graphics.drawable.Drawable
;
import
android.os.AsyncTask
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
com.caverock.androidsvg.SVG
;
import
com.caverock.androidsvg.SVGParseException
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.core.Data
;
import
com.topjohnwu.core.tasks.ParallelTask
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.ResponseListener
;
import
com.topjohnwu.superuser.ShellUtils
;
import
org.commonmark.node.Node
;
import
org.commonmark.parser.Parser
;
import
org.commonmark.renderer.html.HtmlRenderer
;
import
com.topjohnwu.utils.ByteArrayStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.AlertDialog
;
import
ru.noties.markwon.Markwon
;
import
ru.noties.markwon.SpannableConfiguration
;
import
ru.noties.markwon.spans.AsyncDrawable
;
public
class
MarkDownWindow
extends
ParallelTask
<
Void
,
Void
,
String
>
{
private
String
mTitle
;
private
String
mUrl
;
private
InputStream
is
;
public
class
MarkDownWindow
{
private
static
final
SpannableConfiguration
config
=
SpannableConfiguration
.
builder
(
App
.
self
)
.
asyncDrawableLoader
(
new
Loader
()).
build
();
public
MarkDownWindow
(
Activity
context
,
String
title
,
String
url
)
{
super
(
context
);
mTitle
=
title
;
mUrl
=
url
;
public
static
void
show
(
Activity
activity
,
String
title
,
String
url
)
{
Networking
.
get
(
url
).
getAsString
(
new
Listener
(
activity
,
title
));
}
public
MarkDownWindow
(
Activity
context
,
String
title
,
InputStream
in
)
{
super
(
context
);
mTitle
=
title
;
is
=
in
;
public
static
void
show
(
Activity
activity
,
String
title
,
InputStream
is
)
{
try
{
ByteArrayOutputStream
baos
=
new
ByteArrayOutputStream
();
ShellUtils
.
pump
(
is
,
baos
);
new
Listener
(
activity
,
title
).
onResponse
(
baos
.
toString
());
}
catch
(
IOException
ignored
)
{}
}
@Override
protected
String
doInBackground
(
Void
...
voids
)
{
App
app
=
App
.
self
;
String
md
;
if
(
mUrl
!=
null
)
{
md
=
Utils
.
dlString
(
mUrl
);
}
else
{
try
(
ByteArrayOutputStream
out
=
new
ByteArrayOutputStream
())
{
ShellUtils
.
pump
(
is
,
out
);
md
=
out
.
toString
();
is
.
close
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
return
""
;
}
static
class
Listener
implements
ResponseListener
<
String
>
{
Activity
activity
;
String
title
;
Listener
(
Activity
a
,
String
t
)
{
activity
=
a
;
title
=
t
;
}
String
css
;
try
(
InputStream
in
=
app
.
getResources
()
.
openRawResource
(
Data
.
isDarkTheme
?
R
.
raw
.
dark
:
R
.
raw
.
light
);
ByteArrayOutputStream
out
=
new
ByteArrayOutputStream
())
{
ShellUtils
.
pump
(
in
,
out
);
css
=
out
.
toString
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
return
""
;
@Override
public
void
onResponse
(
String
md
)
{
AlertDialog
.
Builder
alert
=
new
AlertDialog
.
Builder
(
activity
);
alert
.
setTitle
(
title
);
View
mv
=
LayoutInflater
.
from
(
activity
).
inflate
(
R
.
layout
.
markdown_window
,
null
);
Markwon
.
setMarkdown
(
mv
.
findViewById
(
R
.
id
.
md_txt
),
config
,
md
);
alert
.
setView
(
mv
);
alert
.
setNegativeButton
(
R
.
string
.
close
,
(
dialog
,
id
)
->
dialog
.
dismiss
());
alert
.
show
();
}
Parser
parser
=
Parser
.
builder
().
build
();
HtmlRenderer
renderer
=
HtmlRenderer
.
builder
().
build
();
Node
doc
=
parser
.
parse
(
md
);
return
String
.
format
(
"<style>%s</style>%s"
,
css
,
renderer
.
render
(
doc
));
}
@Override
protected
void
onPostExecute
(
String
html
)
{
AlertDialog
.
Builder
alert
=
new
AlertDialog
.
Builder
(
getActivity
());
alert
.
setTitle
(
mTitle
);
static
class
Loader
implements
AsyncDrawable
.
Loader
{
WebView
wv
=
new
WebView
(
getActivity
());
wv
.
loadDataWithBaseURL
(
"fake://"
,
html
,
"text/html"
,
"UTF-8"
,
null
);
@Override
public
void
load
(
@NonNull
String
url
,
@NonNull
AsyncDrawable
asyncDrawable
)
{
AsyncTask
.
THREAD_POOL_EXECUTOR
.
execute
(()
->
{
InputStream
is
=
Networking
.
get
(
url
).
execForInputStream
().
getResult
();
if
(
is
==
null
)
return
;
ByteArrayStream
buf
=
new
ByteArrayStream
();
buf
.
readFrom
(
is
);
// First try default drawables
Drawable
drawable
=
Drawable
.
createFromStream
(
buf
.
getInputStream
(),
""
);
if
(
drawable
==
null
)
{
// SVG
try
{
SVG
svg
=
SVG
.
getFromInputStream
(
buf
.
getInputStream
());
int
width
=
Utils
.
dpInPx
((
int
)
svg
.
getDocumentWidth
());
int
height
=
Utils
.
dpInPx
((
int
)
svg
.
getDocumentHeight
());
final
Bitmap
bitmap
=
Bitmap
.
createBitmap
(
width
,
height
,
Bitmap
.
Config
.
ARGB_4444
);
final
Canvas
canvas
=
new
Canvas
(
bitmap
);
float
density
=
App
.
self
.
getResources
().
getDisplayMetrics
().
density
;
canvas
.
scale
(
density
,
density
);
svg
.
renderToCanvas
(
canvas
);
drawable
=
new
BitmapDrawable
(
App
.
self
.
getResources
(),
bitmap
);
}
catch
(
SVGParseException
ignored
)
{}
}
if
(
drawable
!=
null
)
{
drawable
.
setBounds
(
0
,
0
,
drawable
.
getIntrinsicWidth
(),
drawable
.
getIntrinsicHeight
());
asyncDrawable
.
setResult
(
drawable
);
}
});
}
alert
.
setView
(
wv
);
alert
.
setNegativeButton
(
R
.
string
.
close
,
(
dialog
,
id
)
->
dialog
.
dismiss
());
alert
.
show
();
@Override
public
void
cancel
(
@NonNull
String
url
)
{}
}
}
app/src/full/res/layout/markdown_window.xml
0 → 100644
View file @
aad9aced
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<TextView
android:id=
"@+id/md_txt"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"15dp"
android:layout_marginEnd=
"15dp"
android:paddingTop=
"10dp"
/>
</ScrollView>
\ No newline at end of file
core/src/main/java/com/topjohnwu/core/tasks/ParallelTask.java
deleted
100644 → 0
View file @
dd2c9eea
package
com
.
topjohnwu
.
core
.
tasks
;
import
android.app.Activity
;
import
android.os.AsyncTask
;
import
java.lang.ref.WeakReference
;
public
abstract
class
ParallelTask
<
Params
,
Progress
,
Result
>
extends
AsyncTask
<
Params
,
Progress
,
Result
>
{
private
WeakReference
<
Activity
>
weakActivity
;
public
ParallelTask
()
{}
public
ParallelTask
(
Activity
context
)
{
weakActivity
=
new
WeakReference
<>(
context
);
}
protected
Activity
getActivity
()
{
return
weakActivity
.
get
();
}
@SuppressWarnings
(
"unchecked"
)
public
void
exec
(
Params
...
params
)
{
executeOnExecutor
(
AsyncTask
.
THREAD_POOL_EXECUTOR
,
params
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment