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
ad05a33e
Commit
ad05a33e
authored
Jul 04, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show release notes and changelog in MarkDownWindow
parent
8224e038
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
13 deletions
+24
-13
MagiskManager.java
src/full/java/com/topjohnwu/magisk/MagiskManager.java
+2
-1
CheckUpdates.java
src/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
+2
-1
ShowUI.java
src/full/java/com/topjohnwu/magisk/utils/ShowUI.java
+20
-11
No files found.
src/full/java/com/topjohnwu/magisk/MagiskManager.java
View file @
ad05a33e
...
@@ -58,8 +58,9 @@ public class MagiskManager extends Application implements Shell.Container {
...
@@ -58,8 +58,9 @@ public class MagiskManager extends Application implements Shell.Container {
public
int
remoteManagerVersionCode
=
-
1
;
public
int
remoteManagerVersionCode
=
-
1
;
public
String
magiskLink
;
public
String
magiskLink
;
public
String
release
NoteLink
;
public
String
magisk
NoteLink
;
public
String
managerLink
;
public
String
managerLink
;
public
String
managerNoteLink
;
public
String
uninstallerLink
;
public
String
uninstallerLink
;
public
boolean
keepVerity
=
false
;
public
boolean
keepVerity
=
false
;
...
...
src/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
View file @
ad05a33e
...
@@ -42,11 +42,12 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
...
@@ -42,11 +42,12 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
mm
.
remoteMagiskVersionString
=
magisk
.
getString
(
"version"
);
mm
.
remoteMagiskVersionString
=
magisk
.
getString
(
"version"
);
mm
.
remoteMagiskVersionCode
=
magisk
.
getInt
(
"versionCode"
);
mm
.
remoteMagiskVersionCode
=
magisk
.
getInt
(
"versionCode"
);
mm
.
magiskLink
=
magisk
.
getString
(
"link"
);
mm
.
magiskLink
=
magisk
.
getString
(
"link"
);
mm
.
release
NoteLink
=
magisk
.
getString
(
"note"
);
mm
.
magisk
NoteLink
=
magisk
.
getString
(
"note"
);
JSONObject
manager
=
json
.
getJSONObject
(
"app"
);
JSONObject
manager
=
json
.
getJSONObject
(
"app"
);
mm
.
remoteManagerVersionString
=
manager
.
getString
(
"version"
);
mm
.
remoteManagerVersionString
=
manager
.
getString
(
"version"
);
mm
.
remoteManagerVersionCode
=
manager
.
getInt
(
"versionCode"
);
mm
.
remoteManagerVersionCode
=
manager
.
getInt
(
"versionCode"
);
mm
.
managerLink
=
manager
.
getString
(
"link"
);
mm
.
managerLink
=
manager
.
getString
(
"link"
);
mm
.
managerNoteLink
=
manager
.
getString
(
"note"
);
JSONObject
uninstaller
=
json
.
getJSONObject
(
"uninstaller"
);
JSONObject
uninstaller
=
json
.
getJSONObject
(
"uninstaller"
);
mm
.
uninstallerLink
=
uninstaller
.
getString
(
"link"
);
mm
.
uninstallerLink
=
uninstaller
.
getString
(
"link"
);
}
catch
(
JSONException
ignored
)
{}
}
catch
(
JSONException
ignored
)
{}
...
...
src/full/java/com/topjohnwu/magisk/utils/ShowUI.java
View file @
ad05a33e
...
@@ -18,6 +18,7 @@ import com.topjohnwu.magisk.MagiskManager;
...
@@ -18,6 +18,7 @@ import com.topjohnwu.magisk.MagiskManager;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.asyncs.InstallMagisk
;
import
com.topjohnwu.magisk.asyncs.InstallMagisk
;
import
com.topjohnwu.magisk.asyncs.MarkDownWindow
;
import
com.topjohnwu.magisk.asyncs.RestoreImages
;
import
com.topjohnwu.magisk.asyncs.RestoreImages
;
import
com.topjohnwu.magisk.components.AlertDialogBuilder
;
import
com.topjohnwu.magisk.components.AlertDialogBuilder
;
import
com.topjohnwu.magisk.components.SnackbarMaker
;
import
com.topjohnwu.magisk.components.SnackbarMaker
;
...
@@ -25,7 +26,6 @@ import com.topjohnwu.magisk.receivers.DownloadReceiver;
...
@@ -25,7 +26,6 @@ import com.topjohnwu.magisk.receivers.DownloadReceiver;
import
com.topjohnwu.magisk.receivers.ManagerUpdate
;
import
com.topjohnwu.magisk.receivers.ManagerUpdate
;
import
com.topjohnwu.magisk.receivers.RebootReceiver
;
import
com.topjohnwu.magisk.receivers.RebootReceiver
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -123,7 +123,7 @@ public class ShowUI {
...
@@ -123,7 +123,7 @@ public class ShowUI {
MagiskManager
mm
=
Utils
.
getMagiskManager
(
activity
);
MagiskManager
mm
=
Utils
.
getMagiskManager
(
activity
);
String
filename
=
Utils
.
fmt
(
"Magisk-v%s(%d).zip"
,
String
filename
=
Utils
.
fmt
(
"Magisk-v%s(%d).zip"
,
mm
.
remoteMagiskVersionString
,
mm
.
remoteMagiskVersionCode
);
mm
.
remoteMagiskVersionString
,
mm
.
remoteMagiskVersionCode
);
new
AlertDialogBuilder
(
activity
)
AlertDialog
.
Builder
b
=
new
AlertDialogBuilder
(
activity
)
.
setTitle
(
mm
.
getString
(
R
.
string
.
repo_install_title
,
mm
.
getString
(
R
.
string
.
magisk
)))
.
setTitle
(
mm
.
getString
(
R
.
string
.
repo_install_title
,
mm
.
getString
(
R
.
string
.
magisk
)))
.
setMessage
(
mm
.
getString
(
R
.
string
.
repo_install_msg
,
filename
))
.
setMessage
(
mm
.
getString
(
R
.
string
.
repo_install_msg
,
filename
))
.
setCancelable
(
true
)
.
setCancelable
(
true
)
...
@@ -208,22 +208,27 @@ public class ShowUI {
...
@@ -208,22 +208,27 @@ public class ShowUI {
}
}
).
show
();
).
show
();
})
})
.
setNeutralButton
(
R
.
string
.
release_notes
,
(
d
,
i
)
->
{
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
);
if
(
mm
.
releaseNoteLink
!=
null
)
{
if
(!
TextUtils
.
isEmpty
(
mm
.
magiskNoteLink
))
{
Intent
openLink
=
new
Intent
(
Intent
.
ACTION_VIEW
,
Uri
.
parse
(
mm
.
releaseNoteLink
));
b
.
setNeutralButton
(
R
.
string
.
release_notes
,
(
d
,
i
)
->
{
if
(
mm
.
magiskNoteLink
.
contains
(
"forum.xda-developers"
))
{
// Open forum links in browser
Intent
openLink
=
new
Intent
(
Intent
.
ACTION_VIEW
,
Uri
.
parse
(
mm
.
magiskNoteLink
));
openLink
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
openLink
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
mm
.
startActivity
(
openLink
);
mm
.
startActivity
(
openLink
);
}
else
{
new
MarkDownWindow
(
activity
,
null
,
mm
.
magiskNoteLink
).
exec
();
}
}
})
})
;
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
)
}
.
show
();
b
.
show
();
}
}
public
static
void
managerInstallDialog
(
Activity
activity
)
{
public
static
void
managerInstallDialog
(
Activity
activity
)
{
MagiskManager
mm
=
Utils
.
getMagiskManager
(
activity
);
MagiskManager
mm
=
Utils
.
getMagiskManager
(
activity
);
String
filename
=
Utils
.
fmt
(
"MagiskManager-v%s(%d).apk"
,
String
filename
=
Utils
.
fmt
(
"MagiskManager-v%s(%d).apk"
,
mm
.
remoteManagerVersionString
,
mm
.
remoteManagerVersionCode
);
mm
.
remoteManagerVersionString
,
mm
.
remoteManagerVersionCode
);
new
AlertDialogBuilder
(
activity
)
AlertDialog
.
Builder
b
=
new
AlertDialogBuilder
(
activity
)
.
setTitle
(
mm
.
getString
(
R
.
string
.
repo_install_title
,
mm
.
getString
(
R
.
string
.
app_name
)))
.
setTitle
(
mm
.
getString
(
R
.
string
.
repo_install_title
,
mm
.
getString
(
R
.
string
.
app_name
)))
.
setMessage
(
mm
.
getString
(
R
.
string
.
repo_install_msg
,
filename
))
.
setMessage
(
mm
.
getString
(
R
.
string
.
repo_install_msg
,
filename
))
.
setCancelable
(
true
)
.
setCancelable
(
true
)
...
@@ -236,8 +241,12 @@ public class ShowUI {
...
@@ -236,8 +241,12 @@ public class ShowUI {
mm
.
sendBroadcast
(
intent
);
mm
.
sendBroadcast
(
intent
);
});
});
})
})
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
)
.
setNegativeButton
(
R
.
string
.
no_thanks
,
null
);
.
show
();
if
(!
TextUtils
.
isEmpty
(
mm
.
managerNoteLink
))
{
b
.
setNeutralButton
(
R
.
string
.
app_changelog
,
(
d
,
i
)
->
new
MarkDownWindow
(
activity
,
null
,
mm
.
managerNoteLink
).
exec
());
}
b
.
show
();
}
}
public
static
void
uninstallDialog
(
Activity
activity
)
{
public
static
void
uninstallDialog
(
Activity
activity
)
{
...
...
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