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

Commit 08496e3e authored by tibbi's avatar tibbi
Browse files

removing some redundant check related to the shared theme

parent b288aeea

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ buildscript { 
        propMinSdkVersion = 21

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '5.5.0'

        propVersionName = '5.5.1'

        kotlin_version = '1.3.10'

    }

commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ abstract class BaseSplashActivity : AppCompatActivity() { 


    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        if (isThankYouInstalled() && (baseConfig.appRunCount == 0 || !baseConfig.wasSharedThemeAfterUpdateChecked)) {

            baseConfig.wasSharedThemeAfterUpdateChecked = true

        if (isThankYouInstalled() && baseConfig.appRunCount == 0) {

            getSharedTheme {

                if (it != null) {

                    baseConfig.apply {

commons/src/main/kotlin/com/simplemobiletools/commons/helpers/BaseConfig.kt

+0 −5
Original line number Diff line number Diff line
@@ -164,11 +164,6 @@ open class BaseConfig(val context: Context) { 
        get() = prefs.getBoolean(WAS_SHARED_THEME_FORCED, false)

        set(wasSharedThemeForced) = prefs.edit().putBoolean(WAS_SHARED_THEME_FORCED, wasSharedThemeForced).apply()



    // used only for checking shared theme after updating to 3.0.0 from some previous version

    var wasSharedThemeAfterUpdateChecked: Boolean

        get() = prefs.getBoolean(WAS_SHARED_THEME_AFTER_UPDATE_CHECKED, false)

        set(wasSharedThemeAfterUpdateChecked) = prefs.edit().putBoolean(WAS_SHARED_THEME_AFTER_UPDATE_CHECKED, wasSharedThemeAfterUpdateChecked).apply()



    var showInfoBubble: Boolean

        get() = prefs.getBoolean(SHOW_INFO_BUBBLE, true)

        set(showInfoBubble) = prefs.edit().putBoolean(SHOW_INFO_BUBBLE, showInfoBubble).apply()

commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ const val WAS_SHARED_THEME_EVER_ACTIVATED = "was_shared_theme_ever_activated" 
const val IS_USING_SHARED_THEME = "is_using_shared_theme"

const val WAS_SHARED_THEME_FORCED = "was_shared_theme_forced"

const val WAS_CUSTOM_THEME_SWITCH_DESCRIPTION_SHOWN = "was_custom_theme_switch_description_shown"

const val WAS_SHARED_THEME_AFTER_UPDATE_CHECKED = "was_shared_theme_after_update_checked"

const val SHOW_INFO_BUBBLE = "show_info_bubble"

const val LAST_CONFLICT_RESOLUTION = "last_conflict_resolution"

const val LAST_CONFLICT_APPLY_TO_ALL = "last_conflict_apply_to_all"