Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable SplashScreen compat implementation on API 31+ #4447

Merged
merged 1 commit into from
May 15, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,15 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {

@SuppressLint("RestrictedApi")
override fun onCreate(savedInstanceState: Bundle?) {
val splashScreen = installSplashScreen()
// Newer Android versions don't need to install the compat Splash Screen
// and it can cause theming bugs.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
installSplashScreen()
}
super.onCreate(savedInstanceState)

val activeAccount = accountManager.activeAccount
if (activeAccount == null) {
splashScreen.setKeepOnScreenCondition { true }
// will be redirected to LoginActivity by BaseActivity
return
}
// will be redirected to LoginActivity by BaseActivity
val activeAccount = accountManager.activeAccount ?: return

if (explodeAnimationWasRequested()) {
overrideActivityTransitionCompat(
Expand Down
Loading