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
53e51f17
Commit
53e51f17
authored
Jul 29, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow incomplete update JSONs
parent
40b63bfe
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
50 additions
and
14 deletions
+50
-14
CheckUpdates.java
...c/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
+50
-14
No files found.
app/src/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
View file @
53e51f17
...
...
@@ -21,6 +21,34 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
showNotification
=
b
;
}
private
int
getInt
(
JSONObject
json
,
String
name
,
int
defValue
)
{
if
(
json
==
null
)
return
defValue
;
try
{
return
json
.
getInt
(
name
);
}
catch
(
JSONException
e
)
{
return
defValue
;
}
}
private
String
getString
(
JSONObject
json
,
String
name
,
String
defValue
)
{
if
(
json
==
null
)
return
defValue
;
try
{
return
json
.
getString
(
name
);
}
catch
(
JSONException
e
)
{
return
defValue
;
}
}
private
JSONObject
getJson
(
JSONObject
json
,
String
name
)
{
try
{
return
json
.
getJSONObject
(
name
);
}
catch
(
JSONException
e
)
{
return
null
;
}
}
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
MagiskManager
mm
=
MagiskManager
.
get
();
...
...
@@ -36,21 +64,29 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
jsonStr
=
WebService
.
getString
(
mm
.
prefs
.
getString
(
Const
.
Key
.
CUSTOM_CHANNEL
,
""
));
break
;
}
JSONObject
json
;
try
{
JSONObject
json
=
new
JSONObject
(
jsonStr
);
JSONObject
magisk
=
json
.
getJSONObject
(
"magisk"
);
mm
.
remoteMagiskVersionString
=
magisk
.
getString
(
"version"
);
mm
.
remoteMagiskVersionCode
=
magisk
.
getInt
(
"versionCode"
);
mm
.
magiskLink
=
magisk
.
getString
(
"link"
);
mm
.
magiskNoteLink
=
magisk
.
getString
(
"note"
);
JSONObject
manager
=
json
.
getJSONObject
(
"app"
);
mm
.
remoteManagerVersionString
=
manager
.
getString
(
"version"
);
mm
.
remoteManagerVersionCode
=
manager
.
getInt
(
"versionCode"
);
mm
.
managerLink
=
manager
.
getString
(
"link"
);
mm
.
managerNoteLink
=
manager
.
getString
(
"note"
);
JSONObject
uninstaller
=
json
.
getJSONObject
(
"uninstaller"
);
mm
.
uninstallerLink
=
uninstaller
.
getString
(
"link"
);
}
catch
(
JSONException
ignored
)
{}
json
=
new
JSONObject
(
jsonStr
);
}
catch
(
JSONException
e
)
{
return
null
;
}
JSONObject
magisk
=
getJson
(
json
,
"magisk"
);
mm
.
remoteMagiskVersionString
=
getString
(
magisk
,
"version"
,
null
);
mm
.
remoteMagiskVersionCode
=
getInt
(
magisk
,
"versionCode"
,
-
1
);
mm
.
magiskLink
=
getString
(
magisk
,
"link"
,
null
);
mm
.
magiskNoteLink
=
getString
(
magisk
,
"note"
,
null
);
JSONObject
manager
=
getJson
(
json
,
"app"
);
mm
.
remoteManagerVersionString
=
getString
(
manager
,
"version"
,
null
);
mm
.
remoteManagerVersionCode
=
getInt
(
manager
,
"versionCode"
,
-
1
);
mm
.
managerLink
=
getString
(
manager
,
"link"
,
null
);
mm
.
managerNoteLink
=
getString
(
manager
,
"note"
,
null
);
JSONObject
uninstaller
=
getJson
(
json
,
"uninstaller"
);
mm
.
uninstallerLink
=
getString
(
uninstaller
,
"link"
,
null
);
return
null
;
}
...
...
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