Made loadStateFromPreferenceStore() check if no messages

jukofyork · Nov 9, 2024 · 5b9ac08 · 5b9ac08
1 parent bd1ac26
commit 5b9ac08
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/eclipse.plugin.aiassistant/src/eclipse/plugin/aiassistant/view/MainPresenter.java b/eclipse.plugin.aiassistant/src/eclipse/plugin/aiassistant/view/MainPresenter.java
@@ -270,28 +270,30 @@ public void run() {
 	                Logger.warning("Failed to load chat conversation: " + e.getMessage());
 	                tempConversation = new ChatConversation(); // Fallback to an empty conversation
 	            }
-	    		performOnMainView(mainView -> {
-	    			mainView.getChatMessageArea().setEnabled(false);
-	    			mainView.getChatMessageArea().setVisible(false);
-	    		});
-	            for (ChatMessage message : tempConversation.messages()) {
-	                switch (message.getRole()) {
-	                    case USER:
-	                        sendUserMessage(message.getMessage(), false);
-	                        break;
-	                    case ASSISTANT:
-	                        sendAutoReplyAssistantMessage(message.getMessage());
-	                        break;
-	                    case NOTIFICATION:
-	                        displayNotificationMessage(message.getMessage());
-	                        break;
-	                }
-	            }
-	    		performOnMainView(mainView -> {
-	    			mainView.getChatMessageArea().setVisible(true);
-	    			mainView.getChatMessageArea().setEnabled(true);
-	    		});
-	    		onScrollToBottom(); // Ensures the view is scrolled to the bottom after loading messages
+	            if (!tempConversation.isEmpty()) {
+		    		performOnMainView(mainView -> {
+		    			mainView.getChatMessageArea().setEnabled(false);
+		    			mainView.getChatMessageArea().setVisible(false);
+		    		});
+		            for (ChatMessage message : tempConversation.messages()) {
+		                switch (message.getRole()) {
+		                    case USER:
+		                        sendUserMessage(message.getMessage(), false);
+		                        break;
+		                    case ASSISTANT:
+		                        sendAutoReplyAssistantMessage(message.getMessage());
+		                        break;
+		                    case NOTIFICATION:
+		                        displayNotificationMessage(message.getMessage());
+		                        break;
+		                }
+		            }
+		    		performOnMainView(mainView -> {
+		    			mainView.getChatMessageArea().setVisible(true);
+		    			mainView.getChatMessageArea().setEnabled(true);
+		    		});
+		    		onScrollToBottom();
+	            }
 	    		try {
 	                userMessageHistory = Preferences.loadUserMessageHistory();
 	            } catch (IOException e) {