Commit graph

713 commits

Author SHA1 Message Date
Tobias Kaminsky
ba55545bd1 daily dev 20190529
1b3cc0f78 Add funding support (#4077)
3c16d8bb4 add funding support
df3ac186b Move PowerUtils to dedicated power management service (#4073)
9cdc9269a ktlint
3d7b14386 added gpl license header
8116bfd79 Merge pull request #4063 from nextcloud/ktLint
90d960041 add ktlint
537b30494 daily dev 20190528
2019-05-29 03:34:02 +02:00
Andy Scherzinger
8116bfd79f
Merge pull request #4063 from nextcloud/ktLint
Add ktlint
2019-05-28 10:17:07 +02:00
tobiasKaminsky
90d9600418
add ktlint
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-05-28 10:02:36 +02:00
Tobias Kaminsky
537b304942 daily dev 20190528
035342895 Stabilize coverage (#4070)
71e73134b Enable coverage only in CI (#4068)
6ca1c8858 Stabilize coverage
a891c848d add changelog for 3.6.1 and 3.6.2 (#4069)
e5f24ebef remove empty lines after headline
471761452 add changelog for 3.6.1 and 3.6.2
fcb5738a8 [tx-robot] updated from transifex
eef4fb5fa [tx-robot] updated from transifex
33587bd2c Enable coverage only in CI
a42fd3b47 [tx-robot] updated from transifex
245ea82c4 daily dev 20190524
2019-05-28 03:33:52 +02:00
Unpublished
33587bd2cc Enable coverage only in CI
Signed-off-by: Unpublished <unpublished@gmx.net>
2019-05-24 23:42:04 +02:00
Tobias Kaminsky
245ea82c46 daily dev 20190524
3b3184184 Merge pull request #3969 from nextcloud/receivePushDelete
6074c9320 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
f28007e6b OCFileListFragment: Only scroll to top if directory changed (#4058)
b061e4d38 Merge commit '51ee4d88fd0555a945a24b1ab3beba2ffdc79c06'
51ee4d88f handle silent delete/delete-all push notifications do not ignore talk messages (will only be sent if no talk app is installed) exclude generated Parcelable
fb6b11f20 Use product name on rich document, if available (#3971)
4197d3be9 use proper qa build lib dependency
8c0609759 Only compare directories if necessary
403a3e062 Use product name on rich document, if available use placeholder for string reset to master-snapshot fix analysis warning use new translatable string use var vor qa flavor too
9b0a789d3 Merge pull request #4040 from nextcloud/ezaquarii/remove-findbugs
d6b4deea1 Remove legacy FindBugs tasks from build script
53c9c0573 daily dev 20190523
2019-05-24 03:33:51 +02:00
Andy Scherzinger
4197d3be99
use proper qa build lib dependency
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-05-23 09:48:54 +02:00
tobiasKaminsky
403a3e062c
Use product name on rich document, if available
use placeholder for string
reset to master-snapshot
fix analysis warning
use new translatable string
use var vor qa flavor too

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-05-23 08:58:52 +02:00
Andy Scherzinger
9b0a789d3b
Merge pull request #4040 from nextcloud/ezaquarii/remove-findbugs
Remove legacy FindBugs tasks from build script
2019-05-23 08:07:59 +02:00
Chris Narkiewicz
d6b4deea17
Remove legacy FindBugs tasks from build script
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-05-23 05:43:10 +01:00
Tobias Kaminsky
53c9c0573b daily dev 20190523
a8829c6c6 Refactor ConnectivityUtils (#4008)
9cbb677ba Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
c988459eb Merge commit '1f290419662c8058cd4bd90a161222f4150f6f25'
1f2904196 revert commentig
fabe3b233 open file from notification (#4019)
b3312aa97 linewrap
415deca15 [tx-robot] updated from transifex
6a79f10a4 daily dev 20190522
2019-05-23 03:33:51 +02:00
drone
c988459eb8 Merge commit '1f290419662c8058cd4bd90a161222f4150f6f25' 2019-05-22 11:39:17 +00:00
Tobias Kaminsky
6a79f10a41 daily dev 20190522
2146d808b Merge pull request #4032 from nextcloud/emailOnError
762a80666 Merge pull request #4046 from nextcloud/fix-issues-sso-ocs-header
4d90477cc Merge pull request #4049 from nextcloud/followup4044
faaca8691 throw exception if sso users try to set the OCS-APIREQUEST header themselves
889d0669b email on failure
c635e2e49 Close WhatsNewActivity if open
5c686ef31 Merge pull request #4041 from nextcloud/ezaquarii/fix-weak-ref-dereference-npe-in-thumbnails-cache-manager
f88239b67 daily dev 20190521
2019-05-22 03:33:46 +02:00
Tobias Kaminsky
f88239b679 daily dev 20190521
bd4bc646c Merge pull request #4044 from nextcloud/fixToolbar
5d4a966b4 add fix for app protection
759558c46 Use account.hashCode instead of name as account switching value (#4031)
c16622dd9 Fix IllegalStateException on Toolbar while activity recreation
0bb4e72e9 Add test for IllegalStateException of FileDisplayActivity
28c7e7469 use account.hashCode instead of name as account switching value
d65ce6de5 [tx-robot] updated from transifex
740aff425 daily dev 20190520
2019-05-21 03:33:46 +02:00
Tobias Kaminsky
740aff425b daily dev 20190520
de3508c4e Merge pull request #4036 from nextcloud/wordingForAPK
64b008694 [tx-robot] updated from transifex
821b3b361 [tx-robot] updated from transifex
8bf577510 daily dev 20190518
2019-05-20 03:33:53 +02:00
Chris Narkiewicz
412f9eb1c8
Refactor ConnectivityUtils
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-05-18 13:44:41 +01:00
Tobias Kaminsky
8bf5775105 daily dev 20190518
65026e789 Changelog for fdroid now with line breaks (#4035)
c8f0f20be move to versionDev flavor
16f7b4e17 deploy artifact on success (#4018)
17765573a deploy gplay artifact on success as own QA flavor
c382b3dd8 changelog for fdroid now with line breaks
28159cf47 [tx-robot] updated from transifex
1b532f86a daily dev 20190517
2019-05-18 03:34:38 +02:00
Tobias Kaminsky
16f7b4e17c
deploy artifact on success (#4018)
deploy artifact on success
2019-05-17 07:46:48 +02:00
tobiasKaminsky
17765573ac
deploy gplay artifact on success as own QA flavor
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-05-17 07:36:28 +02:00
Tobias Kaminsky
1b532f86a8 daily dev 20190517
e394748bd Merge pull request #4028 from nextcloud/externalIcon
b9698f949 Merge pull request #4034 from nextcloud/addChangelogToFdroid
0bc6e5362 add changelog to fdroid via fastlane
aa8fc2e5c use authenticated glide loader for svg
d16d2979d Merge pull request #4029 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-3.4.1
2dd4c3041 Bump gradle from 3.4.0 to 3.4.1
eba0a9852 daily dev 20190515
2019-05-17 03:36:28 +02:00
dependabot[bot]
2dd4c30419
Bump gradle from 3.4.0 to 3.4.1
Bumps gradle from 3.4.0 to 3.4.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-16 01:13:13 +00:00
Tobias Kaminsky
eba0a98521 daily dev 20190515
b4f36f4a41 Merge pull request #3989 from nextcloud/askForPassword
1edf2cd82c changes due to rebase
a0a841f7dd revert to master branch
d372a21bd4 combine if statement
9650a14e57 change capability name
788cea14b8 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
8f78e61c6f if ask for password is set, show an optional password dialog
3b24d0920f daily dev 20190514
2019-05-15 03:34:52 +02:00
Tobias Kaminsky
3b24d0920f daily dev 20190514
da3894157b Merge pull request #3974 from nextcloud/richDocumentsOptionalMimetypes
22b352a47d Merge pull request #4013 from nextcloud/emailOnError
8424fd1b95 email on error
8bc713ee46 daily dev 20190513
2019-05-14 03:34:55 +02:00
Tobias Kaminsky
8bc713ee46 daily dev 20190513
deffbd8b00 Ensure that userId is always present (#3909)
504b3daa79 - testUserId() removes test state - removed commented code
b410e1bb09 [tx-robot] updated from transifex
2c30e5e9f7 spotbugs: remove redundant null checks
0a9e79988a codacy: Avoid declaring a variable if it is unreferenced before a possible exit point.
ed24c43f42 revert lib back to master
87dd10323a - migrate userId - always fetch userId on account creation
a6de22aa94 [tx-robot] updated from transifex
bc11455e79 Merge pull request #3993 from nextcloud/debugWebView
06a8a44494 Merge pull request #3997 from nextcloud/noFABonSearch
75c65b49c8 enable webview debug on debug builds; disabled on productive builds
1327b7e33a Spotbugs: disable experimental BAS_BLOATED_ASSIGNMENT_SCOPE (#3998)
57e01e240a Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
1c76b9765e disable experimental BAS_BLOATED_ASSIGNMENT_SCOPE: Method assigns a variable in a larger scope than is needed                      THIS DETECTOR IS HIGHLY EXPERIMENTAL AND IS LIKELY TO CREATE A LOT OF FUD
c513959edb show fab when navigating into a search
2019-05-13 09:24:51 +02:00
dependabot[bot]
96470a38f5
Bump lombok from 1.18.6 to 1.18.8
Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.6 to 1.18.8.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.6...v1.18.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-05-07 08:24:40 +02:00
Chris Narkiewicz
fd9f9a3ee9
Enable Kotlin support
Closes #3620

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-05-06 16:22:31 +01:00
dependabot[bot]
c6b80bb6f7
Bump fb-contrib from 7.4.3 to 7.4.5
Bumps [fb-contrib](https://github.com/mebigfatguy/fb-contrib) from 7.4.3 to 7.4.5.
- [Release notes](https://github.com/mebigfatguy/fb-contrib/releases)
- [Commits](https://github.com/mebigfatguy/fb-contrib/compare/v7.4.3...v7.4.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-06 01:12:33 +00:00
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