Commit graph

23469 commits

Author SHA1 Message Date
Jonas Mayer
bb27d01dc5 Fix notification conflict not resolvable also on master
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
c069cd1992 Fix spotless again
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
878052991c Restart uploads after app restart
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
5ba3201bc5 remove complexity form notifyResult
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
9cdd22d5c6 Fix Spotless again
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
b84ecdc168 Fix Notification problems
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
4826bf11b3 Fix spotless again
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
242e7dbf29 Remove empty java file
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
2acb4ef67e Fix Codacy
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
8f671f70e5 Fix spotless and other small issues
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
6534756d10 Merge with master
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
Jonas Mayer
d335d962f7 Rearrange functions and remove necessary complexity
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
alperozturk
861a39da8e Improve notifications
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
c00a423a0e Improve notifications
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
d83844fe1f Fix imports
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
02287fd80b Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
b198f94873 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
96c2284b26 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
30d03d84bc setChannelId for Android 8 and above
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
2fc33a6eba Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
f6bd33734b Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
e507317005 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
72e90e56bf Rename function and remove pending uploads variable
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
d67a87fdb4 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
06f590d88d Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
f44a0360dd Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
7d20b3e62a Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
ce4f5c2901 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
47099dec72 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
bb0a580ada Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
df7f32cd1e Add missing random notification
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
8a18520b00 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
c6a480b919 Fix CodeAnalytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
50b0a24b5d Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
f258571a69 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
5936210a30 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
3cbd8ba8e6 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
584bac9ae7 Remove FileUploader imports
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
6f24eb5638 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
0eca11f762 Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
0b0691a3ac Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
4c428aef35 Use helper files
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
b4631eb348 Use helper files for FilesUploadWorker
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
1f105770b1 Create FileUploaderIntents
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
alperozturk
f94ea0ae21 Create UploadNotificationManager
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-01-27 12:45:33 +01:00
Andy Scherzinger
a5e08e202e
Merge pull request #12414 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
2024-01-27 08:28:05 +01:00
Nextcloud bot
19a1d2b69e
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-27 03:07:58 +00:00
nextcloud-android-bot
a68b2ef5bc 🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2024-01-27 02:55:25 +00:00
Tobias Kaminsky
a27285ab8d daily dev 20240127
Update Nextcloud Android library
2024-01-27 03:40:39 +01:00
Tobias Kaminsky
2e0164cbca Merge remote-tracking branch 'origin/master' into dev 2024-01-27 03:34:51 +01:00