Skip to content

Commit 0f1bf10

Browse files
committed
Fix settings handler for 1 SIM phones
1 parent a89c51e commit 0f1bf10

1 file changed

Lines changed: 14 additions & 12 deletions

File tree

android/app/src/main/java/com/httpsms/SettingsActivity.kt

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,19 @@ class SettingsActivity : AppCompatActivity() {
4747
sim2Switch.visibility = SwitchMaterial.GONE
4848
val outgoingSwitch = findViewById<SwitchMaterial>(R.id.settings_sim2_outgoing_messages)
4949
outgoingSwitch.visibility = SwitchMaterial.GONE
50-
return
51-
}
52-
53-
val phoneNumberSIM2 = findViewById<TextInputEditText>(R.id.settingsSIM2InputEdit)
54-
phoneNumberSIM2.setText(Settings.getSIM2PhoneNumber(context))
55-
phoneNumberSIM2.isEnabled = false
50+
} else {
51+
val phoneNumberSIM2 = findViewById<TextInputEditText>(R.id.settingsSIM2InputEdit)
52+
phoneNumberSIM2.setText(Settings.getSIM2PhoneNumber(context))
53+
phoneNumberSIM2.isEnabled = false
5654

57-
val sim2IncomingMessages = findViewById<SwitchMaterial>(R.id.settings_sim2_incoming_messages)
58-
sim2IncomingMessages.isChecked = Settings.isIncomingMessageEnabled(context, Constants.SIM2)
59-
sim2IncomingMessages.setOnCheckedChangeListener{ _, isChecked -> run { Settings.setIncomingActiveSIM2(context, isChecked) } }
55+
val sim2IncomingMessages = findViewById<SwitchMaterial>(R.id.settings_sim2_incoming_messages)
56+
sim2IncomingMessages.isChecked = Settings.isIncomingMessageEnabled(context, Constants.SIM2)
57+
sim2IncomingMessages.setOnCheckedChangeListener{ _, isChecked -> run { Settings.setIncomingActiveSIM2(context, isChecked) } }
6058

61-
val sim2OutgoingMessages = findViewById<SwitchMaterial>(R.id.settings_sim2_outgoing_messages)
62-
sim2OutgoingMessages.isChecked = Settings.getActiveStatus(context, Constants.SIM2)
63-
sim2OutgoingMessages.setOnCheckedChangeListener{ _, isChecked -> run { Settings.setActiveStatusAsync(context, isChecked, Constants.SIM2) } }
59+
val sim2OutgoingMessages = findViewById<SwitchMaterial>(R.id.settings_sim2_outgoing_messages)
60+
sim2OutgoingMessages.isChecked = Settings.getActiveStatus(context, Constants.SIM2)
61+
sim2OutgoingMessages.setOnCheckedChangeListener{ _, isChecked -> run { Settings.setActiveStatusAsync(context, isChecked, Constants.SIM2) } }
62+
}
6463

6564
handleEncryptionSettings(context)
6665
handleIncomingCallEvents(context)
@@ -73,8 +72,11 @@ class SettingsActivity : AppCompatActivity() {
7372
Settings.setIncomingCallEventsEnabled(context, Constants.SIM1, isChecked)
7473
}}
7574

75+
Timber.w("we are here")
76+
7677
val sim2IncomingCalls = findViewById<SwitchMaterial>(R.id.settingsSim2EnableIncomingCallEvents)
7778
if (!Settings.isDualSIM(context)) {
79+
Timber.w("we are here")
7880
sim2IncomingCalls.visibility = SwitchMaterial.GONE
7981
return
8082
}

0 commit comments

Comments
 (0)