From 1b53949ef38280575554a09a1370bca437a9424f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Sat, 14 Oct 2017 22:30:54 +0300 Subject: [PATCH] login fix --- .idea/misc.xml | 2 +- .../android/activity/LoginActivity.java | 35 +++++++++++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index cca2cda..7158618 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java b/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java index 48d982f..77ff6f7 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java @@ -19,8 +19,10 @@ import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzalink.android.api.ApiService; import ch.pizzalink.android.api.ResponseObject; import ch.pizzalink.android.helper.DialogHelper; +import ch.pizzalink.android.helper.SessionHelper; import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzalink.android.model.UserModel; +import ch.pizzalink.android.model.cart.CartInfoModel; import ch.pizzalink.android.view.PizzalinkEditText; import retrofit2.Call; import retrofit2.Callback; @@ -95,17 +97,18 @@ public class LoginActivity extends BaseActivity { call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - DialogHelper.hideLoadingDialog(); if(response.isSuccessful() && response.body().getData() != null && response.body().isSuccess()){ SharedPrefsHelper.saveUser(response.body().getData()); SharedPrefsHelper.saveCustomerToken(response.body().getData().getToken()); SharedPrefsHelper.setCustomerLoggedIn(true); - startActivity(new Intent(LoginActivity.this, MainActivity.class)); + getCartItemCount(); } - else + else{ + DialogHelper.hideLoadingDialog(); ApiErrorUtils.parseError(response); + } } @Override @@ -115,4 +118,30 @@ public class LoginActivity extends BaseActivity { } }); } + + private void getCartItemCount(){ + Call> call = ApiService.apiInterface.getCartProducts( + SessionHelper.getCustomerToken().getToken()); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + DialogHelper.hideLoadingDialog(); + if(response.isSuccessful() && + response.body().getData() != null && + response.body().isSuccess()){ + SharedPrefsHelper.setCartItemCount(response.body().getData().getProducts().size()); + startActivity(new Intent(LoginActivity.this, MainActivity.class)); + + } + else + ApiErrorUtils.parseError(response); + } + + @Override + public void onFailure(Call> call, Throwable t) { + DialogHelper.hideLoadingDialog(); + DialogHelper.showFailedDialog(); + } + }); + } }