mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-29 02:38:58 +03:00
Code Issues Projects Releases Packages Wiki Activity
15616 commits 228 branches 1574 tags 622 MiB
Commit graph

15616 commits

This branch
This branch
All branches
Author SHA1 Message Date
dependabot-preview[bot]
1fec59e719
Merge pull request #6801 from nextcloud/dependabot/gradle/com.pinterest-ktlint-0.38.1 2020-08-25 05:47:40 +00:00
dependabot-preview[bot]
493f77f060
Bump ktlint from 0.38.0 to 0.38.1 
Bumps [ktlint](https://github.com/pinterest/ktlint) from 0.38.0 to 0.38.1.
- [Release notes](https://github.com/pinterest/ktlint/releases)
- [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pinterest/ktlint/compare/0.38.0...0.38.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-25 01:13:12 +00:00
Tobias Kaminsky
a90cf6a364
Merge pull request #6786 from nextcloud/dependabot/gradle/com.pinterest-ktlint-0.38.0 
Bump ktlint from 0.37.2 to 0.38.0
 2020-08-24 10:09:55 +02:00
Tobias Kaminsky
ad7564b942
Merge pull request #6751 from grote/6726-documentsprovider-0-bytes 
Reset last sync date of files written via DocumentsProvider
 2020-08-24 09:51:10 +02:00
Tobias Kaminsky
3d083444fd
Merge pull request #6772 from nextcloud/crashOnBrokenThumbnail 
return onError in onPostExecute (which runs on UI thread)
 2020-08-24 09:32:13 +02:00
Tobias Kaminsky
e13b580611
Merge pull request #6775 from nextcloud/doNotPreviewHTML 
do not preview html within our text view
 2020-08-24 09:29:14 +02:00
Tobias Kaminsky
59e6722b11
Merge pull request #6771 from nextcloud/fixSyncConflictOnAutoUpload 
Fix #5755
 2020-08-24 09:02:14 +02:00
dependabot-preview[bot]
5c3fbf232c
Merge pull request #6787 from nextcloud/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.0.0 2020-08-24 06:38:35 +00:00
tobiasKaminsky
f0f467d2a1
fix code formatting according to new ktlint 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-24 08:36:43 +02:00
Nextcloud bot
d20a006ad6
[tx-robot] updated from transifex 2020-08-24 03:32:28 +00:00
dependabot-preview[bot]
fd8c50fea7
Bump constraintlayout from 1.1.3 to 2.0.0 
Bumps constraintlayout from 1.1.3 to 2.0.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-24 01:13:59 +00:00
dependabot-preview[bot]
3f0a4d0f44
Bump ktlint from 0.37.2 to 0.38.0 
Bumps [ktlint](https://github.com/pinterest/ktlint) from 0.37.2 to 0.38.0.
- [Release notes](https://github.com/pinterest/ktlint/releases)
- [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pinterest/ktlint/compare/0.37.2...0.38.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-24 01:13:35 +00:00
Nextcloud bot
0b3826fcf8
[tx-robot] updated from transifex 2020-08-23 03:33:15 +00:00
Nextcloud bot
ce041065c5
[tx-robot] updated from transifex 2020-08-22 03:30:14 +00:00
Torsten Grote
64ec705398
Reset last sync date of files written via DocumentsProvider 
The sync operation detects changes by comparing timestamps in
milliseconds. However, the local modification time only has a precision
of seconds (even though given in milliseconds).
When the DocumentsProvider is used programmatically, operations such as
a create and a subsequent write can happen within the same second
causing the sync operation to not detect the change and therefore
failing to upload a file causing data loss.

This commit also moves the file close listener to the thread used by the
DocumentsStorageProvider as this is more appropriate than the UI thread.

Fixes #6726

Signed-off-by: Torsten Grote <t@grobox.de>
 2020-08-21 09:15:19 -03:00
tobiasKaminsky
856916e658
do not preview html within our text view 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-21 11:44:57 +02:00
tobiasKaminsky
c50798cd24
return onError in onPostExecute (which runs on UI thread) 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-21 10:46:11 +02:00
dependabot-preview[bot]
de38e90acb
Merge pull request #6764 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.11.2 2020-08-21 07:33:04 +00:00
Tobias Kaminsky
6c043bff77
Merge pull request #6763 from nextcloud/dependabot/gradle/org.conscrypt-conscrypt-android-2.5.0 
Bump conscrypt-android from 2.4.0 to 2.5.0
 2020-08-21 09:32:50 +02:00
tobiasKaminsky
23b05f3a56
Fix #5755 
- use correct name collision info by synced folder
- syncedFolder.getNameCollisionPolicyInt -> returns int
- syncedFolder.getNameColllisionPolicy -> returns enum
- remove not needed backgroundJobManager from FilesSyncWork.kt

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-21 09:21:32 +02:00
Nextcloud bot
bf460b7451
[tx-robot] updated from transifex 2020-08-21 03:31:44 +00:00
dependabot-preview[bot]
da01fff04f
Bump detekt-gradle-plugin from 1.11.1 to 1.11.2 
Bumps detekt-gradle-plugin from 1.11.1 to 1.11.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-20 15:04:06 +00:00
dependabot-preview[bot]
916c503a2f
Bump conscrypt-android from 2.4.0 to 2.5.0 
Bumps [conscrypt-android](https://github.com/google/conscrypt) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/google/conscrypt/releases)
- [Commits](https://github.com/google/conscrypt/compare/2.4.0...2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-20 15:03:02 +00:00
Andy Scherzinger
dcf7455e57
Merge pull request #6760 from nextcloud/passwortToShare 
Fix crash on setting password
 2020-08-20 14:00:11 +02:00
tobiasKaminsky
886d42dc0f
Fix crash on setting password 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-20 12:30:18 +02:00
Tobias Kaminsky
800da337e9
Merge pull request #6744 from nextcloud/mnemonicTest 
fix mnemonic test
 2020-08-20 10:39:10 +02:00
Nextcloud bot
b75b151906
[tx-robot] updated from transifex 2020-08-20 03:33:56 +00:00
Tobias Kaminsky
4b9546335e
Merge pull request #6747 from nextcloud/bumpTo3.14Alpha 
Bump to 3.14.0 Alpha
 2020-08-19 10:48:36 +02:00
tobiasKaminsky
43d2edec47
also fix FDA open test 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-19 10:22:06 +02:00
Andy Scherzinger
457a5f1e90
Bump to 3.14.0 Alpha 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-08-19 09:48:20 +02:00
Andy Scherzinger
9a72f408c4
Merge pull request #6743 from nextcloud/changelog-master-stable-3.13.0 
Add changelog for 3.13.0
 2020-08-19 09:39:55 +02:00
tobiasKaminsky
0ecc933d5f
fix mnemonic test 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-19 09:19:26 +02:00
Tobias Kaminsky
8e33dd89fc
Merge pull request #6740 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.11.1 
Bump detekt-gradle-plugin from 1.11.0 to 1.11.1
 2020-08-19 09:19:00 +02:00
Nextcloud bot
47898e5d0d
[tx-robot] updated from transifex 2020-08-19 03:34:36 +00:00
dependabot-preview[bot]
51ebac6aa4
Bump detekt-gradle-plugin from 1.11.0 to 1.11.1 
Bumps detekt-gradle-plugin from 1.11.0 to 1.11.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-19 01:13:25 +00:00
tobiasKaminsky
039c4ee350
Add changelog for 3.13.0 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-18 10:37:42 +02:00
Tobias Kaminsky
5a1e57dbd1
Merge pull request #6724 from nextcloud/hideBigLoadingSpinner 
Do not show big spinner when initial loading a folder that is known to be not empty
 2020-08-18 09:38:39 +02:00
Tobias Kaminsky
5640c8c522
Merge pull request #6715 from nextcloud/fabOnSharing 
hide FAB on sharing view
 2020-08-18 08:45:05 +02:00
tobiasKaminsky
a6e0d2b8bf
Do not show big spinner when initial loading a folder that is known to be not empty, or on PhotoFragment 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-18 08:40:15 +02:00
Tobias Kaminsky
cd3cd7962a
Merge pull request #6701 from nextcloud/fix/dialogButtonTinting 
Correct call order when tinting the dialog button
 2020-08-18 08:30:27 +02:00
Tobias Kaminsky
872901fca4
Merge pull request #6714 from nextcloud/e2e_oldsupport 
E2E: support old iv delimiter, read only
 2020-08-18 07:54:28 +02:00
Nextcloud bot
0fe4115a67
[tx-robot] updated from transifex 2020-08-18 03:36:21 +00:00
Tobias Kaminsky
ee075f285c
Merge pull request #6721 from grote/6719-npe-onTransferProgress 
Prevent NPE: Ensure that mNotificationManager is not null
 2020-08-17 20:32:27 +02:00
tobiasKaminsky
c88cd18774
E2E: support old iv delimiter, read only 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-17 20:28:45 +02:00
Torsten Grote
8fbfc9028a
Ensure that mNotificationManager is not null when updating transfer progress 
This might happen, if the FileUploader service is being destroyed,
so mNotificationManager is set to null.

The applied fix has been used in a couple of other places in this file
as well, so it is at least consistent.

Signed-off-by: Torsten Grote <t@grobox.de>
 2020-08-17 11:03:39 -03:00
Andy Scherzinger
2bead6a747
make sure sorting is hidden too for details view 
remove redundant calls

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-08-17 13:58:47 +02:00
tobiasKaminsky
2a48130c55
hide FAB on sharing view 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-17 11:22:29 +02:00
Nextcloud bot
f71827c014
[tx-robot] updated from transifex 2020-08-17 03:29:39 +00:00
tobiasKaminsky
be04dec3ea
add tests 
- for error: UI test
- for mnemonic: we cannot capture dialog, so it is only an integration test

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-08-17 03:01:30 +02:00
Tobias Kaminsky
9cbbc556e0
Merge pull request #6703 from nextcloud/dependabot/gradle/kotlin_version-1.4.0 
Bump kotlin_version from 1.3.72 to 1.4.0
 2020-08-17 02:20:17 +02:00