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
490e4d31
Commit
490e4d31
authored
Oct 30, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Target the proper channel in stub
parent
dc9f69ba
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
build.gradle
stub/build.gradle
+1
-1
DownloadActivity.java
.../src/main/java/com/topjohnwu/magisk/DownloadActivity.java
+5
-4
RawData.java
...src/main/java/com/topjohnwu/magisk/obfuscate/RawData.java
+7
-3
No files found.
stub/build.gradle
View file @
490e4d31
...
...
@@ -4,7 +4,7 @@ android {
defaultConfig
{
applicationId
'com.topjohnwu.magisk'
versionCode
1
versionName
"1.0"
versionName
props
[
'appVersion'
]
buildConfigField
'String'
,
'DEV_CHANNEL'
,
props
[
'DEV_CHANNEL'
]
?:
'null'
}
...
...
stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
View file @
490e4d31
...
...
@@ -24,9 +24,10 @@ import static com.topjohnwu.magisk.DelegateApplication.MANAGER_APK;
public
class
DownloadActivity
extends
Activity
{
private
static
final
boolean
CANARY
=
BuildConfig
.
VERSION_NAME
.
contains
(
"-"
);
private
static
final
String
URL
=
BuildConfig
.
DEV_CHANNEL
!=
null
?
BuildConfig
.
DEV_CHANNEL
:
RawData
.
urlBase
()
+
(
BuildConfig
.
DEBUG
?
RawData
.
canary
()
:
RawData
.
stable
(
));
BuildConfig
.
DEV_CHANNEL
!=
null
?
BuildConfig
.
DEV_CHANNEL
:
RawData
.
urlBase
()
+
(
BuildConfig
.
DEBUG
?
RawData
.
debug
()
:
(
CANARY
?
RawData
.
canary
()
:
RawData
.
stable
()
));
private
String
apkLink
;
private
ErrorHandler
err
=
(
conn
,
e
)
->
{
...
...
@@ -71,7 +72,7 @@ public class DownloadActivity extends Activity {
new
AlertDialog
.
Builder
(
this
)
.
setCancelable
(
false
)
.
setTitle
(
RawData
.
appName
())
.
setMessage
(
RawData
.
n
o_internet_msg
())
.
setMessage
(
RawData
.
n
etworkError
())
.
setNegativeButton
(
ok
,
(
d
,
w
)
->
finish
())
.
show
();
}
...
...
@@ -87,7 +88,7 @@ public class DownloadActivity extends Activity {
new
AlertDialog
.
Builder
(
DownloadActivity
.
this
)
.
setCancelable
(
false
)
.
setTitle
(
RawData
.
appName
())
.
setMessage
(
RawData
.
upgrade
_m
sg
())
.
setMessage
(
RawData
.
upgrade
M
sg
())
.
setPositiveButton
(
yes
,
(
d
,
w
)
->
dlAPK
())
.
setNegativeButton
(
no
,
(
d
,
w
)
->
finish
())
.
show
();
...
...
stub/src/main/java/com/topjohnwu/magisk/obfuscate/RawData.java
View file @
490e4d31
...
...
@@ -16,19 +16,23 @@ public class RawData {
return
"https://raw.githubusercontent.com/topjohnwu/magisk_files/"
;
}
public
static
String
canary
()
{
public
static
String
debug
()
{
return
"canary/debug.json"
;
}
public
static
String
canary
()
{
return
"canary/release.json"
;
}
public
static
String
stable
()
{
return
"master/stable.json"
;
}
public
static
String
n
o_internet_msg
()
{
public
static
String
n
etworkError
()
{
return
res
.
getString
(
R
.
string
.
no_internet_msg
);
}
public
static
String
upgrade
_m
sg
()
{
public
static
String
upgrade
M
sg
()
{
return
res
.
getString
(
R
.
string
.
upgrade_msg
);
}
...
...
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