Commit graph

686 commits

Author SHA1 Message Date
Tobias Kaminsky
3c51355d4d daily dev 20190502
71f33705a1 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
0f500884cf Merge pull request #3916 from jmue/cleanup/string_compare
7bb07a0419 Update wording for store text (#3903)
4c72f3f9a7 Merge pull request #3923 from nextcloud/editOnShareLink
81ed32f470 allow edit on link share on a file
7d01ff75f0 - fix IT tests - re-organized build.gradle a bit
a9afff7763 Merge pull request #3929 from nextcloud/dependabot/gradle/org.powermock-powermock-core-2.0.2
71c6d99624 bump all other powermock parts to 2.0.2
0421d26f06 Bump powermock-core from 2.0.0 to 2.0.2
1d28d1b520 Update with new wording from frontpage
de3d3de1bf Merge pull request #3924 from nextcloud/warnOnStable
69dd243a39 warn for wrong library branch on stable
2379b49577 Merge pull request #3921 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-3.4.0
c2730e8e0a Bump gradle from 3.3.2 to 3.4.0
b69169f457 unify empty string compare
8bb654b5ef fix test & review comments
d8b9d109b1 unify empty string compare
2f23a30906 remove unused variable (#3920)
92df32e664 Merge pull request #3918 from nextcloud/codacyCleanup
091c003b5d Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
15ec4876d1 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
da3c497630 Merge commit '334155e707975e740a0a13b33d9b7bbedf40e9bc'
b22f517029 Merge pull request #3915 from jmue/cleanup/ocfile
c7c6a989b4 use constant
e6604c8101 use constant
caa2a91bfc Merge pull request #3912 from nextcloud/libraryUsage
334155e707 some cleanups
28f80cd3ff Merge pull request #3907 from nextcloud/ezaquarii/initialize-main-app-context-before-content-providers-start
2afb934b41 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
8be1157e79 Merge pull request #3899 from jmue/cleanup/uriutils
52020a9bf3 direct usage of library project
4062d40aa6 Merge pull request #3908 from nextcloud/missingInjectable
2a08cb47d9 Initialize global context before MainApp.onCreate()
f02f482fb5 Missing Injectable lead to half-stored account
02cbafe59e Merge pull request #3765 from nextcloud/showSharees
dc7a2c0e7e show sharees
03e04e516e Merge pull request #3889 from nextcloud/checkUserId
d65e94b4e2 Update wording for store text
585a3d0852 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
533debfca0 - removed useNextcloudUserAgent -> we now use this everytime - removed any oAuth and saml stuff, as we rely on weblogin flow
d544fa5801 Merge pull request #3897 from nextcloud/ezaquarii/move-current-account-getter-to-user-account-manager
5b4ffba287 Merge pull request #3900 from nextcloud/codacyOnMaster
27572446cd remove unused code
428a8bbcc9 show codacy count only on master
6b44074d1e Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
c62e89b807 Merge commit '442394f949ff2de86bcccae172d2e9d997ab2ef8'
442394f949 Migrate current account getter from AccountUtils to UserAccountManager
182b65ed34 daily dev 20190414
2019-05-02 08:51:48 +02:00
Andy Scherzinger
0f500884cf
Merge pull request #3916 from jmue/cleanup/string_compare
unify empty string compare
2019-04-30 18:14:58 +02:00
tobiasKaminsky
7d01ff75f0
- fix IT tests
- re-organized build.gradle a bit

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-04-29 14:53:02 +02:00
Andy Scherzinger
71c6d99624
bump all other powermock parts to 2.0.2
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-04-25 10:40:25 +02:00
dependabot[bot]
0421d26f06
Bump powermock-core from 2.0.0 to 2.0.2
Bumps [powermock-core](https://github.com/powermock/powermock) from 2.0.0 to 2.0.2.
- [Release notes](https://github.com/powermock/powermock/releases)
- [Changelog](https://github.com/powermock/powermock/blob/release/2.x/docs/changelog.txt)
- [Commits](https://github.com/powermock/powermock/compare/powermock-2.0.0...powermock-2.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-22 01:12:33 +00:00
dependabot[bot]
c2730e8e0a
Bump gradle from 3.3.2 to 3.4.0
Bumps gradle from 3.3.2 to 3.4.0.

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-04-18 09:47:48 +02:00
Tobias Kaminsky
182b65ed34 daily dev 20190414
4442d5a338 Merge pull request #3895 from nextcloud/ezaquarii/user-account-manager
cd9eea52bc daily dev 20190413
2019-04-14 03:33:32 +02:00
Tobias Kaminsky
cd9eea52bc daily dev 20190413
98a134f6ca Merge pull request #3886 from nextcloud/ezaquarii/rename-preference-manager
75775ac34f Merge pull request #3871 from nextcloud/showCodacy
82fc476962 Merge pull request #3890 from nextcloud/deleteTests
36937b2366 Merge pull request #3882 from nextcloud/NPECheckScanner
1275728182 Rename PreferenceManager to AppPreferencesImpl
0e17ebdabd delete old tests
1074bcf46a Merge pull request #3879 from nextcloud/pmdRuleset
09da127d29 - rename ruleset - add test_test to MainApp to test Codacy
8e1ebca9c5 daily dev 20190412
2019-04-13 03:33:40 +02:00
Andy Scherzinger
1074bcf46a
Merge pull request #3879 from nextcloud/pmdRuleset
PMD ruleset
2019-04-12 07:52:31 +02:00
tobiasKaminsky
09da127d29
- rename ruleset
- add test_test to MainApp to test Codacy

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-04-12 07:44:25 +02:00
Tobias Kaminsky
8e1ebca9c5 daily dev 20190412
b52ce7e85c Merge pull request #3873 from nextcloud/codacy
32b04cb07e remove unused variable
35ff763950 codacy: combine statements
8353ef42bb Merge pull request #3864 from nextcloud/connectivityutils-powermock-test
477bc797aa removed placeholder test class
aa98015739 Merge branch 'connectivityutils-powermock-test' of github.com:nextcloud/android into connectivityutils-powermock-test
d760206654 Removed placeholder test class
3d9e379b43 Merge pull request #3841 from nextcloud/owncloudsession-unit-tests
a97eb3b45b - use lombok - remove m prefix - correct assert output - add licence
7e38b60ca0 utils: Restricted access declarations for OwnCloudSession class.
8712c9e783 tests: added unit tests for the OwnCloudSession class
0013ee8309 Merge pull request #3878 from nextcloud/dependabot/gradle/org.mockito-mockito-core-2.27.0
a34761ba3a code review changes
dac5897894 codacy: make newRemotePath a local variable
659775dc25 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
2ea4b352e3 combine statements
d19b7742d6 remove m/s-prefixes, make use of lombok
a05ba1a54f reformatting var declarations
d41a8a9054 spotbugs: Exceptional return value ignored
38466e01d3 reformatting
47a74a13fd remove unused HookActvity
c6498ae6b4 Use Butterknife for Log Activity
92219048da remove unused method
b41cca2840 add log statement to parent class
a3c7e7b74a use interface instead of implementation
88da903e59 daily dev 20190411
2019-04-12 03:34:47 +02:00
Andy Scherzinger
8353ef42bb
Merge pull request #3864 from nextcloud/connectivityutils-powermock-test
test: added PowerMocked unit tests for the ConnectivityUtils class.
2019-04-11 14:34:38 +02:00
Andy Scherzinger
0013ee8309
Merge pull request #3878 from nextcloud/dependabot/gradle/org.mockito-mockito-core-2.27.0
Bump mockito-core from 2.26.0 to 2.27.0
2019-04-11 07:46:20 +02:00
Tobias Kaminsky
88da903e59 daily dev 20190411
5aba8fe28a Merge pull request #3866 from nextcloud/tests-powerutils
58702f0ce5 Merge pull request #3867 from nextcloud/codacy
b5723187f1 remove typo
2859054633 codacy: Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.
2de1f7e5d9 codacy: Avoid unused private methods such as 'allFiles()'.
a5d4c2d8ad codacy: No need to call String.valueOf to append to a string.
7bc663efbc codacy: Avoid using Literals in Conditional Statements
39e113f251 codacy: This call to Collection.toArray() may be optimizable
2c55f2ee49 codacy: Avoid declaring a variable if it is unreferenced before a possible exit point.
cd1469317d codacy: This statement should have braces
73aea003ec codacy: A class which only has private constructors should be final
e1ec691d4a codacy: Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.
3e5d6700ab Merge pull request #3858 from nextcloud/devWithChangelog
0bf2f8c479 show changelog in dev
c0186e7191 Merge pull request #3868 from nextcloud/changelog360
6ab3b599be Release 3.6.0
5bf97c0bfd daily dev 20190410
2019-04-11 03:33:42 +02:00
dependabot[bot]
811b676f18
Bump mockito-core from 2.26.0 to 2.27.0
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.26.0 to 2.27.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.26.0...v2.27.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-11 01:12:18 +00:00
Tobias Kaminsky
5bf97c0bfd daily dev 20190410 2019-04-10 03:33:32 +02:00
ardevd
e17e5f6bd7
test: added PowerMocked unit tests for the ConnectivityUtils class.
Added necessary PowerMock dependencies in addition to a JSON dependency which is required in order to unit test with JSON objects. The default JSON library is part of AOSP and would need to be mocked which is not what we want.

Signed-off-by: ardevd <edvard.holst@gmail.com>
2019-04-09 14:59:18 +02:00
Tobias Kaminsky
db42fde7d0 daily dev 20190409 2019-04-09 03:34:25 +02:00
Tobias Kaminsky
958832d1c9 daily dev 20190408 2019-04-08 03:34:25 +02:00
Andy Scherzinger
c4a4179467
Merge pull request #3849 from nextcloud/dependabot/gradle/org.mockito-mockito-core-2.26.0
Bump mockito-core from 2.25.1 to 2.26.0
2019-04-07 12:04:26 +02:00
Tobias Kaminsky
7d2aad6cfe daily dev 20190406 2019-04-06 03:34:12 +02:00
dependabot[bot]
5ed4b269fa
Bump mockito-core from 2.25.1 to 2.26.0
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.25.1 to 2.26.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.25.1...v2.26.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-05 01:12:17 +00:00
Tobias Kaminsky
2b95ff3dc1 daily dev 20190404 2019-04-04 03:33:38 +02:00
Andy Scherzinger
8cb9a76b93
bump dagger to 2.22.1
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-04-03 08:47:49 +02:00
Tobias Kaminsky
06e710d67c daily dev 20190403 2019-04-03 03:34:35 +02:00
Andy Scherzinger
15a944933b
bump master to 3.7.0-alpha1
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-04-02 12:45:15 +02:00
Andy Scherzinger
2dfbe3dfe1
Merge pull request #3826 from nextcloud/dependabot/gradle/com.mebigfatguy.fb-contrib-fb-contrib-7.4.3
Bump fb-contrib from 7.4.3.sb to 7.4.3
2019-04-02 08:23:10 +02:00
Tobias Kaminsky
677bd759df daily dev 20190402 2019-04-02 03:34:18 +02:00
dependabot[bot]
9e63184aca
Bump fb-contrib from 7.4.3.sb to 7.4.3
Bumps [fb-contrib](https://github.com/mebigfatguy/fb-contrib) from 7.4.3.sb to 7.4.3.
- [Release notes](https://github.com/mebigfatguy/fb-contrib/releases)
- [Commits](https://github.com/mebigfatguy/fb-contrib/compare/v7.4.3.sb...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-02 01:11:33 +00:00
tobiasKaminsky
20802780c7
use spotbugs for analytics
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-04-01 10:30:49 +02:00
Chris Narkiewicz
d4788b0ad0
Add SpotBugs tasks
Closes #3759

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-30 22:55:57 +00:00
Tobias Kaminsky
7608587e87 daily dev 20190329 2019-03-29 03:34:19 +01:00
tobiasKaminsky
816a10735a
- unify icons
- add svg, convert to android xml, removed png

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

fix after rebase

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

renamed user -> ic_user (icon)
make favorite mutable

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

replace further png resources with xml drawables

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

fixes after rebase

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

allow for vector compat

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

add missing icon

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

add yet another missing icon

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

lint: When using VectorDrawableCompat, you need to use app:srcCompat

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

lint: When using VectorDrawableCompat, you need to use app:srcCompat

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

fix lint

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Drone: update Lint results to reflect reduced error/warning count [skip ci]

Signed-off-by: nextcloud-android-bot <android@nextcloud.com>

improve findbugs score

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

use correct icon for user account settings within drawer menu

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

icons needs to be grey600 by default, don't tint grey600 to not tint avatars

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

codacy: organize imports

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

programmatically set in-View drawables, in-view drawables can't be set via XML when supporting pre-lollipop

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

codacy: Useless parentheses & organize imports

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

organize imports

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

codacy: useless paranthesis

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

revert programmatically set
do not use vectorDrawables.useSupportLibrary

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

use 128dp for talk

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Revert "lint: When using VectorDrawableCompat, you need to use app:srcCompat"

This reverts commit 80068e7d37f3a8c6b7096c51543bda68443e4341.

Revert "lint: When using VectorDrawableCompat, you need to use app:srcCompat"

This reverts commit 0130e9a96d2602ad4b5d33aae67f34a458366d70.

revert srcCompat

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-28 10:14:01 +01:00
Andy Scherzinger
f91b4d22cd
Merge pull request #3795 from nextcloud/dependabot/gradle/com.h3xstream.findsecbugs-findsecbugs-plugin-1.9.0
Bump findsecbugs-plugin from 1.8.0 to 1.9.0
2019-03-28 07:22:37 +01:00
Tobias Kaminsky
e6f32d794c daily dev 20190328 2019-03-28 03:33:31 +01:00
dependabot[bot]
f95f9fcb39
Bump findsecbugs-plugin from 1.8.0 to 1.9.0
Bumps [findsecbugs-plugin](https://github.com/find-sec-bugs/find-sec-bugs) from 1.8.0 to 1.9.0.
- [Release notes](https://github.com/find-sec-bugs/find-sec-bugs/releases)
- [Changelog](https://github.com/find-sec-bugs/find-sec-bugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/find-sec-bugs/find-sec-bugs/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-28 02:15:17 +00:00
Tobias Kaminsky
9b7a354c2e daily dev 20190327 2019-03-27 03:33:33 +01:00
Tobias Kaminsky
10840d9e2c daily dev 20190323 2019-03-23 03:33:32 +01:00
Chris Narkiewicz
8fbe2ee38e
Integrate Dagger 2
Closes #3751

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-22 07:50:15 +01:00
Tobias Kaminsky
2e9b2c9dd6 daily dev 20190321 2019-03-21 03:33:20 +01:00
Tobias Kaminsky
7c28461679 daily dev 20190320 2019-03-20 03:33:18 +01:00
Tobias Kaminsky
bb6324ca97 daily dev 20190319 2019-03-19 03:34:16 +01:00
dependabot[bot]
3c66847f14
Bump mockito-core from 2.25.0 to 2.25.1
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.25.0 to 2.25.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.25.0...v2.25.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-18 02:14:13 +00:00
Tobias Kaminsky
9c0f7b11b8 daily dev 20190316 2019-03-16 03:33:17 +01:00
Tobias Kaminsky
9f053b53e5 daily dev 20190314 2019-03-14 03:33:10 +01:00
Tobias Kaminsky
b5931a385f daily dev 20190313 2019-03-13 03:33:13 +01:00
Tobias Kaminsky
2d286408c1 daily dev 20190312 2019-03-12 03:33:12 +01:00
Andy Scherzinger
38559be8fd
Merge pull request #3713 from nextcloud/ezaquarii/refactor-sort-order-preferences
Move sort order preferences to AppPreferences interface
2019-03-11 13:15:33 +01:00
Tobias Kaminsky
df8cfbe387 daily dev 20190310 2019-03-10 03:33:16 +01:00
Chris Narkiewicz
e521d25d63
Move sort order preferences to AppPreferences interface
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-10 01:25:31 +00:00