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
271cbddd
Commit
271cbddd
authored
Feb 19, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Settings improvements
parent
c1423ca9
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
41 additions
and
28 deletions
+41
-28
build.gradle
build.gradle
+1
-1
MagiskManager.java
src/main/java/com/topjohnwu/magisk/MagiskManager.java
+23
-0
SettingsActivity.java
src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+6
-2
SplashActivity.java
src/main/java/com/topjohnwu/magisk/SplashActivity.java
+2
-20
CheckUpdates.java
src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
+1
-1
Const.java
src/main/java/com/topjohnwu/magisk/utils/Const.java
+1
-1
strings.xml
src/main/res/values/strings.xml
+3
-0
app_settings.xml
src/main/res/xml/app_settings.xml
+4
-3
No files found.
build.gradle
View file @
271cbddd
...
...
@@ -8,7 +8,7 @@ android {
applicationId
"com.topjohnwu.magisk"
minSdkVersion
21
targetSdkVersion
27
versionCode
10
0
versionCode
10
3
versionName
"5.6.0"
javaCompileOptions
{
annotationProcessorOptions
{
...
...
src/main/java/com/topjohnwu/magisk/MagiskManager.java
View file @
271cbddd
package
com
.
topjohnwu
.
magisk
;
import
android.app.job.JobInfo
;
import
android.app.job.JobScheduler
;
import
android.content.ComponentName
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.content.pm.PackageManager
;
...
...
@@ -14,6 +17,7 @@ import android.widget.Toast;
import
com.topjohnwu.magisk.container.Module
;
import
com.topjohnwu.magisk.database.RepoDatabaseHelper
;
import
com.topjohnwu.magisk.database.SuDatabaseHelper
;
import
com.topjohnwu.magisk.services.UpdateCheckService
;
import
com.topjohnwu.magisk.utils.Const
;
import
com.topjohnwu.magisk.utils.Topic
;
import
com.topjohnwu.magisk.utils.Utils
;
...
...
@@ -226,4 +230,23 @@ public class MagiskManager extends Shell.ContainerApp {
public
void
setPermissionGrantCallback
(
Runnable
callback
)
{
permissionGrantCallback
=
callback
;
}
public
void
setupUpdateCheck
()
{
JobScheduler
scheduler
=
(
JobScheduler
)
getSystemService
(
JOB_SCHEDULER_SERVICE
);
if
(
prefs
.
getBoolean
(
Const
.
Key
.
CHECK_UPDATES
,
true
))
{
if
(
scheduler
.
getAllPendingJobs
().
isEmpty
()
||
Const
.
UPDATE_SERVICE_VER
>
prefs
.
getInt
(
Const
.
Key
.
UPDATE_SERVICE_VER
,
-
1
))
{
ComponentName
service
=
new
ComponentName
(
this
,
UpdateCheckService
.
class
);
JobInfo
info
=
new
JobInfo
.
Builder
(
Const
.
ID
.
UPDATE_SERVICE_ID
,
service
)
.
setRequiredNetworkType
(
JobInfo
.
NETWORK_TYPE_ANY
)
.
setPersisted
(
true
)
.
setPeriodic
(
8
*
60
*
60
*
1000
)
.
build
();
scheduler
.
schedule
(
info
);
}
}
else
{
scheduler
.
cancel
(
Const
.
UPDATE_SERVICE_VER
);
}
}
}
src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
271cbddd
...
...
@@ -150,9 +150,10 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
reauth
.
setSummary
(
R
.
string
.
android_o_not_support
);
}
//
Remov
e fingerprint option if not possible
//
Disabl
e fingerprint option if not possible
if
(!
FingerprintHelper
.
canUseFingerprint
())
{
suCategory
.
removePreference
(
fingerprint
);
fingerprint
.
setEnabled
(
false
);
fingerprint
.
setSummary
(
R
.
string
.
disable_fingerprint
);
}
if
(
mm
.
magiskVersionCode
>=
1440
)
{
...
...
@@ -298,6 +299,9 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
case
Const
.
Key
.
UPDATE_CHANNEL
:
new
CheckUpdates
().
exec
();
break
;
case
Const
.
Key
.
CHECK_UPDATES
:
mm
.
setupUpdateCheck
();
break
;
}
mm
.
loadConfig
();
setSummary
();
...
...
src/main/java/com/topjohnwu/magisk/SplashActivity.java
View file @
271cbddd
...
...
@@ -2,10 +2,6 @@ package com.topjohnwu.magisk;
import
android.app.NotificationChannel
;
import
android.app.NotificationManager
;
import
android.app.job.JobInfo
;
import
android.app.job.JobScheduler
;
import
android.content.ComponentName
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.os.Build
;
import
android.os.Bundle
;
...
...
@@ -15,7 +11,6 @@ import com.topjohnwu.magisk.asyncs.LoadModules;
import
com.topjohnwu.magisk.asyncs.ParallelTask
;
import
com.topjohnwu.magisk.asyncs.UpdateRepos
;
import
com.topjohnwu.magisk.components.Activity
;
import
com.topjohnwu.magisk.services.UpdateCheckService
;
import
com.topjohnwu.magisk.utils.Const
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
...
...
@@ -50,31 +45,18 @@ public class SplashActivity extends Activity {
LoadModules
loadModuleTask
=
new
LoadModules
();
if
(
Utils
.
checkNetworkStatus
())
{
// Fire update check
new
CheckUpdates
().
exec
();
// Add repo update check
loadModuleTask
.
setCallBack
(()
->
new
UpdateRepos
(
false
).
exec
());
}
// Magisk working as expected
if
(
Shell
.
rootAccess
()
&&
mm
.
magiskVersionCode
>
0
)
{
// Add update checking service
if
(
Const
.
UPDATE_SERVICE_VER
>
mm
.
prefs
.
getInt
(
Const
.
Key
.
UPDATE_SERVICE_VER
,
-
1
))
{
ComponentName
service
=
new
ComponentName
(
this
,
UpdateCheckService
.
class
);
JobInfo
info
=
new
JobInfo
.
Builder
(
Const
.
ID
.
UPDATE_SERVICE_ID
,
service
)
.
setRequiredNetworkType
(
JobInfo
.
NETWORK_TYPE_ANY
)
.
setPersisted
(
true
)
.
setPeriodic
(
8
*
60
*
60
*
1000
)
.
build
();
((
JobScheduler
)
getSystemService
(
Context
.
JOB_SCHEDULER_SERVICE
)).
schedule
(
info
);
}
// Update check service
mm
.
setupUpdateCheck
();
// Fire asynctasks
loadModuleTask
.
exec
();
// Check dtbo status
Utils
.
patchDTBO
();
}
...
...
src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
View file @
271cbddd
...
...
@@ -54,7 +54,7 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
@Override
protected
void
onPostExecute
(
Void
v
)
{
MagiskManager
mm
=
MagiskManager
.
get
();
if
(
showNotification
&&
mm
.
prefs
.
getBoolean
(
Const
.
Key
.
UPDATE_NOTIFICATION
,
true
)
)
{
if
(
showNotification
)
{
if
(
BuildConfig
.
VERSION_CODE
<
mm
.
remoteManagerVersionCode
)
{
ShowUI
.
managerUpdateNotification
();
}
else
if
(
mm
.
magiskVersionCode
<
mm
.
remoteMagiskVersionCode
)
{
...
...
src/main/java/com/topjohnwu/magisk/utils/Const.java
View file @
271cbddd
...
...
@@ -120,7 +120,7 @@ public class Const {
public
static
final
String
FLASH_SET_BOOT
=
"boot"
;
// others
public
static
final
String
UPDATE_NOTIFICATION
=
"notification
"
;
public
static
final
String
CHECK_UPDATES
=
"check_update
"
;
public
static
final
String
UPDATE_CHANNEL
=
"update_channel"
;
public
static
final
String
CUSTOM_CHANNEL
=
"custom_channel"
;
public
static
final
String
BOOT_FORMAT
=
"boot_format"
;
...
...
src/main/res/values/strings.xml
View file @
271cbddd
...
...
@@ -140,6 +140,8 @@
<string
name=
"language"
>
Language
</string>
<string
name=
"system_default"
>
(System Default)
</string>
<string
name=
"settings_update"
>
Update Settings
</string>
<string
name=
"settings_check_update_title"
>
Check Updates
</string>
<string
name=
"settings_check_update_summary"
>
Check updates in the background periodically
</string>
<string
name=
"settings_update_channel_title"
>
Update Channel
</string>
<string
name=
"settings_update_stable"
>
Stable
</string>
<string
name=
"settings_update_beta"
>
Beta
</string>
...
...
@@ -188,6 +190,7 @@
<string
name=
"requester_summary"
>
Root sessions will inherit its requester\'s namespace
</string>
<string
name=
"isolate_summary"
>
Each root session will have its own isolated namespace
</string>
<string
name=
"android_o_not_support"
>
Does not support Android 8.0+
</string>
<string
name=
"disable_fingerprint"
>
No fingerprints were set or no device support
</string>
<!--Superuser-->
<string
name=
"su_request_title"
>
Superuser Request
</string>
...
...
src/main/res/xml/app_settings.xml
View file @
271cbddd
...
...
@@ -32,9 +32,10 @@
android:title=
"@string/settings_update"
>
<SwitchPreference
android:key=
"notification"
android:title=
"@string/settings_notification_title"
android:summary=
"@string/settings_notification_summary"
/>
android:key=
"check_update"
android:defaultValue=
"true"
android:title=
"@string/settings_check_update_title"
android:summary=
"@string/settings_check_update_summary"
/>
<ListPreference
android:key=
"update_channel"
...
...
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