Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Only include transitionKind in intents for Pachli activities (#716) 

Previous code always included the transitionKind enum as an extra, and
could cause a crash if the activity launched by the intent was not a
Pachli activity.

Fixes #700.
This commit is contained in:
Nik Clayton 2024-05-30 14:05:42 +02:00 committed by GitHub
parent 61afde882c
commit 84fdf4abb7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/app/pachli/fragment/SFragment.kt
View File

@ -95,7 +95,11 @@ abstract class SFragment<T : IStatusViewData> : Fragment(), StatusActionListener
private var serverCanTranslate = false private var serverCanTranslate = false
override fun startActivity(intent: Intent) { override fun startActivity(intent: Intent) {
requireActivity().startActivityWithDefaultTransition(intent) if (intent.component?.className?.startsWith("app.pachli.") == true) {
requireActivity().startActivityWithDefaultTransition(intent)
} else {
super.startActivity(intent)
}
} }
override fun onAttach(context: Context) { override fun onAttach(context: Context) {

10
core/activity/src/main/kotlin/app/pachli/core/activity/extensions/ActivityExtensions.kt
View File

@ -27,8 +27,12 @@ import app.pachli.core.activity.BaseActivity
import app.pachli.core.activity.BuildConfig import app.pachli.core.activity.BuildConfig
/** /**
* Starts the activity in [intent] (which must be a subclass of [BaseActivity]) * Starts the activity in [intent]. Should only be called on subclasses of [BaseActivity].
* using [transitionKind] as the open/close transition. *
* If the activity is a Pachli activity then [transitionKind] is included in the intent and
* used as the open/close transition.
*
* See [BaseActivity.onCreate] for the other half of this code.
*/ */
fun Activity.startActivityWithTransition(intent: Intent, transitionKind: TransitionKind) { fun Activity.startActivityWithTransition(intent: Intent, transitionKind: TransitionKind) {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
@ -60,7 +64,7 @@ fun Activity.startActivityWithDefaultTransition(intent: Intent) = startActivityW
fun Activity.setCloseTransition(transitionKind: TransitionKind) { fun Activity.setCloseTransition(transitionKind: TransitionKind) {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
if (this !is BaseActivity) { if (this !is BaseActivity) {
throw IllegalStateException("startActivityWithTransition must be used with BaseActivity subclass") throw IllegalStateException("setCloseTransition must be used with BaseActivity subclass")
} }
} }