mirror of
				https://gitlab.com/comunic/comunicmobile
				synced 2025-11-04 04:04:18 +00:00 
			
		
		
		
	Fix refresh issue when conversation has been closed
This commit is contained in:
		@@ -64,8 +64,7 @@ class _ConversationScreenState extends State<ConversationScreen> {
 | 
			
		||||
  void deactivate() {
 | 
			
		||||
    super.deactivate();
 | 
			
		||||
 | 
			
		||||
    if(_refreshTime != null)
 | 
			
		||||
      _refreshTime.cancel();
 | 
			
		||||
    if (_refreshTime != null) _refreshTime.cancel();
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  void _setError(ErrorLevel err) => setState(() => _error = err);
 | 
			
		||||
@@ -94,6 +93,8 @@ class _ConversationScreenState extends State<ConversationScreen> {
 | 
			
		||||
 | 
			
		||||
  /// Load a list of messages
 | 
			
		||||
  Future<void> _loadMessages(bool online) async {
 | 
			
		||||
    if (!mounted) return;
 | 
			
		||||
 | 
			
		||||
    //First, get the messages
 | 
			
		||||
    final messages = await _conversationsHelper.getNewMessages(
 | 
			
		||||
        conversationID: widget.conversationID,
 | 
			
		||||
@@ -417,27 +418,27 @@ class _ConversationScreenState extends State<ConversationScreen> {
 | 
			
		||||
    final choice = await showDialog<bool>(
 | 
			
		||||
      context: context,
 | 
			
		||||
      builder: (c) => AlertDialog(
 | 
			
		||||
            title: Text(tr("Confirm deletion")),
 | 
			
		||||
            content: Text(
 | 
			
		||||
              tr("Do you really want to delete this message ? The operation can not be cancelled !"),
 | 
			
		||||
              textAlign: TextAlign.justify,
 | 
			
		||||
        title: Text(tr("Confirm deletion")),
 | 
			
		||||
        content: Text(
 | 
			
		||||
          tr("Do you really want to delete this message ? The operation can not be cancelled !"),
 | 
			
		||||
          textAlign: TextAlign.justify,
 | 
			
		||||
        ),
 | 
			
		||||
        actions: <Widget>[
 | 
			
		||||
          FlatButton(
 | 
			
		||||
            child: Text(
 | 
			
		||||
              tr("Cancel").toUpperCase(),
 | 
			
		||||
            ),
 | 
			
		||||
            actions: <Widget>[
 | 
			
		||||
              FlatButton(
 | 
			
		||||
                child: Text(
 | 
			
		||||
                  tr("Cancel").toUpperCase(),
 | 
			
		||||
                ),
 | 
			
		||||
                onPressed: () => Navigator.pop(c, false),
 | 
			
		||||
              ),
 | 
			
		||||
              FlatButton(
 | 
			
		||||
                child: Text(
 | 
			
		||||
                  tr("Confirm").toUpperCase(),
 | 
			
		||||
                  style: TextStyle(color: Colors.red),
 | 
			
		||||
                ),
 | 
			
		||||
                onPressed: () => Navigator.pop(c, true),
 | 
			
		||||
              ),
 | 
			
		||||
            ],
 | 
			
		||||
            onPressed: () => Navigator.pop(c, false),
 | 
			
		||||
          ),
 | 
			
		||||
          FlatButton(
 | 
			
		||||
            child: Text(
 | 
			
		||||
              tr("Confirm").toUpperCase(),
 | 
			
		||||
              style: TextStyle(color: Colors.red),
 | 
			
		||||
            ),
 | 
			
		||||
            onPressed: () => Navigator.pop(c, true),
 | 
			
		||||
          ),
 | 
			
		||||
        ],
 | 
			
		||||
      ),
 | 
			
		||||
    );
 | 
			
		||||
 | 
			
		||||
    if (choice == null || !choice) return;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user