diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 4b6bf5e..03d9c98 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,18 +1,6 @@ - - - - - - - - - - - - diff --git a/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java b/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java index 988e491..edf920c 100644 --- a/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java +++ b/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java @@ -521,7 +521,7 @@ public class CgSubscriptionActivity extends AppCompatActivity if (monthly_price == null || yearly_price == null) throw new Exception(); - binding.yearDiscountedPrice.setText(yearly_price); + binding.yearDiscountedPrice.setText("$" + yearly_price); binding.monthlyPrice.setText("$" + monthly_price); BigDecimal TWELVE = new BigDecimal(12); diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java index 107e52d..96d3761 100644 --- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java +++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/SplashFragment.java @@ -120,7 +120,7 @@ public class SplashFragment extends Fragment binding.newUpdateView.getRoot().setVisibility(View.VISIBLE); - if (BuildConfig.VERSION_CODE < response.body().result.force_update_version) { + if (response.body().result.force_update == 1 && BuildConfig.VERSION_CODE < response.body().result.force_update_version) { // current version is less than forced latest version // update is mandatory binding.newUpdateView.skipBtn.setVisibility(View.GONE); @@ -179,8 +179,10 @@ public class SplashFragment extends Fragment } onProfileProgressFetched(response.body().result); - } else { + } else if (response.code() == 401) { sessionExpired(); + }else{ + onProfileProgressFetchFailed(new Exception("Response body is null"), response.message()); } } @@ -207,8 +209,10 @@ public class SplashFragment extends Fragment } onCgDataFetched(response.body().result); - } else { + } else if (response.code() == 401) { sessionExpired(); + }else{ + onCgDataFetchFailed(new Exception("Response body is null"), response.message()); } }