Skip to content

fix(upload-list): load list on resume #17249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alperozturk96 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −10
Open

fix(upload-list): load list on resume #17249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ class UploadListActivity :

swipeListRefreshLayout?.let { viewThemeUtils.androidx.themeSwipeRefreshLayout(it) }
swipeListRefreshLayout?.setOnRefreshListener { this.refresh() }
loadItems()
}

private fun setupEmptyList() {
Expand Down Expand Up @@ -269,6 +268,7 @@ class UploadListActivity :
binding?.autoUploadBatterySaverWarningCard?.let {
uploadWarningCard?.bind(it)
}
loadItems()
}

override fun onRemoteOperationFinish(operation: RemoteOperation<*>?, result: RemoteOperationResult<*>) {
Expand Down Expand Up @@ -372,7 +372,7 @@ class UploadListActivity :
private fun showConflictSnackbar(messageId: Int) {
conflictSnackbar?.apply {
setText(messageId)
setDuration(Snackbar.LENGTH_LONG)
duration = Snackbar.LENGTH_LONG
show()
}
}
Expand All @@ -391,11 +391,9 @@ class UploadListActivity :
companion object {
private val TAG: String = UploadListActivity::class.java.getSimpleName()

fun createIntent(file: OCFile?, user: User?, flag: Int?, context: Context?): Intent =
fun createIntent(file: OCFile?, user: User?, flag: Int, context: Context): Intent =
Intent(context, UploadListActivity::class.java).apply {
if (flag != null) {
setFlags(flags or flag)
}
setFlags(flags or flag)
putExtra(EXTRA_FILE, file)
putExtra(EXTRA_USER, user)
}
Expand Down
8 changes: 4 additions & 4 deletions ...rc/main/java/com/owncloud/android/ui/adapter/uploadList/helper/UploadListAdapterHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class UploadListAdapterHelper(private val activity: FileActivity) {
file.setStoragePath(upload.localPath)
val user = activity.accountManager.getUser(upload.accountName)
if (user.isPresent) {
val intent = ConflictsResolveActivity.Companion.createIntent(
val intent = ConflictsResolveActivity.createIntent(
file,
user.get(),
upload.uploadId,
Expand Down Expand Up @@ -61,16 +61,16 @@ class UploadListAdapterHelper(private val activity: FileActivity) {
}

val optionalUser = activity.user
if (PreviewImageFragment.Companion.canBePreviewed(file) && optionalUser.isPresent) {
if (PreviewImageFragment.canBePreviewed(file) && optionalUser.isPresent) {
// show image preview and stay in uploads tab
val intent = FileDisplayActivity.Companion.openFileIntent(activity, optionalUser.get(), file)
val intent = FileDisplayActivity.openFileIntent(activity, optionalUser.get(), file)
activity.startActivity(intent)
return
}

val intent = Intent(activity, FileDisplayActivity::class.java).apply {
setAction(Intent.ACTION_VIEW)
putExtra(FileDisplayActivity.Companion.KEY_FILE_PATH, upload.remotePath)
putExtra(FileDisplayActivity.KEY_FILE_PATH, upload.remotePath)
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
}
activity.startActivity(intent)
Expand Down
Loading