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
97843532
Commit
97843532
authored
Jul 29, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ActivityTracker
Koin does not support nullable types
parent
7d93ca5c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
10 deletions
+17
-10
App.kt
app/src/main/java/com/topjohnwu/magisk/App.kt
+6
-5
ApplicationModule.kt
...rc/main/java/com/topjohnwu/magisk/di/ApplicationModule.kt
+9
-4
RemoteFileService.kt
.../com/topjohnwu/magisk/model/download/RemoteFileService.kt
+2
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/App.kt
View file @
97843532
...
...
@@ -13,6 +13,7 @@ import androidx.work.impl.WorkDatabase
import
androidx.work.impl.WorkDatabase_Impl
import
com.topjohnwu.magisk.data.database.RepoDatabase
import
com.topjohnwu.magisk.data.database.RepoDatabase_Impl
import
com.topjohnwu.magisk.di.ActivityTracker
import
com.topjohnwu.magisk.di.koinModules
import
com.topjohnwu.magisk.extensions.get
import
com.topjohnwu.magisk.utils.LocaleManager
...
...
@@ -26,7 +27,7 @@ import java.util.concurrent.ThreadPoolExecutor
open
class
App
:
Application
()
{
lateinit
var
protected
Context
:
Context
lateinit
var
de
Context
:
Context
override
fun
attachBaseContext
(
base
:
Context
)
{
super
.
attachBaseContext
(
base
)
...
...
@@ -39,15 +40,15 @@ open class App : Application() {
modules
(
koinModules
)
}
protectedContext
=
baseContext
deContext
=
base
self
=
this
if
(
Build
.
VERSION
.
SDK_INT
>=
24
)
{
protected
Context
=
base
.
createDeviceProtectedStorageContext
()
protectedContext
.
moveSharedPreferencesFrom
(
base
,
base
.
defaultPrefsName
)
de
Context
=
base
.
createDeviceProtectedStorageContext
()
deContext
.
moveSharedPreferencesFrom
(
base
,
defaultPrefsName
)
}
registerActivityLifecycleCallbacks
(
get
())
registerActivityLifecycleCallbacks
(
get
<
ActivityTracker
>
())
Networking
.
init
(
base
)
LocaleManager
.
setLocale
(
this
)
...
...
app/src/main/java/com/topjohnwu/magisk/di/ApplicationModule.kt
View file @
97843532
package
com.topjohnwu.magisk.di
import
android.annotation.SuppressLint
import
android.app.Activity
import
android.app.Application
import
android.content.Context
...
...
@@ -14,15 +15,16 @@ val applicationModule = module {
factory
{
get
<
Context
>().
resources
}
factory
{
get
<
Context
>()
as
App
}
factory
{
get
<
Context
>().
packageManager
}
factory
(
Protected
)
{
get
<
App
>().
protected
Context
}
factory
(
Protected
)
{
get
<
App
>().
de
Context
}
single
(
SUTimeout
)
{
get
<
Context
>(
Protected
).
getSharedPreferences
(
"su_timeout"
,
0
)
}
single
{
PreferenceManager
.
getDefaultSharedPreferences
(
get
<
Context
>(
Protected
))
}
single
{
ActivityTracker
()
as
Application
.
ActivityLifecycleCallbacks
}
factory
{
(
get
<
Application
.
ActivityLifecycleCallbacks
>()
as
ActivityTracker
).
foreground
}
single
{
ActivityTracker
()
}
factory
{
get
<
ActivityTracker
>().
foreground
?:
NullActivity
}
}
private
class
ActivityTracker
:
Application
.
ActivityLifecycleCallbacks
{
class
ActivityTracker
:
Application
.
ActivityLifecycleCallbacks
{
@Volatile
var
foreground
:
Activity
?
=
null
override
fun
onActivityCreated
(
activity
:
Activity
,
bundle
:
Bundle
?)
{}
...
...
@@ -45,3 +47,6 @@ private class ActivityTracker : Application.ActivityLifecycleCallbacks {
override
fun
onActivityDestroyed
(
activity
:
Activity
)
{}
}
@SuppressLint
(
"Registered"
)
object
NullActivity
:
Activity
()
app/src/main/java/com/topjohnwu/magisk/model/download/RemoteFileService.kt
View file @
97843532
...
...
@@ -7,6 +7,7 @@ import com.skoumal.teanity.extensions.subscribeK
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.data.network.GithubRawServices
import
com.topjohnwu.magisk.di.NullActivity
import
com.topjohnwu.magisk.extensions.firstMap
import
com.topjohnwu.magisk.extensions.get
import
com.topjohnwu.magisk.extensions.writeTo
...
...
@@ -56,7 +57,7 @@ abstract class RemoteFileService : NotificationService() {
}
})
{
val
newId
=
finishNotify
(
it
,
subject
)
get
<
Activity
?>()
?.
run
{
if
(
get
<
Activity
>()
!
is
NullActivity
)
{
onFinished
(
it
,
subject
,
newId
)
}
}
...
...
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