12631 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nextcloud bot	a260345c86	[tx-robot] updated from transifex	2019-04-10 00:51:17 +00:00
ardevd	df9e8f49ef	Merge branch 'connectivityutils-powermock-test' of github.com:nextcloud/android into connectivityutils-powermock-test ... Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-09 20:39:08 +02:00
ardevd	b2fe726d93	Merge branch 'connectivityutils-powermock-test' of github.com:nextcloud/android into connectivityutils-powermock-test ... Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-09 20:38:44 +02:00
ardevd	544fda94e0	Merge branch 'connectivityutils-powermock-test' of github.com:nextcloud/android into connectivityutils-powermock-test	2019-04-09 20:37:46 +02:00
ardevd	94fb4ad349	minor cleanup ... Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-09 20:37:36 +02:00
ardevd	ffeaa7f766	added file header ... Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-09 20:36:14 +02:00
ardevd	81184d0266	test: added unit tests for the PowerUtils util class. ... Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-09 20:35:04 +02:00
ardevd	1ad459364f	minor cleanup	2019-04-09 19:59:42 +02:00
ardevd	e03dfc695d	updated tests ... Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-09 19:57:02 +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
Andy Scherzinger	b252c6440d	Merge pull request #3859 from nextcloud/unit-tests-for-connectivity-utils ... tests: added unit tests for the ConnectivityUtils util class.	2019-04-09 11:29:24 +02:00
ardevd	6b2ddd97fe	added GPL header ... Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-09 10:55:46 +02:00
ardevd	2f6cf091df	tests: added unit tests for the ConnectivityUtils util class. ... The isOnlineWithWifi() method is fully covered by these tests. Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-09 10:55:46 +02:00
Tobias Kaminsky	3456fec447	Merge pull request #3845 from nextcloud/thumbnailWithCorrectIcon ... Thumbnail with correct mimetype	2019-04-09 10:28:27 +02:00
tobiasKaminsky	79659e04a5	fix findbugs/spotbugs ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2019-04-09 10:21:02 +02:00
tobiasKaminsky	8713f4e3c1	As we can have now any preview (if there is a preview generator), we also need a fallback for any mimetype ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2019-04-09 10:06:15 +02:00
Tobias Kaminsky	0548dfb77a	Merge pull request #3847 from nextcloud/fixOldLogin ... revert to old auth login method: do not use weblogin suffix	2019-04-09 09:31:15 +02:00
Tobias Kaminsky	db42fde7d0	daily dev 20190409	2019-04-09 03:34:25 +02:00
Nextcloud bot	01df8d4a27	[tx-robot] updated from transifex	2019-04-09 00:50:46 +00:00
Andy Scherzinger	30cad20f86	Merge pull request #3839 from nextcloud/simplified-string-utils ... Minor refactor of StringUtils class. Added unit tests.	2019-04-08 13:27:57 +02:00
tobiasKaminsky	1646e46bde	remove test prefix name ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2019-04-08 11:55:46 +02:00
Tobias Kaminsky	f1ec1289fd	Merge pull request #3853 from nextcloud/fixDrone ... fix drone.yml for drone 1.0	2019-04-08 07:24:07 +01:00
tobiasKaminsky	dc069ed79e	fix drone.yml for drone 1.0 ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me> Signed-off-by: Morris Jobke <hey@morrisjobke.de> Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2019-04-08 08:01:10 +02:00
Tobias Kaminsky	958832d1c9	daily dev 20190408	2019-04-08 03:34:25 +02:00
Nextcloud bot	1f22645137	[tx-robot] updated from transifex	2019-04-08 00:52:12 +00: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
Andy Scherzinger	43c1d5e53c	Merge pull request #3850 from nextcloud/remove-unused-imports ... removed unused imports.	2019-04-05 12:18:37 +02:00
tobiasKaminsky	f932ab3f5b	added nullable ... add null checks Signed-off-by: tobiasKaminsky <tobias@kaminsky.me> wip Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2019-04-05 09:51:25 +01:00
ardevd	c40788b11d	removed unused imports. ... Leaving unused imports in reduces the code's readability, since their presence can be confusing.	2019-04-05 10:33:20 +02:00
ardevd	7d97b267af	updated assertion failure text. return empty string if arguments are null	2019-04-05 10:24:32 +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
Nextcloud bot	4bcaf8414e	[tx-robot] updated from transifex	2019-04-05 00:51:44 +00:00
tobiasKaminsky	ed7cf414da	revert to old auth login method: do not use weblogin suffix ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2019-04-04 21:30:21 +01:00
Tobias Kaminsky	2b95ff3dc1	daily dev 20190404	2019-04-04 03:33:38 +02:00
Nextcloud bot	347f30674f	[tx-robot] updated from transifex	2019-04-04 00:51:24 +00:00
ardevd	44e1cd846c	utils: replaced string concatenation with String.format. ... Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-03 09:56:05 +02:00
ardevd	fa047b751b	tests: added unit tests for the StringUtils class. ... Provides full test coverage of said class. Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-03 09:56:04 +02:00
ardevd	1c92e8c88b	utils: Removed dependency on android.text.TextUtils. ... Depending upon android.text.TextUtils for simply checking if a string is empty seems unnecessary and makes unit testing harder. Signed-off-by: ardevd <edvard.holst@gmail.com>	2019-04-03 09:56:03 +02:00
Andy Scherzinger	479a0558aa	Merge pull request #3838 from nextcloud/daggerUpdate ... bump dagger to 2.22.1	2019-04-03 09:00:17 +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
Nextcloud bot	e88df10983	[tx-robot] updated from transifex	2019-04-03 00:53:20 +00:00
Andy Scherzinger	b9c9954ad0	Merge pull request #3829 from nextcloud/370-alpha1 ... bump master to 3.7.0-alpha1	2019-04-02 13:04:16 +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	cbb4234771	Merge pull request #3791 from nextcloud/ezaquarii/inject-app-preferences-into-activities ... Inject AppPreferences into activities and fragments	2019-04-02 12:33:08 +02:00
Nextcloud bot	ed84655a05	[tx-robot] updated from transifex	2019-04-02 09:11:34 +00: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