ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed BaseActivity dependency from SplashActivity.

This commit is contained in:
Neil Marietta 2021-05-03 11:05:01 +02:00
parent 31b8c9c095
commit 599b6d6d24
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ch/protonmail/android/activities/BaseActivity.java
View File

@ -184,9 +184,7 @@ public abstract class BaseActivity extends AppCompatActivity implements INetwork
@Override
public void onBackPressed() {
if (!(this instanceof SplashActivity)) {
saveLastInteraction();
}
saveLastInteraction();
finish();
}

17
app/src/main/java/ch/protonmail/android/activities/SplashActivity.kt
View File

@ -20,27 +20,30 @@
package ch.protonmail.android.activities
import android.os.Bundle
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.flowWithLifecycle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import ch.protonmail.android.R
import ch.protonmail.android.feature.account.AccountStateManager
import ch.protonmail.android.utils.startMailboxActivity
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import javax.inject.Inject
class SplashActivity : BaseActivity() {
@AndroidEntryPoint
class SplashActivity : AppCompatActivity() {
override fun getLayoutId(): Int = R.layout.activity_splash
override fun shouldCheckForAutoLogout(): Boolean = false
@Inject
lateinit var accountStateManager: AccountStateManager
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_splash)
accountStateManager.register(this)
// Start Login or MailboxActivity.
accountStateManager.state
.flowWithLifecycle(lifecycle, Lifecycle.State.CREATED)
.onEach {
when (it) {
is AccountStateManager.State.Processing -> Unit