Commit graph

4616 commits

Author SHA1 Message Date
alperozturk
f55d61c05a Add tests
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-15 09:04:03 +02:00
alperozturk
182673672f Add test
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-15 09:04:03 +02:00
alperozturk
9fd1ef5205 Add testUpdateFileNameForEncryptedFileWhenEncryptedFileUploadRemotePathShouldSetAsEncrypted
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-15 09:04:03 +02:00
alperozturk
7d9a8f1d9f Add correct decryptedRemotePath for v1
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-15 09:04:03 +02:00
alperozturk
7c15334dc0 Remove unused imports and logic
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-15 09:04:03 +02:00
alperozturk
affc77715c Use remote path correctly
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-15 09:04:03 +02:00
alperozturk
eaa773d5a9 Use better message
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-15 09:04:03 +02:00
alperozturk
82c1c25a2f Use encrypted remote path for file conflict resolver dialog
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-15 09:04:03 +02:00
alperozturk
d9d9cf56b2 Check existence of decryptedRemotePath
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-15 09:04:03 +02:00
alperozturk
3bcd2b3703 Dont use null path
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-15 09:04:03 +02:00
Nextcloud bot
f7b883c936
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-15 02:38:53 +00:00
Nextcloud bot
5f1b87fdc0
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-14 02:41:31 +00:00
Tobias Kaminsky
33e59f1365 daily dev 20240414 2024-04-14 02:37:25 +02:00
Tobias Kaminsky
fad4dcdc7e Merge remote-tracking branch 'origin/master' into dev 2024-04-14 02:31:04 +02:00
Nextcloud bot
5d787161a3
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-13 02:56:54 +00:00
Tobias Kaminsky
69524b7a9d daily dev 20240413
Update Nextcloud Android library
2024-04-13 03:49:46 +02:00
Tobias Kaminsky
10e30a5def Merge remote-tracking branch 'origin/master' into dev 2024-04-13 03:38:07 +02:00
renovate[bot]
09ac533573
Update plugin com.google.devtools.ksp to v1.9.23-1.0.20
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-12 15:27:19 +00:00
renovate[bot]
90a1ce32de
Update dependency commons-io:commons-io to v2.16.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-12 15:08:03 +00:00
alperozturk
80e581bcd3
Use path for each user
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 12:23:19 +02:00
alperozturk
7342b54f42 Add log for failed uploads
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
80b40b947c Add fixme comments
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
c78a67d53c Specifically make visible retry failed uploads action
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
24b2d033f1 Clear temp encrypted folder for clear failed uploads actions
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
a7fe0adafb Use more clear argument names
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
7470fef2d6 Clear temp directory for cancelling all uploads
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
39e9916732 Use tempEncryptedFolder
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
123c576399 Dont use cache dir. cache dir might be deleted during big file uploads
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
d583a2f62c Revert changes
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
a563c87b01 Delete temporal file usage for e2e
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
14d3257036 Remove "." suffix
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
9c5d39f301 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
17f7676abb Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
0e47ad737f Use single line code for getFileName
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
6515602ee6 Fix file name in notification
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
c6c6460630 Use temp directory for tempEncryptedFile creation
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
alperozturk
79e651874a Delete temp encryptedFile in all cases
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-12 09:54:45 +02:00
renovate[bot]
fc07d544d0
Update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v6.0.12
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-12 04:22:38 +00:00
Nextcloud bot
9a3a7d4466
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-12 02:40:57 +00:00
Tobias Kaminsky
85918c46bf daily dev 20240412
Update Nextcloud Android library
2024-04-12 03:49:39 +02:00
Tobias Kaminsky
9b4d39befe Merge remote-tracking branch 'origin/master' into dev 2024-04-12 03:37:37 +02:00
renovate[bot]
cb434e50dc Update dependency androidx.compose.ui:ui-tooling-preview to v1.6.5
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-11 10:16:34 +02:00
Nextcloud bot
7d3ece4f8f
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-11 02:42:27 +00:00
Tobias Kaminsky
b7642c202f daily dev 20240411
Update Nextcloud Android library
2024-04-11 03:47:21 +02:00
Tobias Kaminsky
59335bc5af Merge remote-tracking branch 'origin/master' into dev 2024-04-11 03:37:28 +02:00
Nextcloud bot
5d60473632
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-10 02:44:58 +00:00
Tobias Kaminsky
13e9077e5f daily dev 20240410
Update Nextcloud Android library
2024-04-10 03:48:41 +02:00
Tobias Kaminsky
d0b7cafa1d Merge remote-tracking branch 'origin/master' into dev 2024-04-10 03:37:58 +02:00
Andy Scherzinger
3f10969ea5
Merge pull request #12811 from nextcloud/renovate/androidx.compose.ui-ui-tooling-1.x
Update dependency androidx.compose.ui:ui-tooling to v1.6.5
2024-04-09 17:59:25 +02:00
renovate[bot]
0064fb14e9 Update dependency androidx.compose:compose-bom to v2024.04.00
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-09 16:33:43 +02:00
renovate[bot]
e44372e121 Update dependency androidx.compose.ui:ui-tooling to v1.6.5
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-04-09 16:18:52 +02:00
Andy Scherzinger
ce8b5cdb2e
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-09 15:22:13 +02:00
Andy Scherzinger
7c055f28ca
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-09 12:06:30 +02:00
Andy Scherzinger
5366c1e6b9
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-09 11:15:03 +02:00
Andy Scherzinger
e416eefabd
Merge pull request #12844 from nextcloud/chore/noid/spdxHeader21
Add SPDX header
2024-04-09 08:15:57 +02:00
Nextcloud bot
f1c6f79b65
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-09 02:40:21 +00:00
Tobias Kaminsky
adb1748279 daily dev 20240409 2024-04-09 02:37:09 +02:00
Tobias Kaminsky
2ff249bda9 Merge remote-tracking branch 'origin/master' into dev 2024-04-09 02:30:58 +02:00
Andy Scherzinger
7427f1a898
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-08 17:35:50 +02:00
Andy Scherzinger
afa0cb5f00
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-08 14:36:20 +02:00
Andy Scherzinger
40a343e895
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-08 13:49:07 +02:00
Nextcloud bot
d8e8d012f3
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-08 02:41:10 +00:00
Tobias Kaminsky
71c07ac310 daily dev 20240408 2024-04-08 02:37:17 +02:00
Tobias Kaminsky
b94749125a Merge remote-tracking branch 'origin/master' into dev 2024-04-08 02:31:00 +02:00
Andy Scherzinger
7921ab7058
Update test screenshot
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-07 17:25:05 +02:00
Andy Scherzinger
4638b3df1a
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-07 17:07:24 +02:00
Andy Scherzinger
3bc5171ca1
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-07 16:28:00 +02:00
Andy Scherzinger
00b09048a9
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-07 11:09:29 +02:00
Nextcloud bot
fd267f21a9
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-07 02:41:16 +00:00
Tobias Kaminsky
ea9998983b daily dev 20240407 2024-04-07 02:37:35 +02:00
Tobias Kaminsky
612cd78882 Merge remote-tracking branch 'origin/master' into dev 2024-04-07 02:30:54 +02:00
Nextcloud bot
2c5ddf53a7
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-06 02:52:06 +00:00
Tobias Kaminsky
18d63a3410 daily dev 20240406
Update Nextcloud Android library
2024-04-06 03:47:19 +02:00
Tobias Kaminsky
fc06ec634c Merge remote-tracking branch 'origin/master' into dev 2024-04-06 03:36:26 +02:00
Andy Scherzinger
d12c8d63ff
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-05 23:21:20 +02:00
Andy Scherzinger
897a7fb46e
Update screenshots
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-05 22:59:36 +02:00
Andy Scherzinger
88e4a6e723
fix QR code icon size
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-05 19:33:38 +02:00
Andy Scherzinger
6b78e642a8
Update circle text on tests
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-05 18:13:40 +02:00
Andy Scherzinger
569cfb1bd8
Update share overlay aligning with web UI
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-05 18:06:10 +02:00
Andy Scherzinger
8ac304cfc5
replace circles with teams icon
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-05 17:52:59 +02:00
Andy Scherzinger
2a9e4ca737
replace share icon in files listing
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-05 17:02:45 +02:00
Andy Scherzinger
d40da36805
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-05 16:54:43 +02:00
hotorcelexo
2fff2f6aee
Update strings.xml
the lines are confused in meaning

Signed-off-by: hotorcelexo <IgorPolyakov@users.noreply.github.com>
2024-04-05 11:53:10 +03:00
Andy Scherzinger
29c46b22e0
Add SPDX header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-04-05 10:05:34 +02:00
Nextcloud bot
de34a559b2
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-05 02:41:21 +00:00
Tobias Kaminsky
782ceed132 daily dev 20240405 2024-04-05 02:37:38 +02:00
Tobias Kaminsky
36987463e5 Merge remote-tracking branch 'origin/master' into dev 2024-04-05 02:31:01 +02:00
alperozturk
0480b82858
Reduce spotbugs
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-04 15:51:07 +02:00
alperozturk
b2b5cdb5dd
Add comment for final block
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-04 15:02:07 +02:00
ZetaTom
dc0d87948b
Simply folder unlock
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
2024-04-04 14:55:12 +02:00
alperozturk
c4c7773147
Dont dismiss error or stopped notifications
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-04 14:44:04 +02:00
alperozturk
be3fc9f5d4
Remove duplicate usage of unlock folder operation and mimic success
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-04 14:42:07 +02:00
ZetaTom
de1dcfe93a
Refactoring and minor changes
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
2024-04-04 13:46:35 +02:00
ZetaTom
761d37de01
Add FIXME
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
2024-04-04 13:13:45 +02:00
alperozturk
c7d2d05083
Reduce spotless bugs
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-04 12:03:45 +02:00
alperozturk
247bbd4dcd Use remote operation for mimic ok response
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-04 11:53:43 +02:00
Alper Öztürk
1b8f0f95c2 Update app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
2024-04-04 11:53:43 +02:00
alperozturk
5b51aed284 Use filename instead path
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-04 11:53:43 +02:00
alperozturk
b523c34d29 Fix media files permission
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-04-04 11:53:43 +02:00
Jonas Mayer
1794015c1d Fix spotbugs with Alper
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-04-04 11:53:43 +02:00