diff --git a/app/src/main/java/com/nivesh/production/bajajfd/api/ApiClient.kt b/app/src/main/java/com/nivesh/production/bajajfd/api/ApiClient.kt index aaa5a11..b9452d4 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/api/ApiClient.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/api/ApiClient.kt @@ -1,11 +1,19 @@ package com.nivesh.production.bajajfd.api +import android.content.Context +import com.nivesh.production.bajajfd.R import com.nivesh.production.bajajfd.interfaces.ApiInterface import com.nivesh.production.bajajfd.util.Constants.Companion.BASE_URL import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory +import java.security.KeyStore +import java.security.SecureRandom +import java.util.* +import java.util.concurrent.TimeUnit +import javax.net.ssl.* + class ApiClient { companion object { @@ -16,8 +24,25 @@ class ApiClient { logging.setLevel(HttpLoggingInterceptor.Level.BODY) //see the body of response //create client for retrofit + + + val trustManagerFactory: TrustManagerFactory = + TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()) + trustManagerFactory.init(null as KeyStore?) + val trustManagers: Array = trustManagerFactory.getTrustManagers() + check(!(trustManagers.size != 1 || trustManagers[0] !is X509TrustManager)) { + "Unexpected default trust managers:" + Arrays.toString( + trustManagers + ) + } + val trustManager: X509TrustManager = trustManagers[0] as X509TrustManager + val sslContext = SSLContext.getInstance("SSL") + sslContext.init(null, arrayOf(trustManager), null) + val sslSocketFactory: SSLSocketFactory = sslContext.socketFactory + val client = OkHttpClient.Builder() .addInterceptor(logging) + .sslSocketFactory(sslSocketFactory, trustManager) .retryOnConnectionFailure(true) .build() Retrofit.Builder() diff --git a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXX.kt b/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXX.kt index 4bacf38..187adc4 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXX.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/model/ResponseXXXXXXXXXXXX.kt @@ -1,7 +1,9 @@ package com.nivesh.production.bajajfd.model +import com.nivesh.production.bajajfd.util.Resource + data class ResponseXXXXXXXXXXXX( - val Errors: Any, + val Errors: List, val FDDataResponse: FDDataResponse, val Message: String, val Status: String, diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt index f03e175..8ea3c27 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepThreeBajajFDFragment.kt @@ -308,9 +308,14 @@ class StepThreeBajajFDFragment : BaseFragment() { du.DocumentType = "PAN" du.FDProvider = "Bajaj" du.ImageEncodeToBase64 = front //"data:image/png;base64" - du.NiveshClientCode = "8872" - du.UniqueId = "5463772498" + du.NiveshClientCode = (activity as BajajFdMainActivity).getClientDetailsResponse.ObjectResponse?.clientDetails?.clientMasterMFD?.CLIENT_CODE + du.UniqueId = uniqueId stepThreeBajajFDViewModel.documentsUpload(du,Constants.token) + + val gson = Gson() + val jsonString = gson.toJson(DocumentUpload()) + Log.e("check_request_json",jsonString) + stepThreeBajajFDViewModel.getDocumentUploadMutableData.observe(viewLifecycleOwner){ response -> when (response){ is Resource.Success ->{ diff --git a/app/src/main/res/raw/my_certificate.cer b/app/src/main/res/raw/my_certificate.cer new file mode 100644 index 0000000..a09b782 --- /dev/null +++ b/app/src/main/res/raw/my_certificate.cer @@ -0,0 +1,35 @@ +-----BEGIN CERTIFICATE----- +MIIGLDCCBRSgAwIBAgIRAOC8oou3uiOKidLRgPxPMbIwDQYJKoZIhvcNAQELBQAw +gY8xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO +BgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE3MDUGA1UE +AxMuU2VjdGlnbyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD +QTAeFw0yMTEyMTAwMDAwMDBaFw0yMzAxMTAyMzU5NTlaMBcxFTATBgNVBAMMDCou +bml2ZXNoLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6WeYgq +GOpEvmY7KJKAi4mcdnH7L/2+Cxe2gVlq9vpFmnqFiPZS1JXCo2L8xSq6/Hxkiwkw +JMvGTCK+fhN4Zs/eYQ3fWeWv+AkRCs5/H6LxtsNuOxLiNNSUPqyT5yWkA7KK8uyo +ocE2qmOikqZWuWGjHoY+LiWE0Vb+iK8+XiP7EE+hrqB3UrW6WytxNF4yMmmNPmof +Cqhxh66DV1C6YhC4PMuqjtS811r9tfLp9GP2zwWAEFmUFP29UiNGuqp5r2Js5Vn8 +tJbVo5NKl+paCSRRqWt94iBn9iaVeKaaKd0vgXzD4KhXPAn3SkTutRjS14uSHIxu +2rDreclJrv1ylZECAwEAAaOCAvgwggL0MB8GA1UdIwQYMBaAFI2MXsRUrYrhd+mb ++ZsF4bgBjWHhMB0GA1UdDgQWBBSEO7RmJP+bzz6mTVBA+XsF6a/7vTAOBgNVHQ8B +Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB +BQUHAwIwSQYDVR0gBEIwQDA0BgsrBgEEAbIxAQICBzAlMCMGCCsGAQUFBwIBFhdo +dHRwczovL3NlY3RpZ28uY29tL0NQUzAIBgZngQwBAgEwgYQGCCsGAQUFBwEBBHgw +djBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5zZWN0aWdvLmNvbS9TZWN0aWdvUlNB +RG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAjBggrBgEFBQcwAYYX +aHR0cDovL29jc3Auc2VjdGlnby5jb20wIwYDVR0RBBwwGoIMKi5uaXZlc2guY29t +ggpuaXZlc2guY29tMIIBfAYKKwYBBAHWeQIEAgSCAWwEggFoAWYAdgCt9776fP8Q +yIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAX2i87C2AAAEAwBHMEUCIQDHdsDn +kA3ktyMxce/FRtb61TpIkZQjhMDFoRzVMOSghgIgcawr75bc9bnT5RzuPVd8es1R +8euvGvaIUWveW3LNmFIAdQB6MoxU2LcttiDqOOBSHumEFnAyE4VNO9IrwTpXo1Lr +UgAAAX2i87B0AAAEAwBGMEQCIA75W33zs9u3tKLjTiFOAclYDaWbOS/GoE179wr2 +d4jKAiBZp0TnvFa1+I4jC9faot83PqClumyl3QRwR3CeAfMgsQB1AOg+0No+9QY1 +MudXKLyJa8kD08vREWvs62nhd31tBr1uAAABfaLzsE8AAAQDAEYwRAIgOitVc+nj +J5gkft/VKRP0w2ZxChHC0yEgPJzMC8KmnQMCIBcRmGBcpN+vQXL0t7gSTrIGTjAJ +jxJptQfLsPXJ3/sBMA0GCSqGSIb3DQEBCwUAA4IBAQCq2CbjmPky6ISXzM86kD2n +7lakrVoo5QpJhopWhr0bp+Bf3+I2l2ZIEtCP9/z1zVIGfPXxEGsvYB+gxi4t0YDy +8v+tiNxzOG6rhHSgs9SVhfFb/iFp3n2RtD4iezvGsiSjp7KiSCaV1gknlQlC09eJ +b6mNk2cDHaABfyRFIDZRvZ69rn9pRKHGWdIoGcrFNovWOaOeN+I46G54Vfy3VS+3 +PeVBU6ziRGIQ0oq0kPWbv8wKYz+dTKsO/NhhRXwr5LFLd2HdAXKnGTqSgcjXGqar +n9MRJA9rm6+fKz7sRaGd4daJIKRb5QDAv46tpzKYoLt3/hrn0mZwiiiu0kp7XuOQ +-----END CERTIFICATE-----