Cancel upload from notification #3563

parneet-guraya · 2024-01-08T16:37:28Z

Fix: #2374

🖼️ Screenshots

Record_2024-01-08-21-51-44.mp4

Functionality Check

Folder which is created to upload chunks gets deleted.
Due to deletion no chunks of the file are left on the server so if we try to upload the same file again it would start from beginning.
Worker which does the uploading work is cancelled.
Notification of uploading file is also cancelled.

🏁 Checklist

⛑️ Tests (unit and/or integration) are included or not needed
🔖 Capability is checked or not needed
🔙 Backport requests are created or not needed: /backport to stable-xx.x
📅 Milestone is set
🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

rapterjet2004

LGTM! 👍🏾

mahibi · 2024-01-16T12:42:44Z

i tested with 2 devices.

on one device, there is this an exception whenever i cancel the upload (progress bar stops and notification remains):

2024-01-16 13:35:34.822  7827-7871  WM-WorkerWrapper        com.nextcloud.talk2                  I  Work [ id=8379a708-ccb3-401e-b68f-d88adb5af4f2, tags={ com.nextcloud.talk.jobs.UploadAndShareFilesWorker } ] was cancelled
                                                                                                    java.util.concurrent.CancellationException: Task was cancelled.
                                                                                                    	at androidx.work.impl.utils.futures.AbstractFuture.cancellationExceptionWithCause(AbstractFuture.java:1183)
                                                                                                    	at androidx.work.impl.utils.futures.AbstractFuture.getDoneValue(AbstractFuture.java:513)
                                                                                                    	at androidx.work.impl.utils.futures.AbstractFuture.get(AbstractFuture.java:474)
                                                                                                    	at androidx.work.impl.WorkerWrapper$2.run(WorkerWrapper.java:316)
                                                                                                    	at androidx.work.impl.utils.SerialExecutorImpl$Task.run(SerialExecutorImpl.java:96)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1137)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:637)
                                                                                                    	at java.lang.Thread.run(Thread.java:1012)
2024-01-16 13:35:35.093  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  <-- 404 Not Found https://sermo.nextcloud.com/remote.php/dav/uploads/marcel2/96a8b16a8d10da74b83d12b4685898f9/0000000025600000-0000000026623999 (325ms)
2024-01-16 13:35:35.093  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  Server: nginx/1.24.0
2024-01-16 13:35:35.093  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  Date: Tue, 16 Jan 2024 12:35:34 GMT
2024-01-16 13:35:35.094  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  Content-Type: application/xml; charset=utf-8
2024-01-16 13:35:35.094  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  Transfer-Encoding: chunked
2024-01-16 13:35:35.094  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  Connection: keep-alive
2024-01-16 13:35:35.094  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  Vary: Accept-Encoding
2024-01-16 13:35:35.094  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  Expires: Thu, 19 Nov 1981 08:52:00 GMT
2024-01-16 13:35:35.095  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  Cache-Control: no-store, no-cache, must-revalidate
2024-01-16 13:35:35.095  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  Pragma: no-cache
2024-01-16 13:35:35.095  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  Content-Security-Policy: default-src 'none';
2024-01-16 13:35:35.096  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  <?xml version="1.0" encoding="utf-8"?>
2024-01-16 13:35:35.096  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
2024-01-16 13:35:35.096  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I    <s:exception>Sabre\DAV\Exception\NotFound</s:exception>
2024-01-16 13:35:35.097  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I    <s:message>File with name //96a8b16a8d10da74b83d12b4685898f9 could not be located</s:message>
2024-01-16 13:35:35.097  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  </d:error>
2024-01-16 13:35:35.097  7827-7903  okhttp.OkHttpClient     com.nextcloud.talk2                  I  <-- END HTTP (262-byte body)
2024-01-16 13:35:35.102  7827-7903  ChunkedFileUploader     com.nextcloud.talk2                  E  Something went wrong in ChunkedFileUploader
                                                                                                    at.bitfire.dav4jvm.exception.NotFoundException: HTTP 404 Not Found
                                                                                                    	at at.bitfire.dav4jvm.DavResource.checkStatus(DavResource.kt:376)
                                                                                                    	at at.bitfire.dav4jvm.DavResource.checkStatus(DavResource.kt:358)
                                                                                                    	at at.bitfire.dav4jvm.DavResource.put(DavResource.kt:262)
                                                                                                    	at at.bitfire.dav4jvm.DavResource.put$default(DavResource.kt:244)
                                                                                                    	at com.nextcloud.talk.upload.chunked.ChunkedFileUploader.uploadChunk(ChunkedFileUploader.kt:261)
                                                                                                    	at com.nextcloud.talk.upload.chunked.ChunkedFileUploader.upload(ChunkedFileUploader.kt:106)
                                                                                                    	at com.nextcloud.talk.jobs.UploadAndShareFilesWorker.doWork(UploadAndShareFilesWorker.kt:149)
                                                                                                    	at androidx.work.Worker$1.run(Worker.java:82)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1137)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:637)
                                                                                                    	at java.lang.Thread.run(Thread.java:1012)

on the other device, it works, but it's totally slow in response (however this might not be caused by this PR. starting the upload is also slow, might have to be improved by using coroutineWorker with "setExpedited")

parneet-guraya · 2024-01-16T15:11:32Z

Hi @mahibi 👋
I tested myself but couldn't reproduce the same :-( .

Device: Oneplus 9RT (Android 13)

Record_2024-01-16-20-04-45.2.mp4

Device: Google Pixel 6a (Android 13)

screen-20240116-195338.2.mp4

2024-01-16 13:35:35.102  7827-7903  ChunkedFileUploader     com.nextcloud.talk2                  E  Something went wrong in ChunkedFileUploader
                                                                                                    at.bitfire.dav4jvm.exception.NotFoundException: HTTP 404 Not Found
                                                                                                    	at at.bitfire.dav4jvm.DavResource.checkStatus(DavResource.kt:376)
                                                                                                    	at at.bitfire.dav4jvm.DavResource.checkStatus(DavResource.kt:358)
                                                                                                    	at at.bitfire.dav4jvm.DavResource.put(DavResource.kt:262)
                                                                                                    	at at.bitfire.dav4jvm.DavResource.put$default(DavResource.kt:244)
                                                                                                    	at com.nextcloud.talk.upload.chunked.ChunkedFileUploader.uploadChunk(ChunkedFileUploader.kt:261)
                                                                                                    	at com.nextcloud.talk.upload.chunked.ChunkedFileUploader.upload(ChunkedFileUploader.kt:106)
                                                                                                    	at com.nextcloud.talk.jobs.UploadAndShareFilesWorker.doWork(UploadAndShareFilesWorker.kt:149)
                                                                                                    	at androidx.work.Worker$1.run(Worker.java:82)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1137)
                                                                                                    	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:637)
                                                                                                    	at java.lang.Thread.run(Thread.java:1012)

But, I believe the above exception could be happening because the upload folder is deleted (where the chunks are uploaded) but the chunks upload logic still uploading some chunks even if the worker has been cancelled and that is what raising the exception.

on the other device, it works, but it's totally slow in response (however this might not be caused by this PR. starting the upload is also slow, might have to be improved by using coroutineWorker with "setExpedited")

Do you want me to handle this too in this PR or should I keep this for another one?

Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>

github-actions · 2024-01-17T08:29:57Z

Codacy

Lint

Type	master	PR
Warnings	83	83
Errors	8	8

SpotBugs

Category	Base	New
Bad practice	6	6
Correctness	8	8
Dodgy code	112	112
Internationalization	3	3
Malicious code vulnerability	3	3
Performance	6	6
Security	1	1
Total	139	139

github-actions · 2024-01-17T08:35:30Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/3563-talk.apk

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud Talk app.

mahibi · 2024-01-17T08:36:21Z

But, I believe the above exception could be happening because the upload folder is deleted (where the chunks are uploaded) but the chunks upload logic still uploading some chunks even if the worker has been cancelled and that is what raising the exception.

I merged for now. If the above exception appears again we can fix with a followup PR

on the other device, it works, but it's totally slow in response (however this might not be caused by this PR. starting the upload is also slow, might have to be improved by using coroutineWorker with "setExpedited")

Do you want me to handle this too in this PR or should I keep this for another one?

if you would like, feel free to give it a try with another PR 👍
I did some approach in #3185 but never found the time to research more about it.
If you think that could be the right direction, feel free to migrate UploadAndShareFilesWorker to coroutineWorker and try out "setExpedited".
If it seems to solve issues, we could continue to migrate more workers to coroutine workers and if necessary setExpedited.

parneet-guraya · 2024-01-17T09:02:19Z

Great 👍, will definitely pick this up

github-actions · 2024-03-30T01:56:26Z

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

parneet-guraya added enhancement New feature or request 3. to review Waiting for reviews feature: notifications 🔔 feature: sharing 🤝 labels Jan 8, 2024

parneet-guraya requested review from mahibi and rapterjet2004 January 8, 2024 16:37

parneet-guraya force-pushed the upload-noti-cancel branch from 1f49eeb to cdd0fcc Compare January 8, 2024 16:41

rapterjet2004 approved these changes Jan 9, 2024

View reviewed changes

add cancel upload functionality

6f88c8b

Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>

mahibi force-pushed the upload-noti-cancel branch from cdd0fcc to 6f88c8b Compare January 17, 2024 08:21

mahibi merged commit 160426e into master Jan 17, 2024
15 of 16 checks passed

delete-merged-branch bot deleted the upload-noti-cancel branch January 17, 2024 08:25

github-actions bot added the feedback-requested label Mar 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cancel upload from notification #3563

Cancel upload from notification #3563

parneet-guraya commented Jan 8, 2024 •

edited

Loading

rapterjet2004 left a comment

mahibi commented Jan 16, 2024

parneet-guraya commented Jan 16, 2024 •

edited

Loading

github-actions bot commented Jan 17, 2024

github-actions bot commented Jan 17, 2024

mahibi commented Jan 17, 2024

parneet-guraya commented Jan 17, 2024

github-actions bot commented Mar 30, 2024

Cancel upload from notification #3563

Cancel upload from notification #3563

Conversation

parneet-guraya commented Jan 8, 2024 • edited Loading

🖼️ Screenshots

Functionality Check

🏁 Checklist

rapterjet2004 left a comment

Choose a reason for hiding this comment

mahibi commented Jan 16, 2024

parneet-guraya commented Jan 16, 2024 • edited Loading

github-actions bot commented Jan 17, 2024

Codacy

Lint

SpotBugs

github-actions bot commented Jan 17, 2024

mahibi commented Jan 17, 2024

parneet-guraya commented Jan 17, 2024

github-actions bot commented Mar 30, 2024

parneet-guraya commented Jan 8, 2024 •

edited

Loading

parneet-guraya commented Jan 16, 2024 •

edited

Loading