TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-03-13 21:30:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename load failed

Browse Source
This commit is contained in:
Andrew 2024-06-17 09:37:15 +09:30
parent 56df122331
commit 73a25c88f1
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/onboarding/loading/LoadingActivity.kt
View File

@ -34,12 +34,12 @@ class LoadingActivity: BaseActionBarActivity() {
return
}
private fun register(skipped: Boolean) {
private fun register(loadFailed: Boolean) {
prefs.setLastConfigurationSyncTime(System.currentTimeMillis())
when {
skipped -> startPickDisplayNameActivity(
failedToLoad = true,
loadFailed -> startPickDisplayNameActivity(
loadFailed = true,
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
)
else -> startHomeActivity()

1
app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotificationsActivity.kt
View File

@ -11,7 +11,6 @@ import dagger.hilt.android.AndroidEntryPoint
import org.session.libsession.utilities.TextSecurePreferences
import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.BaseActionBarActivity
import org.thoughtcrime.securesms.home.HomeActivity
import org.thoughtcrime.securesms.home.startHomeActivity
import org.thoughtcrime.securesms.notifications.PushRegistry
import org.thoughtcrime.securesms.onboarding.loading.LoadingActivity

16
app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt
View File

@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.ui.setComposeContent
import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo
import javax.inject.Inject
private const val EXTRA_FAILED_TO_LOAD = "extra_failed_to_load"
private const val EXTRA_LOAD_FAILED = "extra_load_failed"
@AndroidEntryPoint
class PickDisplayNameActivity : BaseActionBarActivity() {
@ -26,10 +26,10 @@ class PickDisplayNameActivity : BaseActionBarActivity() {
@Inject lateinit var viewModelFactory: PickDisplayNameViewModel.AssistedFactory
@Inject lateinit var prefs: TextSecurePreferences
val failedToLoad get() = intent.getBooleanExtra(EXTRA_FAILED_TO_LOAD, false)
private val loadFailed get() = intent.getBooleanExtra(EXTRA_LOAD_FAILED, false)
private val viewModel: PickDisplayNameViewModel by viewModels {
viewModelFactory.create(failedToLoad)
viewModelFactory.create(loadFailed)
}
override fun onCreate(savedInstanceState: Bundle?) {
@ -38,11 +38,11 @@ class PickDisplayNameActivity : BaseActionBarActivity() {
setComposeContent { DisplayNameScreen(viewModel) }
if (!failedToLoad) prefs.setHasViewedSeed(false)
if (!loadFailed) prefs.setHasViewedSeed(false)
lifecycleScope.launch {
viewModel.eventFlow.collect {
if (failedToLoad) startHomeActivity() else startMessageNotificationsActivity()
if (loadFailed) startHomeActivity() else startMessageNotificationsActivity()
}
}
}
@ -54,11 +54,11 @@ class PickDisplayNameActivity : BaseActionBarActivity() {
}
}
fun Context.startPickDisplayNameActivity(failedToLoad: Boolean = false, flags: Int = 0) {
ApplicationContext.getInstance(this).newAccount = !failedToLoad
fun Context.startPickDisplayNameActivity(loadFailed: Boolean = false, flags: Int = 0) {
ApplicationContext.getInstance(this).newAccount = !loadFailed
Intent(this, PickDisplayNameActivity::class.java)
.apply { putExtra(EXTRA_FAILED_TO_LOAD, failedToLoad) }
.apply { putExtra(EXTRA_LOAD_FAILED, loadFailed) }
.also { it.flags = flags }
.also(::startActivity)
}