diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index b162c974ea..a306ceecd8 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -19,7 +19,6 @@ import androidx.core.content.ContextCompat; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.gamecenter.common.callback.OnViewClickListener; import com.gh.common.constant.Config; import com.gh.common.dialog.CertificationDialog; import com.gh.common.dialog.PackageCheckDialogFragment; @@ -29,26 +28,18 @@ import com.gh.common.repository.ReservationRepository; import com.gh.common.simulator.SimulatorDownloadManager; import com.gh.common.simulator.SimulatorGameManager; import com.gh.common.util.CheckLoginUtils; -import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; -import com.gh.gamecenter.common.utils.ExtensionsKt; -import com.gh.gamecenter.common.utils.NightModeUtils; -import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.common.util.DownloadDialogHelper; import com.gh.common.util.GameUtils; import com.gh.common.util.GameViewUtils; -import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.LogUtils; -import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewsUtils; -import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.RealNameHelper; import com.gh.common.util.ReservationHelper; import com.gh.common.view.DownloadProgressBar; -import com.gh.gamecenter.common.view.DrawableView; import com.gh.common.view.GameIconView; import com.gh.download.DownloadManager; import com.gh.download.dialog.DownloadDialog; @@ -57,6 +48,14 @@ import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.baselist.LoadStatus; +import com.gh.gamecenter.common.callback.OnViewClickListener; +import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.ImageUtils; +import com.gh.gamecenter.common.utils.NightModeUtils; +import com.gh.gamecenter.common.view.DrawableView; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.MtaHelper; +import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; @@ -595,7 +594,7 @@ public class BindingAdapters { */ private static void restoreDialogFragment(DownloadProgressBar progressBar) { GamePermissionDialogFragment gamePermissionDialogFragment = - ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getSimpleName())); + ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getName())); if (gamePermissionDialogFragment != null) { gamePermissionDialogFragment.dismissAllowingStateLoss(); } diff --git a/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt index 9b727e790e..51281c5b22 100644 --- a/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt @@ -87,7 +87,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() { } }.show( activity.supportFragmentManager, - ApplyModeratorDialogFragment::class.java.simpleName + ApplyModeratorDialogFragment::class.java.name ) } } diff --git a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt index 5e3369eaba..5baf903885 100644 --- a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt @@ -114,7 +114,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() { return } } - var installPermissionDialogFragment = activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.simpleName) as? InstallPermissionDialogFragment + var installPermissionDialogFragment = activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.name) as? InstallPermissionDialogFragment if (installPermissionDialogFragment != null) { installPermissionDialogFragment.mCallBack = callBack installPermissionDialogFragment.isXapk = isXapk @@ -128,7 +128,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() { this.isXapk = isXapk this.url = downloadEntity.url } - installPermissionDialogFragment.show(activity.supportFragmentManager, InstallPermissionDialogFragment::class.java.simpleName) + installPermissionDialogFragment.show(activity.supportFragmentManager, InstallPermissionDialogFragment::class.java.name) } } } diff --git a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt index 1da047ca1c..73b58f9a47 100644 --- a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt @@ -350,12 +350,12 @@ class PackageCheckDialogFragment : BaseDialogFragment() { if (!activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) return var dialogFragment = - activity.supportFragmentManager.findFragmentByTag(PackageCheckDialogFragment::class.java.simpleName) as? PackageCheckDialogFragment + activity.supportFragmentManager.findFragmentByTag(PackageCheckDialogFragment::class.java.name) as? PackageCheckDialogFragment if (dialogFragment == null) { dialogFragment = PackageCheckDialogFragment() dialogFragment.gameEntity = gameEntity dialogFragment.callBack = callBack - dialogFragment.show(activity.supportFragmentManager, PackageCheckDialogFragment::class.java.simpleName) + dialogFragment.show(activity.supportFragmentManager, PackageCheckDialogFragment::class.java.name) } else { dialogFragment.gameEntity = gameEntity dialogFragment.callBack = callBack diff --git a/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt index 1ec238cb47..0c637fd122 100644 --- a/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt @@ -167,7 +167,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() { fun show(activity: FragmentActivity, privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null, callBack: ((isSuccess: Boolean) -> Unit)?) { - var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(PrivacyPolicyDialogFragment::class.java.simpleName) as? PrivacyPolicyDialogFragment + var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(PrivacyPolicyDialogFragment::class.java.name) as? PrivacyPolicyDialogFragment if (privacyDialogFragment != null) { privacyDialogFragment.mCallBack = callBack val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction() @@ -183,7 +183,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() { } privacyDialogFragment.show( activity.supportFragmentManager, - PrivacyPolicyDialogFragment::class.java.simpleName + PrivacyPolicyDialogFragment::class.java.name ) } } diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt index 132bdaa258..5c5c2b1ec2 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt @@ -213,23 +213,23 @@ open class SearchActivity : BaseActivity() { val transaction = supportFragmentManager.beginTransaction() when (type) { DEFAULT -> { - val fragment = supportFragmentManager.findFragmentByTag(SearchDefaultFragment::class.java.simpleName) + val fragment = supportFragmentManager.findFragmentByTag(SearchDefaultFragment::class.java.name) ?: SearchDefaultFragment() - transaction.replace(R.id.search_result, fragment, SearchDefaultFragment::class.java.simpleName) + transaction.replace(R.id.search_result, fragment, SearchDefaultFragment::class.java.name) } GAME_DIGEST -> { val digestListFragment = - supportFragmentManager.findFragmentByTag(SearchGameIndexFragment::class.java.simpleName) as? SearchGameIndexFragment + supportFragmentManager.findFragmentByTag(SearchGameIndexFragment::class.java.name) as? SearchGameIndexFragment ?: SearchGameIndexFragment() digestListFragment.setParams(mSearchKey ?: "", mSearchType.value) - transaction.replace(R.id.search_result, digestListFragment, SearchGameIndexFragment::class.java.simpleName) + transaction.replace(R.id.search_result, digestListFragment, SearchGameIndexFragment::class.java.name) } GAME_DETAIL -> { val detailListFragment = - supportFragmentManager.findFragmentByTag(SearchGameResultFragment::class.java.simpleName) as? SearchGameResultFragment + supportFragmentManager.findFragmentByTag(SearchGameResultFragment::class.java.name) as? SearchGameResultFragment ?: SearchGameResultFragment() detailListFragment.setParams(mSearchKey ?: "", mSearchType.value) - transaction.replace(R.id.search_result, detailListFragment, SearchGameResultFragment::class.java.simpleName) + transaction.replace(R.id.search_result, detailListFragment, SearchGameResultFragment::class.java.name) } } mDisplayType = type @@ -256,7 +256,7 @@ open class SearchActivity : BaseActivity() { } override fun handleBackPressed(): Boolean { - val fragment = supportFragmentManager.findFragmentByTag(SearchDefaultFragment::class.java.simpleName) + val fragment = supportFragmentManager.findFragmentByTag(SearchDefaultFragment::class.java.name) if (fragment == null) { updateDisplayType(DEFAULT) return true diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java index 69c81c68d2..3eca397f7b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java @@ -96,7 +96,7 @@ public class DetailViewHolder { private void restoreDialogFragment() { DialogFragment gamePermissionDialogFragment = - (DialogFragment) ((AppCompatActivity) context).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getSimpleName()); + (DialogFragment) ((AppCompatActivity) context).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getName()); if (gamePermissionDialogFragment != null) { gamePermissionDialogFragment.dismissAllowingStateLoss(); } diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt index 28e5b63ea6..39471cd4bb 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayActivity.kt @@ -19,10 +19,10 @@ class AmwayActivity : BaseActivity() { DisplayUtils.transparentStatusBar(this) - val containerFragment = supportFragmentManager.findFragmentByTag(AmwayFragment::class.java.simpleName) + val containerFragment = supportFragmentManager.findFragmentByTag(AmwayFragment::class.java.name) ?: AmwayFragment().with(intent.extras) // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移 - supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment, AmwayFragment::class.java.simpleName).commitAllowingStateLoss() + supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment, AmwayFragment::class.java.name).commitAllowingStateLoss() } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchActivity.kt b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchActivity.kt index 5c8a67468a..3920e26891 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchActivity.kt @@ -62,14 +62,14 @@ class AmwaySearchActivity : SearchActivity() { val transaction = supportFragmentManager.beginTransaction() when (type) { DisplayType.DEFAULT -> { - val fragment = supportFragmentManager.findFragmentByTag(SearchDefaultFragment::class.java.simpleName) + val fragment = supportFragmentManager.findFragmentByTag(SearchDefaultFragment::class.java.name) ?: AmwaySearchDefaultFragment() - transaction.replace(R.id.search_result, fragment, SearchDefaultFragment::class.java.simpleName) + transaction.replace(R.id.search_result, fragment, SearchDefaultFragment::class.java.name) } else -> { - val fragment = supportFragmentManager.findFragmentByTag(AmwaySearchListFragment::class.java.simpleName) + val fragment = supportFragmentManager.findFragmentByTag(AmwaySearchListFragment::class.java.name) ?: AmwaySearchListFragment() - transaction.replace(R.id.search_result, fragment, AmwaySearchListFragment::class.java.simpleName) + transaction.replace(R.id.search_result, fragment, AmwaySearchListFragment::class.java.name) } } mDisplayType = type diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt index 868cc22d9f..a73474add7 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt @@ -119,7 +119,7 @@ class CatalogFragment : LazyFragment() { mBinding?.rvCatalog?.adapter = CatalogAdapter(requireContext(), this@CatalogFragment, this, subCatalog) if (hasSpecial && selectedCatalogPosition == 0) { - mSpecialCatalogFragment = childFragmentManager.findFragmentByTag(SpecialCatalogFragment::class.java.simpleName) as? SpecialCatalogFragment + mSpecialCatalogFragment = childFragmentManager.findFragmentByTag(SpecialCatalogFragment::class.java.name) as? SpecialCatalogFragment ?: SpecialCatalogFragment() mSpecialCatalogFragment?.arguments = bundleOf( EntranceConsts.KEY_IS_CATEGORY_V2 to false, @@ -128,16 +128,16 @@ class CatalogFragment : LazyFragment() { EntranceConsts.KEY_EXPOSURE_SOURCE to arguments?.getParcelable( EntranceConsts.KEY_EXPOSURE_SOURCE) ) - childFragmentManager.beginTransaction().replace(R.id.container_sub_catalog, mSpecialCatalogFragment!!, SpecialCatalogFragment::class.java.simpleName).commitAllowingStateLoss() + childFragmentManager.beginTransaction().replace(R.id.container_sub_catalog, mSpecialCatalogFragment!!, SpecialCatalogFragment::class.java.name).commitAllowingStateLoss() } else { - mSubCatalogFragment = childFragmentManager.findFragmentByTag(SubCatalogFragment::class.java.simpleName) as? SubCatalogFragment + mSubCatalogFragment = childFragmentManager.findFragmentByTag(SubCatalogFragment::class.java.name) as? SubCatalogFragment ?: SubCatalogFragment() mSubCatalogFragment?.arguments = bundleOf( EntranceConsts.KEY_CATALOG_ID to id, EntranceConsts.KEY_PRIMARY_CATALOG_ID to subCatalog[selectedCatalogPosition].id, EntranceConsts.KEY_CATALOG_TITLE to mCatalogTitle ) - childFragmentManager.beginTransaction().replace(R.id.container_sub_catalog, mSubCatalogFragment!!, SubCatalogFragment::class.java.simpleName).commitAllowingStateLoss() + childFragmentManager.beginTransaction().replace(R.id.container_sub_catalog, mSubCatalogFragment!!, SubCatalogFragment::class.java.name).commitAllowingStateLoss() } } } @@ -170,7 +170,7 @@ class CatalogFragment : LazyFragment() { private fun changeToSubCatalogFragment(position: Int) { mEntity?.run { mSubCatalogFragment = - childFragmentManager.findFragmentByTag(SubCatalogFragment::class.java.simpleName) as? SubCatalogFragment + childFragmentManager.findFragmentByTag(SubCatalogFragment::class.java.name) as? SubCatalogFragment ?: SubCatalogFragment() mSubCatalogFragment?.arguments = bundleOf( EntranceConsts.KEY_CATALOG_ID to id, @@ -180,7 +180,7 @@ class CatalogFragment : LazyFragment() { childFragmentManager.beginTransaction().replace( R.id.container_sub_catalog, mSubCatalogFragment!!, - SubCatalogFragment::class.java.simpleName + SubCatalogFragment::class.java.name ).commitAllowingStateLoss() } } @@ -188,7 +188,7 @@ class CatalogFragment : LazyFragment() { private fun changeToSpecialCatalogFragment() { mEntity?.run { mSpecialCatalogFragment = - childFragmentManager.findFragmentByTag(SpecialCatalogFragment::class.java.simpleName) as? SpecialCatalogFragment + childFragmentManager.findFragmentByTag(SpecialCatalogFragment::class.java.name) as? SpecialCatalogFragment ?: SpecialCatalogFragment() mSpecialCatalogFragment?.arguments = bundleOf( EntranceConsts.KEY_IS_CATEGORY_V2 to false, @@ -201,7 +201,7 @@ class CatalogFragment : LazyFragment() { childFragmentManager.beginTransaction().replace( R.id.container_sub_catalog, mSpecialCatalogFragment!!, - SpecialCatalogFragment::class.java.simpleName + SpecialCatalogFragment::class.java.name ).commitAllowingStateLoss() } } diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt index c7cd8414e9..f8d25cbe8d 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt @@ -301,7 +301,7 @@ class CategoryV2Fragment : LazyFragment() { private fun initSpecialCatalogFragment() { mEntity?.run { mSpecialCatalogFragment = childFragmentManager - .findFragmentByTag(SpecialCatalogFragment::class.java.simpleName) + .findFragmentByTag(SpecialCatalogFragment::class.java.name) as? SpecialCatalogFragment ?: SpecialCatalogFragment() mSpecialCatalogFragment?.arguments = bundleOf( EntranceConsts.KEY_IS_CATEGORY_V2 to true, @@ -315,7 +315,7 @@ class CategoryV2Fragment : LazyFragment() { .replace( R.id.gamesContainer, mSpecialCatalogFragment!!, - SpecialCatalogFragment::class.java.simpleName + SpecialCatalogFragment::class.java.name ) .commitAllowingStateLoss() } @@ -325,7 +325,7 @@ class CategoryV2Fragment : LazyFragment() { mEntity?.run { mViewModel?.run { mCategoryV2ListFragment = childFragmentManager - .findFragmentByTag(CategoryV2ListFragment::class.java.simpleName) + .findFragmentByTag(CategoryV2ListFragment::class.java.name) as? CategoryV2ListFragment ?: CategoryV2ListFragment() mCategoryV2ListFragment?.arguments = bundleOf( EntranceConsts.KEY_CATEGORY_ID to id, @@ -339,7 +339,7 @@ class CategoryV2Fragment : LazyFragment() { .replace( R.id.gamesContainer, mCategoryV2ListFragment!!, - CategoryV2ListFragment::class.java.simpleName + CategoryV2ListFragment::class.java.name ) .commitAllowingStateLoss() } @@ -354,7 +354,7 @@ class CategoryV2Fragment : LazyFragment() { if (hasSpecial) { if (selectedCategoryPosition == 0) { mCategoryV2ListFragment = childFragmentManager - .findFragmentByTag(CategoryV2ListFragment::class.java.simpleName) + .findFragmentByTag(CategoryV2ListFragment::class.java.name) as? CategoryV2ListFragment ?: CategoryV2ListFragment() mCategoryV2ListFragment?.arguments = bundleOf( EntranceConsts.KEY_CATEGORY_ID to id, @@ -365,14 +365,14 @@ class CategoryV2Fragment : LazyFragment() { ) childFragmentManager .beginTransaction() - .replace(R.id.gamesContainer, mCategoryV2ListFragment!!, CategoryV2ListFragment::class.java.simpleName) + .replace(R.id.gamesContainer, mCategoryV2ListFragment!!, CategoryV2ListFragment::class.java.name) .commitAllowingStateLoss() } else { if (position == 0) { removeGuide() mSpecialCatalogFragment = childFragmentManager - .findFragmentByTag(SpecialCatalogFragment::class.java.simpleName) + .findFragmentByTag(SpecialCatalogFragment::class.java.name) as? SpecialCatalogFragment ?: SpecialCatalogFragment() mSpecialCatalogFragment?.arguments = bundleOf( EntranceConsts.KEY_IS_CATEGORY_V2 to true, @@ -383,7 +383,7 @@ class CategoryV2Fragment : LazyFragment() { ) childFragmentManager .beginTransaction() - .replace(R.id.gamesContainer, mSpecialCatalogFragment!!, SpecialCatalogFragment::class.java.simpleName) + .replace(R.id.gamesContainer, mSpecialCatalogFragment!!, SpecialCatalogFragment::class.java.name) .commitAllowingStateLoss() } else { if (mCategoryV2ListFragment?.isStateSaved == false) { diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt index 8ce4e6000e..f3a21e1eaa 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt @@ -23,10 +23,10 @@ class ForumDetailActivity : BaseActivity() { DisplayUtils.transparentStatusBar(this) - mContainerFragment = supportFragmentManager.findFragmentByTag(ForumDetailFragment::class.java.simpleName) + mContainerFragment = supportFragmentManager.findFragmentByTag(ForumDetailFragment::class.java.name) ?: ForumDetailFragment().with(intent.extras) // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移 - supportFragmentManager.beginTransaction().replace(R.id.placeholder, mContainerFragment!!, ForumDetailFragment::class.java.simpleName).commitAllowingStateLoss() + supportFragmentManager.beginTransaction().replace(R.id.placeholder, mContainerFragment!!, ForumDetailFragment::class.java.name).commitAllowingStateLoss() } override fun getBusinessId(): Pair { diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchActivity.kt index d36648242b..8a135cc0b3 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumOrUserSearchActivity.kt @@ -73,23 +73,23 @@ class ForumOrUserSearchActivity : SearchActivity() { val transaction = supportFragmentManager.beginTransaction() when (type) { DisplayType.DEFAULT -> { - val fragment = supportFragmentManager.findFragmentByTag(SearchDefaultFragment::class.java.simpleName) + val fragment = supportFragmentManager.findFragmentByTag(SearchDefaultFragment::class.java.name) ?: ForumOrUserSearchDefaultFragment() fragment.arguments = intent.extras - transaction.replace(R.id.search_result, fragment, SearchDefaultFragment::class.java.simpleName) + transaction.replace(R.id.search_result, fragment, SearchDefaultFragment::class.java.name) } else -> { if (mEntrance == "论坛首页") { - val fragment = supportFragmentManager.findFragmentByTag(ForumOrUserSearchFragment::class.java.simpleName) as? ForumOrUserSearchFragment + val fragment = supportFragmentManager.findFragmentByTag(ForumOrUserSearchFragment::class.java.name) as? ForumOrUserSearchFragment ?: ForumOrUserSearchFragment() fragment.setSearchKey(mSearchKey ?: "") - transaction.replace(R.id.search_result, fragment, ForumOrUserSearchFragment::class.java.simpleName) + transaction.replace(R.id.search_result, fragment, ForumOrUserSearchFragment::class.java.name) } else { - val fragment = supportFragmentManager.findFragmentByTag(ForumContentSearchListFragment::class.java.simpleName) as? ForumContentSearchListFragment + val fragment = supportFragmentManager.findFragmentByTag(ForumContentSearchListFragment::class.java.name) as? ForumContentSearchListFragment ?: ForumContentSearchListFragment() fragment.setSearchKey(mSearchKey ?: "") fragment.arguments = intent.extras - transaction.replace(R.id.search_result, fragment, ForumContentSearchListFragment::class.java.simpleName) + transaction.replace(R.id.search_result, fragment, ForumContentSearchListFragment::class.java.name) } } } diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt index 5010aabfb1..ac9c75fa16 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt @@ -94,7 +94,7 @@ class ColumnCollectionDetailFragment : LazyListFragment { mGamesCollectionFragment = - childFragmentManager.findFragmentByTag(UserPlayedGameFragment::class.java.simpleName) as? GamesCollectionFragment + childFragmentManager.findFragmentByTag(UserPlayedGameFragment::class.java.name) as? GamesCollectionFragment ?: GamesCollectionFragment() mGamesCollectionFragment?.arguments = bundleOf(KEY_USER_ID to mUserId, KEY_TYPE to GamesCollectionFragment.TYPE_USER) childFragmentManager.beginTransaction() - .replace(R.id.contentContainer, mGamesCollectionFragment!!, GamesCollectionFragment::class.java.simpleName) + .replace(R.id.contentContainer, mGamesCollectionFragment!!, GamesCollectionFragment::class.java.name) .commitAllowingStateLoss() } TYPE_PLAYED_GAME -> { - mPlayedGameFragment = childFragmentManager.findFragmentByTag(UserPlayedGameFragment::class.java.simpleName) as? UserPlayedGameFragment + mPlayedGameFragment = childFragmentManager.findFragmentByTag(UserPlayedGameFragment::class.java.name) as? UserPlayedGameFragment ?: UserPlayedGameFragment() mPlayedGameFragment?.arguments = bundleOf(KEY_USER_ID to mUserId) childFragmentManager.beginTransaction() - .replace(R.id.contentContainer, mPlayedGameFragment!!, UserPlayedGameFragment::class.java.simpleName).commitAllowingStateLoss() + .replace(R.id.contentContainer, mPlayedGameFragment!!, UserPlayedGameFragment::class.java.name).commitAllowingStateLoss() } else -> { mCommentFragment = - childFragmentManager.findFragmentByTag(UserCommentHistoryFragment::class.java.simpleName) as? UserCommentHistoryFragment + childFragmentManager.findFragmentByTag(UserCommentHistoryFragment::class.java.name) as? UserCommentHistoryFragment ?: UserCommentHistoryFragment() mCommentFragment?.arguments = bundleOf(KEY_USER_ID to mUserId) childFragmentManager.beginTransaction() - .replace(R.id.contentContainer, mCommentFragment!!, UserCommentHistoryFragment::class.java.simpleName).commitAllowingStateLoss() + .replace(R.id.contentContainer, mCommentFragment!!, UserCommentHistoryFragment::class.java.name).commitAllowingStateLoss() } } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt index 1eb3a5421d..b2c87f3ffb 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt @@ -64,7 +64,7 @@ class CommentActivity : BaseActivity() { setResult(Activity.RESULT_OK, resultIntent) } } - var commentFragment = supportFragmentManager.findFragmentByTag(NewCommentFragment::class.java.simpleName) + var commentFragment = supportFragmentManager.findFragmentByTag(NewCommentFragment::class.java.name) if (commentFragment != null) { if (commentFragment is NewCommentFragment) { commentFragment.setCommentListener(commentCallback) @@ -139,7 +139,7 @@ class CommentActivity : BaseActivity() { } supportFragmentManager.beginTransaction() - .replace(R.id.answerCommentPlaceholderView, commentFragment!!, NewCommentFragment::class.java.simpleName).commitNowAllowingStateLoss() + .replace(R.id.answerCommentPlaceholderView, commentFragment!!, NewCommentFragment::class.java.name).commitNowAllowingStateLoss() mBinding.maskView.alpha = 0f if (!isStairsComment) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseActivityDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseActivityDialogFragment.kt index 9e3508a024..5f3f26859b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseActivityDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseActivityDialogFragment.kt @@ -32,10 +32,10 @@ class ChooseActivityDialogFragment : BaseDialogFragment() { super.onViewCreated(view, savedInstanceState) mLastSelectActivityId = requireArguments().getString(TAG_ACTIVITY_ID) ?: "" val beginTransaction = childFragmentManager.beginTransaction() - val fragment = childFragmentManager.findFragmentByTag(VideoLabelFragment::class.java.simpleName) as? VideoLabelFragment + val fragment = childFragmentManager.findFragmentByTag(VideoLabelFragment::class.java.name) as? VideoLabelFragment ?: VideoLabelFragment() fragment.arguments = arguments - beginTransaction.replace(binding.container.id, fragment, VideoLabelFragment::class.java.simpleName) + beginTransaction.replace(binding.container.id, fragment, VideoLabelFragment::class.java.name) beginTransaction.commitAllowingStateLoss() binding.confirmTv.setOnClickListener { val activityLabelEntity = fragment.getSelectedActivity() diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt index 1666f5587f..500c972a26 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt @@ -91,12 +91,12 @@ class ChooseForumActivity : BaseActivity() { if (mSearchResultFragment == null || mSearchResultFragment?.isAdded == false) { val beginTransaction = supportFragmentManager.beginTransaction() mSearchResultFragment = - supportFragmentManager.findFragmentByTag(ChooseForumContainerFragment::class.java.simpleName) as? ChooseForumContainerFragment + supportFragmentManager.findFragmentByTag(ChooseForumContainerFragment::class.java.name) as? ChooseForumContainerFragment ?: ChooseForumContainerFragment.getInstance(ChooseForumContainerFragment.ChooseForumType.SEARCH) as ChooseForumContainerFragment beginTransaction.replace( binding.searchResultContainer.id, mSearchResultFragment!!, - ChooseForumContainerFragment::class.java.simpleName + ChooseForumContainerFragment::class.java.name ) beginTransaction.commitAllowingStateLoss() } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt index ad48b6f33c..d776c7e3f2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/PreviewVideoActivity.kt @@ -18,10 +18,10 @@ class PreviewVideoActivity : BaseActivity() { super.onCreate(savedInstanceState) DisplayUtils.transparentStatusBar(this) - val containerFragment = supportFragmentManager.findFragmentByTag(PreviewVideoFragment::class.java.simpleName) + val containerFragment = supportFragmentManager.findFragmentByTag(PreviewVideoFragment::class.java.name) ?: PreviewVideoFragment().with(intent.extras) // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移 - supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment, PreviewVideoFragment::class.java.simpleName).commitAllowingStateLoss() + supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment, PreviewVideoFragment::class.java.name).commitAllowingStateLoss() } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt index 97b56f9d10..521b6d8851 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt @@ -22,10 +22,10 @@ class ForumVideoDetailActivity : BaseActivity() { super.onCreate(savedInstanceState) DisplayUtils.transparentStatusBar(this) - containerFragment = supportFragmentManager.findFragmentByTag(ForumVideoDetailFragment::class.java.simpleName) + containerFragment = supportFragmentManager.findFragmentByTag(ForumVideoDetailFragment::class.java.name) ?: ForumVideoDetailFragment().with(intent.extras) // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移 - supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment!!, ForumVideoDetailFragment::class.java.simpleName) + supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment!!, ForumVideoDetailFragment::class.java.name) .commitAllowingStateLoss() } diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt index c6155ad934..f301144103 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt @@ -69,10 +69,10 @@ class GameServersPublishFragment : LazyFragment() { val bundle = arguments bundle?.putString(EntranceConsts.KEY_TYPE, "开服") - mContentFragment = childFragmentManager.findFragmentByTag(GameServersContentFragment::class.java.simpleName) as? GameServersContentFragment + mContentFragment = childFragmentManager.findFragmentByTag(GameServersContentFragment::class.java.name) as? GameServersContentFragment ?: GameServersContentFragment() mContentFragment.arguments = bundle - childFragmentManager.beginTransaction().replace(R.id.layout_fragment_content, mContentFragment, GameServersContentFragment::class.java.simpleName).commitAllowingStateLoss() + childFragmentManager.beginTransaction().replace(R.id.layout_fragment_content, mContentFragment, GameServersContentFragment::class.java.name).commitAllowingStateLoss() loadServerFilterTag() } diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.kt index bc9ee8a423..c8539d0f55 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.kt @@ -70,17 +70,17 @@ class SubjectFragment : LazyFragment() { val tag: String val fragment: Fragment = when { "tile" == entity.typeEntity.layout -> { - tag = SubjectTileFragment::class.java.simpleName + tag = SubjectTileFragment::class.java.name childFragmentManager.findFragmentByTag(tag) ?: SubjectTileFragment() } "rows" == entity.typeEntity.layout -> { - tag = SubjectRowsFragment::class.java.simpleName + tag = SubjectRowsFragment::class.java.name childFragmentManager.findFragmentByTag(tag) ?: SubjectRowsFragment() } else -> { - tag = SubjectTabFragment::class.java.simpleName + tag = SubjectTabFragment::class.java.name childFragmentManager.findFragmentByTag(tag) ?: SubjectTabFragment() } diff --git a/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt index 0f46ae0eb1..dbbd4c0525 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt @@ -52,10 +52,10 @@ class SubjectRowsFragment : BaseFragment() { createLabelsLayout() createFilterLayout() - mListFragment = childFragmentManager.findFragmentByTag(SubjectListFragment::class.java.simpleName) as? SubjectListFragment + mListFragment = childFragmentManager.findFragmentByTag(SubjectListFragment::class.java.name) as? SubjectListFragment ?: SubjectListFragment() mListFragment.arguments = arguments - childFragmentManager.beginTransaction().replace(R.id.rows_list_container, mListFragment, SubjectListFragment::class.java.simpleName) + childFragmentManager.beginTransaction().replace(R.id.rows_list_container, mListFragment, SubjectListFragment::class.java.name) .commitAllowingStateLoss() } diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt index c145469c4b..1085aa7d89 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt @@ -17,10 +17,10 @@ class TeenagerModeActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) updateStatusBarColor(R.color.background_white, R.color.background_white) - mContainerFragment = supportFragmentManager.findFragmentByTag(TeenagerModeFragment::class.java.simpleName) + mContainerFragment = supportFragmentManager.findFragmentByTag(TeenagerModeFragment::class.java.name) ?: TeenagerModeFragment().with(intent.extras) if (mContainerFragment?.isAdded == false) { - supportFragmentManager.beginTransaction().replace(R.id.placeholder, mContainerFragment!!, TeenagerModeFragment::class.java.simpleName).commitAllowingStateLoss() + supportFragmentManager.beginTransaction().replace(R.id.placeholder, mContainerFragment!!, TeenagerModeFragment::class.java.name).commitAllowingStateLoss() } } diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt index 1f6cb18b27..547881c09d 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt @@ -38,11 +38,11 @@ class TeenagerModeFragment : ToolbarFragment() { mBinding?.include?.normalToolbar?.setBackgroundColor(Color.TRANSPARENT) mBinding?.switchTv?.setOnClickListener { if (!ClickUtils.isFastDoubleClick(R.id.switchTv)) { - val mContainerFragment = requireActivity().supportFragmentManager.findFragmentByTag(PasswordSettingFragment::class.java.simpleName) + val mContainerFragment = requireActivity().supportFragmentManager.findFragmentByTag(PasswordSettingFragment::class.java.name) ?: PasswordSettingFragment().with(bundle) requireActivity().supportFragmentManager.beginTransaction().run { addToBackStack(null) - add(R.id.placeholder, mContainerFragment!!, PasswordSettingFragment::class.java.simpleName).commitAllowingStateLoss() + add(R.id.placeholder, mContainerFragment!!, PasswordSettingFragment::class.java.name).commitAllowingStateLoss() } } } @@ -72,11 +72,11 @@ class TeenagerModeFragment : ToolbarFragment() { mBinding?.switchTv?.layoutParams = (mBinding?.switchTv?.layoutParams as ConstraintLayout.LayoutParams).apply { setMargins(0, 0, 0, 68F.dip2px()) } mBinding?.changePwdTv?.setOnClickListener { val bundle = Bundle().apply { putString(TeenagerModeActivity.TYPE, TeenagerModeActivity.TYPE_CHANGE_PWD) } - val mContainerFragment = requireActivity().supportFragmentManager.findFragmentByTag(PasswordSettingFragment::class.java.simpleName) + val mContainerFragment = requireActivity().supportFragmentManager.findFragmentByTag(PasswordSettingFragment::class.java.name) ?: PasswordSettingFragment().with(bundle) requireActivity().supportFragmentManager.beginTransaction().run { addToBackStack(null) - add(R.id.placeholder, mContainerFragment!!, PasswordSettingFragment::class.java.simpleName).commitAllowingStateLoss() + add(R.id.placeholder, mContainerFragment!!, PasswordSettingFragment::class.java.name).commitAllowingStateLoss() } } } diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt index 4e1c172c6b..86c34ad4bd 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataActivity.kt @@ -15,10 +15,10 @@ class VideoDataActivity : BaseActivity() { DisplayUtils.transparentStatusBar(this) - val containerFragment = supportFragmentManager.findFragmentByTag(VideoDataFragment::class.java.simpleName) + val containerFragment = supportFragmentManager.findFragmentByTag(VideoDataFragment::class.java.name) ?: VideoDataFragment().with(intent.extras) // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移 - supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment, VideoDataFragment::class.java.simpleName) + supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment, VideoDataFragment::class.java.name) .commitAllowingStateLoss() } diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt index c06cc5ce85..ca1ea8c142 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailActivity.kt @@ -22,10 +22,10 @@ class VideoDetailActivity : BaseActivity() { val extras = intent.extras extras?.putString("uuid", uuid.toString()) - mContainerFragment = supportFragmentManager.findFragmentByTag(HomeVideoFragment::class.java.simpleName) as? HomeVideoFragment + mContainerFragment = supportFragmentManager.findFragmentByTag(HomeVideoFragment::class.java.name) as? HomeVideoFragment ?: HomeVideoFragment().with(extras) as HomeVideoFragment - supportFragmentManager.beginTransaction().replace(R.id.layout_activity_content, mContainerFragment!!, HomeVideoFragment::class.java.simpleName).commitNowAllowingStateLoss() + supportFragmentManager.beginTransaction().replace(R.id.layout_activity_content, mContainerFragment!!, HomeVideoFragment::class.java.name).commitNowAllowingStateLoss() } override fun handleBackPressed(): Boolean { diff --git a/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt b/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt index 21b67add2a..bedec06355 100644 --- a/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt @@ -23,11 +23,11 @@ class PosterClipActivity : ToolBarActivity() { setNavigationTitle("剪辑封面") val videoPath = intent.getStringExtra(EntranceConsts.KEY_PATH_VIDEO) - val fragment = supportFragmentManager.findFragmentByTag(VideoPosterFragment::class.java.simpleName) as? VideoPosterFragment + val fragment = supportFragmentManager.findFragmentByTag(VideoPosterFragment::class.java.name) as? VideoPosterFragment ?: VideoPosterFragment.newInstance(videoPath, null) supportFragmentManager .beginTransaction() - .replace(R.id.layout_fragment_content, fragment, VideoPosterFragment::class.java.simpleName) + .replace(R.id.layout_fragment_content, fragment, VideoPosterFragment::class.java.name) .commitAllowingStateLoss() findViewById(R.id.menu_next).setOnClickListener { diff --git a/libraries/Matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java b/libraries/Matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java index 34a510034d..31c029405f 100644 --- a/libraries/Matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java +++ b/libraries/Matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java @@ -26,13 +26,6 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; - -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - import android.view.MenuItem; import android.view.View; import android.view.Window; @@ -40,6 +33,12 @@ import android.widget.AdapterView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.Fragment; + import com.zhihu.matisse.R; import com.zhihu.matisse.filter.ApplyFilter; import com.zhihu.matisse.internal.entity.Album; @@ -237,7 +236,7 @@ public class MatisseActivity extends AppCompatActivity implements } else { mSelectedCollection.overwrite(selected, collectionType); Fragment mediaSelectionFragment = getSupportFragmentManager().findFragmentByTag( - MediaSelectionFragment.class.getSimpleName()); + MediaSelectionFragment.class.getName()); if (mediaSelectionFragment instanceof MediaSelectionFragment) { ((MediaSelectionFragment) mediaSelectionFragment).refreshMediaGrid(); } @@ -433,7 +432,7 @@ public class MatisseActivity extends AppCompatActivity implements fragment = MediaSelectionFragment.newInstance(album); getSupportFragmentManager() .beginTransaction() - .add(R.id.container, fragment, MediaSelectionFragment.class.getSimpleName()) + .add(R.id.container, fragment, MediaSelectionFragment.class.getName()) .commitAllowingStateLoss(); } }