msglist: Retrieve topic from failed-to-send messages

Author: PIG208

lib/widgets/message_list.dart

@@ -1480,7 +1480,6 @@ class OutboxMessageWithPossibleSender extends StatelessWidget {
 
   final MessageListOutboxMessageItem item;
 
-  // TODO should we restore the topic as well?
   void _handlePress(BuildContext context) {
     final content = item.message.content.endsWith('\n')
       ? item.message.content : '${item.message.content}\n';
@@ -1492,6 +1491,13 @@ class OutboxMessageWithPossibleSender extends StatelessWidget {
       composeBoxController.contentFocusNode.requestFocus();
     }
 
+    if (composeBoxController case StreamComposeBoxController(:final topic)) {
+      final conversation = item.message.conversation;
+      if (topic.isTopicVacuous && conversation is StreamConversation) {
+        topic.setTopic(conversation.topic);
+      }
+    }
+
     final store = PerAccountStoreWidget.of(context);
     assert(store.outboxMessages.containsKey(item.message.localMessageId));
     store.removeOutboxMessage(item.message.localMessageId);

test/widgets/message_list_test.dart

@@ -11,6 +11,7 @@ import 'package:zulip/api/model/events.dart';
 import 'package:zulip/api/model/initial_snapshot.dart';
 import 'package:zulip/api/model/model.dart';
 import 'package:zulip/api/model/narrow.dart';
+import 'package:zulip/api/route/channels.dart';
 import 'package:zulip/api/route/messages.dart';
 import 'package:zulip/model/actions.dart';
 import 'package:zulip/model/localizations.dart';
@@ -1359,6 +1360,8 @@ void main() {
     final stream = eg.stream();
     const content = 'outbox message content';
 
+    final topicInputFinder = find.byWidgetPredicate(
+      (widget) => widget is TextField && widget.controller is ComposeTopicController);
     final contentInputFinder = find.byWidgetPredicate(
       (widget) => widget is TextField && widget.controller is ComposeContentController);
 
@@ -1409,7 +1412,57 @@ void main() {
         localMessageId: store.outboxMessages.keys.single));
     });
 
-    testWidgets('failed to send message, retrieve the content to compose box', (tester) async {
+    testWidgets('in channel narrow, failed to send message, retrieve both topic and content to compose box', (tester) async {
+      await setupMessageListPage(tester,
+        narrow: ChannelNarrow(stream.streamId), streams: [stream],
+        messages: []);
+
+      connection.prepare(json: GetStreamTopicsResult(topics: []).toJson());
+      await tester.enterText(topicInputFinder, 'test topic');
+      await sendMessageAndFail(tester);
+
+      final controller = tester.state<ComposeBoxState>(find.byType(ComposeBox)).controller;
+      controller as StreamComposeBoxController;
+      await tester.enterText(topicInputFinder, '');
+      check(controller.content).text.isNotNull().isEmpty();
+
+      // Tap the message.  This should put its topic and content back into
+      // the compose box and remove it.
+      await tester.tap(outboxMessageFinder);
+      await tester.pump();
+      check(outboxMessageFinder).findsNothing();
+      check(controller.topic).text.equals('test topic');
+      check(controller.content).text.equals('$content\n\n');
+
+      await tester.pump(kLocalEchoDebounceDuration);
+    });
+
+    testWidgets('in channel narrow, failed to send message, retrieve only content to compose box if topic input is non-vacuous', (tester) async {
+      await setupMessageListPage(tester,
+        narrow: ChannelNarrow(stream.streamId), streams: [stream],
+        messages: []);
+
+      connection.prepare(json: GetStreamTopicsResult(topics: []).toJson());
+      await tester.enterText(topicInputFinder, 'test topic');
+      await sendMessageAndFail(tester);
+
+      final controller = tester.state<ComposeBoxState>(find.byType(ComposeBox)).controller;
+      controller as StreamComposeBoxController;
+      await tester.enterText(topicInputFinder, 'different topic');
+      check(controller.content).text.isNotNull().isEmpty();
+
+      // Tap the message.  This should put its content back into the compose box
+      // and remove it.
+      await tester.tap(outboxMessageFinder);
+      await tester.pump();
+      check(outboxMessageFinder).findsNothing();
+      check(controller.topic).text.equals('different topic');
+      check(controller.content).text.equals('$content\n\n');
+
+      await tester.pump(kLocalEchoDebounceDuration);
+    });
+
+    testWidgets('in topic narrow, failed to send message, retrieve the content to compose box', (tester) async {
       await setupMessageListPage(tester,
         narrow: eg.topicNarrow(stream.streamId, 'topic'), streams: [stream],
         messages: []);