Fix App doesnt start after setting name

pull/1482/head
Andrew 3 weeks ago
parent d29b2e2f96
commit 21f7020866

@ -15,6 +15,8 @@ class LandingActivity : BaseActionBarActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
TextSecurePreferences.setHasSeenWelcomeScreen(this, true)
// We always hit this LandingActivity on launch - but if there is a previous instance of
// Session then close this activity to resume the last activity from the previous instance.
if (!isTaskRoot) { finish(); return }

@ -18,6 +18,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import network.loki.messenger.R
import org.session.libsession.utilities.Device
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsession.utilities.TextSecurePreferences.Companion.isNotificationsEnabled
import org.thoughtcrime.securesms.ApplicationContext
@ -32,6 +33,8 @@ class NotificationsPreferenceFragment : ListSummaryPreferenceFragment() {
lateinit var pushRegistry: PushRegistry
@Inject
lateinit var prefs: TextSecurePreferences
@Inject
lateinit var device: Device
override fun onCreate(paramBundle: Bundle?) {
super.onCreate(paramBundle)
@ -39,6 +42,7 @@ class NotificationsPreferenceFragment : ListSummaryPreferenceFragment() {
// Set up FCM toggle
val fcmKey = "pref_key_use_fcm"
val fcmPreference: SwitchPreferenceCompat = findPreference(fcmKey)!!
fcmPreference.isVisible = device.pushAvailable
fcmPreference.isChecked = prefs.isPushEnabled()
fcmPreference.setOnPreferenceChangeListener { _: Preference, newValue: Any ->
prefs.setPushEnabled(newValue as Boolean)

Loading…
Cancel
Save