Skip to content

fix a NPE #2781

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
davigonz merged 1 commit into from
Feb 6, 2020
Merged

fix a NPE #2781

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
15 changes: 8 additions & 7 deletions owncloudApp/src/main/java/com/owncloud/android/files/services/FileUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public class FileUploader extends Service
//since there can be only one instance of an Android service, there also just one db connection.
private UploadsStorageManager mUploadsStorageManager = null;

private IndexedForest<UploadFileOperation> mPendingUploads = new IndexedForest<UploadFileOperation>();
private IndexedForest<UploadFileOperation> mPendingUploads = new IndexedForest<>();

private LocalBroadcastManager mLocalBroadcastManager;

Expand Down Expand Up @@ -565,7 +565,7 @@ public class FileUploaderBinder extends Binder implements OnDatatransferProgress
* {@link FileUploaderBinder} instance
*/
private Map<String, WeakReference<OnDatatransferProgressListener>> mBoundListeners =
new HashMap<String, WeakReference<OnDatatransferProgressListener>>();
new HashMap<>();

/**
* Cancels a pending or current upload of a remote file.
Expand Down Expand Up @@ -873,7 +873,7 @@ public void uploadFile(String uploadKey) {
);
}

if (!uploadResult.isSuccess()) {
if (uploadResult != null && !uploadResult.isSuccess()) {
TransferRequester requester = new TransferRequester();
int jobId = mPendingUploads.buildKey(
mCurrentAccount.name,
Expand Down Expand Up @@ -917,10 +917,11 @@ public void uploadFile(String uploadKey) {
Timber.v(stringToLog);
}

mUploadsStorageManager.updateDatabaseUploadResult(uploadResult, mCurrentUpload);

/// notify result
notifyUploadResult(mCurrentUpload, uploadResult);
if (uploadResult != null) {
mUploadsStorageManager.updateDatabaseUploadResult(uploadResult, mCurrentUpload);
/// notify result
notifyUploadResult(mCurrentUpload, uploadResult);
}

sendBroadcastUploadFinished(mCurrentUpload, uploadResult, removeResult.second);
}
Expand Down