moxxy/moxxy
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xmpp: Fix notification not saying 'connected' after boot

Browse Source
This commit is contained in:
PapaTutuWawa
2022-01-23 22:17:08 +01:00
parent 6c060b2425
commit 630dfe276b
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/repositories/xmpp.dart
View File

@@ -183,7 +183,7 @@ class XmppRepository {
} }
}); });
if (event.state == ConnectionState.connected) { if (event.state == XmppConnectionState.connected) {
final connection = GetIt.I.get<XmppConnection>(); final connection = GetIt.I.get<XmppConnection>();
saveConnectionSettings(connection.getConnectionSettings()); saveConnectionSettings(connection.getConnectionSettings());
GetIt.I.get<RosterRepository>().requestRoster(); GetIt.I.get<RosterRepository>().requestRoster();

4
lib/service/xmpp.dart
View File

@@ -83,9 +83,9 @@ void onStart() {
final xmpp = XmppRepository(sendData: (data) { final xmpp = XmppRepository(sendData: (data) {
if (data["type"] == "ConnectionStateEvent") { if (data["type"] == "ConnectionStateEvent") {
if (data["state"] == "CONNECTED") { if (data["state"] == XmppConnectionState.connected.toString().split(".")[1]) {
FlutterBackgroundService().setNotificationInfo(title: "Moxxy", content: "Ready to receive messages"); FlutterBackgroundService().setNotificationInfo(title: "Moxxy", content: "Ready to receive messages");
} else if (data["state"] == "CONNECTING") { } else if (data["state"] == XmppConnectionState.connecting.toString().split(".")[1]) {
FlutterBackgroundService().setNotificationInfo(title: "Moxxy", content: "Connecting..."); FlutterBackgroundService().setNotificationInfo(title: "Moxxy", content: "Connecting...");
} else { } else {
FlutterBackgroundService().setNotificationInfo(title: "Moxxy", content: "Disconnected"); FlutterBackgroundService().setNotificationInfo(title: "Moxxy", content: "Disconnected");

36
lib/xmpp/connection.dart
View File

@@ -24,7 +24,7 @@ import "package:moxxyv2/xmpp/xeps/xep_0368.dart";
import "package:uuid/uuid.dart"; import "package:uuid/uuid.dart";
enum ConnectionState { enum XmppConnectionState {
notConnected, notConnected,
connecting, connecting,
connected, connected,
@@ -32,7 +32,7 @@ enum ConnectionState {
} }
class ConnectionStateChangedEvent extends XmppEvent { class ConnectionStateChangedEvent extends XmppEvent {
final ConnectionState state; final XmppConnectionState state;
ConnectionStateChangedEvent({ required this.state }); ConnectionStateChangedEvent({ required this.state });
} }
@@ -52,7 +52,7 @@ class AuthenticationFailedEvent extends XmppEvent {
class XmppConnection { class XmppConnection {
late ConnectionSettings _connectionSettings; late ConnectionSettings _connectionSettings;
late final BaseSocketWrapper _socket; late final BaseSocketWrapper _socket;
late ConnectionState _connectionState; late XmppConnectionState _connectionState;
late final Stream<String> _socketStream; late final Stream<String> _socketStream;
late final StreamController<XmppEvent> _eventStreamController; late final StreamController<XmppEvent> _eventStreamController;
final Map<String, Completer<XMLNode>> _awaitingResponse = {}; final Map<String, Completer<XMLNode>> _awaitingResponse = {};
@@ -79,7 +79,7 @@ class XmppConnection {
late final void Function(String) _log; late final void Function(String) _log;
XmppConnection({ BaseSocketWrapper? socket, Function(String) log = print }) { XmppConnection({ BaseSocketWrapper? socket, Function(String) log = print }) {
_connectionState = ConnectionState.notConnected; _connectionState = XmppConnectionState.notConnected;
_routingState = RoutingState.unauthenticated; _routingState = RoutingState.unauthenticated;
// NOTE: For testing // NOTE: For testing
@@ -93,7 +93,7 @@ class XmppConnection {
_resource = ""; _resource = "";
_streamBuffer = XmlStreamBuffer(); _streamBuffer = XmlStreamBuffer();
_currentBackoffAttempt = 0; _currentBackoffAttempt = 0;
_connectionState = ConnectionState.notConnected; _connectionState = XmppConnectionState.notConnected;
_log = log; _log = log;
_socketStream = _socket.getDataStream(); _socketStream = _socket.getDataStream();
@@ -169,7 +169,7 @@ class XmppConnection {
_log("ERROR: " + error.toString()); _log("ERROR: " + error.toString());
// TODO: This may be too harsh for every error // TODO: This may be too harsh for every error
_setConnectionState(ConnectionState.notConnected); _setConnectionState(XmppConnectionState.notConnected);
_socket.close(); _socket.close();
if (_currentBackoffAttempt == 0) { if (_currentBackoffAttempt == 0) {
@@ -221,7 +221,7 @@ class XmppConnection {
// TODO: Restrict the connecteing condition s.t. routingState must be one of // TODO: Restrict the connecteing condition s.t. routingState must be one of
// This uses the StreamManager to behave like a send queue // This uses the StreamManager to behave like a send queue
if (_connectionState == ConnectionState.connected || _connectionState == ConnectionState.connecting) { if (_connectionState == XmppConnectionState.connected || _connectionState == XmppConnectionState.connecting) {
_socket.write(stanzaString); _socket.write(stanzaString);
// Try to ack every stanza // Try to ack every stanza
@@ -236,11 +236,11 @@ class XmppConnection {
/// Sets the connection state to [state] and triggers an event of type /// Sets the connection state to [state] and triggers an event of type
/// [ConnectionStateChangedEvent]. /// [ConnectionStateChangedEvent].
void _setConnectionState(ConnectionState state) { void _setConnectionState(XmppConnectionState state) {
_connectionState = state; _connectionState = state;
_eventStreamController.add(ConnectionStateChangedEvent(state: state)); _eventStreamController.add(ConnectionStateChangedEvent(state: state));
if (state == ConnectionState.connected) { if (state == XmppConnectionState.connected) {
_connectionPingTimer = Timer.periodic(const Duration(minutes: 5), _pingConnectionOpen); _connectionPingTimer = Timer.periodic(const Duration(minutes: 5), _pingConnectionOpen);
} else { } else {
if (_connectionPingTimer != null) { if (_connectionPingTimer != null) {
@@ -301,7 +301,7 @@ class XmppConnection {
void _pingConnectionOpen(Timer timer) { void _pingConnectionOpen(Timer timer) {
// Follow the recommendation of XEP-0198 and just request an ack. If SM is not enabled, // Follow the recommendation of XEP-0198 and just request an ack. If SM is not enabled,
// send a whitespace ping // send a whitespace ping
if (_connectionState == ConnectionState.connected) { if (_connectionState == XmppConnectionState.connected) {
_sendEvent(SendPingEvent()); _sendEvent(SendPingEvent());
} }
} }
@@ -387,7 +387,7 @@ class XmppConnection {
} else if (result.getState() == AuthenticationResult.failure) { } else if (result.getState() == AuthenticationResult.failure) {
_log("SASL failed"); _log("SASL failed");
_sendEvent(AuthenticationFailedEvent(saslError: result.getValue())); _sendEvent(AuthenticationFailedEvent(saslError: result.getValue()));
_setConnectionState(ConnectionState.error); _setConnectionState(XmppConnectionState.error);
_routingState = RoutingState.error; _routingState = RoutingState.error;
} }
} }
@@ -400,7 +400,7 @@ class XmppConnection {
} else if (result.getState() == AuthenticationResult.failure) { } else if (result.getState() == AuthenticationResult.failure) {
_log("SASL failed"); _log("SASL failed");
_sendEvent(AuthenticationFailedEvent(saslError: result.getValue())); _sendEvent(AuthenticationFailedEvent(saslError: result.getValue()));
_setConnectionState(ConnectionState.error); _setConnectionState(XmppConnectionState.error);
_routingState = RoutingState.error; _routingState = RoutingState.error;
} }
} }
@@ -453,7 +453,7 @@ class XmppConnection {
} else { } else {
_log("Resource binding failed!"); _log("Resource binding failed!");
_routingState = RoutingState.error; _routingState = RoutingState.error;
_setConnectionState(ConnectionState.error); _setConnectionState(XmppConnectionState.error);
} }
} }
break; break;
@@ -471,7 +471,7 @@ class XmppConnection {
// NOTE: _resource is already set if we resume // NOTE: _resource is already set if we resume
assert(_resource != ""); assert(_resource != "");
_routingState = RoutingState.handleStanzas; _routingState = RoutingState.handleStanzas;
_setConnectionState(ConnectionState.connected); _setConnectionState(XmppConnectionState.connected);
final h = int.parse(node.attributes["h"]!); final h = int.parse(node.attributes["h"]!);
_sendEvent(StreamResumedEvent(h: h)); _sendEvent(StreamResumedEvent(h: h));
@@ -499,7 +499,7 @@ class XmppConnection {
_routingState = RoutingState.handleStanzas; _routingState = RoutingState.handleStanzas;
getPresenceManager().sendInitialPresence(); getPresenceManager().sendInitialPresence();
_setConnectionState(ConnectionState.connected); _setConnectionState(XmppConnectionState.connected);
} }
} }
break; break;
@@ -543,12 +543,12 @@ class XmppConnection {
/// To be called when we lost network connection /// To be called when we lost network connection
Future<void> onNetworkConnectionLost() async { Future<void> onNetworkConnectionLost() async {
_socket.close(); _socket.close();
_setConnectionState(ConnectionState.notConnected); _setConnectionState(XmppConnectionState.notConnected);
} }
/// To be called when we lost network connection /// To be called when we lost network connection
Future<void> onNetworkConnectionRegained() async { Future<void> onNetworkConnectionRegained() async {
if (_connectionState == ConnectionState.notConnected) { if (_connectionState == XmppConnectionState.notConnected) {
connect(); connect();
} }
} }
@@ -592,7 +592,7 @@ class XmppConnection {
} }
_currentBackoffAttempt = 0; _currentBackoffAttempt = 0;
_setConnectionState(ConnectionState.connecting); _setConnectionState(XmppConnectionState.connecting);
_routingState = RoutingState.unauthenticated; _routingState = RoutingState.unauthenticated;
_sendStreamHeader(); _sendStreamHeader();
} }

6
lib/xmpp/xeps/xep_0198.dart
View File

@@ -32,8 +32,8 @@ class StreamManagementManager extends XmppManagerBase {
void setState(int c2s, int s2c) { void setState(int c2s, int s2c) {
// Prevent this being called multiple times // Prevent this being called multiple times
assert(_c2sStanzaCount == 0); //assert(_c2sStanzaCount == 0);
assert(_s2cStanzaCount == 0); //assert(_s2cStanzaCount == 0);
_c2sStanzaCount = c2s; _c2sStanzaCount = c2s;
_s2cStanzaCount = s2c; _s2cStanzaCount = s2c;
@@ -45,7 +45,7 @@ class StreamManagementManager extends XmppManagerBase {
void setStreamResumptionId(String id) { void setStreamResumptionId(String id) {
// Prevent this being called multiple times // Prevent this being called multiple times
assert(_streamResumptionId == null); //assert(_streamResumptionId == null);
_streamResumptionId = id; _streamResumptionId = id;
} }