Merge pull request #1906 from nextcloud/notificationManager

Get notification manager if it does not exist
This commit is contained in:
Tobias Kaminsky 2018-01-05 13:11:17 +01:00 committed by GitHub
commit 026241a3af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1158,7 +1158,11 @@ public class FileUploader extends Service
private void notifyUploadResult(UploadFileOperation upload, private void notifyUploadResult(UploadFileOperation upload,
RemoteOperationResult uploadResult) { RemoteOperationResult uploadResult) {
Log_OC.d(TAG, "NotifyUploadResult with resultCode: " + uploadResult.getCode()); Log_OC.d(TAG, "NotifyUploadResult with resultCode: " + uploadResult.getCode());
// / cancelled operation or success -> silent removal of progress notification // cancelled operation or success -> silent removal of progress notification
if (mNotificationManager == null) {
mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
}
mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker); mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker);
// Show the result: success or fail notification // Show the result: success or fail notification