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
98deec23
Commit
98deec23
authored
Nov 05, 2021
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor adjustments
parent
022c217c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
15 deletions
+15
-15
BaseMainActivity.kt
...c/main/java/com/topjohnwu/magisk/arch/BaseMainActivity.kt
+1
-6
JobService.kt
app/src/main/java/com/topjohnwu/magisk/core/JobService.kt
+3
-3
BaseActivity.kt
.../main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
+8
-5
themes.xml
app/src/main/res/values-v31/themes.xml
+2
-1
styles_md2.xml
app/src/main/res/values/styles_md2.xml
+1
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/arch/BaseMainActivity.kt
View file @
98deec23
...
@@ -2,7 +2,6 @@ package com.topjohnwu.magisk.arch
...
@@ -2,7 +2,6 @@ package com.topjohnwu.magisk.arch
import
android.content.Intent
import
android.content.Intent
import
android.net.Uri
import
android.net.Uri
import
android.os.Build.VERSION.SDK_INT
import
android.os.Bundle
import
android.os.Bundle
import
androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import
androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import
androidx.databinding.ViewDataBinding
import
androidx.databinding.ViewDataBinding
...
@@ -35,11 +34,7 @@ abstract class BaseMainActivity<VM : BaseViewModel, Binding : ViewDataBinding>
...
@@ -35,11 +34,7 @@ abstract class BaseMainActivity<VM : BaseViewModel, Binding : ViewDataBinding>
if
(
isRunningAsStub
&&
doPreload
)
{
if
(
isRunningAsStub
&&
doPreload
)
{
// Manually apply splash theme for stub
// Manually apply splash theme for stub
if
(
SDK_INT
>=
31
)
{
theme
.
applyStyle
(
R
.
style
.
StubSplashTheme
,
true
)
theme
.
applyStyle
(
R
.
style
.
StubSplashTheme
,
true
)
}
else
{
theme
.
applyStyle
(
R
.
style
.
SplashTheme
,
true
)
}
}
}
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
...
...
app/src/main/java/com/topjohnwu/magisk/core/JobService.kt
View file @
98deec23
...
@@ -39,7 +39,7 @@ class JobService : BaseJobService() {
...
@@ -39,7 +39,7 @@ class JobService : BaseJobService() {
companion
object
{
companion
object
{
fun
schedule
(
context
:
Context
)
{
fun
schedule
(
context
:
Context
)
{
val
s
vc
=
context
.
getSystemService
<
JobScheduler
>()
?:
return
val
s
cheduler
=
context
.
getSystemService
<
JobScheduler
>()
?:
return
if
(
Config
.
checkUpdate
)
{
if
(
Config
.
checkUpdate
)
{
val
cmp
=
JobService
::
class
.
java
.
cmp
(
context
.
packageName
)
val
cmp
=
JobService
::
class
.
java
.
cmp
(
context
.
packageName
)
val
info
=
JobInfo
.
Builder
(
Const
.
ID
.
JOB_SERVICE_ID
,
cmp
)
val
info
=
JobInfo
.
Builder
(
Const
.
ID
.
JOB_SERVICE_ID
,
cmp
)
...
@@ -47,9 +47,9 @@ class JobService : BaseJobService() {
...
@@ -47,9 +47,9 @@ class JobService : BaseJobService() {
.
setRequiredNetworkType
(
JobInfo
.
NETWORK_TYPE_ANY
)
.
setRequiredNetworkType
(
JobInfo
.
NETWORK_TYPE_ANY
)
.
setRequiresDeviceIdle
(
true
)
.
setRequiresDeviceIdle
(
true
)
.
build
()
.
build
()
s
vc
.
schedule
(
info
)
s
cheduler
.
schedule
(
info
)
}
else
{
}
else
{
s
vc
.
cancel
(
Const
.
ID
.
JOB_SERVICE_ID
)
s
cheduler
.
cancel
(
Const
.
ID
.
JOB_SERVICE_ID
)
}
}
}
}
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
View file @
98deec23
...
@@ -15,6 +15,7 @@ import androidx.collection.SparseArrayCompat
...
@@ -15,6 +15,7 @@ import androidx.collection.SparseArrayCompat
import
androidx.core.app.ActivityCompat
import
androidx.core.app.ActivityCompat
import
androidx.core.content.ContextCompat
import
androidx.core.content.ContextCompat
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.isRunningAsStub
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.ktx.reflectField
import
com.topjohnwu.magisk.ktx.reflectField
...
@@ -46,11 +47,13 @@ abstract class BaseActivity : AppCompatActivity() {
...
@@ -46,11 +47,13 @@ abstract class BaseActivity : AppCompatActivity() {
}
}
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
// Overwrite private members to avoid nasty "false" stack traces being logged
if
(
isRunningAsStub
)
{
val
delegate
=
delegate
// Overwrite private members to avoid nasty "false" stack traces being logged
val
clz
=
delegate
.
javaClass
val
delegate
=
delegate
clz
.
reflectField
(
"mActivityHandlesUiModeChecked"
).
set
(
delegate
,
true
)
val
clz
=
delegate
.
javaClass
clz
.
reflectField
(
"mActivityHandlesUiMode"
).
set
(
delegate
,
false
)
clz
.
reflectField
(
"mActivityHandlesUiModeChecked"
).
set
(
delegate
,
true
)
clz
.
reflectField
(
"mActivityHandlesUiMode"
).
set
(
delegate
,
false
)
}
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
}
}
...
...
app/src/main/res/values-v31/themes.xml
View file @
98deec23
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources>
<!-- For stub APK, we need to manually handle the SplashScreen -->
<!-- For stub on API 31+, we cannot rely on the platform SplashScreen -->
<!-- Force using SplashScreenBase that was used for older APIs -->
<style
name=
"StubSplashTheme"
parent=
"Theme.SplashScreenBase"
>
<style
name=
"StubSplashTheme"
parent=
"Theme.SplashScreenBase"
>
<item
name=
"android:enforceStatusBarContrast"
>
false
</item>
<item
name=
"android:enforceStatusBarContrast"
>
false
</item>
<item
name=
"android:enforceNavigationBarContrast"
>
false
</item>
<item
name=
"android:enforceNavigationBarContrast"
>
false
</item>
...
...
app/src/main/res/values/styles_md2.xml
View file @
98deec23
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
<resources>
<resources>
<style
name=
"SplashTheme"
parent=
"Theme.Splash"
/>
<style
name=
"SplashTheme"
parent=
"Theme.Splash"
/>
<style
name=
"StubSplashTheme"
parent=
"Theme.Splash"
/>
<style
name=
"Foundation"
parent=
"Theme.Foundation.Light"
/>
<style
name=
"Foundation"
parent=
"Theme.Foundation.Light"
/>
...
...
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