diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CodeInputPresenter.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CodeInputPresenter.java index 13084154189175cd2c335a3e80cdf56241957591..91b5a6a2b1f9be1bd77c3ffeb4012ca44108cbf7 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CodeInputPresenter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CodeInputPresenter.java @@ -1,6 +1,7 @@ package com.ninja.mobile.communicator.mvp.presenters; import com.arellomobile.mvp.InjectViewState; +import com.ninja.mobile.communicator.R; import com.ninja.mobile.communicator.data.models.mqtt.Io; import com.ninja.mobile.communicator.data.models.mqtt.Response; import com.ninja.mobile.communicator.mvp.view.CodeInputView; @@ -8,6 +9,8 @@ import com.ninja.mobile.communicator.ui.fragments.signin.InfoFragment; import com.ninja.mobile.communicator.utils.StringUtils; import com.ninja.mobile.communicator.utils.ValidationUtils; +import timber.log.Timber; + /** * Created by dmitro.boiko on 05/07/2017. **/ @@ -27,15 +30,11 @@ public class CodeInputPresenter extends BaseErrorPresenter { if (io.isSuccess()) { successFlow(io); } else { - errorFlow(io); + Timber.e(io.getStatus()); } } } - private void errorFlow(Io io) { - showCodeErrorMessage(io.getStatus(), -1); - } - private void successFlow(Io io) { switch (io.getStatus()) { case Io.Responses.LOGIN: @@ -58,11 +57,11 @@ public class CodeInputPresenter extends BaseErrorPresenter { mDataManager.confirmSms(StringUtils.deleteSpaces(code)); phoneNumber = phone; } else { - showCodeErrorMessage("Code is too small.", -1); + showCodeErrorMessage(R.string.signin_text_code_to_small, -1); } } - private void showCodeErrorMessage(String message, int errorCode) { + private void showCodeErrorMessage(int message, int errorCode) { getViewState().showCodeError(message, errorCode); } diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/EditProfilePresenter.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/EditProfilePresenter.java index d47c05250f93d31513d722a39f163c058ab6af9a..4cb70529f19a8f3915ad0229ffb9bf16bafa5eb1 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/EditProfilePresenter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/EditProfilePresenter.java @@ -3,6 +3,7 @@ package com.ninja.mobile.communicator.mvp.presenters; import android.text.TextUtils; import com.arellomobile.mvp.InjectViewState; +import com.ninja.mobile.communicator.R; import com.ninja.mobile.communicator.data.models.mqtt.BaseModelMQQT; import com.ninja.mobile.communicator.data.models.mqtt.Io; import com.ninja.mobile.communicator.data.models.mqtt.Profile; @@ -13,6 +14,8 @@ import com.ninja.mobile.communicator.utils.ValidationUtils; import java.util.ArrayList; +import timber.log.Timber; + /** * Date: 25.06.17 * Time: 04:10 @@ -37,7 +40,7 @@ public class EditProfilePresenter extends BasePresenter { } else { //// FIXME: 13/07/2017 message with error if (response.data instanceof Io) { - getViewState().onErrorMessage(((Io) response.data).getStatus()); + Timber.e(((Io) response.data).getStatus()); } } } @@ -55,7 +58,7 @@ public class EditProfilePresenter extends BasePresenter { getViewState().navigateBack(mProfile); } - private void showErrorMessage(String errorMessage) { + private void showErrorMessage(int errorMessage) { getViewState().onErrorMessage(errorMessage); } @@ -69,11 +72,11 @@ public class EditProfilePresenter extends BasePresenter { private void createErrorMessage(String firstName) { //// FIXME: 30/06/2017 add error messages - String errorMessage; + int errorMessage; if (TextUtils.isEmpty(firstName)) { - errorMessage = "FirstName cannot be empty."; + errorMessage = R.string.signin_text_first_name_empty; } else { - errorMessage = "FirstName length should be at least 2 symbols."; + errorMessage = R.string.signin_text_first_name_lenth; } showErrorMessage(errorMessage); } diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/InfoPresenter.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/InfoPresenter.java index 4a44953f1cb2382dcb53f59be1d8f2681b0cf481..2f0b4969209eb6f9927069eb8aa8944e4db0a05c 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/InfoPresenter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/InfoPresenter.java @@ -7,6 +7,7 @@ package com.ninja.mobile.communicator.mvp.presenters; import android.text.TextUtils; import com.arellomobile.mvp.InjectViewState; +import com.ninja.mobile.communicator.R; import com.ninja.mobile.communicator.data.models.mqtt.BaseModelMQQT; import com.ninja.mobile.communicator.data.models.mqtt.Io; import com.ninja.mobile.communicator.data.models.mqtt.Profile; @@ -17,6 +18,8 @@ import com.ninja.mobile.communicator.utils.ValidationUtils; import java.util.ArrayList; +import timber.log.Timber; + @InjectViewState public class InfoPresenter extends BaseErrorPresenter { @@ -37,7 +40,7 @@ public class InfoPresenter extends BaseErrorPresenter { } else { //// FIXME: 13/07/2017 message with error if (response.data instanceof Io) { - showErrorMessage(((Io) response.data).getStatus(), -1); + Timber.e(((Io) response.data).getStatus()); } } } @@ -54,7 +57,7 @@ public class InfoPresenter extends BaseErrorPresenter { } } - private void showErrorMessage(String message, int messageId) { + private void showErrorMessage(int message, int messageId) { getViewState().showCodeError(message, messageId); } @@ -76,11 +79,11 @@ public class InfoPresenter extends BaseErrorPresenter { private void createErrorMessage(String firstName) { //// FIXME: 30/06/2017 add error messages - String errorMessage; + int errorMessage; if (TextUtils.isEmpty(firstName)) { - errorMessage = "FirstName cannot be empty."; + errorMessage = R.string.signin_text_first_name_empty; } else { - errorMessage = "FirstName length should be at least 2 symbols."; + errorMessage = R.string.signin_text_first_name_lenth; } showErrorMessage(errorMessage, -1); } diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/LoginPresenter.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/LoginPresenter.java index 1e452bbe496046528908e1efe7677721a7698c73..1395fc06c37775420fe73fb0d8f230aa362b9f1f 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/LoginPresenter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/LoginPresenter.java @@ -14,6 +14,7 @@ import com.ninja.mobile.communicator.utils.Utils; import io.reactivex.Observable; import io.reactivex.disposables.Disposable; +import timber.log.Timber; /** * Date: 25.06.17 @@ -171,7 +172,7 @@ public class LoginPresenter extends BasePresenter { case Io.Responses.MISMATCH_USER_DATA: case Io.Responses.ERROR: default: - getViewState().showCodeError(io.getStatus(), -2); + Timber.e(io.getStatus()); break; } } @@ -186,7 +187,7 @@ public class LoginPresenter extends BasePresenter { break; default: //ShowError - getViewState().showCodeError(io.getStatus(), -2); + Timber.e(io.getStatus()); break; } } diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/MainPresenter.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/MainPresenter.java index 1c1dfa278ae5ab0c120aaf7e9de71a8cda48aaa8..a9ad54e0ccc04c69a94964d7ba74c9bf0cc9ba53 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/MainPresenter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/MainPresenter.java @@ -35,11 +35,11 @@ public class MainPresenter extends BaseErrorPresenter { manageProfile(response); } else { // FIXME: 12.07.2017 show error - getViewState().showCodeError("Model error", -1); + Timber.e(response.toString()); } } else { // FIXME: 12.07.2017 show error - getViewState().showCodeError("error", -1); + Timber.e(response.toString()); } } catch (Exception e) { Timber.e(e); @@ -50,7 +50,7 @@ public class MainPresenter extends BaseErrorPresenter { mDataManager.saveProfile((Profile) response.data); Profile profile = (Profile) response.data; if (profile.status.equals(BaseModelMQQT.Types.GET)) { - getViewState().showCodeError("Profile successfully received", -1); + Timber.d("Profile successfully received"); } else { getViewState().navigateToSplash(); mDataManager.clearPreferences(); diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/view/EditProfileView.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/view/EditProfileView.java index f4263be8fda649d4d561a81236dfc9a7befc7c28..2d038e804fa0172f21be83cef71dcaadf1f38d5a 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/view/EditProfileView.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/view/EditProfileView.java @@ -9,7 +9,7 @@ import com.ninja.mobile.communicator.data.models.mqtt.Profile; public interface EditProfileView extends MvpView { - void onErrorMessage(String errorMessage); + void onErrorMessage(int errorMessage); void navigateBack(Profile userPerson); } diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/view/ErrorMvpView.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/view/ErrorMvpView.java index be6da69964a65ed93e684796fed4910f2060d920..f32edcd0eca56fc5f4bc5e2d1a73382fe185624c 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/view/ErrorMvpView.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/view/ErrorMvpView.java @@ -14,5 +14,5 @@ public interface ErrorMvpView extends MvpView{ void showInternetError(); @StateStrategyType(SingleStateStrategy.class) - void showCodeError(String message, int code); + void showCodeError(int message, int code); } diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/profile/EditProfileFragment.java b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/profile/EditProfileFragment.java index 4e68a8bfb846df4dbbde69f39e98b80264595215..6a36f4b0ac43f0c67069b0a3d2ff73a59948ed2a 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/profile/EditProfileFragment.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/profile/EditProfileFragment.java @@ -66,7 +66,7 @@ public class EditProfileFragment extends BaseFragment implements EditProfileView } @Override - public void onErrorMessage(String errorMessage) { + public void onErrorMessage(int errorMessage) { } diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/CodeInputFragment.java b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/CodeInputFragment.java index 24c2a9433c483ffd1f1467596181d870aa25bb4a..33c18047a1d062e50be99fbcf698b53cd27436a6 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/CodeInputFragment.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/CodeInputFragment.java @@ -85,7 +85,7 @@ public class CodeInputFragment extends BaseFragment implements CodeInputView { showAlert(getString(R.string.error_no_internet_connection), null); } - @Override public void showCodeError(String message, int code) { + @Override public void showCodeError(int message, int code) { showAlert(message, null); } } diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/InfoFragment.java b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/InfoFragment.java index 93ba7185951cd1d63c20de22c3d9409b7748065f..a04f34d585f5c837018c9c6e138d2a112f834af2 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/InfoFragment.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/InfoFragment.java @@ -80,7 +80,7 @@ public class InfoFragment extends BaseFragment implements InfoView { } @Override - public void showCodeError(String message, int code) { + public void showCodeError(int message, int code) { showAlert(message, null); } diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/LoginFragment.java b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/LoginFragment.java index 1131d5cfe6f1c6620cfde581faecb076efd9822d..a8038ee5908aa099bcc71e4b3bf7af725ea96280 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/LoginFragment.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/fragments/signin/LoginFragment.java @@ -1,11 +1,8 @@ package com.ninja.mobile.communicator.ui.fragments.signin; -import android.content.DialogInterface; import android.os.Bundle; import android.os.Handler; import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -170,7 +167,7 @@ public class LoginFragment extends BaseFragment implements LoginView { } private void initSpannableTerms() { - View.OnClickListener onClickListener = v -> Toast.makeText(getActivity(), "It is not working now :-(", Toast.LENGTH_SHORT).show(); + View.OnClickListener onClickListener = v -> Toast.makeText(getActivity(), R.string.its_not_working, Toast.LENGTH_SHORT).show(); SpannableUtils.setSpannable(getActivity(), mTermsOfUse, R.string.signin_text_description, R.string.signin_text_description_highlight, onClickListener); } @@ -178,7 +175,7 @@ public class LoginFragment extends BaseFragment implements LoginView { Toast.makeText(getContext(), R.string.error_no_internet_connection, Toast.LENGTH_SHORT).show(); } - @Override public void showCodeError(String message, int code) { + @Override public void showCodeError(int message, int code) { } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 31496f7e2dc335b194882a7f0af5ba87ac946bbd..308a17e27b7b1bd0e270db45f7274a34aafc95c8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,6 +17,12 @@ First Name\u002A Last Name --- --- + "Code is too small." + "FirstName cannot be empty." + "FirstName length should be at least 2 symbols." + + + "It is not working now :-(" Camera