Commit graph

8412 commits

Author SHA1 Message Date
Tobias Kaminsky
2a8164acf1
Merge pull request #4700 from nextcloud/account-cleanup-receive-external-file-activity
Remove onAccountSet from ReceiveExternalFilesActivity
2019-10-18 10:17:48 +02:00
Nextcloud bot
76622c8861
[tx-robot] updated from transifex 2019-10-18 07:12:22 +00:00
Tobias Kaminsky
e31ff9901f daily dev 20191018
16cc46f4e Merge pull request #4687 from nextcloud/account-cleanup-upload-files-activity
d9567a2bb Merge pull request #4686 from nextcloud/account-cleanup-image-video-preview
2d9afe36c Merge pull request #4688 from nextcloud/account-cleanup-share-activity
f4a27cc5d Merge pull request #4693 from nextcloud/account-cleanup-file-display-activity
d237a834b Merge pull request #4699 from nextcloud/removeUploadPathActivity
64c986eaf Merge pull request #4689 from nextcloud/account-cleanup-folder-picker-activity
56d188086 Bump powermock-core from 2.0.2 to 2.0.4 (#4695)
ca77c7a2d Bump powermock-api-mockito2 from 2.0.2 to 2.0.4 (#4696)
baaf5d4f4 Bump powermock-module-junit4 from 2.0.2 to 2.0.4 (#4697)
ab904e336 We do not use UploadPathActivity anymore(?)
9773dc43c Merge pull request #4694 from nextcloud/account-cleanup-conflicts-resolve-activity
ae6cfb34c daily dev 20191017
2019-10-18 03:36:24 +02:00
Chris Narkiewicz
5d6e316570
Remove onAccountSet from ReceiveExternalFilesActivity
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-10-17 15:45:00 +01:00
Tobias Kaminsky
16cc46f4ed
Merge pull request #4687 from nextcloud/account-cleanup-upload-files-activity
Remove onAccountSet from UploadFilesActivity
2019-10-17 15:22:10 +02:00
Tobias Kaminsky
d9567a2bb6
Merge pull request #4686 from nextcloud/account-cleanup-image-video-preview
Remove onAccountSet from image and video preview activities
2019-10-17 15:21:54 +02:00
Tobias Kaminsky
2d9afe36c9
Merge pull request #4688 from nextcloud/account-cleanup-share-activity
Remove onAccountSet from ShareActivity
2019-10-17 15:21:44 +02:00
Tobias Kaminsky
f4a27cc5dc
Merge pull request #4693 from nextcloud/account-cleanup-file-display-activity
Remove onAccountSet from FileDisplayActivity
2019-10-17 14:58:13 +02:00
Tobias Kaminsky
d237a834b8
Merge pull request #4699 from nextcloud/removeUploadPathActivity
We do not use UploadPathActivity anymore(?)
2019-10-17 11:39:12 +02:00
Tobias Kaminsky
64c986eaf2
Merge pull request #4689 from nextcloud/account-cleanup-folder-picker-activity
Remove onAccountSet from FolderPickerActivity
2019-10-17 11:38:08 +02:00
tobiasKaminsky
ab904e336b
We do not use UploadPathActivity anymore(?)
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-10-17 08:23:15 +02:00
Tobias Kaminsky
9773dc43cf
Merge pull request #4694 from nextcloud/account-cleanup-conflicts-resolve-activity
Remove onAccountSet from ConflictsResolveActivity
2019-10-17 07:48:30 +02:00
Tobias Kaminsky
ae6cfb34ce daily dev 20191017
e47daaffd Merge pull request #4684 from nextcloud/codacy2
3ef96f887 Merge pull request #4677 from nextcloud/deprecate-set-account-logic
4f815e47b daily dev 20191016
2019-10-17 03:36:14 +02:00
Chris Narkiewicz
451cec9f3a
Remove onAccountSet from ConflictsResolveActivity
Deprecated onAccountSet logic simply inlined in onStart.
No change of control flow.

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-10-16 21:12:09 +01:00
Chris Narkiewicz
e5a6accf66
Remove onAccountSet from FileDisplayActivity
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-10-16 21:07:50 +01:00
Chris Narkiewicz
b199a62b78
Remove onAccountSet from image and video preview activities
Both callbacks are directly called from onStart().
Since callback parameter is unused, inline the
callback code in onStart().

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-10-16 19:57:11 +01:00
Chris Narkiewicz
f428fb5810
Remove onAccountSet from UploadFilesActivity
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-10-16 19:55:39 +01:00
Chris Narkiewicz
6a88a02f94
Remove onAccountSet from ShareActivity
Since onAccountSet is called directly from onStart,
we can inline the code in onStart safely.

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-10-16 19:54:30 +01:00
Chris Narkiewicz
3519d04eea
Remove onAccountSet from FolderPickerActivity
Move onAccountSet body to onStart.
Unconditionally reset fragment state, since the
acctount restoration flag is no longer available.

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-10-16 19:50:21 +01:00
Andy Scherzinger
e47daaffdc
Merge pull request #4684 from nextcloud/codacy2
more codacy fixes
2019-10-16 17:42:07 +02:00
Tobias Kaminsky
3ef96f8877
Merge pull request #4677 from nextcloud/deprecate-set-account-logic
Deprecate setAccount logic and remove accounWasSet flag
2019-10-16 14:57:46 +02:00
Tobias Kaminsky
4f815e47bc daily dev 20191016
862e5d477 Merge pull request #4537 from nextcloud/ezaquarii/migrate-ncontentobserverjob-to-workmanager
8cbabf08e add license header
54e5ce3ae Merge pull request #4683 from nextcloud/fixSorting
2286981db Merge pull request #4681 from nextcloud/codacy
1b0d548c6 fix sorting of synced folder: NPE if both enabled, but one has null folder name
31b62a863 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
2ab45a72a codacy: Deeply nested if..then statements are hard to read
2dabd04aa codacy: These nested if statements could be combined
e0802a0da codacy: Avoid using Literals in Conditional Statements
638a5b9fc codacy: Avoid unused imports such as 'androidx.fragment.app.Fragment'
ab6424701 codacy: Avoid unused method parameters such as 'appVersion'.
a73031148 Merge pull request #4679 from nextcloud/dependabot/gradle/com.pinterest-ktlint-0.35.0
26297005c [tx-robot] updated from transifex
df6504e6b Bump ktlint from 0.34.2 to 0.35.0
d189867d3 [tx-robot] updated from transifex
d3b0880e3 [tx-robot] updated from transifex
fc355d169 daily dev 20191012
2019-10-16 03:36:36 +02:00
Andy Scherzinger
7f209618eb
codacy: shorten method length
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-10-15 16:38:01 +02:00
Andy Scherzinger
9beecfa184
codacy: Document empty constructor (rather make setting flag more explicit in this case)
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-10-15 15:57:53 +02:00
Andy Scherzinger
670e9d3a61
codacy: Ensure you override both equals() and hashCode()
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-10-15 15:57:45 +02:00
Andy Scherzinger
862e5d4776
Merge pull request #4537 from nextcloud/ezaquarii/migrate-ncontentobserverjob-to-workmanager
Migrate NContentObserverJob to WorkManager
2019-10-15 15:23:15 +02:00
tobiasKaminsky
8cbabf08e5
add license header
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-10-15 13:41:27 +02:00
Andy Scherzinger
54e5ce3ae0
Merge pull request #4683 from nextcloud/fixSorting
fix sorting of synced folder: NPE if both enabled, but one has null folder name
2019-10-15 13:36:49 +02:00
tobiasKaminsky
1b0d548c69
fix sorting of synced folder: NPE if both enabled, but one has null folder name
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-10-15 09:56:55 +02:00
Andy Scherzinger
2ab45a72ac
codacy: Deeply nested if..then statements are hard to read
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-10-14 14:59:28 +02:00
Andy Scherzinger
2dabd04aa9
codacy: These nested if statements could be combined
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-10-14 14:59:28 +02:00
Andy Scherzinger
e0802a0da4
codacy: Avoid using Literals in Conditional Statements
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-10-14 14:59:27 +02:00
Andy Scherzinger
638a5b9fc0
codacy: Avoid unused imports such as 'androidx.fragment.app.Fragment'
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-10-14 14:59:26 +02:00
Andy Scherzinger
ab6424701b
codacy: Avoid unused method parameters such as 'appVersion'.
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-10-14 14:59:26 +02:00
Nextcloud bot
26297005c9
[tx-robot] updated from transifex 2019-10-14 03:05:53 +00:00
Chris Narkiewicz
c90626aaf5
Deprecate setAccount logic and remove accounWasSet flag
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-10-13 16:02:46 +01:00
Nextcloud bot
d189867d36
[tx-robot] updated from transifex 2019-10-13 03:08:24 +00:00
Nextcloud bot
d3b0880e38
[tx-robot] updated from transifex 2019-10-12 03:07:28 +00:00
Tobias Kaminsky
fc355d1690 daily dev 20191012
bc618c96c Merge pull request #4658 from nextcloud/381changelog
991a55cb6 Merge pull request #4656 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.1.1
d4e5ecd90 3.8.1 release notes
45f5b384d Merge pull request #4655 from nextcloud/revertDisableException
4d512c5dd Bump detekt-gradle-plugin from 1.0.1 to 1.1.1
e333c88a0 [tx-robot] updated from transifex
0dbee8aa9 daily dev 20191011
2019-10-12 03:37:48 +02:00
Andy Scherzinger
45f5b384db
Merge pull request #4655 from nextcloud/revertDisableException
Revert disabling of exception handler
2019-10-11 08:11:59 +02:00
Nextcloud bot
e333c88a08
[tx-robot] updated from transifex 2019-10-11 03:04:45 +00:00
Tobias Kaminsky
0dbee8aa95 daily dev 20191011
bfacbee7b Merge pull request #4630 from nextcloud/releaseProcess
fe0796329 add imfo about hotfix and security fix releases
f1cf050a8 Merge pull request #4626 from nextcloud/removeCustomEdit
af7bf9b2f Merge pull request #4647 from nextcloud/fixVanishingImages
4a9c7c806 Merge pull request #4648 from nextcloud/fixRelativePath
a2f2da9c2 move logic completely into function prevent double subfolders
73fc5e47e OCFiles can be retrieved also by photo search, which then do not have a parent, nor a fileId as the are only virtual files upon refreshing folder - they were found in database, but only updated with fileId=-1. - they were not found in parent folder, so we have to search them manually via file path
cf74da7bd - remove CustomEditTextField - do not use fancy material header for textInput, but regular TextView - do not show QR button on legacy login - fix layout in tablet mode
3e444725a daily dev 20191010
2019-10-11 03:36:06 +02:00
tobiasKaminsky
8cc3ec7ad6
revert disabling of exception handler
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-10-10 17:15:08 +02:00
Tobias Kaminsky
f1cf050a81
Merge pull request #4626 from nextcloud/removeCustomEdit
remove CustomEditTextField
2019-10-10 17:07:26 +02:00
Andy Scherzinger
af7bf9b2f7
Merge pull request #4647 from nextcloud/fixVanishingImages
Fix vanishing images
2019-10-10 13:56:29 +02:00
tobiasKaminsky
a2f2da9c20
move logic completely into function
prevent double subfolders

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-10-10 12:01:35 +02:00
tobiasKaminsky
73fc5e47ed
OCFiles can be retrieved also by photo search, which then do not have a parent, nor a fileId as the are only virtual files
upon refreshing folder
- they were found in database, but only updated with fileId=-1.
- they were not found in parent folder, so we have to search them manually via file path

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-10-10 10:51:54 +02:00
tobiasKaminsky
cf74da7bda
- remove CustomEditTextField
- do not use fancy material header for textInput, but regular TextView
- do not show QR button on legacy login
- fix layout in tablet mode

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-10-10 08:25:22 +02:00
Tobias Kaminsky
3e444725a9 daily dev 20191010
07d0abe87 Merge pull request #4644 from nextcloud/detectAuth
9be019ce4 Merge pull request #4637 from nextcloud/fixSingleAccountMode
140eb3b66 Allow broader check on CheckAuth
babcbec38 Merge pull request #4640 from nextcloud/accountListDisappears
3d6d396ba fix disappearing account list on resume
baefe67ea enhance single account mode
bb81d2349 Merge pull request #4632 from nextcloud/npeInDetail
ad9daacb2 Merge pull request #4629 from nextcloud/ezaquarii/remove-sticky-headers-code
832e525f0 hardening on possible NPE due to null account/activity
f321cedb2 Merge pull request #4623 from nextcloud/fixSyncedFolderNofications
eb5f8e017 [tx-robot] updated from transifex
ff1d95008 daily dev 20191009
2019-10-10 03:36:04 +02:00
Tobias Kaminsky
07d0abe87e
Merge pull request #4644 from nextcloud/detectAuth
Allow broader check on CheckAuth
2019-10-09 21:06:00 +02:00