diff --git a/app/src/main/java/com/example/nemophila/entities/ErrorType.java b/app/src/main/java/com/example/nemophila/entities/ErrorType.java index 4ab24d7..8d40df5 100644 --- a/app/src/main/java/com/example/nemophila/entities/ErrorType.java +++ b/app/src/main/java/com/example/nemophila/entities/ErrorType.java @@ -5,7 +5,8 @@ NetworkError("ネットワークエラー"), InvalidToken("トークンが不一致"), UnknownError("不明なエラー"), - ResponseNoyFound("リソースが見つかりません"); + ResponseNotFound("リソースが見つかりません"), + ServerError("サーバーエラー"); private final String text; diff --git a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java index 5f3d05b..8b5aed5 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java @@ -1,12 +1,9 @@ package com.example.nemophila.viewmodels; import android.util.Log; -import android.widget.TextView; -import com.example.nemophila.R; import com.example.nemophila.entities.Account; import com.example.nemophila.entities.AccountJson; -import com.example.nemophila.entities.AccountNameJson; import com.example.nemophila.entities.ErrorType; import com.example.nemophila.entities.Post; import com.example.nemophila.entities.PostJson; @@ -284,11 +281,13 @@ private String parseStatusCode(Integer stats) { switch (stats) { case 404: - return ErrorType.ResponseNoyFound.getText(); + return ErrorType.ResponseNotFound.getText(); case 401: return ErrorType.InvalidToken.getText(); case 400: return ErrorType.ResponseError.getText(); + case 500: + return ErrorType.ServerError.getText(); default: return ErrorType.UnknownError.getText(); } diff --git a/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java index 13e1bf2..0f5e67a 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java @@ -5,9 +5,6 @@ import com.example.nemophila.entities.AccountNameJson; import com.example.nemophila.entities.ErrorType; -import com.example.nemophila.entities.Post; -import com.example.nemophila.entities.PostJson; -import com.example.nemophila.resources.AccountsRest; import com.example.nemophila.resources.FriendsRest; import java.util.ArrayList; @@ -279,11 +276,13 @@ private String parseStatusCode(Integer stats) { switch (stats) { case 404: - return ErrorType.ResponseNoyFound.getText(); + return ErrorType.ResponseNotFound.getText(); case 401: return ErrorType.InvalidToken.getText(); case 400: return ErrorType.ResponseError.getText(); + case 500: + return ErrorType.ServerError.getText(); default: return ErrorType.UnknownError.getText(); } diff --git a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java index 9229454..d418ed8 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java @@ -153,11 +153,13 @@ private String parseStatusCode(Integer stats) { switch (stats) { case 404: - return ErrorType.ResponseNoyFound.getText(); + return ErrorType.ResponseNotFound.getText(); case 401: return ErrorType.InvalidToken.getText(); case 400: return ErrorType.ResponseError.getText(); + case 500: + return ErrorType.ServerError.getText(); default: return ErrorType.UnknownError.getText(); } diff --git a/app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java index e5e8b46..90e6cb0 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java @@ -2,16 +2,12 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; import com.example.nemophila.entities.ErrorType; import com.example.nemophila.entities.Shop; import com.example.nemophila.resources.ShopsRest; import com.google.android.gms.maps.model.Marker; -import java.io.IOError; -import java.io.IOException; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -187,11 +183,13 @@ private String parseStatusCode(Integer stats) { switch (stats) { case 404: - return ErrorType.ResponseNoyFound.getText(); + return ErrorType.ResponseNotFound.getText(); case 401: return ErrorType.InvalidToken.getText(); case 400: return ErrorType.ResponseError.getText(); + case 500: + return ErrorType.ServerError.getText(); default: return ErrorType.UnknownError.getText(); }