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
834c1648
Commit
834c1648
authored
Sep 02, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce unnecessary code
parent
04a4265e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
19 deletions
+10
-19
MagiskFragment.java
app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java
+10
-11
Utils.java
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+0
-8
No files found.
app/src/main/java/com/topjohnwu/magisk/MagiskFragment.java
View file @
834c1648
...
...
@@ -351,17 +351,16 @@ public class MagiskFragment extends Fragment
private
void
updateUI
()
{
((
MainActivity
)
getActivity
()).
checkHideSection
();
final
int
ROOT
=
0x1
,
NETWORK
=
0x2
,
UPTODATE
=
0x4
;
int
status
=
0
;
status
|=
Shell
.
rootAccess
()
?
ROOT
:
0
;
status
|=
Utils
.
checkNetworkStatus
(
magiskManager
)
?
NETWORK
:
0
;
status
|=
magiskManager
.
magiskVersionCode
>=
1300
?
UPTODATE
:
0
;
magiskUpdateCard
.
setVisibility
(
Utils
.
checkBits
(
status
,
NETWORK
)
?
View
.
VISIBLE
:
View
.
GONE
);
safetyNetCard
.
setVisibility
(
Utils
.
checkBits
(
status
,
NETWORK
)
?
View
.
VISIBLE
:
View
.
GONE
);
bootImageCard
.
setVisibility
(
Utils
.
checkBits
(
status
,
NETWORK
,
ROOT
)
?
View
.
VISIBLE
:
View
.
GONE
);
installOptionCard
.
setVisibility
(
Utils
.
checkBits
(
status
,
NETWORK
)
?
View
.
VISIBLE
:
View
.
GONE
);
installButton
.
setVisibility
(
Utils
.
checkBits
(
status
,
NETWORK
)
?
View
.
VISIBLE
:
View
.
GONE
);
uninstallButton
.
setVisibility
(
Utils
.
checkBits
(
status
,
UPTODATE
,
ROOT
)
?
View
.
VISIBLE
:
View
.
GONE
);
boolean
hasNetwork
=
Utils
.
checkNetworkStatus
(
getActivity
());
boolean
hasRoot
=
Shell
.
rootAccess
();
boolean
isUpToDate
=
magiskManager
.
magiskVersionCode
>
1300
;
magiskUpdateCard
.
setVisibility
(
hasNetwork
?
View
.
VISIBLE
:
View
.
GONE
);
safetyNetCard
.
setVisibility
(
hasNetwork
?
View
.
VISIBLE
:
View
.
GONE
);
bootImageCard
.
setVisibility
(
hasNetwork
&&
hasRoot
?
View
.
VISIBLE
:
View
.
GONE
);
installOptionCard
.
setVisibility
(
hasNetwork
?
View
.
VISIBLE
:
View
.
GONE
);
installButton
.
setVisibility
(
hasNetwork
?
View
.
VISIBLE
:
View
.
GONE
);
uninstallButton
.
setVisibility
(
isUpToDate
&&
hasRoot
?
View
.
VISIBLE
:
View
.
GONE
);
int
image
,
color
;
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View file @
834c1648
...
...
@@ -185,14 +185,6 @@ public class Utils {
return
networkInfo
!=
null
&&
networkInfo
.
isConnected
();
}
public
static
boolean
checkBits
(
int
bits
,
int
...
masks
)
{
for
(
int
mask
:
masks
)
{
if
((
bits
&
mask
)
==
0
)
return
false
;
}
return
true
;
}
public
static
void
showMagiskUpdate
(
MagiskManager
magiskManager
)
{
NotificationCompat
.
Builder
builder
=
new
NotificationCompat
.
Builder
(
magiskManager
,
MagiskManager
.
NOTIFICATION_CHANNEL
);
builder
.
setSmallIcon
(
R
.
drawable
.
ic_magisk
)
...
...
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