Merge pull request #597 from nextcloud/fix/capabilities

Fix/capabilities
nextcloud · Aug 23, 2023 · 86bb58d · 86bb58d
2 parents c96b5b6 + 2c06d0d
commit 86bb58d
Show file tree

Hide file tree

Showing 12 changed files with 9,420 additions and 7,734 deletions.
diff --git a/external/nextcloud-openapi-extractor b/external/nextcloud-openapi-extractor
diff --git a/external/nextcloud-server b/external/nextcloud-server
diff --git a/packages/neon/neon/lib/src/app.dart b/packages/neon/neon/lib/src/app.dart
@@ -291,7 +291,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, tray.Tra
                       : null,
                   builder: (final context, final capabilitiesSnapshot) {
                     final appTheme = AppTheme(
-                      capabilitiesSnapshot.data?.capabilities.theming,
+                      capabilitiesSnapshot.data?.capabilities.themingPublicCapabilities?.theming,
                       keepOriginalAccentColor: themeKeepOriginalAccentColor,
                       oledAsDark: themeOLEDAsDark,
                       appThemes: _appImplementations.map((final a) => a.theme).whereNotNull(),

diff --git a/packages/neon/neon/lib/src/blocs/apps.dart b/packages/neon/neon/lib/src/blocs/apps.dart
@@ -69,7 +69,9 @@ class AppsBloc extends InteractiveBloc implements AppsBlocEvents, AppsBlocStates
     _capabilitiesBloc.capabilities.listen((final result) {
       notificationsAppImplementation.add(
         result.transform(
-          (final data) => data.capabilities.notifications != null ? _findAppImplementation(AppIDs.notifications) : null,
+          (final data) => data.capabilities.notificationsCapabilities?.notifications != null
+              ? _findAppImplementation(AppIDs.notifications)
+              : null,
         ),
       );
 

diff --git a/packages/neon/neon/lib/src/theme/theme.dart b/packages/neon/neon/lib/src/theme/theme.dart
@@ -16,7 +16,7 @@ class AppTheme {
     this.appThemes,
   }) : keepOriginalAccentColor = nextcloudTheme == null || keepOriginalAccentColor;
 
-  final CoreOcsGetCapabilitiesResponse200ApplicationJson_Ocs_Data_Capabilities_Theming? nextcloudTheme;
+  final CoreThemingPublicCapabilities_Theming? nextcloudTheme;
   final bool keepOriginalAccentColor;
   final bool oledAsDark;
   final Iterable<ThemeExtension>? appThemes;

diff --git a/packages/neon/neon/lib/src/widgets/drawer.dart b/packages/neon/neon/lib/src/widgets/drawer.dart
@@ -137,7 +137,7 @@ class NeonDrawerHeader extends StatelessWidget {
           );
         }
 
-        final theme = capabilities.requireData.capabilities.theming;
+        final theme = capabilities.requireData.capabilities.themingPublicCapabilities?.theming;
 
         if (theme == null) {
           return const SizedBox();

diff --git a/packages/nextcloud/lib/src/api/core.openapi.dart b/packages/nextcloud/lib/src/api/core.openapi.dart
diff --git a/packages/nextcloud/lib/src/api/core.openapi.g.dart b/packages/nextcloud/lib/src/api/core.openapi.g.dart