Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08ec14f3 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '4721-Crash_in_dark_mode_issue' into 'main' 

4721-Crash_in_dark_mode_issue

See merge request e/apps/mail!41
parents 63152f3e deb19f55

app/core/src/main/java/com/fsck/k9/controller/push/PushService.kt

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ class PushService : Service() { 
        Timber.v("PushService.onStartCommand()")

        super.onStartCommand(intent, flags, startId)



       // startForeground()

        initializePushController()



        return START_STICKY

app/core/src/main/java/com/fsck/k9/controller/push/PushServiceManager.kt

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ internal class PushServiceManager(private val context: Context) { 
        try {

            val intent = Intent(context, PushService::class.java)

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

               // context.startForegroundService(intent)

                context.startService(intent)

            } else {

                context.startService(intent)

app/k9mail/src/main/java/com/fsck/k9/K9ThemeProvider.kt

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ import com.fsck.k9.ui.base.ThemeProvider 
// TODO: Move this class and the theme resources to the main app module

class K9ThemeProvider : ThemeProvider {

    override val appThemeResourceId = R.style.Theme_K9_DayNight

    override val appLightThemeResourceId = R.style.Theme_K9_Light

    override val appDarkThemeResourceId = R.style.Theme_K9_Dark

    override val appLightThemeResourceId = R.style.Theme_K9_DayNight

    override val appDarkThemeResourceId = R.style.Theme_K9_DayNight

    override val dialogThemeResourceId = R.style.Theme_K9_Dialog_DayNight

    override val translucentDialogThemeResourceId = R.style.Theme_K9_Dialog_Translucent_DayNight

}

app/k9mail/src/main/res/values-night/bools.xml

0 → 100644
+4 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <bool name="isLightMode">false</bool>

</resources>
 
 No newline at end of file

app/k9mail/src/main/res/values-night/themes.xml

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>



    <style name="Theme.K9.DayNight" parent="Theme.K9.Dark" />

    <style name="Theme.K9.Dialog.DayNight" parent="Theme.K9.Dialog.Dark" />

    <style name="Theme.K9.Dialog.Translucent.DayNight" parent="Theme.K9.Dialog.Translucent.Dark" />



</resources>