diff --git a/app/src/main/java/com/example/sprout/refactor/model/RegistrationModel.java b/app/src/main/java/com/example/sprout/refactor/model/RegistrationModel.java index a9f1d7f..e12c427 100644 --- a/app/src/main/java/com/example/sprout/refactor/model/RegistrationModel.java +++ b/app/src/main/java/com/example/sprout/refactor/model/RegistrationModel.java @@ -15,12 +15,14 @@ private Observer observer = null; private Observable accountObservable = new Observable<>(); private RegistrationRepository registrationRepository = null; + private Account account = null; public RegistrationModel(RegistrationRepository registrationRepository) { this.registrationRepository = registrationRepository; observer = new Observer() { @Override public void notify(Account account) { + RegistrationModel.this.account = account; PreferenceUtil.getInstance().saveInt(PreferenceUtil.Key.USER_ID, account.getUserID()); PreferenceUtil.getInstance().saveBoolean(PreferenceUtil.Key.REGISTERED, true); accountObservable.notifyObservers(account); @@ -42,4 +44,8 @@ public Observable getAccountObservable() { return accountObservable; } + + public Account getAccount(){ + return this.account; + } } diff --git a/app/src/main/java/com/example/sprout/refactor/model/RoomModel.java b/app/src/main/java/com/example/sprout/refactor/model/RoomModel.java index 76e19e2..5dad648 100644 --- a/app/src/main/java/com/example/sprout/refactor/model/RoomModel.java +++ b/app/src/main/java/com/example/sprout/refactor/model/RoomModel.java @@ -13,6 +13,7 @@ private RoomRepository roomRepository = null; private Observable roomObservable = new Observable<>(); + private Room room = null; public RoomModel(RoomRepository roomRepository) { this.roomRepository = roomRepository; @@ -20,6 +21,7 @@ Observer RoomObserver = new Observer() { @Override public void notify(Room room) { + RoomModel.this.room = room; roomObservable.notifyObservers(room); } @@ -35,6 +37,10 @@ roomRepository.getRoom(roomId); } + public Room getRoom(){ + return this.room; + } + public Observable getRoomObservable() { return roomObservable; } diff --git a/app/src/main/java/com/example/sprout/refactor/model/RoomResponseModel.java b/app/src/main/java/com/example/sprout/refactor/model/RoomResponseModel.java index 20419e7..d608139 100644 --- a/app/src/main/java/com/example/sprout/refactor/model/RoomResponseModel.java +++ b/app/src/main/java/com/example/sprout/refactor/model/RoomResponseModel.java @@ -14,6 +14,7 @@ private RoomRepository roomRepository = null; private Observable roomResponseObservable = new Observable<>(); + private RoomResponse roomResponse = null; public RoomResponseModel(RoomRepository roomRepository) { this.roomRepository = roomRepository; @@ -21,6 +22,7 @@ Observer roomResponseObserver = new Observer() { @Override public void notify(RoomResponse roomResponse) { + RoomResponseModel.this.roomResponse = roomResponse; PreferenceUtil.getInstance().saveInt(PreferenceUtil.Key.ROOM_ID, roomResponse.getRoom().getRoomId()); PreferenceUtil.getInstance().saveInt(PreferenceUtil.Key.MEMBER_ID, roomResponse.getMemberId()); roomResponseObservable.notifyObservers(roomResponse); @@ -53,4 +55,8 @@ public Observable getRoomResponseObservable() { return roomResponseObservable; } + + public RoomResponse getRoomResponse(){ + return this.roomResponse; + } }