From 7aa72c3c087f5458e04d2473eea81b150771784b Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Mon, 13 Sep 2021 15:26:51 +0200 Subject: [PATCH] chore: Update SDK --- lib/pages/login.dart | 4 +- lib/pages/settings_3pid.dart | 4 +- lib/widgets/matrix.dart | 4 +- linux/flutter/generated_plugin_registrant.cc | 2 + linux/flutter/generated_plugin_registrant.h | 2 + pubspec.lock | 39 +++++++++++--------- pubspec.yaml | 9 +---- 7 files changed, 34 insertions(+), 30 deletions(-) diff --git a/lib/pages/login.dart b/lib/pages/login.dart index 585ad530..36397d0d 100644 --- a/lib/pages/login.dart +++ b/lib/pages/login.dart @@ -177,9 +177,9 @@ class LoginController extends State { final clientSecret = DateTime.now().millisecondsSinceEpoch.toString(); final response = await showFutureLoadingDialog( context: context, - future: () => Matrix.of(context).client.requestEmailToken( - input.single, + future: () => Matrix.of(context).client.requestTokenToResetPasswordEmail( clientSecret, + input.single, sendAttempt++, ), ); diff --git a/lib/pages/settings_3pid.dart b/lib/pages/settings_3pid.dart index 4fc34050..e03045e9 100644 --- a/lib/pages/settings_3pid.dart +++ b/lib/pages/settings_3pid.dart @@ -33,9 +33,9 @@ class Settings3PidController extends State { final clientSecret = DateTime.now().millisecondsSinceEpoch.toString(); final response = await showFutureLoadingDialog( context: context, - future: () => Matrix.of(context).client.requestEmailToken( - input.single, + future: () => Matrix.of(context).client.requestTokenToRegisterEmail( clientSecret, + input.single, Settings3Pid.sendAttempt++, ), ); diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index 1baf4c4d..d9aadb29 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -168,9 +168,9 @@ class MatrixState extends State with WidgetsBindingObserver { final clientSecret = Matrix.of(context).client.generateUniqueTransactionId(); final currentThreepidCreds = - await Matrix.of(context).client.requestEmailToken( - emailInput.single, + await Matrix.of(context).client.requestTokenToRegisterEmail( clientSecret, + emailInput.single, 0, ); final auth = AuthenticationThreePidCreds( diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 5a2c553e..0a1f5713 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #include "generated_plugin_registrant.h" #include diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h index 9bf74789..e0f0a47b 100644 --- a/linux/flutter/generated_plugin_registrant.h +++ b/linux/flutter/generated_plugin_registrant.h @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #ifndef GENERATED_PLUGIN_REGISTRANT_ #define GENERATED_PLUGIN_REGISTRANT_ diff --git a/pubspec.lock b/pubspec.lock index 3f76bcf5..38332068 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -56,7 +56,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" audioplayers: dependency: "direct main" description: @@ -105,7 +105,7 @@ packages: name: canonical_json url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" characters: dependency: transitive description: @@ -119,7 +119,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" chewie: dependency: "direct main" description: @@ -513,6 +513,13 @@ packages: description: flutter source: sdk version: "0.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.2" future_loading_dialog: dependency: "direct main" description: @@ -719,19 +726,17 @@ packages: matrix: dependency: "direct main" description: - path: "." - ref: e13b00d127bc68c0659188b1e8aa25f510e9398a - resolved-ref: e13b00d127bc68c0659188b1e8aa25f510e9398a - url: "https://gitlab.com/famedly/company/frontend/famedlysdk.git" - source: git - version: "0.4.3" + name: matrix + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.0" matrix_api_lite: - dependency: "direct main" + dependency: transitive description: name: matrix_api_lite url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.4.3" matrix_link_text: dependency: "direct main" description: @@ -745,7 +750,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" mgrs_dart: dependency: transitive description: @@ -1048,7 +1053,7 @@ packages: name: random_string url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.3.1" receive_sharing_intent: dependency: "direct main" description: @@ -1312,21 +1317,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.16.8" + version: "1.17.10" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.3.19" + version: "0.4.0" timezone: dependency: transitive description: @@ -1410,7 +1415,7 @@ packages: name: unorm_dart url: "https://pub.dartlang.org" source: hosted - version: "0.1.2" + version: "0.2.0" url_launcher: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 7558811c..d45960f1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: fluffychat description: Chat with your friends. publish_to: none -version: 0.40.0+1 +version: 0.40.1+1 environment: sdk: ">=2.6.0 <3.0.0" @@ -45,11 +45,7 @@ dependencies: intl: any localstorage: ^4.0.0+1 lottie: ^1.1.0 - matrix: - git: - url: https://gitlab.com/famedly/company/frontend/famedlysdk.git - ref: e13b00d127bc68c0659188b1e8aa25f510e9398a - matrix_api_lite: 0.4.2 + matrix: ^0.5.0 matrix_link_text: ^1.0.2 native_imaging: git: https://gitlab.com/famedly/libraries/native_imaging.git @@ -105,4 +101,3 @@ flutter: - asset: fonts/NotoSans/NotoSans-BoldItalic.ttf weight: 700 style: italic - \ No newline at end of file