diff --git a/app/src/main/java/com/huanchengfly/tieba/post/Extensions.kt b/app/src/main/java/com/huanchengfly/tieba/post/Extensions.kt index 0977ff2e..b6a195a4 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/Extensions.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/Extensions.kt @@ -79,11 +79,11 @@ inline fun Fragment.goToActivity(pre: Intent.() -> Unit) } fun Context.toastShort(text: String) { - Toast.makeText(this, text, Toast.LENGTH_SHORT).show() + runCatching { Toast.makeText(this, text, Toast.LENGTH_SHORT).show() } } fun Context.toastShort(resId: Int, vararg args: Any) { - Toast.makeText(this, getString(resId, *args), Toast.LENGTH_SHORT).show() + toastShort(getString(resId, *args)) } fun ViewGroup.enableChangingLayoutTransition() { diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/ForumInfoFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/ForumInfoFragment.kt index 51c7596a..ab5aa0a0 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/ForumInfoFragment.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/ForumInfoFragment.kt @@ -91,6 +91,8 @@ class ForumInfoFragment : BaseFragment(), Refreshable, ScrollTopable { val bundle = arguments if (savedInstanceState == null && bundle != null) { forumName = bundle.getString(ForumFragment.PARAM_FORUM_NAME) + } else if (savedInstanceState != null) { + forumName = savedInstanceState.getString(ForumFragment.PARAM_FORUM_NAME) } } @@ -99,14 +101,13 @@ class ForumInfoFragment : BaseFragment(), Refreshable, ScrollTopable { super.onSaveInstanceState(outState) } - @Deprecated("Deprecated in Java") - override fun onActivityCreated(savedInstanceState: Bundle?) { - if (savedInstanceState != null) { - forumName = savedInstanceState.getString(ForumFragment.PARAM_FORUM_NAME) - } - super.onActivityCreated(savedInstanceState) + override fun onViewStateRestored(savedInstanceState: Bundle?) { + super.onViewStateRestored(savedInstanceState) + if (savedInstanceState != null) forumName = + savedInstanceState.getString(ForumFragment.PARAM_FORUM_NAME) } + override fun getLayoutId(): Int { return R.layout.fragment_forum_info } @@ -145,6 +146,7 @@ class ForumInfoFragment : BaseFragment(), Refreshable, ScrollTopable { } private fun refresh() { + forumName ?: return mRefreshLayout.isRefreshing = true launch(IO + job) { TiebaApi.getInstance()