fix(nextcloud): Stop exporting the crypton package

Signed-off-by: provokateurin <kate@provokateurin.de>

Author: provokateurin

packages/neon_framework/lib/src/models/push_notification.dart

@@ -1,6 +1,7 @@
+import 'package:crypton/crypton.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:meta/meta.dart';
-import 'package:nextcloud/notifications.dart' show DecryptedSubject, RSAPrivateKey, decryptPushNotificationSubject;
+import 'package:nextcloud/notifications.dart' show DecryptedSubject, decryptPushNotificationSubject;
 
 part 'push_notification.g.dart';
 

packages/neon_framework/lib/src/utils/push_utils.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'dart:ui';
 
 import 'package:crypto/crypto.dart';
+import 'package:crypton/crypton.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
@@ -37,19 +38,19 @@ class PushUtils {
   /// The callback will only be set if the current flutter engine was opened in the foreground.
   static Future<void> Function(PushNotification notification)? onLocalNotificationClicked;
 
-  static notifications.RSAKeypair loadRSAKeypair() {
+  static RSAKeypair loadRSAKeypair() {
     const storage = AppStorage(StorageKeys.notifications);
     const keyDevicePrivateKey = 'device-private-key';
 
-    final notifications.RSAKeypair keypair;
+    final RSAKeypair keypair;
     if (!storage.containsKey(keyDevicePrivateKey) || (storage.getString(keyDevicePrivateKey)!.isEmpty)) {
       debugPrint('Generating RSA keys for push notifications');
       // The key size has to be 2048, other sizes are not accepted by Nextcloud (at the moment at least)
       // ignore: avoid_redundant_argument_values
-      keypair = notifications.RSAKeypair.fromRandom(keySize: 2048);
+      keypair = RSAKeypair.fromRandom(keySize: 2048);
       unawaited(storage.setString(keyDevicePrivateKey, keypair.privateKey.toPEM()));
     } else {
-      keypair = notifications.RSAKeypair(notifications.RSAPrivateKey.fromPEM(storage.getString(keyDevicePrivateKey)!));
+      keypair = RSAKeypair(RSAPrivateKey.fromPEM(storage.getString(keyDevicePrivateKey)!));
     }
 
     return keypair;

packages/neon_framework/pubspec.yaml

@@ -12,6 +12,7 @@ dependencies:
   collection: ^1.0.0
   cookie_jar: ^4.0.0
   crypto: ^3.0.0
+  crypton: ^2.0.0
   cupertino_icons: ^1.0.0
   dynamic_color: ^1.0.0
   emoji_picker_flutter: ^2.0.0

packages/nextcloud/lib/src/helpers/notifications.dart

@@ -6,8 +6,6 @@ import 'package:crypto/crypto.dart';
 import 'package:crypton/crypton.dart';
 import 'package:json_annotation/json_annotation.dart';
 
-export 'package:crypton/crypton.dart' show RSAKeypair, RSAPrivateKey, RSAPublicKey;
-
 part 'notifications.g.dart';
 
 /// Generates the push token hash which is just sha512

packages/nextcloud/test/notifications_test.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:crypton/crypton.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:nextcloud/notifications.dart';
 import 'package:nextcloud_test/nextcloud_test.dart';