mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-23 01:00:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
14620 commits 221 branches 1589 tags 640 MiB
Commit graph

14620 commits

This branch
This branch
All branches
Author SHA1 Message Date
tobiasKaminsky
8e45d953f1
Fix NPE on restoring file detail sharing fragment 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-09 08:51:23 +01:00
Nextcloud bot
19333cef78
[tx-robot] updated from transifex 2020-03-09 03:25:08 +00:00
Nextcloud bot
e32364d2fd
[tx-robot] updated from transifex 2020-03-08 03:30:50 +00:00
Nextcloud bot
a52277e5c0
[tx-robot] updated from transifex 2020-03-07 03:28:49 +00:00
AJ Jordan
9686d38f95
Expand paths to ignore for dev edition changelogs 2020-03-06 21:34:22 -05:00
AJ Jordan
a712d61386
Fix commits missing from dev edition changelogs 
Ref #5525

Signed-off-by: AJ Jordan <alex@strugee.net>
 2020-03-06 21:34:17 -05:00
Andy Scherzinger
3598ed75a3
Merge pull request #5595 from nextcloud/dependabot/gradle/pl.droidsonroids.gif-android-gif-drawable-1.2.19 
Bump android-gif-drawable from 1.2.15 to 1.2.19
 2020-03-06 13:44:33 +01:00
Andy Scherzinger
770f5264fc
Merge pull request #5596 from nextcloud/dependabot/gradle/org.mockito-mockito-android-3.3.1 
Bump mockito-android from 3.3.0 to 3.3.1
 2020-03-06 13:35:49 +01:00
dependabot-preview[bot]
8e5fc8ea9c
Bump android-gif-drawable from 1.2.15 to 1.2.19 
Bumps [android-gif-drawable](https://github.com/koral--/android-gif-drawable) from 1.2.15 to 1.2.19.
- [Release notes](https://github.com/koral--/android-gif-drawable/releases)
- [Changelog](https://github.com/koral--/android-gif-drawable/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/koral--/android-gif-drawable/compare/v1.2.15...v1.2.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-06 12:19:19 +00:00
Andy Scherzinger
12d4a93144
Merge pull request #5594 from nextcloud/feature/minSdk17 
change minimum supported Android version to 4.2
 2020-03-06 13:16:59 +01:00
dependabot-preview[bot]
54889cb418
Bump mockito-android from 3.3.0 to 3.3.1 
Bumps [mockito-android](https://github.com/mockito/mockito) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.3.0...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-06 12:06:41 +00:00
Andy Scherzinger
03c586bd94
remove unused dimens value 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-03-06 12:49:39 +01:00
Andy Scherzinger
be4efdd8ce
remove unneeded call 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-03-06 12:49:38 +01:00
Andy Scherzinger
37cc49b2d0
use correct dimens id 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-03-06 12:49:38 +01:00
Andy Scherzinger
3cfec4e0ba
remove sdk17 checks 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-03-06 12:49:37 +01:00
tobiasKaminsky
7a6ae44d77
Remove outdated right/left as now only start/end is needed 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-06 12:49:36 +01:00
Andy Scherzinger
4a6f5b2da7
change minimum supported Android version to 4.2 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-03-06 12:49:36 +01:00
Andy Scherzinger
b960e9c9ba
Merge pull request #5584 from nextcloud/dependabot/gradle/androidx.work-work-runtime-ktx-2.3.3 
Bump work-runtime-ktx from 2.3.2 to 2.3.3
 2020-03-06 12:46:41 +01:00
Tobias Kaminsky
581c12a867
Merge pull request #5546 from nextcloud/ezaquarii/migrations-manager 
Migrations manager
 2020-03-06 12:25:23 +01:00
dependabot-preview[bot]
4a957714ea
Bump work-runtime-ktx from 2.3.2 to 2.3.3 
Bumps work-runtime-ktx from 2.3.2 to 2.3.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-06 11:06:50 +00:00
Andy Scherzinger
232c801c9f
Merge pull request #5569 from nextcloud/removeUnusedClass 
remove unused class
 2020-03-06 12:03:37 +01:00
Andy Scherzinger
11aa3e1575
master is at 94 lint warnings 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-03-06 11:10:30 +01:00
tobiasKaminsky
5872a973a7
Bump after rebase 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-06 10:36:10 +01:00
Chris Narkiewicz
1ba288e5e6
Properly signal error when user id migration fails 
Previous implementation was returning success status
when *any* account was migrated, despite possible
failures.

Return error when any account fails to be migrated.

The migration remines idempotent and can be re-run
again, until if finally succeeds.

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
 2020-03-06 10:35:57 +01:00
Chris Narkiewicz
9ef27576e1
Enabled migration manager in MainApp 
Migration manager added to DI.

Migration manager called in place of legacy migration code.

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
 2020-03-06 10:35:57 +01:00
Chris Narkiewicz
439dd4ff78
Removed MigrationManager Robolectric tests 
Robolectric tests are removed as we don't want to emulate
platform.

Renamed instrumentation tests to match expected naming.

Updated detekt rule to allow human readable test function
names in kt files. This naming convention was adopted in
test code to enable human-readable test reports, but
DEX does not support spaces in names. Underscore _ is
a good replacement providnig similar level of readability.

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
 2020-03-06 10:35:57 +01:00
Chris Narkiewicz
1ab8d98d85
Support for optional migrations 
Optional migrations care not causing migration failure
and can be applied again on next application run.

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
 2020-03-06 10:35:57 +01:00
Chris Narkiewicz
b87bf1f10e
Migrations manager 
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
 2020-03-06 10:35:56 +01:00
Andy Scherzinger
98e4acc75a
remove ununsed raw files 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
 2020-03-06 09:59:35 +01:00
tobiasKaminsky
793dd901a2
remove unused class 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-06 09:59:34 +01:00
Nextcloud bot
b4a6ce98c1
[tx-robot] updated from transifex 2020-03-06 03:31:35 +00:00
Tobias Kaminsky
2061207e25
Merge pull request #5531 from nextcloud/fix/AS36 
Update to Android Studio 3.6
 2020-03-05 09:58:46 +01:00
Tobias Kaminsky
bac4e9b854
Merge pull request #5582 from nextcloud/dependabot/gradle/androidx.appcompat-appcompat-1.2.0-alpha03 
Bump appcompat from 1.2.0-alpha02 to 1.2.0-alpha03
 2020-03-05 08:50:22 +01:00
Tobias Kaminsky
c00b13df12
Merge pull request #5491 from nextcloud/conflictDialog 
Enhance conflict dialog
 2020-03-05 08:40:07 +01:00
tobiasKaminsky
30ac72652e
Fix test 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-05 08:22:58 +01:00
dependabot-preview[bot]
dc01b2d5ab
Merge pull request #5583 from nextcloud/dependabot/gradle/androidx.work-work-runtime-2.3.3 2020-03-05 07:11:55 +00:00
Nextcloud bot
4f47892823
[tx-robot] updated from transifex 2020-03-05 03:31:48 +00:00
dependabot-preview[bot]
9c10afa84e
Bump work-runtime from 2.3.2 to 2.3.3 
Bumps work-runtime from 2.3.2 to 2.3.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-05 02:13:15 +00:00
dependabot-preview[bot]
ca6a4e39c2
Bump appcompat from 1.2.0-alpha02 to 1.2.0-alpha03 
Bumps appcompat from 1.2.0-alpha02 to 1.2.0-alpha03.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-05 02:12:42 +00:00
Andy Scherzinger
4d231841d0
Merge pull request #5575 from nextcloud/devLibraryChange 
update dev changelog recognition for updating library
 2020-03-04 11:11:01 +01:00
Andy Scherzinger
7e595f713c
Merge pull request #5574 from nextcloud/dependabot/gradle/kotlin_version-1.3.70 
Bump kotlin_version from 1.3.61 to 1.3.70
 2020-03-04 11:10:25 +01:00
tobiasKaminsky
185123c58f
update dev changelog recognition for updating library 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-04 07:40:33 +01:00
Nextcloud bot
24f8bdbd29
[tx-robot] updated from transifex 2020-03-04 03:29:28 +00:00
dependabot-preview[bot]
f63502a8fa
Bump kotlin_version from 1.3.61 to 1.3.70 
Bumps `kotlin_version` from 1.3.61 to 1.3.70.

Updates `kotlin-gradle-plugin` from 1.3.61 to 1.3.70

Updates `kotlin-stdlib-jdk7` from 1.3.61 to 1.3.70
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.3.70/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.3.61...v1.3.70)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-04 02:14:04 +00:00
Andy Scherzinger
2ffb6dab5f
Merge pull request #5566 from nextcloud/hideOldLogin 
Disable old login method
 2020-03-03 13:17:36 +01:00
tobiasKaminsky
7ca6f304ed
Use proper dialog instantiation 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 10:31:04 +01:00
tobiasKaminsky
b8c4c68275
Fixes during CR 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 10:31:03 +01:00
tobiasKaminsky
836e51fa79
Remove unneeded strings 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 10:31:03 +01:00
tobiasKaminsky
628e58e65e
Fixe during CR 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 10:31:03 +01:00
tobiasKaminsky
ae08a42f8a
Enhance conflict dialog 
- fix bug
- add ui tests
- add instrumented tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2020-03-03 10:31:03 +01:00