Convert RetrofitCallback to Kotlin and some refactoring

app/src/androidTest/java/in/projecteka/jataayu/consent/ui/fragment/ConsentDetailsFragmentTest.kt

@@ -18,8 +18,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
-
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class ConsentDetailsFragmentTest{

app/src/main/java/in/projecteka/jataayu/module/Modules.kt

@@ -26,7 +26,6 @@ import `in`.projecteka.jataayu.user.account.repository.UserAccountsRepositoryImp
 import `in`.projecteka.jataayu.user.account.viewmodel.UserAccountsViewModel
 import okhttp3.ResponseBody
 import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import retrofit2.Converter
 import retrofit2.Retrofit

commons/network/src/main/java/in/projecteka/jataayu/network/utils/NetworkExtensions.kt

@@ -3,17 +3,17 @@ package `in`.projecteka.jataayu.network.utils
 import androidx.lifecycle.MutableLiveData
 import retrofit2.Call
 
-fun <T> Call<T>.observeOn(mutableLiveData: MutableLiveData<T>, responseCallback: ResponseCallback) {
+fun <T> Call<T>.observeOn(mutableLiveData: MutableLiveData<T?>, responseCallback: ResponseCallback) {
     enqueue(object : RetrofitCallback<T>(responseCallback) {
-        override fun observableLiveData(): MutableLiveData<T> {
+        override fun observableLiveData(): MutableLiveData<T?> {
             return mutableLiveData
         }
     })
 }
 
-fun <T> Call<T>.observeOn(mutableLiveData: MutableLiveData<T>) {
+fun <T> Call<T>.observeOn(mutableLiveData: MutableLiveData<T?>) {
     enqueue(object : RetrofitCallback<T>() {
-        override fun observableLiveData(): MutableLiveData<T> {
+        override fun observableLiveData(): MutableLiveData<T?> {
             return mutableLiveData
         }
     })

commons/network/src/main/java/in/projecteka/jataayu/network/utils/RetrofitCallback.kt

@@ -0,0 +1,53 @@
+package `in`.projecteka.jataayu.network.utils
+
+import `in`.projecteka.jataayu.network.model.Error
+import `in`.projecteka.jataayu.network.model.ErrorResponse
+import androidx.lifecycle.MutableLiveData
+import com.google.gson.Gson
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.net.HttpURLConnection.HTTP_FORBIDDEN
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+
+private const val DEFAULT_ERROR_CODE = -1
+private const val ERROR_CODE_UNAUTHORIZED = 1017
+
+abstract class RetrofitCallback<T> : Callback<T?> {
+    private var responseCallback: ResponseCallback? = null
+
+    constructor()
+
+    constructor(responseCallback: ResponseCallback?) {
+        this.responseCallback = responseCallback
+    }
+
+    protected abstract fun observableLiveData(): MutableLiveData<T?>
+    override fun onResponse(call: Call<T?>, response: Response<T?>) {
+        if (response.isSuccessful) {
+            if (responseCallback != null) responseCallback!!.onSuccess(response.body())
+            if (response.body() != null) {
+                observableLiveData().value = response.body()
+            }
+        } else {
+            if (response.errorBody() != null && responseCallback != null) {
+                try {
+                    val errorResponse: ErrorResponse = Gson()
+                        .fromJson<ErrorResponse>(response.errorBody()!!.string(), ErrorResponse::class.java)
+                    responseCallback!!.onFailure(errorResponse)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    var errorCode = DEFAULT_ERROR_CODE
+                    if (response.code() in arrayOf(HTTP_FORBIDDEN, HTTP_UNAUTHORIZED)) {
+                        errorCode = ERROR_CODE_UNAUTHORIZED
+                    }
+                    responseCallback!!.onFailure(ErrorResponse(Error(errorCode, e.message!!)))
+                }
+            }
+        }
+    }
+
+    override fun onFailure(call: Call<T?>, t: Throwable) {
+        if (responseCallback != null) responseCallback!!.onFailure(t)
+    }
+}

commons/network/src/test/java/in/projecteka/jataayu/network/RedirectInterceptorTest.kt

@@ -2,7 +2,6 @@ package `in`.projecteka.jataayu.network
 
 import `in`.projecteka.jataayu.network.interceptor.UnauthorisedUserRedirectInterceptor
 import android.content.Context
-import android.content.Intent
 import com.google.gson.JsonObject
 import okhttp3.OkHttpClient
 import okhttp3.mockwebserver.MockResponse

features/consent/src/main/java/in/projecteka/jataayu/consent/ui/activity/ConsentDetailsActivity.kt

@@ -15,7 +15,8 @@ import `in`.projecteka.jataayu.presentation.showErrorDialog
 import `in`.projecteka.jataayu.presentation.ui.BaseActivity
 import `in`.projecteka.jataayu.presentation.ui.fragment.BaseFragment
 import `in`.projecteka.jataayu.util.extension.startActivityForResult
-import `in`.projecteka.jataayu.util.sharedPref.*
+import `in`.projecteka.jataayu.util.sharedPref.getPinCreated
+import `in`.projecteka.jataayu.util.sharedPref.setPinCreated
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri

features/consent/src/main/java/in/projecteka/jataayu/consent/ui/fragment/ConfirmPinFragment.kt

@@ -81,34 +81,40 @@ class ConfirmPinFragment : BaseDialogFragment(), OtpSubmissionClickHandler, OtpC
             bundle.getString(PIN)?.let { pin ->
                 if (confirmedPin == pin) {
                     showProgressBar(true)
-                    viewModel.createPinResponse.observe(this, Observer {
+                    viewModel.createPinResponse.observe(this, Observer { payloadResource ->
 
-                        when (it) {
-                            is Loading -> showProgressBar(it.isLoading, getString(R.string.creating_pin))
+                        when (payloadResource) {
+                            is Loading -> showProgressBar(payloadResource.isLoading, getString(R.string.creating_pin))
                             is Success -> {
-                                activity?.let {
-                                    it.setPinCreated(true)
+                                activity?.let { fragmentActivity ->
+                                    fragmentActivity.setPinCreated(true)
                                     showProgressBar(true)
-                                    viewModel.userVerificationResponse.observe(this, Observer { userVerificationResponse ->
-                                        activity?.setConsentTempToken(userVerificationResponse.temporaryToken)
-                                        EventBus.getDefault().post(MessageEventType.USER_VERIFIED)
-                                        it.setResult(Activity.RESULT_OK)
-                                        it.finish()
-                                    })
+                                    viewModel.userVerificationResponse.observe(
+                                        this,
+                                        Observer { userVerificationResponse ->
+                                            userVerificationResponse?.temporaryToken?.let {
+                                                activity?.setConsentTempToken(it)
+                                                EventBus.getDefault().post(MessageEventType.USER_VERIFIED)
+                                                fragmentActivity.setResult(Activity.RESULT_OK)
+                                                fragmentActivity.finish()
+                                            }
+                                        })
                                     viewModel.verifyUser(pin, this)
 
                                 }
                             }
                             is PartialFailure -> {
-                                context?.showAlertDialog(getString(R.string.failure), it.error?.message,
-                                    getString(android.R.string.ok))
+                                context?.showAlertDialog(
+                                    getString(R.string.failure), payloadResource.error?.message,
+                                    getString(android.R.string.ok)
+                                )
                             }
                         }
                     })
-                    if (context?.getConsentPinCreationAPIintegrationStatus()!!){
+                    if (context?.getConsentPinCreationAPIintegrationStatus()!!) {
                         showProgressBar(true)
                         viewModel.createPin(confirmedPin)
-                    } else{
+                    } else {
                         activity?.let {
                             it.setResult(Activity.RESULT_OK)
                             it.finish()

features/consent/src/main/java/in/projecteka/jataayu/consent/ui/fragment/UserVerificationFragment.kt

@@ -55,8 +55,10 @@ class UserVerificationFragment : BaseDialogFragment(), OtpSubmissionClickHandler
 
     private fun initObservers() {
         viewModel.userVerificationResponse.observe(this, Observer { it ->
-            context?.setConsentTempToken(it.temporaryToken)
-            EventBus.getDefault().post(MessageEventType.USER_VERIFIED)
+            it?.temporaryToken?.let {
+                context?.setConsentTempToken(it)
+                EventBus.getDefault().post(MessageEventType.USER_VERIFIED)
+            }
         })
     }
 

features/consent/src/main/java/in/projecteka/jataayu/consent/viewmodel/UserVerificationViewModel.kt

@@ -11,7 +11,7 @@ import androidx.lifecycle.ViewModel
 
 class UserVerificationViewModel(private val userVerificationRepository: UserVerificationRepository) : ViewModel() {
     internal var createPinResponse = PayloadLiveData<Void>()
-    internal var userVerificationResponse = liveDataOf<UserVerificationResponse>()
+    internal var userVerificationResponse = liveDataOf<UserVerificationResponse?>()
 
     fun createPin(pin: String) {
         createPinResponse.fetch(userVerificationRepository.createPin(pin))

features/provider/src/main/java/in/projecteka/jataayu/provider/ui/fragment/PatientAccountsFragment.kt

@@ -102,7 +102,7 @@ class PatientAccountsFragment : BaseFragment(), ItemClickCallback, PatientAccoun
         viewModel.linkAccountsResponse.observe(this, linkAccountsObserver)
     }
 
-    private val linkAccountsObserver = Observer<LinkAccountsResponse> { _ ->
+    private val linkAccountsObserver = Observer<LinkAccountsResponse?> { _ ->
         (activity as ProviderActivity).showVerifyOtpScreen()
     }
 

features/provider/src/main/java/in/projecteka/jataayu/provider/ui/fragment/ProviderSearchFragment.kt

@@ -49,9 +49,11 @@ class ProviderSearchFragment : BaseFragment(), ItemClickCallback, TextWatcherCal
     private lateinit var selectedProvider : ProviderInfo
     private lateinit var providersList: ProviderSearchAdapter
 
-    private val providersObserver = Observer<List<ProviderInfo>> { providerNames ->
-        providersList.updateData(lastQuery, providerNames)
-        showNoResultsFoundView(providerNames.isEmpty())
+    private val providersObserver = Observer<List<ProviderInfo>?> { providerNames ->
+        providerNames?.let {
+            providersList.updateData(lastQuery, it)
+            showNoResultsFoundView(it.isEmpty())
+        }
     }
 
     private val patientAccountsObserver =

features/provider/src/main/java/in/projecteka/jataayu/provider/ui/fragment/VerifyOtpFragment.kt

@@ -66,7 +66,7 @@ class VerifyOtpFragment : BaseFragment(),
         setTitle(R.string.verification)
     }
 
-    private val observer = Observer<SuccessfulLinkingResponse> {
+    private val observer = Observer<SuccessfulLinkingResponse?> {
         eventBus.post(MessageEventType.ACCOUNT_LINKED)
         activity?.setResult(RESULT_OK)
         activity?.finish()

features/provider/src/main/java/in/projecteka/jataayu/provider/viewmodel/ProviderSearchViewModel.kt

@@ -16,11 +16,11 @@ import `in`.projecteka.jataayu.util.extension.liveDataOf
 import androidx.lifecycle.ViewModel
 
 class ProviderSearchViewModel(private val providerRepository: ProviderRepository) : ViewModel() {
-    val providers = liveDataOf<List<ProviderInfo>>()
+    val providers = liveDataOf<List<ProviderInfo>?>()
     var providersList = emptyList<ProviderInfo>()
-    val patientDiscoveryResponse = liveDataOf<PatientDiscoveryResponse>()
-    val linkAccountsResponse = liveDataOf<LinkAccountsResponse>()
-    val successfulLinkingResponse = liveDataOf<SuccessfulLinkingResponse>()
+    val patientDiscoveryResponse = liveDataOf<PatientDiscoveryResponse?>()
+    val linkAccountsResponse = liveDataOf<LinkAccountsResponse?>()
+    val successfulLinkingResponse = liveDataOf<SuccessfulLinkingResponse?>()
 
     internal var selectedProviderName = String.EMPTY
 
@@ -35,7 +35,7 @@ class ProviderSearchViewModel(private val providerRepository: ProviderRepository
 
     fun linkPatientAccounts(listCareContexts: List<CareContext>, responseCallback: ResponseCallback) {
 
-        var linkedAccounts = ArrayList<CareContext>()
+        val linkedAccounts = ArrayList<CareContext>()
 
         listCareContexts.forEach {
                 if (it.contextChecked){
@@ -45,11 +45,11 @@ class ProviderSearchViewModel(private val providerRepository: ProviderRepository
 
         val discoveryResponse = patientDiscoveryResponse.value
         val selectedAccountsResponse = PatientDiscoveryResponse(Patient(discoveryResponse?.patient?.referenceNumber!!,
-            discoveryResponse.patient.display, linkedAccounts, discoveryResponse.patient?.matchedBy!!),
+            discoveryResponse.patient.display, linkedAccounts, discoveryResponse.patient.matchedBy),
             discoveryResponse.transactionId)
 
 
-        providerRepository.linkPatientAccounts(selectedAccountsResponse!!).observeOn(linkAccountsResponse, responseCallback)
+        providerRepository.linkPatientAccounts(selectedAccountsResponse).observeOn(linkAccountsResponse, responseCallback)
     }
 
     fun verifyOtp(referenceNumber: String, otp: Otp, responseCallback: ResponseCallback) {

user/account/src/main/java/in/projecteka/jataayu/user/account/ui/fragment/CreateAccountFragment.kt

@@ -2,7 +2,6 @@ package `in`.projecteka.jataayu.user.account.ui.fragment
 
 
 import `in`.projecteka.jataayu.core.model.CreateAccountRequest
-import `in`.projecteka.jataayu.core.model.CreateAccountResponse
 import `in`.projecteka.jataayu.network.model.ErrorResponse
 import `in`.projecteka.jataayu.network.utils.ResponseCallback
 import `in`.projecteka.jataayu.presentation.callback.DateTimeSelectionCallback
@@ -88,10 +87,12 @@ class CreateAccountFragment : BaseFragment(),
             if (validateFields()) {
                 showProgressBar(true)
                 viewModel.createAccountResponse.observe(this,
-                    Observer<CreateAccountResponse> {
-                        context?.setAuthToken(viewModel.getAuthTokenWithTokenType(it))
-                        activity?.setResult(Activity.RESULT_OK)
-                        activity?.finish()
+                    Observer {
+                        it?.let {
+                            context?.setAuthToken(viewModel.getAuthTokenWithTokenType(it))
+                            activity?.setResult(Activity.RESULT_OK)
+                            activity?.finish()
+                        }
                     })
                 viewModel.createAccount(this, getCreateAccountRequest())
             }

user/account/src/main/java/in/projecteka/jataayu/user/account/ui/fragment/UserAccountsFragment.kt

@@ -38,23 +38,25 @@ class UserAccountsFragment : BaseFragment(), ItemClickCallback, ResponseCallback
     private var compositeDisposable = CompositeDisposable()
     private val eventBusInstance = EventBus.getDefault()
 
-    private val observer = Observer<LinkedAccountsResponse> {
-        binding.linkedPatient = it.linkedPatient
+    private val observer = Observer<LinkedAccountsResponse?> {
+        it?.let { binding.linkedPatient = it.linkedPatient }
         getUserAccounts()
     }
 
-    private val profileObserver = Observer<MyProfile> {
-        context?.setPinCreated(it.hasTransactionPin)
-        it.verifiedIdentifiers.forEach { identifier ->
-            if (identifier.type == VERIFIED_IDENTIFIER_MOBILE) {
-                activity?.setMobileIdentifier(identifier.value)
+    private val profileObserver = Observer<MyProfile?> {
+        it?.let {
+            context?.setPinCreated(it.hasTransactionPin)
+            it.verifiedIdentifiers.forEach { identifier ->
+                if (identifier.type == VERIFIED_IDENTIFIER_MOBILE) {
+                    activity?.setMobileIdentifier(identifier.value)
+                }
             }
         }
     }
 
     companion object {
         fun newInstance() = UserAccountsFragment()
-        private val VERIFIED_IDENTIFIER_MOBILE = "MOBILE"
+        private const val VERIFIED_IDENTIFIER_MOBILE = "MOBILE"
     }
 
     override fun onCreateView(

user/account/src/main/java/in/projecteka/jataayu/user/account/viewmodel/UserAccountsViewModel.kt

@@ -12,9 +12,9 @@ import androidx.lifecycle.ViewModel
 import java.util.regex.Pattern
 
 class UserAccountsViewModel(private val repository: UserAccountsRepository) : ViewModel() {
-    var linkedAccountsResponse = liveDataOf<LinkedAccountsResponse>()
-    var createAccountResponse = liveDataOf<CreateAccountResponse>()
-    var myProfileResponse = liveDataOf<MyProfile>()
+    var linkedAccountsResponse = liveDataOf<LinkedAccountsResponse?>()
+    var createAccountResponse = liveDataOf<CreateAccountResponse?>()
+    var myProfileResponse = liveDataOf<MyProfile?>()
 
     fun getUserAccounts(responseCallback: ResponseCallback) {
         repository.getUserAccounts().observeOn(linkedAccountsResponse, responseCallback)