allow full username in login
This commit is contained in:
parent
0880f6d120
commit
924c7fe5b8
2 changed files with 15 additions and 8 deletions
|
|
@ -1,16 +1,15 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:adaptive_dialog/adaptive_dialog.dart';
|
||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||
import 'package:future_loading_dialog/future_loading_dialog.dart';
|
||||
import 'package:matrix/matrix.dart';
|
||||
|
||||
import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
|
||||
import 'package:fluffychat/pangea/utils/firebase_analytics.dart';
|
||||
import 'package:fluffychat/utils/localized_exception_extension.dart';
|
||||
import 'package:fluffychat/widgets/matrix.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||
import 'package:future_loading_dialog/future_loading_dialog.dart';
|
||||
import 'package:matrix/matrix.dart';
|
||||
|
||||
import '../../utils/platform_infos.dart';
|
||||
import 'login_view.dart';
|
||||
|
||||
|
|
@ -75,7 +74,13 @@ class LoginController extends State<Login> {
|
|||
_coolDown?.cancel();
|
||||
|
||||
try {
|
||||
final username = usernameController.text;
|
||||
// #Pangea
|
||||
String username = usernameController.text;
|
||||
if (RegExp(r'^@(\w+):').hasMatch(username)) {
|
||||
username =
|
||||
RegExp(r'^@(\w+):').allMatches(username).elementAt(0).group(1)!;
|
||||
}
|
||||
// Pangea#
|
||||
AuthenticationIdentifier identifier;
|
||||
if (username.isEmail) {
|
||||
identifier = AuthenticationThirdPartyIdentifier(
|
||||
|
|
|
|||
|
|
@ -89,7 +89,9 @@ class LoginView extends StatelessWidget {
|
|||
readOnly: controller.loading,
|
||||
autocorrect: false,
|
||||
autofocus: true,
|
||||
onChanged: controller.checkWellKnownWithCoolDown,
|
||||
// #Pangea
|
||||
// onChanged: controller.checkWellKnownWithCoolDown,
|
||||
// Pangea#
|
||||
controller: controller.usernameController,
|
||||
textInputAction: TextInputAction.next,
|
||||
keyboardType: TextInputType.emailAddress,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue