Minor changes

CSC207-2022F-UofT · Dec 2, 2022 · dd97bbc · dd97bbc
1 parent aa10e64
commit dd97bbc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/screens/login_screen/AppScreenCreator.java b/src/main/java/screens/login_screen/AppScreenCreator.java
@@ -1,16 +1,16 @@
 package screens.login_screen;
+import interface_adapters.appscreen.AppScreenLoader;
+import interface_adapters.login_interface_adapters.UserChatsPresenter;
 import interface_adapters.login_interface_adapters.UserLoginViewI;
 import screens.appscreen.AppScreen;
 import use_cases.user_login_use_cases.UserLoginOutputBoundary;
 
 import java.util.ArrayList;
 
 public class AppScreenCreator implements UserLoginViewI {
-    private String username ;
-    private ArrayList<String> chats;
     private boolean userNotExists;
     private boolean passNotMatched;
-    AppScreen appScreen;
+    AppScreenLoader appScreenLoader;
     public AppScreenCreator(){
     }
     @Override
@@ -19,7 +19,8 @@ public void display() {
             showUnableToLogin();
         }else{
             /*this.appScreen = new AppScreen(username, chats);*/
-            System.out.println(username);
+            //Could be null pointer exception if setChatsPresenter is not called before the below
+            appScreenLoader.openScreen();
         }
     }
 
@@ -28,10 +29,11 @@ private void showUnableToLogin() {
     }
     @Override
     public void setChatsPresenter(UserLoginOutputBoundary chatsPresenter){
-        this.username = chatsPresenter.getUsername();
-        this.chats = (ArrayList<String>) chatsPresenter.getChats();
+        String username = chatsPresenter.getUsername();
+        ArrayList<String> chats = (ArrayList<String>) chatsPresenter.getChats();
         this.userNotExists = chatsPresenter.isNotExists();
         this.passNotMatched = chatsPresenter.isNotMatched();
+        appScreenLoader = new AppScreenLoader(username, chats);
     }
 
 }
diff --git a/src/main/java/use_cases/user_login_use_cases/UserLoginInteractor2.java b/src/main/java/use_cases/user_login_use_cases/UserLoginInteractor2.java
@@ -20,10 +20,8 @@ public UserLoginInteractor2(Database database, UserLoginOutputBoundary chatPrese
     public void login(String username, String password) {
         //will update this.chatPresenter
         //TODO: change below, as its just temporary
-        chatPresenter.setChats(new ArrayList<>());
-        chatPresenter.setUsername(username);
-        chatPresenter.setUserNotExists(false);
-        chatPresenter.setPasswordNotMatched(false);
+        user = database.getUser(username);
+
 
     }