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 468313a..f0cc750 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 @@ -26,12 +26,8 @@ roomRepository.getRoom(roomId) .subscribeOn(Schedulers.computation()) .subscribe( - room -> { - roomSubject.onNext(room); - }, - error -> { - errorSubject.onNext(new Error(error)); - }); + room -> roomSubject.onNext(room), + error -> errorSubject.onNext(new Error(error))); } public void clearStream() { 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 c2573a0..2553d78 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 @@ -32,10 +32,7 @@ roomResponseSubject.onNext(roomResponse); } }, - error -> { - errorSubject.onNext(new Error(error)); - } - ); + error -> errorSubject.onNext(new Error(error))); } public void enterRoomWithKey(int roomId, int userId, String key) { @@ -47,22 +44,15 @@ roomResponseSubject.onNext(roomResponse); } }, - error -> { - errorSubject.onNext(new Error(error)); - } - ); + error -> errorSubject.onNext(new Error(error))); } public void createRoom(int userId, String roomName, String key) { roomRepository.createRoom(userId, roomName, key) .subscribeOn(Schedulers.computation()) .subscribe( - roomResponse -> { - this.roomResponseSubject.onNext(roomResponse); - }, - error -> { - errorSubject.onNext(new Error(error)); - } + roomResponse -> this.roomResponseSubject.onNext(roomResponse), + error -> errorSubject.onNext(new Error(error)) ); } @@ -71,12 +61,8 @@ roomRepository.updateRoomState(roomId, memberId, role) .subscribeOn(Schedulers.computation()) .subscribe( - roomResponse -> { - this.roomResponseSubject.onNext(roomResponse); - }, - error -> { - errorSubject.onNext(new Error(error)); - } + roomResponse -> this.roomResponseSubject.onNext(roomResponse), + error -> errorSubject.onNext(new Error(error)) ); } diff --git a/app/src/main/java/com/example/sprout/refactor/model/RoomsModel.java b/app/src/main/java/com/example/sprout/refactor/model/RoomsModel.java index 0c44295..17f4cb1 100644 --- a/app/src/main/java/com/example/sprout/refactor/model/RoomsModel.java +++ b/app/src/main/java/com/example/sprout/refactor/model/RoomsModel.java @@ -26,9 +26,7 @@ roomRepository.getRooms() .subscribeOn(Schedulers.computation()) .subscribe( - rooms -> { - roomsSubject.onNext(rooms); - }, + rooms -> roomsSubject.onNext(rooms), error -> { if (roomsSubject.getValue() != null) { roomsSubject.onNext(roomsSubject.getValue()); diff --git a/app/src/main/java/com/example/sprout/refactor/viewmodel/RegistrationViewModel.java b/app/src/main/java/com/example/sprout/refactor/viewmodel/RegistrationViewModel.java index 7b13147..fe9c6cd 100644 --- a/app/src/main/java/com/example/sprout/refactor/viewmodel/RegistrationViewModel.java +++ b/app/src/main/java/com/example/sprout/refactor/viewmodel/RegistrationViewModel.java @@ -54,9 +54,7 @@ subscriptions.add( registrationModel.getErrorObservable() .observeOn(AndroidSchedulers.mainThread()) - .subscribe(error -> { - toastMessanger.showToast(new ToastMessage(Sprout.get().getResources().getString(R.string.fail_registration), ToastMessage.Length.LONG)); - }) + .subscribe(error -> toastMessanger.showToast(new ToastMessage(Sprout.get().getResources().getString(R.string.fail_registration), ToastMessage.Length.LONG))) ); } diff --git a/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomMainViewModel.java b/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomMainViewModel.java index c668ad5..a63ee53 100644 --- a/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomMainViewModel.java +++ b/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomMainViewModel.java @@ -102,9 +102,7 @@ preferenceUtil.getInt(PreferenceUtil.Key.USER_ID)) .subscribeOn(Schedulers.computation()) .subscribe( - __ -> { - navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finish)); - } + __ -> navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finish)) ); }