mollyim/mollyim-android
1
0
Fork 0
mirror of https://github.com/mollyim/mollyim-android.git synced 2025-05-12 21:30:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix settings activity result on config change

Browse source
This commit is contained in:
Oscar Mira 2025-04-11 00:55:00 +02:00
parent 21d4aae734
commit 151057be37
No known key found for this signature in database
GPG key ID: B371B98C5DC32237
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsActivity.kt
View file

@ -56,8 +56,8 @@ open class DSLSettingsActivity : PassphraseRequiredActivity() {
}
override fun onNavigateUp(): Boolean {
onWillFinish()
return if (!Navigation.findNavController(this, R.id.nav_host_fragment).popBackStack()) {
onWillFinish()
finish()
true
} else {

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt
View file

@ -82,7 +82,7 @@ class AppSettingsActivity : DSLSettingsActivity(), GooglePayComponent {
}
}
intent = intent.putExtra(START_LOCATION, StartLocation.HOME)
intent = intent.putExtra(START_LOCATION, StartLocation.HOME.code)
if (startingAction == null && savedInstanceState != null) {
wasConfigurationUpdated = savedInstanceState.getBoolean(STATE_WAS_CONFIGURATION_UPDATED)
@ -95,6 +95,7 @@ class AppSettingsActivity : DSLSettingsActivity(), GooglePayComponent {
SignalStore.settings.onConfigurationSettingChanged.observe(this) { key ->
if (key == SettingsValues.THEME) {
DynamicTheme.setDefaultDayNightMode(this)
wasConfigurationUpdated = true
recreate()
} else if (key == SettingsValues.LANGUAGE) {
CachedInflater.from(this).clear()

4
app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
View file

@ -50,10 +50,6 @@ public class DynamicTheme {
Log.d(TAG, "Create configuration different from current previous: " + onCreateNightModeConfiguration + " now: " + ConfigurationUtil.getNightModeConfiguration(activity));
CachedInflater.from(activity).clear();
}
if (onCreateUseDynamicColors != useDynamicColors(activity)) {
Log.d(TAG, "Dynamic theme setting changed. Recreating activity...");
activity.recreate();
}
}
protected @StyleRes int getRegularTheme() {