androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt

@@ -2,7 +2,6 @@ package bou.amine.apps.readerforselfossv2.android
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
@@ -39,8 +38,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        handleTheme()
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
 
         binding = ActivityLoginBinding.inflate(layoutInflater)
         val view = binding.root
@@ -58,11 +56,6 @@ class LoginActivity : AppCompatActivity(), DIAware {
         handleActions()
     }
 
-    @SuppressLint("WrongConstant") // Constant is fetched from the settings
-    private fun handleTheme() {
-        AppCompatDelegate.setDefaultNightMode(appSettingsService.getCurrentTheme())
-    }
-
     private fun handleActions() {
 
         binding.passwordView.setOnEditorActionListener(

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt

@@ -51,6 +51,7 @@ class MyApp : MultiDexApplication(), DIAware {
     private val viewModel: AppViewModel by instance()
     private val connectivityStatus: ConnectivityStatus by instance()
     private val driverFactory: DriverFactory by instance()
+    private val appSettingsService : AppSettingsService by instance()
 
     // TODO: handle with the "previous" way
     private val isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(true)
@@ -125,15 +126,29 @@ class MyApp : MultiDexApplication(), DIAware {
         val oldHandler = Thread.getDefaultUncaughtExceptionHandler()
 
         Thread.setDefaultUncaughtExceptionHandler { thread, e ->
-            if (e is NoClassDefFoundError && e.stackTrace.asList().any {
+            if (e is java.lang.NoClassDefFoundError && e.stackTrace.asList().any {
                     it.toString().contains("android.view.ViewDebug")
                 }) {
+                Unit
             } else {
                 oldHandler.uncaughtException(thread, e)
             }
         }
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        if (appSettingsService.getCurrentTheme() == MODE_NIGHT_FOLLOW_SYSTEM) {
+            var mode = when (newConfig.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
+                Configuration.UI_MODE_NIGHT_YES -> MODE_NIGHT_YES
+                else -> MODE_NIGHT_NO
+            }
+            setDefaultNightMode(mode)
+        }
+
+
+    }
+
     class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {
 
         override fun onResume(owner: LifecycleOwner) {