diff --git a/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt index b735cc5..569cb44 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/NiveshFdMainActivity.kt @@ -124,10 +124,17 @@ class NiveshFdMainActivity : BaseActivity() { } 650 -> "" else -> { - showDialogValidation( - this@NiveshFdMainActivity, - stepsCountResponse.Response.Errors[0].ErrorMessage - ) + if (stepsCountResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + this@NiveshFdMainActivity, + stepsCountResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + this@NiveshFdMainActivity, + "".plus(stepsCountResponse.Response.Message) + ) + } } } } diff --git a/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/PaymentActivity.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/PaymentActivity.kt index 2243806..fd74a3e 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/PaymentActivity.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/activity/PaymentActivity.kt @@ -28,10 +28,10 @@ import com.nivesh.production.niveshfd.viewModel.BajajFDViewModel class PaymentActivity : BaseActivity() { - lateinit var binding: FragmentNiveshfdStepFiveBinding + private lateinit var binding: FragmentNiveshfdStepFiveBinding var dialogWebView: Dialog? = null lateinit var viewModel: BajajFDViewModel - var clientCode : String = "" + private var clientCode : String = "" var uniqueId : String = "" override fun onCreate(savedInstanceState: Bundle?) { @@ -60,7 +60,7 @@ class PaymentActivity : BaseActivity() { } - fun paymentDialog(payUrl: String, value: String) { + private fun paymentDialog(payUrl: String, value: String) { Log.e("payUrl", "-->$payUrl") Log.e("value", "-->$value") dialogWebView = Dialog(this@PaymentActivity) @@ -150,7 +150,7 @@ class PaymentActivity : BaseActivity() { } - fun getData(paymentReQueryResponse: PaymentReQueryResponse) { + private fun getData(paymentReQueryResponse: PaymentReQueryResponse) { if (paymentReQueryResponse.Response.StatusCode == 200) { if (paymentReQueryResponse.Response.Message.isNotEmpty()) { val arrOfStr: List = diff --git a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt index 0b2eb87..49d3f04 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFiveNiveshFDFragment.kt @@ -112,10 +112,17 @@ class StepFiveNiveshFDFragment : Fragment() { } 650 -> "" else -> { - Common.showDialogValidation( - activity as NiveshFdMainActivity, - finalizeFDResponse.Response.Errors[0].ErrorMessage - ) + if (finalizeFDResponse.Response.Errors.isNotEmpty()) { + Common.showDialogValidation( + activity as NiveshFdMainActivity, + finalizeFDResponse.Response.Errors[0].ErrorMessage + ) + }else{ + Common.showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(finalizeFDResponse.Response.Message) + ) + } } } } @@ -162,10 +169,17 @@ class StepFiveNiveshFDFragment : Fragment() { } 650 -> "" else -> { - Common.showDialogValidation( - activity as NiveshFdMainActivity, - finalizeFDResponse.Response.Errors[0].ErrorMessage - ) + if (finalizeFDResponse.Response.Errors.isNotEmpty()) { + Common.showDialogValidation( + activity as NiveshFdMainActivity, + finalizeFDResponse.Response.Errors[0].ErrorMessage + ) + }else{ + Common.showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(finalizeFDResponse.Response.Message) + ) + } } } } diff --git a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFourNiveshFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFourNiveshFDFragment.kt index 9b96c81..bfd4f24 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFourNiveshFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepFourNiveshFDFragment.kt @@ -139,10 +139,17 @@ class StepFourNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - saveFDOtherDataResponse.Response.Errors[0].ErrorMessage - ) + if (saveFDOtherDataResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + saveFDOtherDataResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(saveFDOtherDataResponse.Response.Message) + ) + } } } } @@ -197,10 +204,17 @@ class StepFourNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Message - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -270,10 +284,17 @@ class StepFourNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getFDDetailsResponse.Response.Errors[0].ErrorMessage - ) + if (getFDDetailsResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getFDDetailsResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getFDDetailsResponse.Response.Message) + ) + } } } } diff --git a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepOneNiveshFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepOneNiveshFDFragment.kt index a464f38..0466e7a 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepOneNiveshFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepOneNiveshFDFragment.kt @@ -213,10 +213,17 @@ class StepOneNiveshFDFragment : Fragment() { } 650 -> "" else -> { - Common.showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + Common.showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + Common.showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -267,10 +274,17 @@ class StepOneNiveshFDFragment : Fragment() { } 650 -> "" else -> { - Common.showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + Common.showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + Common.showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -317,10 +331,17 @@ class StepOneNiveshFDFragment : Fragment() { } 650 -> "" else -> { - Common.showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + Common.showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + Common.showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -396,10 +417,17 @@ class StepOneNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - Common.showDialogValidation( - activity as NiveshFdMainActivity, - getMaturityAmountResponse.Response.Errors[0].ErrorMessage - ) + if (getMaturityAmountResponse.Response.Errors.isNotEmpty()) { + Common.showDialogValidation( + activity as NiveshFdMainActivity, + getMaturityAmountResponse.Response.Errors[0].ErrorMessage + ) + }else{ + Common.showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getMaturityAmountResponse.Response.Message) + ) + } } } } @@ -528,10 +556,17 @@ class StepOneNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - Common.showDialogValidation( - activity as NiveshFdMainActivity, - getRatesResponse.Response.Errors[0].ErrorMessage - ) + if (getRatesResponse.Response.Errors.isNotEmpty()) { + Common.showDialogValidation( + activity as NiveshFdMainActivity, + getRatesResponse.Response.Errors[0].ErrorMessage + ) + }else{ + Common.showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getRatesResponse.Response.Message) + ) + } } } } diff --git a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepThreeNiveshFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepThreeNiveshFDFragment.kt index eab31d3..f8a7cdb 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepThreeNiveshFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepThreeNiveshFDFragment.kt @@ -493,10 +493,17 @@ class StepThreeNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - Common.showDialogValidation( - activity as NiveshFdMainActivity, - getUploadResponse.Response.Errors[0].ErrorMessage - ) + if (getUploadResponse.Response.Errors.isNotEmpty()) { + Common.showDialogValidation( + activity as NiveshFdMainActivity, + getUploadResponse.Response.Errors[0].ErrorMessage + ) + }else{ + Common.showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getUploadResponse.Response.Message) + ) + } } } } @@ -541,10 +548,17 @@ class StepThreeNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - Common.showDialogValidation( - activity as NiveshFdMainActivity, - createFDApplicationResponse.Response.Errors[0].ErrorMessage - ) + if (createFDApplicationResponse.Response.Errors.isNotEmpty()) { + Common.showDialogValidation( + activity as NiveshFdMainActivity, + createFDApplicationResponse.Response.Errors[0].ErrorMessage + ) + }else{ + Common.showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(createFDApplicationResponse.Response.Message) + ) + } } } } @@ -606,10 +620,17 @@ class StepThreeNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - Common.showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Message - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + Common.showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + Common.showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } diff --git a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt index a0aa483..a4c3891 100644 --- a/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/niveshfd/ui/fragment/StepTwoNiveshFDFragment.kt @@ -31,6 +31,7 @@ import com.nivesh.production.niveshfd.databinding.FragmentNiveshfdStepTwoBinding import com.nivesh.production.niveshfd.db.PreferenceManager import com.nivesh.production.niveshfd.model.* import com.nivesh.production.niveshfd.ui.activity.NiveshFdMainActivity +import com.nivesh.production.niveshfd.util.Common import com.nivesh.production.niveshfd.util.Common.Companion.commonErrorAutoCompleteMethod import com.nivesh.production.niveshfd.util.Common.Companion.commonErrorMethod import com.nivesh.production.niveshfd.util.Common.Companion.commonSpinnerErrorMethod @@ -769,10 +770,17 @@ class StepTwoNiveshFDFragment : Fragment() { } 650 -> "" else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -822,10 +830,17 @@ class StepTwoNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - createFDApplicationResponse.Response.Errors[0].ErrorMessage - ) + if (createFDApplicationResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + createFDApplicationResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(createFDApplicationResponse.Response.Message) + ) + } } } } @@ -1216,10 +1231,17 @@ class StepTwoNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -1269,10 +1291,17 @@ class StepTwoNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -1361,10 +1390,17 @@ class StepTwoNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -1446,10 +1482,17 @@ class StepTwoNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -1509,10 +1552,17 @@ class StepTwoNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -1584,10 +1634,17 @@ class StepTwoNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -1646,10 +1703,17 @@ class StepTwoNiveshFDFragment : Fragment() { } // 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getCodeResponse.Response.Errors[0].ErrorMessage - ) + if (getCodeResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getCodeResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getCodeResponse.Response.Message) + ) + } } } } @@ -1859,10 +1923,17 @@ class StepTwoNiveshFDFragment : Fragment() { } 650 -> refreshToken() else -> { - showDialogValidation( - activity as NiveshFdMainActivity, - getFDBankListResponse.Response.Errors[0].ErrorMessage - ) + if (getFDBankListResponse.Response.Errors.isNotEmpty()) { + showDialogValidation( + activity as NiveshFdMainActivity, + getFDBankListResponse.Response.Errors[0].ErrorMessage + ) + }else{ + showDialogValidation( + activity as NiveshFdMainActivity, + "".plus(getFDBankListResponse.Response.Message) + ) + } } } }