Merge branch 'main' of gitlab.com:famedly/fluffychat

lib/components/dialogs/bootstrap_dialog.dart

@@ -3,7 +3,6 @@ import 'package:famedlysdk/encryption.dart';
 import 'package:famedlysdk/encryption/utils/bootstrap.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:fluffychat/components/dialogs/adaptive_flat_button.dart';
-import 'package:fluffychat/utils/sentry_controller.dart';
 import 'package:flutter/services.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/cupertino.dart';
@@ -179,24 +178,10 @@ class _BootstrapDialogState extends State<BootstrapDialog> {
                   _recoveryKeyInputLoading = true;
                 });
                 try {
-                  final input = _recoveryKeyTextEditingController.text.trim();
                   await bootstrap.newSsssKey.unlock(
-                    keyOrPassphrase: input,
+                    keyOrPassphrase: _recoveryKeyTextEditingController.text,
                   );
                   await bootstrap.openExistingSsss();
-                  if (widget.client.encryption.crossSigning.enabled) {
-                    Logs().v(
-                        'Cross signing is already enabled. Try to self-sign');
-                    try {
-                      await widget.client.encryption.crossSigning
-                          .selfSign(recoveryKey: input);
-                    } catch (e, s) {
-                      // ignore: unawaited_futures
-                      SentryController.captureException(
-                          'Unable to self sign with recovery key after successfully open existing SSSS: ${e.toString()}',
-                          s);
-                    }
-                  }
                 } catch (e, s) {
                   Logs().w('Unable to unlock SSSS', e, s);
                   setState(() => _recoveryKeyInputError =

lib/l10n/intl_cs.arb

@@ -524,7 +524,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "emoteInvalid": "Neplatná klávesová zkratka emoji!",
+  "emoteInvalid": "Neplatný kód emotikony!",
   "@emoteInvalid": {
     "type": "text",
     "placeholders": {}
@@ -2121,5 +2121,51 @@
   "@noPublicRoomsFound": {
     "type": "text",
     "placeholders": {}
+  },
+  "audioPlayerPlay": "Přehrát",
+  "@audioPlayerPlay": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "audioPlayerPause": "Pozastavit",
+  "@audioPlayerPause": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "badServerLoginTypesException": "Homeserver podporuje přihlášení typu:\n{serverVersions}\nAle tato aplikace podporuje pouze:\n{supportedVersions}",
+  "@badServerLoginTypesException": {
+    "type": "text",
+    "placeholders": {
+      "serverVersions": {},
+      "supportedVersions": {}
+    }
+  },
+  "clearText": "Smazat text",
+  "@clearText": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "userUnknownVerification": "Status ověření uživatele je neznámý",
+  "@userUnknownVerification": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "userNotVerified": "Uživatel není ověřen",
+  "@userNotVerified": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "userVerified": "Uživatel je ověřen",
+  "@userVerified": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "badServerVersionsException": "Homeserver podporuje specifikaci verzí:\n{serverVersions}\nAle tato aplikace podporuje pouze verze {supportedVersions}",
+  "@badServerVersionsException": {
+    "type": "text",
+    "placeholders": {
+      "serverVersions": {},
+      "supportedVersions": {}
+    }
   }
 }

lib/l10n/intl_nb.arb

@@ -1960,5 +1960,45 @@
   "@publicKey": {
     "type": "text",
     "placeholders": {}
+  },
+  "clearText": "Tøm tekst",
+  "@clearText": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "userNotVerified": "Ubekreftet bruker",
+  "@userNotVerified": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "userVerified": "Bekreftet bruker",
+  "@userVerified": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "audioPlayerPlay": "Spill av",
+  "@audioPlayerPlay": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "audioPlayerPause": "Pause",
+  "@audioPlayerPause": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "security": "Sikkerhet",
+  "@security": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "all": "Alle",
+  "@all": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "contacts": "Kontakter",
+  "@contacts": {
+    "type": "text",
+    "placeholders": {}
   }
 }

pubspec.lock

@@ -223,7 +223,7 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: fb5a0bc6a20c2b60e72ac409c4506d0a319e7fb8
+      resolved-ref: "41522e868d7672f2a67b0f2e3bae050435f15f4f"
       url: "https://gitlab.com/famedly/famedlysdk.git"
     source: git
     version: "0.0.1"