mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix:safely retrieve fragments to prevent stale references after rotation

Browse source
This commit is contained in:
Kota-Jagadeesh 2025-10-19 23:02:21 +05:30
parent 8352bc5925
commit 38cd528fc7
1 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

45
app/src/main/java/fr/free/nrw/commons/upload/UploadProgressActivity.kt
View file

@ -21,8 +21,6 @@ import javax.inject.Inject
*/ */
class UploadProgressActivity : BaseActivity() { class UploadProgressActivity : BaseActivity() {
private lateinit var binding: ActivityUploadProgressBinding private lateinit var binding: ActivityUploadProgressBinding
private var pendingUploadsFragment: PendingUploadsFragment? = null
private var failedUploadsFragment: FailedUploadsFragment? = null
var viewPagerAdapter: ViewPagerAdapter? = null var viewPagerAdapter: ViewPagerAdapter? = null
var menu: Menu? = null var menu: Menu? = null
@ -68,18 +66,37 @@ class UploadProgressActivity : BaseActivity() {
setTabs() setTabs()
} }
private fun getPendingUploadsFragment(): PendingUploadsFragment? {
return supportFragmentManager.findFragmentByTag(
"android:switcher:${R.id.upload_progress_view_pager}:${0}",
) as? PendingUploadsFragment
}
// the helper to retrieve the current, non-stale FailedUploadsFragment instance.
private fun getFailedUploadsFragment(): FailedUploadsFragment? {
return supportFragmentManager.findFragmentByTag(
"android:switcher:${R.id.upload_progress_view_pager}:${1}",
) as? FailedUploadsFragment
}
/** /**
* Initializes and sets up the tabs data by creating instances of `PendingUploadsFragment` * Initializes and sets up the tabs data by creating instances of `PendingUploadsFragment`
* and `FailedUploadsFragment`, adds them to the `fragmentList`, and assigns corresponding * and `FailedUploadsFragment`, adds them to the `fragmentList`, and assigns corresponding
* titles from resources to the `titleList`. * titles from resources to the `titleList`.
*/ */
fun setTabs() { fun setTabs() {
pendingUploadsFragment = PendingUploadsFragment() val pendingUploadsFragment: Fragment
failedUploadsFragment = FailedUploadsFragment() val failedUploadsFragment: Fragment
// checks if the fragmentManager already has the fragments (after the rotation)
pendingUploadsFragment = getPendingUploadsFragment() ?: PendingUploadsFragment()
failedUploadsFragment = getFailedUploadsFragment() ?: FailedUploadsFragment()
viewPagerAdapter!!.setTabs( viewPagerAdapter!!.setTabs(
R.string.pending to pendingUploadsFragment!!, R.string.pending to pendingUploadsFragment,
R.string.failed to failedUploadsFragment!! R.string.failed to failedUploadsFragment
) )
viewPagerAdapter!!.notifyDataSetChanged() viewPagerAdapter!!.notifyDataSetChanged()
} }
@ -119,7 +136,8 @@ class UploadProgressActivity : BaseActivity() {
getString(R.string.pause), getString(R.string.pause),
).setIcon(R.drawable.pause_icon) ).setIcon(R.drawable.pause_icon)
.setOnMenuItemClickListener { .setOnMenuItemClickListener {
pendingUploadsFragment!!.pauseUploads() //retrieves the current fragment instance just before the use
getPendingUploadsFragment()?.pauseUploads()
setPausedIcon(true) setPausedIcon(true)
true true
}.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) }.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
@ -133,7 +151,8 @@ class UploadProgressActivity : BaseActivity() {
getString(R.string.cancel), getString(R.string.cancel),
).setIcon(R.drawable.ic_cancel_upload) ).setIcon(R.drawable.ic_cancel_upload)
.setOnMenuItemClickListener { .setOnMenuItemClickListener {
pendingUploadsFragment!!.deleteUploads() //retrieve the current fragment instance just before thee use
getPendingUploadsFragment()?.deleteUploads()
true true
}.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) }.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
@ -147,7 +166,8 @@ class UploadProgressActivity : BaseActivity() {
getString(R.string.resume), getString(R.string.resume),
).setIcon(R.drawable.play_icon) ).setIcon(R.drawable.play_icon)
.setOnMenuItemClickListener { .setOnMenuItemClickListener {
pendingUploadsFragment!!.restartUploads() //retrieve the current fragment instance just before the use
getPendingUploadsFragment()?.restartUploads()
setPausedIcon(false) setPausedIcon(false)
true true
}.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) }.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
@ -160,8 +180,7 @@ class UploadProgressActivity : BaseActivity() {
menu!! menu!!
.add(Menu.NONE, R.id.retry_icon, Menu.NONE, getString(R.string.retry)) .add(Menu.NONE, R.id.retry_icon, Menu.NONE, getString(R.string.retry))
.setIcon(R.drawable.ic_refresh_24dp) .setIcon(R.drawable.ic_refresh_24dp)
.setOnMenuItemClickListener { .setOnMenuItemClickListener { getFailedUploadsFragment()?.restartUploads()
failedUploadsFragment!!.restartUploads()
true true
}.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) }.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
@ -174,7 +193,7 @@ class UploadProgressActivity : BaseActivity() {
getString(R.string.cancel), getString(R.string.cancel),
).setIcon(R.drawable.ic_cancel_upload) ).setIcon(R.drawable.ic_cancel_upload)
.setOnMenuItemClickListener { .setOnMenuItemClickListener {
failedUploadsFragment!!.deleteUploads() getFailedUploadsFragment()?.deleteUploads()
true true
}.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) }.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
@ -208,4 +227,4 @@ class UploadProgressActivity : BaseActivity() {
isErrorIconsVisisble = visible isErrorIconsVisisble = visible
updateMenuItems(binding.uploadProgressViewPager.currentItem) updateMenuItems(binding.uploadProgressViewPager.currentItem)
} }
} }