Tobias Kaminsky
3619390d13
Merge remote-tracking branch 'origin/master' into dev
2023-01-14 02:31:15 +01:00
Tobias Kaminsky
1ac13f972e
daily dev 20230113
2023-01-13 02:36:18 +01:00
Tobias Kaminsky
f7f4ba98bb
Merge remote-tracking branch 'origin/master' into dev
2023-01-13 02:31:09 +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
Tobias Kaminsky
6031fbc4fd
daily dev 20230112
...
Build(deps): Bump ui from 0.3.0 to 0.4.0
Update Nextcloud Android library
Update 3rd-party dependencies
2023-01-12 03:40:52 +01:00
Tobias Kaminsky
c3c35b5c89
Merge remote-tracking branch 'origin/master' into dev
2023-01-12 03:35:47 +01: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
Tobias Kaminsky
349d76126e
daily dev 20230111
...
Update 3rd-party dependencies
2023-01-11 02:36:56 +01:00
Tobias Kaminsky
08874f304b
Merge remote-tracking branch 'origin/master' into dev
2023-01-11 02:31:18 +01: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
Tobias Kaminsky
9dc4fb3461
daily dev 20230110
...
Bump mockitoVersion from 4.10.0 to 4.11.0
Build(deps): Bump gson from 2.10 to 2.10.1
Build(deps): Bump espressoVersion from 3.5.0 to 3.5.1
Build(deps): Bump junit from 1.1.4 to 1.1.5
Update Nextcloud Android library
Update 3rd-party dependencies
2023-01-10 02:40:22 +01:00
Tobias Kaminsky
48219a5b7b
Merge remote-tracking branch 'origin/master' into dev
2023-01-10 02:33:41 +01: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
19ec061fe3
daily dev 20230107
2023-01-07 02:37:04 +01:00
Tobias Kaminsky
614cc936af
Merge remote-tracking branch 'origin/master' into dev
2023-01-07 02:31:29 +01: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
Tobias Kaminsky
d23b1bd8b7
daily dev 20230106
...
Update Nextcloud Android library
2023-01-06 03:41:31 +01:00
tobiasKaminsky
5b52b440d4
Fix test
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-05 15:31:14 +01:00
Álvaro Brey
b3b3fedcdf
lint: Remove useless clickable attribute from some layout roots
...
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-05 08:32:09 +00:00
Álvaro Brey
805add5b69
Clear layout inflation lint issues in ReceiveExternalFilesActivity and UploaderAdapter
...
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-05 08:32:09 +00:00
Álvaro Brey
adae8d9e71
MediaControlView: move to ViewBinding to fix lint issue with inflation and clean up
...
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-05 08:32:09 +00:00
Álvaro Brey
66e19849cb
Use RSAPublicKey interface instead of OpenSSLRsaPublicKey to avoid conscrypt version conflicts
...
OpenSSLRsaPublicKey has a different package when using the open-source conscrypt vs. the one inserted
by Play Services.
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
2023-01-05 09:04:25 +01:00
tobiasKaminsky
7abef86169
Check CSR
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2023-01-05 09:04:23 +01:00
Nextcloud bot
f61a8eb44f
Fix(l10n): 🔠 Update translations from Transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-05 03:35:40 +00:00
Nextcloud bot
0f373ba231
Fix(l10n): 🛠️ Update Transifex configuration
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-05 03:35:12 +00:00
Tobias Kaminsky
8f11f4bca5
daily dev 20230105
...
Update Nextcloud Android library
2023-01-05 03:41:12 +01:00
Nextcloud bot
d5d9125432
Fix(l10n): 🔠 Update translations from Transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2023-01-04 06:03:27 +00:00