Base activities cleanup (#6848)

* secure delegate

* theming delegate

(cherry picked from commit dbad60d03b432b05d2abdbb70b75edcdbac837f9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt

app/src/main/java/eu/kanade/tachiyomi/App.kt

@@ -43,7 +43,7 @@ import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
 import eu.kanade.tachiyomi.util.preference.asImmediateFlow
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil
 import eu.kanade.tachiyomi.util.system.animatorDurationScale

app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt

@@ -0,0 +1,29 @@
+package eu.kanade.tachiyomi.ui.base.activity
+
+import android.content.Context
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegateImpl
+import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegate
+import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegateImpl
+import eu.kanade.tachiyomi.util.system.prepareTabletUiContext
+import uy.kohesive.injekt.injectLazy
+
+open class BaseActivity :
+    AppCompatActivity(),
+    SecureActivityDelegate by SecureActivityDelegateImpl(),
+    ThemingDelegate by ThemingDelegateImpl() {
+
+    protected val preferences: PreferencesHelper by injectLazy()
+
+    override fun attachBaseContext(newBase: Context) {
+        super.attachBaseContext(newBase.prepareTabletUiContext())
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        applyAppTheme(this)
+        super.onCreate(savedInstanceState)
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.kt

@@ -2,32 +2,29 @@ package eu.kanade.tachiyomi.ui.base.activity
 
 import android.content.Context
 import android.os.Bundle
-import androidx.viewbinding.ViewBinding
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegateImpl
+import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegate
+import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegateImpl
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
-import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate
 import eu.kanade.tachiyomi.util.system.prepareTabletUiContext
 import nucleus.view.NucleusAppCompatActivity
+import uy.kohesive.injekt.injectLazy
 
-abstract class BaseRxActivity<VB : ViewBinding, P : BasePresenter<*>> : NucleusAppCompatActivity<P>() {
+open class BaseRxActivity<P : BasePresenter<*>> :
+    NucleusAppCompatActivity<P>(),
+    SecureActivityDelegate by SecureActivityDelegateImpl(),
+    ThemingDelegate by ThemingDelegateImpl() {
 
-    @Suppress("LeakingThis")
+    protected val preferences: PreferencesHelper by injectLazy()
-    private val secureActivityDelegate = SecureActivityDelegate(this)
-
-    lateinit var binding: VB
 
     override fun attachBaseContext(newBase: Context) {
         super.attachBaseContext(newBase.prepareTabletUiContext())
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        applyAppTheme(this)
         super.onCreate(savedInstanceState)
-
-        secureActivityDelegate.onCreate()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        secureActivityDelegate.onResume()
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseViewBindingActivity.kt

@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.activity
-
-import android.os.Bundle
-import androidx.viewbinding.ViewBinding
-import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate
-
-abstract class BaseViewBindingActivity<VB : ViewBinding> : BaseThemedActivity() {
-
-    lateinit var binding: VB
-
-    @Suppress("LeakingThis")
-    private val secureActivityDelegate = SecureActivityDelegate(this)
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        secureActivityDelegate.onCreate()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        secureActivityDelegate.onResume()
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt

@@ -1,11 +1,22 @@
-package eu.kanade.tachiyomi.ui.security
+package eu.kanade.tachiyomi.ui.base.delegate
 
 import android.content.Intent
-import androidx.fragment.app.FragmentActivity
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate.Companion.LOCK_ALL_DAYS
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate.Companion.LOCK_FRIDAY
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate.Companion.LOCK_MONDAY
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate.Companion.LOCK_SATURDAY
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate.Companion.LOCK_SUNDAY
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate.Companion.LOCK_THURSDAY
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate.Companion.LOCK_TUESDAY
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate.Companion.LOCK_WEDNESDAY
 import eu.kanade.tachiyomi.ui.category.biometric.TimeRange
+import eu.kanade.tachiyomi.ui.security.UnlockActivity
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupported
 import eu.kanade.tachiyomi.util.view.setSecureScreen
 import kotlinx.coroutines.flow.combine
@@ -17,37 +28,66 @@ import java.util.Date
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
 
-class SecureActivityDelegate(private val activity: FragmentActivity) {
+interface SecureActivityDelegate {
+    fun registerSecureActivity(activity: AppCompatActivity)
+
+    companion object {
+        var locked: Boolean = true
+
+        const val LOCK_SUNDAY = 0x40
+        const val LOCK_MONDAY = 0x20
+        const val LOCK_TUESDAY = 0x10
+        const val LOCK_WEDNESDAY = 0x8
+        const val LOCK_THURSDAY = 0x4
+        const val LOCK_FRIDAY = 0x2
+        const val LOCK_SATURDAY = 0x1
+        const val LOCK_ALL_DAYS = 0x7F
+    }
+}
+
+class SecureActivityDelegateImpl : SecureActivityDelegate, DefaultLifecycleObserver {
+
+    private lateinit var activity: AppCompatActivity
 
     private val preferences: PreferencesHelper by injectLazy()
 
-    fun onCreate() {
+    override fun registerSecureActivity(activity: AppCompatActivity) {
+        this.activity = activity
+        activity.lifecycle.addObserver(this)
+    }
+
+    override fun onCreate(owner: LifecycleOwner) {
+        setSecureScreen()
+    }
+
+    override fun onResume(owner: LifecycleOwner) {
+        setAppLock()
+    }
+
+    private fun setSecureScreen() {
         val secureScreenFlow = preferences.secureScreen().asFlow()
         val incognitoModeFlow = preferences.incognitoMode().asFlow()
         combine(secureScreenFlow, incognitoModeFlow) { secureScreen, incognitoMode ->
-            secureScreen == PreferenceValues.SecureScreenMode.ALWAYS || secureScreen == PreferenceValues.SecureScreenMode.INCOGNITO && incognitoMode
+            secureScreen == PreferenceValues.SecureScreenMode.ALWAYS ||
+                secureScreen == PreferenceValues.SecureScreenMode.INCOGNITO && incognitoMode
         }
             .onEach { activity.window.setSecureScreen(it) }
             .launchIn(activity.lifecycleScope)
     }
 
-    fun onResume() {
+    private fun setAppLock() {
-        if (preferences.useAuthenticator().get()) {
+        if (!preferences.useAuthenticator().get()) return
         if (activity.isAuthenticationSupported()) {
-                if (isAppLocked()) {
+            if (!isAppLocked()) return
             activity.startActivity(Intent(activity, UnlockActivity::class.java))
             activity.overridePendingTransition(0, 0)
-                }
         } else {
             preferences.useAuthenticator().set(false)
         }
     }
-    }
 
     private fun isAppLocked(): Boolean {
-        if (!locked) {
+        if (!SecureActivityDelegate.locked) return false
-            return false
-        }
 
         // SY -->
         val today: Calendar = Calendar.getInstance()
@@ -81,17 +121,4 @@ class SecureActivityDelegate(private val activity: FragmentActivity) {
         return preferences.lockAppAfter().get() <= 0 ||
             Date().time >= preferences.lastAppUnlock().get() + 60 * 1000 * preferences.lockAppAfter().get()
     }
-
-    companion object {
-        var locked: Boolean = true
-
-        const val LOCK_SUNDAY = 0x40
-        const val LOCK_MONDAY = 0x20
-        const val LOCK_TUESDAY = 0x10
-        const val LOCK_WEDNESDAY = 0x8
-        const val LOCK_THURSDAY = 0x4
-        const val LOCK_FRIDAY = 0x2
-        const val LOCK_SATURDAY = 0x1
-        const val LOCK_ALL_DAYS = 0x7F
-    }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/ThemingDelegate.kt

@@ -1,33 +1,16 @@
-package eu.kanade.tachiyomi.ui.base.activity
+package eu.kanade.tachiyomi.ui.base.delegate
 
-import android.content.Context
+import android.app.Activity
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.util.system.prepareTabletUiContext
+import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.injectLazy
+import uy.kohesive.injekt.api.get
 
-abstract class BaseThemedActivity : AppCompatActivity() {
+interface ThemingDelegate {
-
+    fun applyAppTheme(activity: Activity)
-    val preferences: PreferencesHelper by injectLazy()
-
-    override fun attachBaseContext(newBase: Context) {
-        super.attachBaseContext(newBase.prepareTabletUiContext())
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        applyAppTheme(preferences)
-        super.onCreate(savedInstanceState)
-    }
 
     companion object {
-        fun AppCompatActivity.applyAppTheme(preferences: PreferencesHelper) {
-            getThemeResIds(preferences.appTheme().get(), preferences.themeDarkAmoled().get())
-                .forEach { setTheme(it) }
-        }
-
         fun getThemeResIds(appTheme: PreferenceValues.AppTheme, isAmoled: Boolean): List<Int> {
             val resIds = mutableListOf<Int>()
             when (appTheme) {
@@ -68,3 +51,11 @@ abstract class BaseThemedActivity : AppCompatActivity() {
         }
     }
 }
+
+class ThemingDelegateImpl : ThemingDelegate {
+    override fun applyAppTheme(activity: Activity) {
+        val preferences = Injekt.get<PreferencesHelper>()
+        ThemingDelegate.getThemeResIds(preferences.appTheme().get(), preferences.themeDarkAmoled().get())
+            .forEach { activity.setTheme(it) }
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -41,7 +41,7 @@ import eu.kanade.tachiyomi.data.updater.AppUpdateChecker
 import eu.kanade.tachiyomi.data.updater.AppUpdateResult
 import eu.kanade.tachiyomi.databinding.MainActivityBinding
 import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
-import eu.kanade.tachiyomi.ui.base.activity.BaseViewBindingActivity
+import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.ui.base.controller.FabController
 import eu.kanade.tachiyomi.ui.base.controller.NoAppBarElevationController
@@ -85,7 +85,9 @@ import logcat.LogPriority
 import uy.kohesive.injekt.injectLazy
 import java.util.LinkedList
 
-class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
+class MainActivity : BaseActivity() {
+
+    lateinit var binding: MainActivityBinding
 
     private lateinit var router: Router
 
@@ -694,6 +696,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
     private val nav: NavigationBarView
         get() = binding.bottomNav ?: binding.sideNav!!
 
+    // SY -->
     private fun setNavLabelVisibility() {
         if (preferences.bottomBarLabels().get()) {
             nav.labelVisibilityMode = NavigationBarView.LABEL_VISIBILITY_LABELED
@@ -701,6 +704,11 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
             nav.labelVisibilityMode = NavigationBarView.LABEL_VISIBILITY_SELECTED
         }
     }
+    // SY <--
+
+    init {
+        registerSecureActivity(this)
+    }
 
     companion object {
         // Splash screen

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -53,13 +53,11 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
 import eu.kanade.tachiyomi.data.notification.Notifications
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.ReaderActivityBinding
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity
-import eu.kanade.tachiyomi.ui.base.activity.BaseThemedActivity.Companion.applyAppTheme
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.ui.reader.ReaderPresenter.SetAsCoverResult.AddToLibraryFirst
@@ -126,7 +124,7 @@ import kotlin.time.Duration.Companion.seconds
  * viewers, to which calls from the presenter or UI events are delegated.
  */
 @RequiresPresenter(ReaderPresenter::class)
-class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>() {
+class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
 
     companion object {
         fun newIntent(context: Context, manga: Manga, chapter: Chapter): Intent {
@@ -148,7 +146,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
         const val SHARED_ELEMENT_NAME = "reader_shared_element_root"
     }
 
-    private val preferences: PreferencesHelper by injectLazy()
+    lateinit var binding: ReaderActivityBinding
 
     val hasCutout by lazy { hasDisplayCutout() }
 
@@ -202,7 +200,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
      * Called when the activity is created. Initializes the presenter and configuration.
      */
     override fun onCreate(savedInstanceState: Bundle?) {
-        applyAppTheme(preferences)
+        registerSecureActivity(this)
 
         // Setup shared element transitions
         if (intent.extras?.getBoolean(EXTRA_IS_TRANSITION) == true) {

app/src/main/java/eu/kanade/tachiyomi/ui/security/UnlockActivity.kt

@@ -4,7 +4,8 @@ import android.os.Bundle
 import androidx.biometric.BiometricPrompt
 import androidx.fragment.app.FragmentActivity
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.ui.base.activity.BaseThemedActivity
+import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.startAuthentication
 import eu.kanade.tachiyomi.util.system.logcat
@@ -14,7 +15,7 @@ import java.util.Date
 /**
  * Blank activity with a BiometricPrompt.
  */
-class UnlockActivity : BaseThemedActivity() {
+class UnlockActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt

@@ -12,8 +12,8 @@ import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
+import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
 import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesController
-import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate
 import eu.kanade.tachiyomi.util.preference.bindTo
 import eu.kanade.tachiyomi.util.preference.defaultValue
 import eu.kanade.tachiyomi.util.preference.entriesRes

app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt

@@ -8,11 +8,11 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.ProgressBar
 import eu.kanade.tachiyomi.data.track.TrackManager
-import eu.kanade.tachiyomi.ui.base.activity.BaseThemedActivity
+import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import uy.kohesive.injekt.injectLazy
 
-abstract class BaseOAuthLoginActivity : BaseThemedActivity() {
+abstract class BaseOAuthLoginActivity : BaseActivity() {
 
     internal val trackManager: TrackManager by injectLazy()
 

app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt

@@ -19,7 +19,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.WebviewActivityBinding
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.HttpSource
-import eu.kanade.tachiyomi.ui.base.activity.BaseViewBindingActivity
+import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
 import eu.kanade.tachiyomi.util.system.WebViewClientCompat
 import eu.kanade.tachiyomi.util.system.WebViewUtil
 import eu.kanade.tachiyomi.util.system.getResourceColor
@@ -32,7 +32,9 @@ import reactivecircus.flowbinding.appcompat.navigationClicks
 import reactivecircus.flowbinding.swiperefreshlayout.refreshes
 import uy.kohesive.injekt.injectLazy
 
-class WebViewActivity : BaseViewBindingActivity<WebviewActivityBinding>() {
+class WebViewActivity : BaseActivity() {
+
+    private lateinit var binding: WebviewActivityBinding
 
     private val sourceManager: SourceManager by injectLazy()
 
@@ -203,6 +205,10 @@ class WebViewActivity : BaseViewBindingActivity<WebviewActivityBinding>() {
         openInBrowser(binding.webview.url!!, forceDefaultBrowser = true)
     }
 
+    init {
+        registerSecureActivity(this)
+    }
+
     companion object {
         private const val URL_KEY = "url_key"
         private const val SOURCE_KEY = "source_key"

app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt

@@ -41,7 +41,7 @@ import com.hippo.unifile.UniFile
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.ui.base.activity.BaseThemedActivity
+import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegate
 import eu.kanade.tachiyomi.util.lang.truncateCenter
 import logcat.LogPriority
 import uy.kohesive.injekt.Injekt
@@ -325,7 +325,7 @@ fun Context.createReaderThemeContext(): Context {
 
         val wrappedContext = ContextThemeWrapper(this, R.style.Theme_Tachiyomi)
         wrappedContext.applyOverrideConfiguration(overrideConf)
-        BaseThemedActivity.getThemeResIds(prefs.appTheme().get(), prefs.themeDarkAmoled().get())
+        ThemingDelegate.getThemeResIds(prefs.appTheme().get(), prefs.themeDarkAmoled().get())
             .forEach { wrappedContext.theme.applyStyle(it, true) }
         return wrappedContext
     }

app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreferenceAdapter.kt

@@ -9,7 +9,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.PrefThemeItemBinding
-import eu.kanade.tachiyomi.ui.base.activity.BaseThemedActivity
+import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegate
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import uy.kohesive.injekt.injectLazy
 
@@ -23,7 +23,7 @@ class ThemesPreferenceAdapter(private val clickListener: OnItemClickListener) :
     private lateinit var binding: PrefThemeItemBinding
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ThemeViewHolder {
-        val themeResIds = BaseThemedActivity.getThemeResIds(themes[viewType], preferences.themeDarkAmoled().get())
+        val themeResIds = ThemingDelegate.getThemeResIds(themes[viewType], preferences.themeDarkAmoled().get())
         val themedContext = themeResIds.fold(parent.context) {
             context, themeResId ->
             ContextThemeWrapper(context, themeResId)

app/src/main/java/exh/ui/intercept/InterceptActivity.kt

@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.databinding.EhActivityInterceptBinding
 import eu.kanade.tachiyomi.source.online.UrlImportableSource
-import eu.kanade.tachiyomi.ui.base.activity.BaseViewBindingActivity
+import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
@@ -24,9 +24,11 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 
-class InterceptActivity : BaseViewBindingActivity<EhActivityInterceptBinding>() {
+class InterceptActivity : BaseActivity() {
     private var statusJob: Job? = null
 
+    lateinit var binding: EhActivityInterceptBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -138,6 +140,10 @@ class InterceptActivity : BaseViewBindingActivity<EhActivityInterceptBinding>()
             }
         }
     }
+
+    init {
+        registerSecureActivity(this)
+    }
 }
 
 sealed class InterceptResult {

app/src/main/java/exh/ui/login/EhLoginActivity.kt

@@ -19,7 +19,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.EhActivityLoginBinding
 import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.ui.base.activity.BaseViewBindingActivity
+import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.WebViewUtil
 import eu.kanade.tachiyomi.util.system.setDefaultSettings
@@ -36,7 +36,9 @@ import java.util.Locale
 /**
  * LoginController
  */
-class EhLoginActivity : BaseViewBindingActivity<EhActivityLoginBinding>() {
+class EhLoginActivity : BaseActivity() {
+    lateinit var binding: EhActivityLoginBinding
+
     val preferenceManager: PreferencesHelper by injectLazy()
 
     val sourceManager: SourceManager by injectLazy()