Merge remote-tracking branch 'john/WIP' into development

# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties
This commit is contained in:
Viktor De Pasquale
2019-04-19 16:34:15 +02:00
5 changed files with 28 additions and 27 deletions

View File

@@ -10,6 +10,7 @@ import android.os.AsyncTask
import android.os.Build
import android.os.Bundle
import androidx.appcompat.app.AppCompatDelegate
import androidx.multidex.MultiDex
import androidx.preference.PreferenceManager
import com.topjohnwu.magisk.data.database.MagiskDB
import com.topjohnwu.magisk.data.database.RepoDatabaseHelper
@@ -46,6 +47,7 @@ open class App : Application(), Application.ActivityLifecycleCallbacks {
override fun attachBaseContext(base: Context) {
super.attachBaseContext(base)
MultiDex.install(base)
self = this
deContext = base
registerActivityLifecycleCallbacks(this)