Multiple minor changes

app/src/main/java/com/topjohnwu/magisk/di/ApplicationModule.kt

@@ -4,10 +4,10 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Application
 import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import androidx.preference.PreferenceManager
 import com.skoumal.teanity.rxbus.RxBus
-import com.topjohnwu.magisk.App
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
@@ -17,15 +17,20 @@ val Protected = named("protected")
 val applicationModule = module {
     single { RxBus() }
     factory { get<Context>().resources }
-    factory { get<Context>() as App }
     factory { get<Context>().packageManager }
-    factory(Protected) { get<App>().deContext }
+    factory(Protected) { createDEContext(get()) }
     single(SUTimeout) { get<Context>(Protected).getSharedPreferences("su_timeout", 0) }
     single { PreferenceManager.getDefaultSharedPreferences(get<Context>(Protected)) }
     single { ActivityTracker() }
     factory { get<ActivityTracker>().foreground ?: NullActivity }
 }
 
+private fun createDEContext(context: Context): Context {
+    return if (Build.VERSION.SDK_INT >= 24)
+        context.createDeviceProtectedStorageContext()
+    else context
+}
+
 class ActivityTracker : Application.ActivityLifecycleCallbacks {
 
     @Volatile