public/pogdark-app-flutter
0
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Refactoring for sanity

Browse Source
This commit is contained in:
whysman 2024-11-15 18:13:51 -05:00
parent d18b576d7e
commit 3acb20d1f5
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/main.dart
View File

@ -4,11 +4,11 @@ import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'profile_screen.dart'; import 'profile_screen.dart';
import 'shared_preferences_provider.dart'; import 'shared_preferences_provider.dart';
import 'status_page.dart'; import 'status_page.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
void main() { void main() {
runApp( runApp(

27
lib/status_page.dart
View File

@ -57,6 +57,7 @@ class StatusPageState extends State<StatusPage> with WidgetsBindingObserver {
void _reconnectWebSocket() { void _reconnectWebSocket() {
if (channel.closeCode != null) { if (channel.closeCode != null) {
debugPrint("Reinitializing WebSocket connection..."); debugPrint("Reinitializing WebSocket connection...");
channel.sink.close();
_initializeWebSocket(); _initializeWebSocket();
} }
} }
@ -165,18 +166,26 @@ class StatusPageState extends State<StatusPage> with WidgetsBindingObserver {
debugPrint( debugPrint(
"Incoming id $incomingId, status: $status, prefsID: $prefsId, timestamp: $timeStamp"); "Incoming id $incomingId, status: $status, prefsID: $prefsId, timestamp: $timeStamp");
if (status == 'removed') { if (incomingId == prefsProvider.getUserId()) {
if (incomingId == prefsProvider.getUserId() && if ((status == 'removed' || status == 'none') &&
prefsProvider.getCurrentStatus() != 'none') { prefsProvider.getCurrentStatus() != 'none') {
debugPrint("Clearing local message: $status"); debugPrint("Clearing local message: $status");
await prefsProvider.setCurrentStatus('none'); await prefsProvider.setCurrentStatus('none');
} else if (messages.any((msg) => msg['Id'] == incomingId)) { } else {
messages.removeWhere((msg) => msg['Id'] == incomingId); debugPrint("Ignoring own message: $status");
return;
}
} else {
if (status == 'removed' || status == 'none') {
if (messages.any((msg) => msg['Id'] == incomingId)) {
debugPrint("Removing message from user: $incomingId");
messages.removeWhere((msg) => msg['Id'] == incomingId);
}
} else {
debugPrint("Adding incoming message: $status");
messages.add(message);
_cacheImage(incomingId, image);
} }
} else if (incomingId != prefsId) {
debugPrint("Adding incoming message: $status");
messages.add(message);
_cacheImage(incomingId, image);
} }
} }
@ -307,6 +316,8 @@ class StatusPageState extends State<StatusPage> with WidgetsBindingObserver {
if (snapshot.hasData) { if (snapshot.hasData) {
final newMessage = final newMessage =
jsonDecode(snapshot.data as String) as Map<String, dynamic>; jsonDecode(snapshot.data as String) as Map<String, dynamic>;
final id = newMessage['Id'];
debugPrint("Handling incoming message: $id");
_handleIncomingMessage(newMessage); _handleIncomingMessage(newMessage);
} }
var status = prefsProvider.getCurrentStatus(); var status = prefsProvider.getCurrentStatus();