Merge pull request #196 from zjs81/fix-channel-del

clear app db of channel messages on delete
This commit is contained in:
zjs81
2026-02-22 13:10:05 -07:00
committed by GitHub
2 changed files with 22 additions and 4 deletions
+20 -2
View File
@@ -3,6 +3,7 @@ import 'dart:math';
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:meshcore_open/storage/channel_message_store.dart';
import 'package:meshcore_open/widgets/app_bar.dart'; import 'package:meshcore_open/widgets/app_bar.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
@@ -105,6 +106,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final connector = context.watch<MeshCoreConnector>(); final connector = context.watch<MeshCoreConnector>();
final channelMessageStore = ChannelMessageStore();
// Auto-navigate back to scanner if disconnected // Auto-navigate back to scanner if disconnected
if (!checkConnectionAndNavigate(connector)) { if (!checkConnectionAndNavigate(connector)) {
@@ -304,6 +306,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
return _buildChannelTile( return _buildChannelTile(
context, context,
connector, connector,
channelMessageStore,
channel, channel,
showDragHandle: true, showDragHandle: true,
dragIndex: index, dragIndex: index,
@@ -323,6 +326,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
return _buildChannelTile( return _buildChannelTile(
context, context,
connector, connector,
channelMessageStore,
channel, channel,
); );
}, },
@@ -352,6 +356,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
Widget _buildChannelTile( Widget _buildChannelTile(
BuildContext context, BuildContext context,
MeshCoreConnector connector, MeshCoreConnector connector,
ChannelMessageStore channelMessageStore,
Channel channel, { Channel channel, {
bool showDragHandle = false, bool showDragHandle = false,
int? dragIndex, int? dragIndex,
@@ -468,7 +473,12 @@ class _ChannelsScreenState extends State<ChannelsScreen>
); );
} }
}, },
onLongPress: () => _showChannelActions(context, connector, channel), onLongPress: () => _showChannelActions(
context,
connector,
channelMessageStore,
channel,
),
), ),
); );
} }
@@ -476,6 +486,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
void _showChannelActions( void _showChannelActions(
BuildContext context, BuildContext context,
MeshCoreConnector connector, MeshCoreConnector connector,
ChannelMessageStore channelMessageStore,
Channel channel, Channel channel,
) { ) {
final settingsService = context.read<AppSettingsService>(); final settingsService = context.read<AppSettingsService>();
@@ -528,7 +539,12 @@ class _ChannelsScreenState extends State<ChannelsScreen>
Navigator.pop(context); Navigator.pop(context);
await Future.delayed(const Duration(milliseconds: 100)); await Future.delayed(const Duration(milliseconds: 100));
if (context.mounted) { if (context.mounted) {
_confirmDeleteChannel(context, connector, channel); _confirmDeleteChannel(
context,
connector,
channelMessageStore,
channel,
);
} }
}, },
), ),
@@ -1474,6 +1490,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
void _confirmDeleteChannel( void _confirmDeleteChannel(
BuildContext context, BuildContext context,
MeshCoreConnector connector, MeshCoreConnector connector,
ChannelMessageStore channelMessageStore,
Channel channel, Channel channel,
) { ) {
showDialog( showDialog(
@@ -1492,6 +1509,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
onPressed: () { onPressed: () {
Navigator.pop(dialogContext); Navigator.pop(dialogContext);
connector.deleteChannel(channel.index); connector.deleteChannel(channel.index);
channelMessageStore.clearChannelMessages(channel.index);
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text( content: Text(
+2 -2
View File
@@ -513,10 +513,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.17.0" version: "1.18.0"
mgrs_dart: mgrs_dart:
dependency: transitive dependency: transitive
description: description: