Commit graph

4002 commits

Author SHA1 Message Date
renovate[bot]
38bfe655ec
Update dependency org.osmdroid:osmdroid-android to v6.1.18 2024-01-29 10:30:07 +01:00
renovate[bot]
2011d66c5f
Update dependency com.mebigfatguy.fb-contrib:fb-contrib to v7.6.4 2024-01-29 09:58:23 +01:00
Tobias Kaminsky
3968cc1143
Merge pull request #12443 from nextcloud/splashScreen
larger splash screen icon
2024-01-29 08:28:33 +01:00
tobiasKaminsky
6c0aaa10e5
larger splash screen icon
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-01-29 08:19:25 +01:00
Tobias Kaminsky
d6c7b04e31 daily dev 20240129
Update Nextcloud Android library
2024-01-29 03:43:24 +01:00
Tobias Kaminsky
b781aca757 Merge remote-tracking branch 'origin/master' into dev 2024-01-29 03:35:57 +01:00
Nextcloud bot
23d7d04077
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-29 02:35:56 +00:00
renovate[bot]
5df9b0d14a
Update dependency io.gitlab.arturbosch.detekt:detekt-gradle-plugin to v1.23.4 2024-01-28 22:05:28 +00:00
Nextcloud bot
869fe2c757
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-28 02:36:14 +00:00
Tobias Kaminsky
c9f5a32763 daily dev 20240128 2024-01-28 02:36:25 +01:00
Tobias Kaminsky
175187eaa3 Merge remote-tracking branch 'origin/master' into dev 2024-01-28 02:30:59 +01:00
Jonas Mayer
7f3a64d1f3 remove unnecessary code
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-01-27 12:45:33 +01:00
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
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
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
Tobias Kaminsky
b9877042f1 daily dev 20240126
Update Nextcloud Android library
2024-01-26 03:40:21 +01:00
Nextcloud bot
9492301397
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-26 02:39:57 +00:00
Tobias Kaminsky
79509ef5c4 Merge remote-tracking branch 'origin/master' into dev 2024-01-26 03:34:47 +01:00
Tobias Kaminsky
f1224972ab daily dev 20240125
Update Nextcloud Android library
2024-01-25 03:40:10 +01:00
Tobias Kaminsky
124156505f Merge remote-tracking branch 'origin/master' into dev 2024-01-25 03:34:56 +01:00
tobiasKaminsky
a6043df1dd
use branch via jitpack
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-01-24 08:47:15 +01:00
Elv1zz
e2dd29052b
Reduce number of exit points
The method `onReceivedHttpError` did have 3 exit points (`return`), but Codacy only allows us 2, so error handling for `request?.url` and `view?.context` was combined. Seems debatable, what's more readable, but the rules are the rules.

Signed-off-by: Elv1zz <elv1zz.git@gmail.com>
2024-01-24 08:28:08 +01:00
Elv1zz
7b776c8aa7
Replacing magic number by well-known constant
Improving code quality a bit by avoiding magic numbers.

Signed-off-by: Elv1zz <elv1zz.git@gmail.com>
2024-01-24 08:28:08 +01:00
Elv1zz
d59e16cb4c
Using simplified way of removeKeys method
Isntead of having to find the hostname and port from an URL (which might be more tricky than expected), we now can simply pass down the URL and `AdvancedX509KeyManager` will take care of finding the port from the URL.

Signed-off-by: Elv1zz <elv1zz.git@gmail.com>
2024-01-24 08:28:08 +01:00
Elv1zz
692cee7255
Handle TLS client certificates in NextCloudWebViewClient
All interaction with the nextcloud server is handled by the `NextCloudWebViewClient`, so TLS client certificate handling should be done by that class. Since `AuthenticatorActivity` only extends `NextCloudWebViewClient` with some additional methods, it is enough to have the certificate handling in one place.

Signed-off-by: Elv1zz <elv1zz.git@gmail.com>
2024-01-24 08:28:08 +01:00
Elv1zz
41a8667a26
Temporary change to make automated tests run
Since the official nextcloud android-library does not have the new `AdvancedX509KeyManager`, the automated tests cannot build th
e app. So for that I refer to my fork of the android-library for now. This commit shall be reverted before merge.

Signed-off-by: Elv1zz <elv1zz.git@gmail.com>
2024-01-24 08:28:08 +01:00
Elv1zz
45e369bae8
Added support for TLS client certificates
Using the new `AdvancedX509KeyManager` class from the `nextcloud-android-library` to add support for servers that require a TLS client certificate to connect.

Signed-off-by: Elv1zz <elv1zz.git@gmail.com>
2024-01-24 08:28:08 +01:00
Tobias Kaminsky
5d69cbdb28 daily dev 20240124
Update Nextcloud Android library
2024-01-24 03:40:04 +01:00
Nextcloud bot
e224626c17
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-24 02:38:08 +00:00
Tobias Kaminsky
c4aa5a4923 Merge remote-tracking branch 'origin/master' into dev 2024-01-24 03:34:42 +01:00
Tobias Kaminsky
14c5bce228
Merge pull request #12404 from nextcloud/filedropBugfix
Filedrop must not be used when serializing
2024-01-23 10:51:11 +01:00
tobiasKaminsky
69aa577b91
Filedrop must not be used when serializing
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-01-23 07:42:45 +01:00
Nextcloud bot
03b163f8ee
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-23 02:47:00 +00:00
Tobias Kaminsky
95e6483d0d daily dev 20240123
Update Nextcloud Android library
Update 3rd-party dependencies
2024-01-23 03:39:41 +01:00
Tobias Kaminsky
0a7d380380 Merge remote-tracking branch 'origin/master' into dev 2024-01-23 03:34:33 +01:00
Tobias Kaminsky
c7341d9ab2 daily dev 20240122
Update Nextcloud Android library
2024-01-22 03:41:27 +01:00
Nextcloud bot
d119992272
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-22 02:38:18 +00:00
Tobias Kaminsky
6c25ef20e9 Merge remote-tracking branch 'origin/master' into dev 2024-01-22 03:36:10 +01:00
Nextcloud bot
28df5a551a
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-21 02:57:23 +00:00
Tobias Kaminsky
90d609383b daily dev 20240120 2024-01-20 02:36:28 +01:00
Tobias Kaminsky
21e249e49b Merge remote-tracking branch 'origin/master' into dev 2024-01-20 02:31:00 +01:00
tobiasKaminsky
e95f7d162f
Bump master to 3.29 Alpha
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-01-19 10:18:31 +01:00
Tobias Kaminsky
8d1a26d54f daily dev 20240119
Update Nextcloud Android library
2024-01-19 03:43:52 +01:00
Nextcloud bot
162651d73f
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-19 02:38:17 +00:00
Tobias Kaminsky
1ef544655f Merge remote-tracking branch 'origin/master' into dev 2024-01-19 03:36:47 +01:00
tobiasKaminsky
3d1265d6aa Optional proxy support
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-01-18 09:18:02 +00:00
Nextcloud bot
03b31ea6a2
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-18 02:37:47 +00:00
Tobias Kaminsky
0cbfe36ef7 daily dev 20240118 2024-01-18 02:36:53 +01:00
Tobias Kaminsky
26ae0fe9d5 Merge remote-tracking branch 'origin/master' into dev 2024-01-18 02:31:18 +01:00
tobiasKaminsky
cf67e09c9a
bump to 3.28.0 alpha
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-01-17 07:40:07 +01:00
Tobias Kaminsky
abf8c3ba26 daily dev 20240117
Update Nextcloud Android library
2024-01-17 03:43:04 +01:00
Nextcloud bot
a91381732b
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-01-17 02:38:33 +00:00
Tobias Kaminsky
892d4f199c Merge remote-tracking branch 'origin/master' into dev 2024-01-17 03:36:50 +01:00
tobiasKaminsky
218fbd7815
extract tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-01-16 12:17:50 +01:00
Tobias Kaminsky
6a38825d9c daily dev 20240116
Update Nextcloud Android library
Update 3rd-party dependencies
2024-01-16 03:44:09 +01:00