login fix

This commit is contained in:
2017-10-14 22:30:54 +03:00
parent 66c7bd1838
commit 1b53949ef3
2 changed files with 33 additions and 4 deletions

2
.idea/misc.xml generated
View File

@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

View File

@@ -19,8 +19,10 @@ import ch.pizzalink.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzalink.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzalink.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzalink.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzalink.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.model.UserModel; import ch.pizzalink.android.model.UserModel;
import ch.pizzalink.android.model.cart.CartInfoModel;
import ch.pizzalink.android.view.PizzalinkEditText; import ch.pizzalink.android.view.PizzalinkEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
@@ -95,17 +97,18 @@ public class LoginActivity extends BaseActivity {
call.enqueue(new Callback<ResponseObject<UserModel>>() { call.enqueue(new Callback<ResponseObject<UserModel>>() {
@Override @Override
public void onResponse(Call<ResponseObject<UserModel>> call, Response<ResponseObject<UserModel>> response) { public void onResponse(Call<ResponseObject<UserModel>> call, Response<ResponseObject<UserModel>> response) {
DialogHelper.hideLoadingDialog();
if(response.isSuccessful() && if(response.isSuccessful() &&
response.body().getData() != null && response.body().getData() != null &&
response.body().isSuccess()){ response.body().isSuccess()){
SharedPrefsHelper.saveUser(response.body().getData()); SharedPrefsHelper.saveUser(response.body().getData());
SharedPrefsHelper.saveCustomerToken(response.body().getData().getToken()); SharedPrefsHelper.saveCustomerToken(response.body().getData().getToken());
SharedPrefsHelper.setCustomerLoggedIn(true); SharedPrefsHelper.setCustomerLoggedIn(true);
startActivity(new Intent(LoginActivity.this, MainActivity.class)); getCartItemCount();
} }
else else{
DialogHelper.hideLoadingDialog();
ApiErrorUtils.parseError(response); ApiErrorUtils.parseError(response);
}
} }
@Override @Override
@@ -115,4 +118,30 @@ public class LoginActivity extends BaseActivity {
} }
}); });
} }
private void getCartItemCount(){
Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
SessionHelper.getCustomerToken().getToken());
call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
@Override
public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> 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<ResponseObject<CartInfoModel>> call, Throwable t) {
DialogHelper.hideLoadingDialog();
DialogHelper.showFailedDialog();
}
});
}
} }