Commit graph

1277 commits

Author SHA1 Message Date
Álvaro Brey
53f5348e1d
Update SettingsActivity screenshots to fix screenshot tests
Broken since latest merged e2e tests

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-27 10:42:17 +01:00
Nextcloud bot
48a21bdc59
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-27 03:40:19 +00:00
Nextcloud bot
66dd575f97
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-27 03:39:47 +00:00
dependabot[bot]
400c46c6c4
Build(deps): Bump com.diffplug.spotless from 6.13.0 to 6.14.0
Bumps com.diffplug.spotless from 6.13.0 to 6.14.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>
2023-01-27 02:01:31 +00:00
Nextcloud bot
a69381c775
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-26 03:57:36 +00:00
Nextcloud bot
5041611c6f
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-26 03:57:05 +00:00
Álvaro Brey
3d291d8fec
Bump OUTDATED_SERVER_VERSION to Nextcloud 23, as it has reached EOL
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-25 14:41:06 +01:00
Álvaro Brey
77e906fead
Bump version to 3.25.0
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-25 14:40:36 +01:00
Álvaro Brey
b30b8ebf1f
Merge pull request #10558 from nextcloud/doNotUploadFolderWhenEncryption
When uploading files to an encrypted folder do not allow to upload entire folders
2023-01-25 14:26:54 +01:00
Álvaro Brey
f115883df2
Merge pull request #11138 from nextcloud/favoriteInShares
Shows favorite state in share overview
2023-01-25 12:46:07 +01:00
tobiasKaminsky
d4e9ef203f When uploading files to an encrypted folder do not allow to upload entire folders
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-25 11:28:48 +00:00
tobiasKaminsky
4f1d0347f4 Uses: https://github.com/nextcloud/android-library/pull/968
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-25 09:58:50 +01:00
tobiasKaminsky
f18225eda6
Show "unset encryption" only when E2E is setup
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-25 09:56:55 +01:00
Álvaro Brey
4cedd9d30d
Merge pull request #11230 from nextcloud/e2eCorrectState
Show setup e2e only when
2023-01-25 09:55:00 +01:00
dependabot[bot]
73339ec32c
Build(deps): Bump appcompat from 1.5.1 to 1.6.0
Bumps appcompat from 1.5.1 to 1.6.0.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-25 08:49:57 +00:00
Álvaro Brey
f0003c4a56
Merge pull request #11264 from nextcloud/dependabot/gradle/com.diffplug.spotless-6.13.0
Build(deps): Bump com.diffplug.spotless from 6.12.0 to 6.13.0
2023-01-25 09:47:58 +01:00
Tobias Kaminsky
974bfbd973
Merge pull request #11287 from nextcloud/fixLocalIDafterUpgrade
upon upgrade localID may be null, better use default value
2023-01-25 07:30:10 +01:00
Nextcloud bot
d9d0f21c43
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-25 03:55:40 +00:00
Nextcloud bot
f67469da38
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-25 03:55:09 +00:00
dependabot[bot]
34265d3d2c
Build(deps): Bump material from 1.7.0 to 1.8.0
Bumps [material](https://github.com/material-components/material-components-android) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.7.0...1.8.0)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-25 02:03:02 +00:00
Álvaro Brey
21479cc912
Apply ktlint style after spotless update
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-24 12:02:04 +01:00
Álvaro Brey
07f744fe8f
Merge pull request #11100 from nextcloud/chore/skip-ui-refresh-when-no-changes
Refresh UI only when changes are detected on the server
2023-01-24 11:53:24 +01:00
Álvaro Brey
29bcfd07fd
NextcloudDatabase: 67 to 68 is a manual migration
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-24 11:21:53 +01:00
Álvaro Brey
9053bc96a7
Add test for DB 67 -> 68 migration
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-24 11:21:01 +01:00
Álvaro Brey
42b4519ab1
Add room migration to change local_id to NOT NULL
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-24 10:58:53 +01:00
Álvaro Brey
1f0bcc74b1
Include schema and automigration
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-24 10:02:39 +01:00
tobiasKaminsky
a41ca26b90
upon upgrade localID may be null, better use default value
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-24 08:54:55 +01:00
Nextcloud bot
c9f35c06ea
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-24 03:37:39 +00:00
Nextcloud bot
6cfc469c6e
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-24 03:37:10 +00:00
Dariusz Olszewski
d3841cd0ca Partially revert previous commit - existence check required for directories
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2023-01-23 15:54:54 +00:00
Dariusz Olszewski
08db3923cb Skip check for existing files when reading file data from local DB
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2023-01-23 15:54:54 +00:00
dependabot[bot]
4a5a856034
Build(deps): Bump com.diffplug.spotless from 6.12.0 to 6.13.0
Dependabot couldn't find the original pull request head commit, 10076aeed8cee158e02965ed13b423e9a47208d8.
2023-01-23 15:22:30 +00:00
Dariusz Olszewski
742fa45f16 Refresh UI only when changes are detected on the server
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2023-01-23 15:12:21 +00:00
Nextcloud bot
2f855e0470
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-23 06:14:12 +00:00
Nextcloud bot
e924dff94a
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-22 03:35:31 +00:00
Nextcloud bot
5836b300a2
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-21 03:59:58 +00:00
Nextcloud bot
b678b1c5a2
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-21 03:59:30 +00:00
Tobias Kaminsky
191d7532c0
Merge pull request #11273 from nextcloud/chore/compile-sdk-33
build: Bump compileSdk to 33
2023-01-20 09:19:11 +01:00
Nextcloud bot
94874cd7b2
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-20 03:39:38 +00:00
Nextcloud bot
67b0e0d674
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-20 03:39:10 +00:00
Nextcloud bot
188fbd4084
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-20 02:28:45 +00:00
Nextcloud bot
41a477ca2f
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-20 02:28:16 +00:00
Álvaro Brey
7dc89f1e72
Merge pull request #11269 from nextcloud/fix/10668/create-document-offline-crash
ChooseTemplateDialogFragment: check selectedTemplate is not null before attempting to get the extension
2023-01-19 20:36:11 +01:00
Álvaro Brey
43582e8cb4 Solve compilation errors for DeckApiTest with compileSDK 33
There are now 2 ambiguous resolutions of packageManager.resolveActivity so the mock has to specify type

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-19 15:49:57 +01:00
Álvaro Brey
863c9b72c9 EncryptionUtils: fix new lint warning
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-19 15:49:57 +01:00
Álvaro Brey
e236891827 Fix build errors in SDK 33
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-19 15:49:57 +01:00
Álvaro Brey
5f47494248 build: Bump compileSdk to 33
Now required by several libraries (check open dependabot PRs)

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-19 15:49:57 +01:00
Álvaro Brey
8200b41225 ChooseTemplateDialogFragment: check selectedTemplate is not null before attempting to get the extension
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-18 12:42:49 +01:00
Álvaro Brey
daafa24905 Fix tets that need a 8-length remote ID
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-18 12:23:37 +01:00
Álvaro Brey
0287e34cdc Fix wrong initialization for FileDataStorageManagerContentProviderClientIT
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-18 12:23:37 +01:00
tobiasKaminsky
0b33eaff97 Changes after rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-18 12:23:37 +01:00
tobiasKaminsky
b293ece7b4 fix test -> we need to have a 8 digit remote id for proper testing
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-18 12:23:37 +01:00
tobiasKaminsky
b78e991d54 use localID everywhere
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-18 12:23:37 +01:00
Nextcloud bot
79293e065b
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-18 03:35:34 +00:00
Nextcloud bot
6dace4f962
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-18 03:35:05 +00:00
Álvaro Brey
59a13e0d4f
Merge pull request #11251 from nextcloud/chore/json-common-cases
Avoid JSON deserialization in common trivial cases
2023-01-17 15:15:50 +01:00
tobiasKaminsky
8c68953884 Show setup e2e only when
- e2e is available on server
- no keys exists yet

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-17 14:47:47 +01:00
Álvaro Brey
d93634aac8
Merge pull request #11250 from nextcloud/bugfix/11215
fix(EditorWebView): Move local image upload to the editor web view
2023-01-17 10:34:56 +01:00
Nextcloud bot
a33d8582e2
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-17 03:35:42 +00:00
Nextcloud bot
831c38763b
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-17 03:35:14 +00:00
Álvaro Brey
cdf048945f Reset search when browsing to a folder from the favorites list
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-16 08:22:46 +00:00
Nextcloud bot
960400db81
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-16 03:36:02 +00:00
Nextcloud bot
858cd524e7
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-16 03:35:33 +00:00
Álvaro Brey
f5896fa034
Merge pull request #11249 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-7.4.0
Build(deps): Bump gradle from 7.3.1 to 7.4.0
2023-01-15 23:44:04 +01:00
Nextcloud bot
1cfc7c8716
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-15 03:32:45 +00:00
Nextcloud bot
c91a360f50
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-15 03:32:16 +00:00
Dariusz Olszewski
49cccd1ccd Clean-up - remove commented diagnostic code
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2023-01-14 23:51:21 +00:00
Dariusz Olszewski
eae9ff15c7 Avoid JSON deserialization in common, trivial cases
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2023-01-14 23:51:21 +00:00
Nextcloud bot
20c22eb448
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-14 03:34:42 +00:00
Nextcloud bot
8cb4d33b40
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-14 03:34:14 +00:00
Julius Härtl
23d3dc22b5
fix(EditorWebView): Move local image upload to the editor web view
This makes sure that direct editing apps like text can also use regular
upload image methods through file input elements in the webview

fixes #11215
fixes #10744

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2023-01-13 21:30:15 +01:00
dependabot[bot]
8b0deac0b4
Build(deps): Bump gradle from 7.3.1 to 7.4.0
Bumps gradle from 7.3.1 to 7.4.0.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-13 09:14:20 +01:00
Álvaro Brey
07d2a0c91b
Move test runner back to com.nextcloud.client package
For some reason, Dexopener uses the package of the runner to determine which packages to open.
Which means with the new location, mockk can't work on android < P

Ref: https://github.com/tmurakami/dexopener/issues/24

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-12 17:14:26 +01:00
Álvaro Brey
aefc2db091
MainApp: restore appcomponent method
Not needed for the final approach

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-12 13:10:53 +01:00
Álvaro Brey
7ea6283af4
Add testing utilities to override injections in classes injected with AndroidInjection
This includes Activities, Fragments, Services, etc. Other classes should use constructor injection,
and as such shouldn't need this.

This works by overriding the androidInjector method in the Application class (new TestMainApp added)
and allowing to use custom injectors there.

A InjectionOverrideRule is included for ease of use, but for more complicated cases, injection can be
controlled by accessing TestMainApp directly.

A sample is included in InjectionTestActivityTest.

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-12 12:58:31 +01:00
Álvaro Brey
443e6984f6
Move test helper classes to a consistent package (com.nextcloud.test)
Avoids having them mixed up with the tests

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-12 09:36:27 +01:00
Tobias Kaminsky
7368809f37
Merge pull request #11242 from nextcloud/fix/passcode-double-check
PassCodeManager: add some logic to avoid counting the same activity twice
2023-01-12 08:32:31 +01:00
Nextcloud bot
8bf1a32ded
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-12 03:35:09 +00:00
Nextcloud bot
3eebd46ff5
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-12 03:34:40 +00:00
Álvaro Brey
d6f7bb601d
Merge pull request #11244 from nextcloud/dependabot/gradle/com.github.nextcloud.android-common-ui-0.4.0
Build(deps): Bump ui from 0.3.0 to 0.4.0
2023-01-11 16:31:15 +01:00
Álvaro Brey
81db4f7b54
PasscodeManagerIT: use actual actitivy for test
Can't mock PowerManager on Android < 9

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-11 15:37:48 +01:00
Nextcloud bot
d551c4b585
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-11 03:36:35 +00:00
Nextcloud bot
b13efc4bee
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-11 03:36:05 +00:00
dependabot[bot]
c56d3d16b8
Build(deps): Bump ui from 0.3.0 to 0.4.0
Bumps ui from 0.3.0 to 0.4.0.

---
updated-dependencies:
- dependency-name: com.github.nextcloud.android-common:ui
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 02:04:00 +00:00
Álvaro Brey
df0089ed1d
PassCodeManager: add some logic to avoid counting the same activity twice
This is very specific to the case where an activity extending from AuthenticatorActivity _and_ running as `singleTask`
gets restarted, in which case it calls `PassCodeManager.onActivityResumed` twice (once on `onResume` and once on `onNewIntent`).

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-10 14:38:16 +01:00
Nextcloud bot
cd8ed82937
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-10 03:40:17 +00:00
Nextcloud bot
d49b7184e8
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-10 03:39:47 +00:00
Álvaro Brey
103f2a867c
Merge pull request #11223 from nextcloud/dependabot/gradle/androidx.test.ext-junit-1.1.5
Build(deps): Bump junit from 1.1.4 to 1.1.5
2023-01-09 15:23:46 +01:00
Álvaro Brey
65b8b17213
Merge pull request #11235 from nextcloud/dependabot/gradle/com.google.code.gson-gson-2.10.1
Build(deps): Bump gson from 2.10 to 2.10.1
2023-01-09 15:05:45 +01:00
Álvaro Brey
1c7ffffe03
Merge pull request #11194 from nextcloud/fix/random-lint
fix/random lint
2023-01-09 15:01:45 +01:00
Nextcloud bot
220e77629a
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-09 03:37:36 +00:00
Nextcloud bot
f1d6e90f80
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-09 03:37:07 +00:00
dependabot[bot]
b55a7e683d
Build(deps): Bump gson from 2.10 to 2.10.1
Bumps [gson](https://github.com/google/gson) from 2.10 to 2.10.1.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.10...gson-parent-2.10.1)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-09 02:02:54 +00:00
Nextcloud bot
18bd07420a
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-08 03:34:09 +00:00
Nextcloud bot
fe890614ee
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-08 03:33:40 +00:00
Nextcloud bot
9094298d6b
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-07 03:33:58 +00:00
Nextcloud bot
64e21d462b
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-07 03:33:29 +00:00
Tobias Kaminsky
41ec8b1b21
Merge pull request #10713 from nextcloud/checkCSR
Check CSR
2023-01-06 07:08:40 +01:00
Nextcloud bot
57e1f98094
Fix(l10n): 🔠 Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-06 03:35:53 +00:00
Nextcloud bot
654f2fd01e
Fix(l10n): 🛠️ Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-06 03:35:23 +00:00