mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
17863 commits 226 branches 1571 tags 618 MiB
Commit graph

17863 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
8acf55d0f1
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-06 03:53:53 +00:00
Tobias Kaminsky
7d4fa2994c
Merge pull request #9644 from nextcloud/cleanUpAccountRemoval 
Clean up AccountRemovalWork
 2022-01-05 15:05:32 +01:00
Álvaro Brey
d292c5a75b
Merge pull request #9647 from nextcloud/dependabot/gradle/com.squareup.leakcanary-leakcanary-android-2.8 
Bump leakcanary-android from 2.7 to 2.8
 2022-01-05 09:41:58 +01:00
dependabot[bot]
13cbb29474
Bump leakcanary-android from 2.7 to 2.8 
Bumps [leakcanary-android](https://github.com/square/leakcanary) from 2.7 to 2.8.
- [Release notes](https://github.com/square/leakcanary/releases)
- [Changelog](https://github.com/square/leakcanary/blob/main/docs/changelog.md)
- [Commits](https://github.com/square/leakcanary/compare/v2.7...v2.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-05 02:05:50 +00:00
tobiasKaminsky
90d66c4339
Clean up AccountRemovalWork 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2022-01-04 13:08:44 +01:00
Álvaro Brey
7a7136a9da
Merge pull request #9577 from nextcloud/dependabot/gradle/mockitoVersion-4.2.0 
Bump mockitoVersion from 4.1.0 to 4.2.0
 2022-01-04 11:18:24 +01:00
Nextcloud bot
6d6445a1f6
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-04 03:52:56 +00:00
dependabot[bot]
67a8384731
Bump mockitoVersion from 4.1.0 to 4.2.0 
Bumps `mockitoVersion` from 4.1.0 to 4.2.0.

Updates `mockito-core` from 4.1.0 to 4.2.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0)

Updates `mockito-android` from 4.1.0 to 4.2.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-03 18:28:46 +00:00
Álvaro Brey
556b3b4b79
Merge pull request #9637 from nextcloud/dependabot/gradle/mockkVersion-1.12.2 
Bump mockkVersion from 1.12.1 to 1.12.2
 2022-01-03 19:26:20 +01:00
Álvaro Brey
a3a8170151
Merge pull request #9582 from nextcloud/fix/media-return-after-pause 
Player: don't try to pause a non-running media player
 2022-01-03 16:56:37 +01:00
Álvaro Brey
531eb9f0ac
Merge pull request #9594 from nextcloud/dependabot/gradle/byteBuddyVersion-1.12.6 
Bump byteBuddyVersion from 1.12.4 to 1.12.6
 2022-01-03 08:43:04 +01:00
Nextcloud bot
a3b3f18abd
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-01 03:52:26 +00:00
dependabot[bot]
f7af0e769a
Bump mockkVersion from 1.12.1 to 1.12.2 
Bumps `mockkVersion` from 1.12.1 to 1.12.2.

Updates `mockk` from 1.12.1 to 1.12.2
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.1...1.12.2)

Updates `mockk-android` from 1.12.1 to 1.12.2
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.1...1.12.2)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-31 02:04:33 +00:00
Nextcloud bot
042b93766e
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-27 03:52:10 +00:00
Nextcloud bot
5d32890848
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-25 03:52:43 +00:00
Nextcloud bot
552a657350
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-24 03:55:33 +00:00
Andy Scherzinger
e9b7d9e430
Merge pull request #9610 from nextcloud/Gradle-Log4j 
Bump Gradle for Log4j
 2021-12-23 10:56:44 +01:00
Andy Scherzinger
ead8ef06db
Merge pull request #9603 from nextcloud/changelog-master-stable-3.18.1 
Add changelog for 3.18.1
 2021-12-23 08:50:44 +01:00
Hannes Achleitner
74683d9eb9 Bump Gradle for Log4j 
https://github.com/gradle/gradle/releases/tag/v7.3.3
 2021-12-23 08:46:36 +01:00
Nextcloud bot
afc83b8310
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-23 03:53:42 +00:00
Álvaro Brey Vilas
62eb9632ba
Fastfile: fix requirement check syntax 
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-22 14:17:55 +01:00
Álvaro Brey Vilas
a83a21219e
Add changelog for 3.18.1 
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-22 12:51:13 +01:00
Álvaro Brey
c6731093b1
Merge pull request #9559 from nextcloud/fix/fastlane-check-apk 
Fastlane: fix release with 3 apks, and minor improvements
 2021-12-22 10:30:49 +01:00
Álvaro Brey Vilas
130c004945
FileDataStorageManager: remove obsolete TODO 
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-22 09:52:09 +01:00
Álvaro Brey
9433e2968e Drone: update FindBugs results to reflect reduced error/warning count [skip ci] 
Signed-off-by: Álvaro Brey <drone@nextcloud.com>
 2021-12-22 08:51:21 +00:00
Álvaro Brey
98465ab3fb
Merge pull request from GHSA-vjp2-f63v-w479 
Harden FileContentProvider's public Uri paths
 2021-12-22 09:43:11 +01:00
Álvaro Brey
0d2fd93ea2
Merge pull request #9597 from nextcloud/fix/too-many-thumbnails 
Fix for too many thumbnails in autoupload settings
 2021-12-22 09:37:51 +01:00
Álvaro Brey Vilas
9c7d212d52
Fix for too many thumbnails in autoupload settings 
This patch is twofold:
- Keep using SQL limit until android 11 (which is where it becomes mandatory to not use it)
- Force MediaProvider to stop querying images after limit has been reached, even if cursor contains more.
This handles the edge case of Android versions over 11 which don't properly implement the limit argument

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-21 17:22:10 +01:00
Álvaro Brey Vilas
bc90eb3db1
Remove obsolete TODO 
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-21 16:02:50 +01:00
Álvaro Brey Vilas
724b75d5d3
FileContentProvider: Use SQLiteTokenizer for sortOrder verification too 
More reliable than just splitting by spaces.

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-21 15:06:05 +01:00
Álvaro Brey Vilas
b3aeab9004
FileContentProvider: prevent injection through selection parameters (where) 
For this, I've backported the SQLiteTokenizer class from AOSP, use it to get tokens from the query,
and filter out invalid tokens.

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-21 14:15:34 +01:00
Nextcloud bot
c479f2fdf6
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-21 03:54:15 +00:00
dependabot[bot]
54b50f2b7d
Bump byteBuddyVersion from 1.12.4 to 1.12.6 
Bumps `byteBuddyVersion` from 1.12.4 to 1.12.6.

Updates `byte-buddy` from 1.12.4 to 1.12.6
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.12.4...byte-buddy-1.12.6)

Updates `byte-buddy-android` from 1.12.4 to 1.12.6
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.12.4...byte-buddy-1.12.6)

---
updated-dependencies:
- dependency-name: net.bytebuddy:byte-buddy
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: net.bytebuddy:byte-buddy-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-21 02:04:45 +00:00
Álvaro Brey Vilas
6aae8feeac
FileContentProvider: prevent injection in sortOrder argument for query() 
For this, allow strictly only valid grammar and column names

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-20 18:38:50 +01:00
Álvaro Brey Vilas
830ada4617
FileContentProvider: remove unused method 
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-20 18:03:56 +01:00
Álvaro Brey Vilas
43adc856a4
FileContentProvider: don't verify projectionArray in query() 
query() is already using a projection map and strict mode for those cases, so we're just duplicating work here.

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-20 17:58:54 +01:00
Álvaro Brey Vilas
05371be6d7
FileContentProvider: prevent injection through Uri arguments 
For this, ensure query arguments are used instead of segment concatenation

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-20 17:53:55 +01:00
tobiasKaminsky
72937cf341
FileContentProvider: prevent injection via ContentValues arguments 
For this, verify all column names for ContentValues keys. Values are safe by default.

Co-authored-by: Tobias Kaminsky <tobias.kaminsky@nextcloud.com>
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-20 17:40:11 +01:00
Tobias Kaminsky
7fba2042dc
Merge pull request #9589 from nextcloud/setupLibInfo 
Adjust instruction how to link library in app
 2021-12-20 10:51:35 +01:00
tobiasKaminsky
0680c105b5
Adjust instruction how to link library in app 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2021-12-20 10:47:09 +01:00
Nextcloud bot
4183ee59f8
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-20 03:56:38 +00:00
Nextcloud bot
14a6324c05
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-19 03:59:20 +00:00
Nextcloud bot
26f80ddcbf
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-18 03:53:54 +00:00
Álvaro Brey Vilas
37dfb5eb2c
Player: don't try to pause a non-running media player 
Fixes an issue triggered by pausing, and then minimizing and coming back to the app.

Right now state is still lost (file returns to the beginning) but as a stopgap it's OK.
In the future, the state machine and how it interacts with the fragment should be reworked.

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
 2021-12-17 16:22:39 +01:00
Andy Scherzinger
b4ecf2c9cc
Merge pull request #9546 from nextcloud/update-AGP 
Bump Android Gradle Plugin to 7.0.4
 2021-12-16 17:02:16 +01:00
Álvaro Brey
3de9432651
Merge pull request #9534 from gabmert/naming-conflicts 
Change naming in conflicts to location instead of date
 2021-12-16 09:35:43 +01:00
Álvaro Brey
51d632b0ad
Merge pull request #9568 from nextcloud/dependabot/gradle/byteBuddyVersion-1.12.4 
Bump byteBuddyVersion from 1.12.3 to 1.12.4
 2021-12-16 08:54:24 +01:00
Nextcloud bot
d3db0af0f5
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-16 03:53:43 +00:00
dependabot[bot]
38a2449f5c
Bump byteBuddyVersion from 1.12.3 to 1.12.4 
Bumps `byteBuddyVersion` from 1.12.3 to 1.12.4.

Updates `byte-buddy` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.12.3...byte-buddy-1.12.4)

Updates `byte-buddy-android` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.12.3...byte-buddy-1.12.4)

---
updated-dependencies:
- dependency-name: net.bytebuddy:byte-buddy
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: net.bytebuddy:byte-buddy-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-16 02:07:04 +00:00
gabriel
5500585c1a naming in conflicts by location instead of date 
Signed-off-by: gabriel <74419649+gabmert@users.noreply.github.com>
 2021-12-15 23:13:42 +01:00