inex/FurryChat
1
0
Fork 0
Code Issues Releases 2 Activity

Merge branch 'soru/microg-toast-only-once' into 'master'

Browse source 
Only show the no google services toast once

Closes #106

See merge request ChristianPauly/fluffychat-flutter!113
This commit is contained in:
Christian Pauly 2020-07-21 08:56:26 +00:00
parent eeb820564c 300aea2561
commit c8d71b8e73
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/components/matrix.dart
View file

@ -81,7 +81,7 @@ class MatrixState extends State<Matrix> {
client.connect(); client.connect();
if (await initLoginState == LoginState.logged && !kIsWeb) { if (await initLoginState == LoginState.logged && !kIsWeb) {
await FirebaseController.setupFirebase( await FirebaseController.setupFirebase(
client, this,
widget.clientName, widget.clientName,
); );
} }

13
lib/utils/firebase_controller.dart
View file

@ -13,6 +13,7 @@ import 'package:bot_toast/bot_toast.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/famedlysdk.dart';
import 'famedlysdk_store.dart'; import 'famedlysdk_store.dart';
import '../components/matrix.dart';
abstract class FirebaseController { abstract class FirebaseController {
static final FirebaseMessaging _firebaseMessaging = FirebaseMessaging(); static final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
@ -26,7 +27,9 @@ abstract class FirebaseController {
static const String GATEWAY_URL = 'https://janian.de:7023/'; static const String GATEWAY_URL = 'https://janian.de:7023/';
static const String PUSHER_FORMAT = 'event_id_only'; static const String PUSHER_FORMAT = 'event_id_only';
static Future<void> setupFirebase(Client client, String clientName) async { static Future<void> setupFirebase(
MatrixState matrix, String clientName) async {
final client = matrix.client;
if (Platform.isIOS) iOS_Permission(); if (Platform.isIOS) iOS_Permission();
String token; String token;
@ -36,10 +39,18 @@ abstract class FirebaseController {
token = null; token = null;
} }
if (token?.isEmpty ?? true) { if (token?.isEmpty ?? true) {
final storeItem =
await matrix.store.getItem('chat.fluffy.show_no_google');
final configOptionMissing = storeItem == null || storeItem.isEmpty;
if (configOptionMissing || (!configOptionMissing && storeItem == '1')) {
BotToast.showText( BotToast.showText(
text: L10n.of(context).noGoogleServicesWarning, text: L10n.of(context).noGoogleServicesWarning,
duration: Duration(seconds: 15), duration: Duration(seconds: 15),
); );
if (configOptionMissing) {
await matrix.store.setItem('chat.fluffy.show_no_google', '0');
}
}
return; return;
} }
final pushers = await client.api.requestPushers(); final pushers = await client.api.requestPushers();

2
lib/views/login.dart
View file

@ -57,7 +57,7 @@ class _LoginState extends State<Login> {
if (!kIsWeb) { if (!kIsWeb) {
try { try {
await FirebaseController.setupFirebase( await FirebaseController.setupFirebase(
matrix.client, matrix,
matrix.widget.clientName, matrix.widget.clientName,
); );
} catch (exception) { } catch (exception) {