Skip to content

Commit 63f9db3

Browse files
provokateurinprovokateurin
committed
chore(nextcloud)!: Remove support for server 27.x and all apps only compatible up to 27.x
Signed-off-by: provokateurin <kate@provokateurin.de>
1 parent 15a657d commit 63f9db3

37 files changed

+261
-601
lines changed

‎packages/neon/neon_dashboard/lib/src/blocs/dashboard.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ class _DashboardBloc extends InteractiveBloc implements DashboardBloc {
7474
serializer: account.client.dashboard.dashboardApi.$getWidgets_Serializer(),
7575
// Filter all widgets that don't support v1 nor v2
7676
unwrap: (response) => BuiltList(
77-
response.body.ocs.data.values
78-
.where((widget) => widget.itemApiVersions == null || widget.itemApiVersions!.isNotEmpty),
77+
response.body.ocs.data.values.where((widget) => widget.itemApiVersions.isNotEmpty),
7978
),
8079
);
8180
}
@@ -89,7 +88,7 @@ class _DashboardBloc extends InteractiveBloc implements DashboardBloc {
8988

9089
for (final widget in widgets.value.requireData) {
9190
final itemApiVersions = widget.itemApiVersions;
92-
if (itemApiVersions != null && itemApiVersions.contains(2)) {
91+
if (itemApiVersions.contains(2)) {
9392
v2WidgetIDs.add(widget.id);
9493
} else {
9594
v1WidgetIDs.add(widget.id);

‎packages/neon/neon_dashboard/lib/src/widgets/widget_item.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class DashboardWidgetItem extends StatelessWidget {
4141
);
4242

4343
final overlayIconUrl = item.overlayIconUrl;
44-
if (overlayIconUrl != null && overlayIconUrl.isNotEmpty) {
44+
if (overlayIconUrl.isNotEmpty) {
4545
leading = Stack(
4646
children: [
4747
leading,

‎packages/neon/neon_dashboard/test/bloc_test.dart

+5-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Account mockDashboardAccount() => mockServer({
1616
'meta': {'status': '', 'statuscode': 0},
1717
'data': {
1818
for (final entry in {
19-
'null': null,
2019
'empty': <dynamic>[],
2120
'v1': [1],
2221
'v2': [2],
@@ -30,6 +29,7 @@ Account mockDashboardAccount() => mockServer({
3029
'icon_url': '',
3130
'item_icons_round': false,
3231
'item_api_versions': entry.value,
32+
'reload_interval': 0,
3333
},
3434
},
3535
},
@@ -50,6 +50,7 @@ Account mockDashboardAccount() => mockServer({
5050
'title': key,
5151
'link': '',
5252
'iconUrl': '',
53+
'overlayIconUrl': '',
5354
'sinceId': '',
5455
},
5556
],
@@ -60,6 +61,7 @@ Account mockDashboardAccount() => mockServer({
6061
'title': '$i',
6162
'link': '',
6263
'iconUrl': '',
64+
'overlayIconUrl': '',
6365
'sinceId': '',
6466
},
6567
],
@@ -83,6 +85,7 @@ Account mockDashboardAccount() => mockServer({
8385
'title': key,
8486
'link': '',
8587
'iconUrl': '',
88+
'overlayIconUrl': '',
8689
'sinceId': '',
8790
},
8891
],
@@ -97,6 +100,7 @@ Account mockDashboardAccount() => mockServer({
97100
'title': '$i',
98101
'link': '',
99102
'iconUrl': '',
103+
'overlayIconUrl': '',
100104
'sinceId': '',
101105
},
102106
],
@@ -134,7 +138,6 @@ void main() {
134138

135139
test('refresh', () async {
136140
final widgets = BuiltList<String>([
137-
'null',
138141
'v1',
139142
'v2',
140143
'v1v2',
@@ -148,7 +151,6 @@ void main() {
148151
);
149152

150153
final items = BuiltList<String>([
151-
'null',
152154
'v1',
153155
for (var i = 0; i < 7; i++) '$i',
154156
'v2',

‎packages/neon/neon_talk/test/testing.dart

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ Map<String, dynamic> getRoom({
6262
'participantType': 0,
6363
'permissions': 0,
6464
'readOnly': 0,
65+
'recordingConsent': 0,
6566
'sessionId': '',
6667
'sipEnabled': 0,
6768
'token': token ?? '',
@@ -85,6 +86,7 @@ Map<String, dynamic> getChatMessage({
8586
'expirationTimestamp': 0,
8687
'id': id ?? 0,
8788
'isReplyable': false,
89+
'markdown': false,
8890
'message': message ?? '',
8991
'messageParameters': <dynamic, dynamic>{},
9092
'messageType': spreed.MessageType.comment.name,

‎packages/neon_framework/test/unified_search_bloc_test.dart

+3
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,11 @@ Account mockUnifiedSearchAccount() => mockServer({
6060
for (final id in ['a', 'b', 'c'])
6161
{
6262
'id': id,
63+
'appId': '',
6364
'name': '',
65+
'icon': '',
6466
'order': 0,
67+
'inAppSearch': false,
6568
},
6669
],
6770
},

‎packages/nextcloud/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ These OpenAPI specifications are [generated](https://github.com/nextcloud/openap
5353

5454
| Component | Supported versions (1) |
5555
|------------------------------------------------------------------------------------|------------------------|
56-
| [Server](https://github.com/nextcloud/server) (2) | 27 - 29 |
57-
| [News app](https://github.com/nextcloud/news) | 22 - 25 |
58-
| [Notes app](https://github.com/nextcloud/notes) | 4.7 - 4.10 |
59-
| [Notifications app](https://github.com/nextcloud/notifications) | 27 - 29 |
60-
| [Talk app](https://github.com/nextcloud/spreed) | 17 - 19 |
56+
| [Server](https://github.com/nextcloud/server) (2) | 28 - 29 |
57+
| [News app](https://github.com/nextcloud/news) | 25 |
58+
| [Notes app](https://github.com/nextcloud/notes) | 4.8 - 4.10 |
59+
| [Notifications app](https://github.com/nextcloud/notifications) | 28 - 29 |
60+
| [Talk app](https://github.com/nextcloud/spreed) | 18 - 19 |
6161
| [NextPush app](https://codeberg.org/NextPush/uppush) | 1.4 |
62-
| [User account deletion app](https://framagit.org/framasoft/nextcloud/drop_account) | 2.3 - 2.5 |
62+
| [User account deletion app](https://framagit.org/framasoft/nextcloud/drop_account) | 2.4 - 2.5 |
6363

6464
1: Other versions might be supported too or at least mostly working, but we do not test against those.
6565
2: Server includes the following apps: comments, core, dashboard, dav, files, files_external, files_reminders, files_sharing, files_trashbin, files_versions, provisioning_api, settings, sharebymail, systemtags, theming, updatenotification, user_ldap, user_status, weather_status and WebDAV.

‎packages/nextcloud/lib/src/api/core.openapi.dart

+10-11
Original file line numberDiff line numberDiff line change
@@ -11064,19 +11064,19 @@ abstract interface class $SpreedCapabilities_Config_CallInterface {
1106411064
bool get breakoutRooms;
1106511065
bool get recording;
1106611066
@BuiltValueField(wireName: 'recording-consent')
11067-
int? get recordingConsent;
11067+
int get recordingConsent;
1106811068
@BuiltValueField(wireName: 'supported-reactions')
1106911069
BuiltList<String> get supportedReactions;
1107011070
@BuiltValueField(wireName: 'predefined-backgrounds')
1107111071
BuiltList<String> get predefinedBackgrounds;
1107211072
@BuiltValueField(wireName: 'can-upload-background')
1107311073
bool get canUploadBackground;
1107411074
@BuiltValueField(wireName: 'sip-enabled')
11075-
bool? get sipEnabled;
11075+
bool get sipEnabled;
1107611076
@BuiltValueField(wireName: 'sip-dialout-enabled')
11077-
bool? get sipDialoutEnabled;
11077+
bool get sipDialoutEnabled;
1107811078
@BuiltValueField(wireName: 'can-enable-sip')
11079-
bool? get canEnableSip;
11079+
bool get canEnableSip;
1108011080
@BuiltValueHook(initializeBuilder: true)
1108111081
static void _defaults($SpreedCapabilities_Config_CallInterfaceBuilder b) {}
1108211082
@BuiltValueHook(finalizeBuilder: true)
@@ -11131,10 +11131,9 @@ abstract interface class $SpreedCapabilities_Config_ChatInterface {
1113111131
@BuiltValueField(wireName: 'read-privacy')
1113211132
int get readPrivacy;
1113311133
@BuiltValueField(wireName: 'has-translation-providers')
11134-
bool? get hasTranslationProviders;
11134+
bool get hasTranslationProviders;
1113511135
@BuiltValueField(wireName: 'typing-privacy')
1113611136
int get typingPrivacy;
11137-
BuiltList<String>? get translations;
1113811137
@BuiltValueHook(initializeBuilder: true)
1113911138
static void _defaults($SpreedCapabilities_Config_ChatInterfaceBuilder b) {}
1114011139
@BuiltValueHook(finalizeBuilder: true)
@@ -16412,13 +16411,13 @@ abstract class TranslationApiTranslateResponseApplicationJson
1641216411
@BuiltValue(instantiable: false)
1641316412
abstract interface class $UnifiedSearchProviderInterface {
1641416413
String get id;
16415-
String? get appId;
16414+
String get appId;
1641616415
String get name;
16417-
String? get icon;
16416+
String get icon;
1641816417
int get order;
16419-
BuiltList<String>? get triggers;
16420-
BuiltMap<String, String>? get filters;
16421-
bool? get inAppSearch;
16418+
BuiltList<String> get triggers;
16419+
BuiltMap<String, String> get filters;
16420+
bool get inAppSearch;
1642216421
@BuiltValueHook(initializeBuilder: true)
1642316422
static void _defaults($UnifiedSearchProviderInterfaceBuilder b) {}
1642416423
@BuiltValueHook(finalizeBuilder: true)

0 commit comments

Comments
 (0)