Commit graph

19571 commits

Author SHA1 Message Date
tobiasKaminsky
831bffe571 show only one setup dialog, prevents strange situation on double tapping
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-11-28 14:18:09 +00:00
Álvaro Brey
f9e500ba40
Merge pull request #11105 from nextcloud/chore/noid/updateScreenshots
Update screenshot test results for E2E strings
2022-11-28 14:42:18 +01:00
Andy Scherzinger
c66491a02f
update screenshot test results
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-11-28 13:03:10 +01:00
Álvaro Brey
725348a8d4
Merge pull request #11097 from nextcloud/Valdnet-patch-1
i18n: Change name of encryption
2022-11-28 12:53:50 +01:00
Valdnet
d184aa6690
i18n: Correct spelling
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2022-11-28 09:55:32 +01:00
Valdnet
1433dec21b
i18n: Change to lower case
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2022-11-28 09:55:32 +01:00
Valdnet
e57bf0eb2a
i18n: Correct spelling
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2022-11-28 09:55:31 +01:00
Valdnet
a65b896ce6
i18n: Change name of encryption
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2022-11-28 09:55:19 +01:00
Álvaro Brey
a489619db3
Merge pull request #11103 from nextcloud/dependabot/gradle/org.mockito.kotlin-mockito-kotlin-4.1.0
Bump mockito-kotlin from 4.0.0 to 4.1.0
2022-11-28 09:34:01 +01:00
Nextcloud bot
759b799e37
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-28 03:33:17 +00:00
Nextcloud bot
adcfaf381b
[tx-robot] Update transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-28 03:33:00 +00:00
dependabot[bot]
693fe26e54
Bump mockito-kotlin from 4.0.0 to 4.1.0
Bumps [mockito-kotlin](https://github.com/mockito/mockito-kotlin) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/mockito/mockito-kotlin/releases)
- [Commits](https://github.com/mockito/mockito-kotlin/compare/4.0.0...4.1.0)

---
updated-dependencies:
- dependency-name: org.mockito.kotlin:mockito-kotlin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 02:02:33 +00:00
Nextcloud bot
b9e1bb3f81
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-27 03:30:59 +00:00
Nextcloud bot
cf17a9fbfc
[tx-robot] Update transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-27 03:30:41 +00:00
Nextcloud bot
23d0b40d5b
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-26 03:30:47 +00:00
Nextcloud bot
5d9e0e6e0a
[tx-robot] Update transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-26 03:30:27 +00:00
Álvaro Brey
16023016d7
Merge pull request #11091 from nextcloud/dependabot/gradle/com.diffplug.spotless-6.12.0
Bump com.diffplug.spotless from 6.11.0 to 6.12.0
2022-11-25 14:01:12 +01:00
Tobias Kaminsky
161bc98bde
Merge pull request #11031 from nextcloud/e2eUX
E2e ux
2022-11-25 11:30:43 +01:00
Nextcloud bot
02762bb2f0
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-25 08:27:05 +00:00
Nextcloud bot
f6c083ace7
[tx-robot] Update transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-25 08:26:49 +00:00
Nextcloud bot
b9cdb01b16
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-25 03:36:17 +00:00
Nextcloud bot
209404f058
[tx-robot] Update transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-25 03:35:56 +00:00
dependabot[bot]
766ed4492c
Bump com.diffplug.spotless from 6.11.0 to 6.12.0
Bumps com.diffplug.spotless from 6.11.0 to 6.12.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-25 02:01:32 +00:00
tobiasKaminsky
393e34d28c
restart SettingsActivity after changing e2e settings
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-11-24 15:40:26 +01:00
tobiasKaminsky
3f82d37415
revert to master library
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-11-24 15:40:26 +01:00
tobiasKaminsky
f49252c87e
hide e2e options after removing local e2e setup
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-11-24 15:40:26 +01:00
Álvaro Brey
b110735dcc
NextcloudDatabase: enable automigration for new db version
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-24 15:40:26 +01:00
Álvaro Brey
30d38dee23
Restore database v65 schema from master
Mistakenly changed!

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-24 15:40:26 +01:00
Álvaro Brey
0d098255d9
Pass through SetupEncryptionDF result to SettingsActivity
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-24 15:40:26 +01:00
Álvaro Brey
6b4d6a6dfd
SettingsActivity: fix conditional to show e2e encrypt option
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-24 15:40:26 +01:00
tobiasKaminsky
e3a7453846
properly handle stage 2: key exists, but e2e is not setup on this device
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-11-24 15:40:26 +01:00
Álvaro Brey
1b945b6131
SetupEncryptionDialogFragment: use builtin onCancel for setting cancel result
This captures back button as well

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-24 15:40:26 +01:00
Álvaro Brey
b1b05f740e
SetupEncryptionActivity: give transparent background to make it more seamless
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-24 15:40:26 +01:00
Álvaro Brey
09aac00330
SetupEncryptionActivity: finish activity when error happens
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-24 15:40:26 +01:00
Álvaro Brey
6568d1d272
Close SetupEncryptionActivity when dialog is dismissed
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-24 15:40:26 +01:00
Álvaro Brey
fc446b1deb
Update screenshots for SettingsActivity
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-24 15:40:26 +01:00
Tobias Kaminsky
9f1f21ee8c
Update app/src/main/res/values/strings.xml
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Tobias Kaminsky <tobias@nextcloud.com>
2022-11-24 15:40:26 +01:00
tobiasKaminsky
5b4aba11f5
Better show different states of E2E
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Tobias Kaminsky <tobias@nextcloud.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2022-11-24 15:40:24 +01:00
Álvaro Brey
1c4a1063f1
Merge pull request #10928 from nextcloud/test/calendar-skip-empty
Fix issues with calendar exporting
2022-11-23 22:11:31 +01:00
Álvaro Brey
c938a929c1
Merge pull request #11067 from nextcloud/fix/gallery-crash
GalleryFragment: fix crash when scrolling slowly until the end of the list
2022-11-23 22:10:20 +01:00
Álvaro Brey
f797260f76
Merge pull request #11068 from nextcloud/fix/favorites-back-navigation
FileDisplayActivity: fix drawer menu item when browsing back from favorite folder
2022-11-23 22:08:51 +01:00
Álvaro Brey
eaae4a0f9c
Merge pull request #11069 from nextcloud/fix/video-fullscreen-stuck
Misc fixes for video player
2022-11-23 22:07:43 +01:00
Álvaro Brey
09319ac7c3
Merge pull request #11074 from nextcloud/fix/calendar-backup-wrong-account
CalendarBackupWork: upload to configured account, not current account
2022-11-23 22:06:54 +01:00
Álvaro Brey
b0a3d6cc7e
Merge pull request #11059 from nextcloud/feature/3175/shortcuts_bottombar
Allow Pin to Home with file actions bottom sheet
2022-11-23 18:56:38 +01:00
Álvaro Brey
38e83cd03c Keep screen on while video is playing
Fixes #9059

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-23 10:31:49 +00:00
Álvaro Brey
625ada4c17 Add default error and completion handler to Exoplayer in preview fragment/activity
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-23 10:31:49 +00:00
Álvaro Brey
250e8129dd
CalendarBackupWork: upload to configured account, not current account
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-23 11:13:03 +01:00
Álvaro Brey
7d8e37a8a0
FileDisplayActivity: also update sort group after browsing up
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-23 10:26:16 +01:00
Álvaro Brey
850e9e7ec3 CalendarBackupWork: log amount of calendars
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-23 08:12:10 +00:00
Álvaro Brey
b3eab117db calendar export: port some changes from upstream
Ignore deleted events, and fix alarm triggers

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2022-11-23 08:12:10 +00:00