Skip to content

BugFix - UploadFinishReceiver NPE #15170

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

Merged
merged 1 commit into from
Jul 18, 2025
Merged

BugFix - UploadFinishReceiver NPE #15170

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
19 changes: 12 additions & 7 deletions app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,24 +1513,28 @@ public void onReceive(Context context, Intent intent) {
}

boolean uploadWasFine = intent.getBooleanExtra(FileUploadWorker.EXTRA_UPLOAD_RESULT, false);
boolean renamedInUpload = getFile().getRemotePath().equals(intent.getStringExtra(FileUploadWorker.EXTRA_OLD_REMOTE_PATH));

boolean sameFile = getFile().getRemotePath().equals(uploadedRemotePath) || renamedInUpload;
Fragment details = getLeftFragment();
boolean renamedInUpload = false;
boolean sameFile = false;
if (getFile() != null) {
renamedInUpload = getFile().getRemotePath().equals(intent.getStringExtra(FileUploadWorker.EXTRA_OLD_REMOTE_PATH));
Copy link

@jogerj jogerj Jul 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
renamedInUpload = getFile().getRemotePath().equals(intent.getStringExtra(FileUploadWorker.EXTRA_OLD_REMOTE_PATH));
renamedInUpload = Objects.equals(getFile().getRemotePath(), intent.getStringExtra(FileUploadWorker.EXTRA_OLD_REMOTE_PATH));

Never rely on chaining equals unless you're absolutely sure one if it won't be null

sameFile = getFile().getRemotePath().equals(uploadedRemotePath) || renamedInUpload;
}

if (sameAccount && sameFile && details instanceof FileDetailFragment) {
if (sameAccount && sameFile && getLeftFragment() instanceof FileDetailFragment fileDetailFragment) {
if (uploadWasFine) {
setFile(getStorageManager().getFileByPath(uploadedRemotePath));
} else {
//TODO remove upload progress bar after upload failed.
Log_OC.d(TAG, "Remove upload progress bar after upload failed");
}
if (renamedInUpload) {
if (renamedInUpload && !TextUtils.isEmpty(uploadedRemotePath)) {
String newName = new File(uploadedRemotePath).getName();
DisplayUtils.showSnackMessage(getActivity(), R.string.filedetails_renamed_in_upload_msg, newName);
}
if (uploadWasFine || getFile().fileExists()) {
((FileDetailFragment) details).updateFileDetails(false, true);

if (uploadWasFine || getFile() != null && getFile().fileExists()) {
fileDetailFragment.updateFileDetails(false, true);
} else {
onBackPressed();
}
Expand All @@ -1546,6 +1550,7 @@ public void onReceive(Context context, Intent intent) {
// TODO what about other kind of previews?
}
}

OCFileListFragment ocFileListFragment = getListOfFilesFragment();
if (ocFileListFragment != null) {
ocFileListFragment.setLoading(false);
Expand Down
Loading