mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 00:12:05 +03:00
Code Issues Projects Releases Packages Wiki Activity
20054 commits 220 branches 1587 tags 639 MiB
Commit graph

20054 commits

This branch
This branch
All branches
Author SHA1 Message Date
tobiasKaminsky
0d2dc8ef06
revert to use master library 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2023-01-19 09:11:32 +01:00
Tobias Kaminsky
7f46ce50e1 daily dev 20230119 
Update Nextcloud Android library
 2023-01-19 03:39:33 +01:00
Tobias Kaminsky
52ccc04449 Merge remote-tracking branch 'origin/master' into dev 2023-01-19 03:34:51 +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
Álvaro Brey
0b3707cf25
Merge pull request #11272 from nextcloud/fix/drone-text-main 
drone: Fix branchname for text app
 2023-01-18 11:39:30 +01:00
Álvaro Brey
9517c71230
drone: Fix branchname for text app 
master has been renamed to main

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2023-01-18 11:24:34 +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
Tobias Kaminsky
3d5ba78cb5 daily dev 20230118 
Update Nextcloud Android library
 2023-01-18 03:38:50 +01:00
Tobias Kaminsky
dd8ff0d1b1 Merge remote-tracking branch 'origin/master' into dev 2023-01-18 03:34:14 +01:00
Álvaro Brey
ba76513a24
Merge pull request #11268 from nextcloud/chore/cleanup-wait-for-server 
Chore: copy wait_for_server from library
 2023-01-17 15:16:47 +01: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
Álvaro Brey
0cb1cb0258
Chore: copy wait_for_server from library 
Get rid of duplicated countr

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
 2023-01-17 09:58:06 +01:00
Álvaro Brey
5e5500585c
Merge pull request #11253 from nextcloud/repo-sync/android-config/master 
🔄 synced file(s) with nextcloud/android-config
 2023-01-17 09:20:32 +01:00
Tobias Kaminsky
ca4745df86 daily dev 20230117 
Build(deps): Bump gradle from 7.3.1 to 7.4.0
Update Nextcloud Android library
Update 3rd-party dependencies
 2023-01-17 08:43:14 +01:00
Tobias Kaminsky
54198d7907 Merge remote-tracking branch 'origin/master' into dev 2023-01-17 08:40:34 +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
nextcloud-android-bot
3de35cc451 🔄 synced local '.github/dependabot.yml' with remote 'config/dependabot.yml' 
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
 2023-01-17 02:37:57 +00:00
nextcloud-android-bot
7ceaedb87a 🔄 synced local '.github/workflows/' with remote 'config/workflows/' 
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
 2023-01-17 02:37:57 +00:00
Álvaro Brey
a264730116
Merge pull request #11192 from nextcloud/fix/browseup-wrong-title 
Reset search when browsing to a folder from the favorites list
 2023-01-16 09:58:12 +01: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
Tobias Kaminsky
260e76c713 daily dev 20230114 2023-01-14 02:36:44 +01:00
Tobias Kaminsky
3619390d13 Merge remote-tracking branch 'origin/master' into dev 2023-01-14 02:31:15 +01: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
Álvaro Brey
bbedbc973a
Merge pull request #11248 from nextcloud/test-injection 
Enable overriding injections in AndroidInjection classes during connected tests
 2023-01-13 12:56:45 +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
Nextcloud bot
0f542c49ca
Fix(l10n): 🔠 Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-01-13 03:48:59 +00:00
Nextcloud bot
79094d8f4f
Fix(l10n): 🛠️ Update Transifex configuration 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-01-13 03:48:29 +00: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