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

Fixed null ptr issue on changing modes

Browse source
This commit is contained in:
Kanahia 2024-07-11 17:16:18 +05:30
parent 0051dcc9c0
commit ca1bf88127
1 changed files with 67 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,13 +95,20 @@ class UploadProgressActivity : BaseActivity() {
} }
fun updateMenuItems(currentPosition: Int) { fun updateMenuItems(currentPosition: Int) {
if (menu != null) {
menu!!.clear() menu!!.clear()
if (currentPosition == 0) { if (currentPosition == 0) {
if (isPendingIconsVisible){ if (isPendingIconsVisible) {
if (!isPaused){ if (!isPaused) {
if (menu!!.findItem(R.id.pause_icon) == null) { if (menu!!.findItem(R.id.pause_icon) == null) {
menu!!.add(Menu.NONE, R.id.pause_icon, Menu.NONE, getString(R.string.pause)) menu!!.add(
.setIcon(android.R.drawable.ic_media_pause).setOnMenuItemClickListener { Menu.NONE,
R.id.pause_icon,
Menu.NONE,
getString(R.string.pause)
)
.setIcon(android.R.drawable.ic_media_pause)
.setOnMenuItemClickListener {
pendingUploadsFragment!!.pauseUploads() pendingUploadsFragment!!.pauseUploads()
setPausedIcon(true) setPausedIcon(true)
true true
@ -109,17 +116,29 @@ class UploadProgressActivity : BaseActivity() {
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
if (menu!!.findItem(R.id.cancel_icon) == null) { if (menu!!.findItem(R.id.cancel_icon) == null) {
menu!!.add(Menu.NONE, R.id.cancel_icon, Menu.NONE, getString(R.string.cancel)) menu!!.add(
.setIcon(android.R.drawable.ic_menu_close_clear_cancel).setOnMenuItemClickListener { Menu.NONE,
R.id.cancel_icon,
Menu.NONE,
getString(R.string.cancel)
)
.setIcon(android.R.drawable.ic_menu_close_clear_cancel)
.setOnMenuItemClickListener {
pendingUploadsFragment!!.deleteUploads() pendingUploadsFragment!!.deleteUploads()
true true
} }
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
}else{ } else {
if (menu!!.findItem(R.id.resume_icon) == null) { if (menu!!.findItem(R.id.resume_icon) == null) {
menu!!.add(Menu.NONE, R.id.resume_icon, Menu.NONE, getString(R.string.resume)) menu!!.add(
.setIcon(android.R.drawable.ic_media_play).setOnMenuItemClickListener { Menu.NONE,
R.id.resume_icon,
Menu.NONE,
getString(R.string.resume)
)
.setIcon(android.R.drawable.ic_media_play)
.setOnMenuItemClickListener {
pendingUploadsFragment!!.restartUploads() pendingUploadsFragment!!.restartUploads()
setPausedIcon(false) setPausedIcon(false)
true true
@ -129,7 +148,7 @@ class UploadProgressActivity : BaseActivity() {
} }
} }
} else if (currentPosition == 1) { } else if (currentPosition == 1) {
if (isErrorIconsVisisble){ if (isErrorIconsVisisble) {
if (menu!!.findItem(R.id.retry_icon) == null) { if (menu!!.findItem(R.id.retry_icon) == null) {
menu!!.add(Menu.NONE, R.id.retry_icon, Menu.NONE, getString(R.string.retry)) menu!!.add(Menu.NONE, R.id.retry_icon, Menu.NONE, getString(R.string.retry))
.setIcon(R.drawable.ic_refresh_white_24dp).setOnMenuItemClickListener { .setIcon(R.drawable.ic_refresh_white_24dp).setOnMenuItemClickListener {
@ -139,8 +158,14 @@ class UploadProgressActivity : BaseActivity() {
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
if (menu!!.findItem(R.id.cancel_icon) == null) { if (menu!!.findItem(R.id.cancel_icon) == null) {
menu!!.add(Menu.NONE, R.id.cancel_icon, Menu.NONE, getString(R.string.cancel)) menu!!.add(
.setIcon(android.R.drawable.ic_menu_close_clear_cancel).setOnMenuItemClickListener { Menu.NONE,
R.id.cancel_icon,
Menu.NONE,
getString(R.string.cancel)
)
.setIcon(android.R.drawable.ic_menu_close_clear_cancel)
.setOnMenuItemClickListener {
failedUploadsFragment!!.deleteUploads() failedUploadsFragment!!.deleteUploads()
true true
} }
@ -149,6 +174,7 @@ class UploadProgressActivity : BaseActivity() {
} }
} }
} }
}
fun hidePendingIcons() { fun hidePendingIcons() {
isPendingIconsVisible = false isPendingIconsVisible = false