mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 04:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an NPE.

Browse Source
This commit is contained in:
casey langen 2019-02-16 22:51:52 -08:00
parent dd4fe103c7
commit c9c796255d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/activity/FragmentActivityWithTransport.kt
View File

@ -12,8 +12,7 @@ import io.casey.musikcube.remote.ui.shared.fragment.BaseFragment
import io.casey.musikcube.remote.ui.shared.fragment.TransportFragment
abstract class FragmentActivityWithTransport: BaseActivity(), IFilterable {
protected var transport: TransportFragment? = null
private set
private var transport: TransportFragment? = null
protected lateinit var content: BaseFragment
private set
@ -83,7 +82,7 @@ abstract class FragmentActivityWithTransport: BaseActivity(), IFilterable {
} ?: Unit
override val transitionType: Transition
get() = intent.transitionType
get() = extras.transitionType
protected abstract fun createContentFragment(): BaseFragment
protected abstract val contentFragmentTag: String

4
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Extensions.kt
View File

@ -232,8 +232,8 @@ fun Intent.withTransitionType(type: Transition) =
putExtra(Shared.Extra.TRANSITION_TYPE, type.name)
}
val Intent.transitionType
get() = Transition.from(getStringExtra(Shared.Extra.TRANSITION_TYPE))
val Bundle.transitionType
get() = Transition.from(getString(Shared.Extra.TRANSITION_TYPE, ""))
/*
*