2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Remove FluffyClient and make it no longer static

Browse source
This commit is contained in:
Christian Pauly 2021-06-23 15:35:23 +02:00
commit 2320f6b707
8 changed files with 71 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/widgets/event_content/message_reactions.dart
View file

@ -1,5 +1,4 @@
import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/fluffy_client.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/avatar.dart';
import 'package:flutter/cupertino.dart';
@ -168,7 +167,7 @@ class _ReactionEntry {
}
class _AdaptableReactorsDialog extends StatelessWidget {
final FluffyClient client;
final Client client;
final _ReactionEntry reactionEntry;
const _AdaptableReactorsDialog({

12
lib/widgets/matrix.dart
View file

@ -23,7 +23,6 @@ import '../pages/key_verification_dialog.dart';
import '../utils/platform_infos.dart';
import '../config/app_config.dart';
import '../config/setting_keys.dart';
import '../utils/matrix_sdk_extensions.dart/fluffy_client.dart';
import '../utils/background_push.dart';
import 'package:vrouter/vrouter.dart';
@ -36,13 +35,13 @@ class Matrix extends StatefulWidget {
final BuildContext context;
final Client testClient;
final Client client;
Matrix({
this.child,
@required this.router,
@required this.context,
this.testClient,
@required this.client,
Key key,
}) : super(key: key);
@ -55,14 +54,12 @@ class Matrix extends StatefulWidget {
}
class MatrixState extends State<Matrix> with WidgetsBindingObserver {
FluffyClient client;
Client get client => widget.client;
Store store = Store();
BuildContext navigatorContext;
BackgroundPush _backgroundPush;
bool get testMode => widget.testClient != null;
Map<String, dynamic> get shareContent => _shareContent;
set shareContent(Map<String, dynamic> content) {
_shareContent = content;
@ -78,7 +75,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
void _initWithStore() async {
try {
if (!testMode) await client.init();
await client.init();
if (client.isLogged()) {
final statusMsg = await store.getItem(SettingKeys.ownStatusMessage);
if (statusMsg?.isNotEmpty ?? false) {
@ -285,7 +282,6 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
});
});
}
client = FluffyClient();
onKeyVerificationRequestSub ??= client.onKeyVerificationRequest.stream
.listen((KeyVerification request) async {
var hidPopup = false;