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
ff693828
Commit
ff693828
authored
May 31, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to DB based su configs
parent
1e4425b3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
27 deletions
+31
-27
MagiskManager.java
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+2
-12
SettingsActivity.java
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+4
-15
SuDatabaseHelper.java
.../java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
+25
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
View file @
ff693828
...
...
@@ -161,18 +161,8 @@ public class MagiskManager extends Application {
isSuClient
=
suVersion
.
toUpperCase
().
contains
(
"MAGISK"
);
}
if
(
isSuClient
)
{
ret
=
Shell
.
sh
(
"getprop "
+
ROOT_ACCESS_PROP
);
if
(
Utils
.
isValidShellResponse
(
ret
))
{
suAccessState
=
Integer
.
parseInt
(
ret
.
get
(
0
));
}
else
{
suAccessState
=
0
;
}
ret
=
Shell
.
sh
(
"getprop "
+
MULTIUSER_MODE_PROP
);
if
(
Utils
.
isValidShellResponse
(
ret
))
{
multiuserMode
=
Integer
.
parseInt
(
ret
.
get
(
0
));
}
else
{
multiuserMode
=
0
;
}
suAccessState
=
suDB
.
getSettings
(
SuDatabaseHelper
.
ROOT_ACCESS
,
3
);
multiuserMode
=
suDB
.
getSettings
(
SuDatabaseHelper
.
MULTIUSER_MODE
,
0
);
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
ff693828
...
...
@@ -15,6 +15,7 @@ import com.topjohnwu.magisk.asyncs.MagiskHide;
import
com.topjohnwu.magisk.asyncs.SerialTask
;
import
com.topjohnwu.magisk.components.Activity
;
import
com.topjohnwu.magisk.components.AlertDialogBuilder
;
import
com.topjohnwu.magisk.database.SuDatabaseHelper
;
import
com.topjohnwu.magisk.utils.Logger
;
import
com.topjohnwu.magisk.utils.Shell
;
import
com.topjohnwu.magisk.utils.Utils
;
...
...
@@ -188,24 +189,12 @@ public class SettingsActivity extends Activity {
}.
exec
();
break
;
case
"su_access"
:
magiskManager
.
suAccessState
=
Utils
.
getPrefsInt
(
prefs
,
"su_access"
,
0
);
new
SerialTask
<
Void
,
Void
,
Void
>(
getActivity
())
{
@Override
protected
Void
doInBackground
(
Void
...
params
)
{
Shell
.
su
(
"setprop "
+
MagiskManager
.
ROOT_ACCESS_PROP
+
" "
+
magiskManager
.
suAccessState
);
return
null
;
}
}.
exec
();
magiskManager
.
suAccessState
=
Utils
.
getPrefsInt
(
prefs
,
"su_access"
,
3
);
magiskManager
.
suDB
.
setSettings
(
SuDatabaseHelper
.
ROOT_ACCESS
,
magiskManager
.
suAccessState
);
break
;
case
"multiuser_mode"
:
magiskManager
.
multiuserMode
=
Utils
.
getPrefsInt
(
prefs
,
"multiuser_mode"
,
0
);
new
SerialTask
<
Void
,
Void
,
Void
>(
getActivity
())
{
@Override
protected
Void
doInBackground
(
Void
...
params
)
{
Shell
.
su
(
"setprop "
+
MagiskManager
.
MULTIUSER_MODE_PROP
+
" "
+
magiskManager
.
multiuserMode
);
return
null
;
}
}.
exec
();
magiskManager
.
suDB
.
setSettings
(
SuDatabaseHelper
.
MULTIUSER_MODE
,
magiskManager
.
multiuserMode
);
case
"su_request_timeout"
:
magiskManager
.
suRequestTimeout
=
Utils
.
getPrefsInt
(
prefs
,
"su_request_timeout"
,
10
);
break
;
...
...
app/src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
View file @
ff693828
package
com
.
topjohnwu
.
magisk
.
database
;
import
android.content.ContentValues
;
import
android.content.Context
;
import
android.content.pm.PackageManager
;
import
android.database.Cursor
;
...
...
@@ -18,6 +19,9 @@ import java.util.List;
public
class
SuDatabaseHelper
extends
SQLiteOpenHelper
{
public
static
final
String
ROOT_ACCESS
=
"root_access"
;
public
static
final
String
MULTIUSER_MODE
=
"multiuser_mode"
;
private
static
final
int
DATABASE_VER
=
2
;
private
static
final
String
POLICY_TABLE
=
"policies"
;
private
static
final
String
LOG_TABLE
=
"logs"
;
...
...
@@ -206,4 +210,25 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
db
.
delete
(
LOG_TABLE
,
null
,
null
);
db
.
close
();
}
public
void
setSettings
(
String
key
,
int
value
)
{
ContentValues
data
=
new
ContentValues
();
data
.
put
(
"key"
,
key
);
data
.
put
(
"value"
,
value
);
SQLiteDatabase
db
=
getWritableDatabase
();
db
.
replace
(
SETTINGS_TABLE
,
null
,
data
);
db
.
close
();
}
public
int
getSettings
(
String
key
,
int
defaultValue
)
{
SQLiteDatabase
db
=
getReadableDatabase
();
int
value
=
defaultValue
;
try
(
Cursor
c
=
db
.
query
(
SETTINGS_TABLE
,
null
,
"key=?"
,
new
String
[]
{
key
},
null
,
null
,
null
))
{
while
(
c
.
moveToNext
())
{
value
=
c
.
getInt
(
c
.
getColumnIndex
(
"value"
));
}
}
db
.
close
();
return
value
;
}
}
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