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
86d8b505
Commit
86d8b505
authored
Dec 03, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update CheckUpdate
parent
7b043861
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
46 additions
and
39 deletions
+46
-39
CheckUpdates.java
...c/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
+46
-39
No files found.
app/src/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
View file @
86d8b505
package
com
.
topjohnwu
.
magisk
.
asyncs
;
package
com
.
topjohnwu
.
magisk
.
asyncs
;
import
android.os.AsyncTask
;
import
com.androidnetworking.AndroidNetworking
;
import
com.androidnetworking.error.ANError
;
import
com.androidnetworking.interfaces.JSONObjectRequestListener
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Data
;
import
com.topjohnwu.magisk.Data
;
...
@@ -42,27 +43,38 @@ public class CheckUpdates {
...
@@ -42,27 +43,38 @@ public class CheckUpdates {
}
}
}
}
public
static
void
fetchUpdates
(
)
{
public
static
void
check
(
Runnable
cb
)
{
String
jsonStr
=
""
;
String
url
;
switch
(
Data
.
updateChannel
)
{
switch
(
Data
.
updateChannel
)
{
case
Const
.
Value
.
STABLE_CHANNEL
:
case
Const
.
Value
.
STABLE_CHANNEL
:
jsonStr
=
Utils
.
dlString
(
Const
.
Url
.
STABLE_URL
)
;
url
=
Const
.
Url
.
STABLE_URL
;
break
;
break
;
case
Const
.
Value
.
BETA_CHANNEL
:
case
Const
.
Value
.
BETA_CHANNEL
:
jsonStr
=
Utils
.
dlString
(
Const
.
Url
.
BETA_URL
)
;
url
=
Const
.
Url
.
BETA_URL
;
break
;
break
;
case
Const
.
Value
.
CUSTOM_CHANNEL
:
case
Const
.
Value
.
CUSTOM_CHANNEL
:
jsonStr
=
Utils
.
dlString
(
Data
.
MM
().
prefs
.
getString
(
Const
.
Key
.
CUSTOM_CHANNEL
,
""
)
);
url
=
Data
.
MM
().
prefs
.
getString
(
Const
.
Key
.
CUSTOM_CHANNEL
,
""
);
break
;
break
;
default
:
return
;
}
AndroidNetworking
.
get
(
url
).
build
().
getAsJSONObject
(
new
UpdateListener
(
cb
));
}
}
JSONObject
json
;
public
static
void
check
()
{
try
{
check
(
null
);
json
=
new
JSONObject
(
jsonStr
);
}
catch
(
JSONException
e
)
{
return
;
}
}
private
static
class
UpdateListener
implements
JSONObjectRequestListener
{
private
Runnable
cb
;
UpdateListener
(
Runnable
callback
)
{
cb
=
callback
;
}
@Override
public
void
onResponse
(
JSONObject
json
)
{
JSONObject
magisk
=
getJson
(
json
,
"magisk"
);
JSONObject
magisk
=
getJson
(
json
,
"magisk"
);
Data
.
remoteMagiskVersionString
=
getString
(
magisk
,
"version"
,
null
);
Data
.
remoteMagiskVersionString
=
getString
(
magisk
,
"version"
,
null
);
Data
.
remoteMagiskVersionCode
=
getInt
(
magisk
,
"versionCode"
,
-
1
);
Data
.
remoteMagiskVersionCode
=
getInt
(
magisk
,
"versionCode"
,
-
1
);
...
@@ -82,11 +94,7 @@ public class CheckUpdates {
...
@@ -82,11 +94,7 @@ public class CheckUpdates {
JSONObject
snet
=
getJson
(
json
,
"snet"
);
JSONObject
snet
=
getJson
(
json
,
"snet"
);
Data
.
snetVersionCode
=
getInt
(
snet
,
"versionCode"
,
-
1
);
Data
.
snetVersionCode
=
getInt
(
snet
,
"versionCode"
,
-
1
);
Data
.
snetLink
=
getString
(
snet
,
"link"
,
null
);
Data
.
snetLink
=
getString
(
snet
,
"link"
,
null
);
}
public
static
void
check
(
Runnable
cb
)
{
AsyncTask
.
THREAD_POOL_EXECUTOR
.
execute
(()
->
{
fetchUpdates
();
if
(
cb
!=
null
)
{
if
(
cb
!=
null
)
{
if
(
BuildConfig
.
VERSION_CODE
<
Data
.
remoteManagerVersionCode
)
{
if
(
BuildConfig
.
VERSION_CODE
<
Data
.
remoteManagerVersionCode
)
{
Notifications
.
managerUpdate
();
Notifications
.
managerUpdate
();
...
@@ -96,10 +104,9 @@ public class CheckUpdates {
...
@@ -96,10 +104,9 @@ public class CheckUpdates {
cb
.
run
();
cb
.
run
();
}
}
Topic
.
publish
(
Topic
.
UPDATE_CHECK_DONE
);
Topic
.
publish
(
Topic
.
UPDATE_CHECK_DONE
);
});
}
}
public
static
void
check
()
{
@Override
check
(
null
);
public
void
onError
(
ANError
anError
)
{}
}
}
}
}
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