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
96650c06
Commit
96650c06
authored
Dec 28, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the issue that installation configs won't stick
parent
26038a0a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
MagiskFragment.java
src/main/java/com/topjohnwu/magisk/MagiskFragment.java
+2
-6
MagiskManager.java
src/main/java/com/topjohnwu/magisk/MagiskManager.java
+8
-5
SplashActivity.java
src/main/java/com/topjohnwu/magisk/SplashActivity.java
+1
-0
No files found.
src/main/java/com/topjohnwu/magisk/MagiskFragment.java
View file @
96650c06
...
@@ -138,13 +138,9 @@ public class MagiskFragment extends Fragment
...
@@ -138,13 +138,9 @@ public class MagiskFragment extends Fragment
setupExpandable
();
setupExpandable
();
keepVerityChkbox
.
setChecked
(
mm
.
keepVerity
);
keepVerityChkbox
.
setChecked
(
mm
.
keepVerity
);
keepVerityChkbox
.
setOnCheckedChangeListener
((
view
,
isChecked
)
->
{
keepVerityChkbox
.
setOnCheckedChangeListener
((
view
,
checked
)
->
mm
.
keepVerity
=
checked
);
mm
.
keepVerity
=
isChecked
;
});
keepEncChkbox
.
setChecked
(
mm
.
keepEnc
);
keepEncChkbox
.
setChecked
(
mm
.
keepEnc
);
keepEncChkbox
.
setOnCheckedChangeListener
((
view
,
isChecked
)
->
{
keepEncChkbox
.
setOnCheckedChangeListener
((
view
,
checked
)
->
mm
.
keepEnc
=
checked
);
mm
.
keepEnc
=
isChecked
;
});
mSwipeRefreshLayout
.
setOnRefreshListener
(
this
);
mSwipeRefreshLayout
.
setOnRefreshListener
(
this
);
updateUI
();
updateUI
();
...
...
src/main/java/com/topjohnwu/magisk/MagiskManager.java
View file @
96650c06
...
@@ -212,6 +212,14 @@ public class MagiskManager extends Application {
...
@@ -212,6 +212,14 @@ public class MagiskManager extends Application {
if
(
Utils
.
isValidShellResponse
(
ret
))
if
(
Utils
.
isValidShellResponse
(
ret
))
bootBlock
=
ret
.
get
(
0
);
bootBlock
=
ret
.
get
(
0
);
if
(
suDB
!=
null
&&
!
SuDatabaseHelper
.
verified
)
{
suDB
.
close
();
suDB
=
new
SuDatabaseHelper
();
}
}
public
void
getDefaultInstallFlags
()
{
List
<
String
>
ret
;
ret
=
Shell
.
su
(
"echo \"$DTBOIMAGE\""
);
ret
=
Shell
.
su
(
"echo \"$DTBOIMAGE\""
);
if
(
Utils
.
isValidShellResponse
(
ret
))
if
(
Utils
.
isValidShellResponse
(
ret
))
keepVerity
=
true
;
keepVerity
=
true
;
...
@@ -235,11 +243,6 @@ public class MagiskManager extends Application {
...
@@ -235,11 +243,6 @@ public class MagiskManager extends Application {
if
(
Utils
.
isValidShellResponse
(
ret
))
if
(
Utils
.
isValidShellResponse
(
ret
))
keepEnc
=
Boolean
.
parseBoolean
(
ret
.
get
(
0
));
keepEnc
=
Boolean
.
parseBoolean
(
ret
.
get
(
0
));
}
catch
(
NumberFormatException
ignored
)
{}
}
catch
(
NumberFormatException
ignored
)
{}
if
(
suDB
!=
null
&&
!
SuDatabaseHelper
.
verified
)
{
suDB
.
close
();
suDB
=
new
SuDatabaseHelper
();
}
}
}
public
void
setPermissionGrantCallback
(
Runnable
callback
)
{
public
void
setPermissionGrantCallback
(
Runnable
callback
)
{
...
...
src/main/java/com/topjohnwu/magisk/SplashActivity.java
View file @
96650c06
...
@@ -34,6 +34,7 @@ public class SplashActivity extends Activity {
...
@@ -34,6 +34,7 @@ public class SplashActivity extends Activity {
MagiskManager
mm
=
getMagiskManager
();
MagiskManager
mm
=
getMagiskManager
();
mm
.
loadMagiskInfo
();
mm
.
loadMagiskInfo
();
mm
.
getDefaultInstallFlags
();
Utils
.
loadPrefs
();
Utils
.
loadPrefs
();
// Dynamic detect all locales
// Dynamic detect all locales
...
...
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