From beece85c88083f17e1b0a60c5edcc34b377b966e Mon Sep 17 00:00:00 2001
From: Aditya Gupta <ashishgupta9936ad@gmail.com>
Date: Sat, 19 Aug 2023 00:02:38 +0530
Subject: [PATCH] Updated PrefManger

---
 .../main/java/com/mifos/api/BaseApiManager.kt |   4 +-
 .../java/com/mifos/api/MifosInterceptor.kt    |   8 +-
 .../mifos/api/datamanager/DataManagerAuth.kt  |   7 +-
 .../api/datamanager/DataManagerCenter.kt      |  18 +-
 .../api/datamanager/DataManagerCharge.kt      |   6 +-
 .../api/datamanager/DataManagerClient.kt      |  34 +--
 .../api/datamanager/DataManagerGroups.kt      |  30 +--
 .../mifos/api/datamanager/DataManagerLoan.kt  |  18 +-
 .../api/datamanager/DataManagerOffices.kt     |   9 +-
 .../api/datamanager/DataManagerSavings.kt     |  22 +-
 .../mifos/api/datamanager/DataManagerStaff.kt |   9 +-
 .../api/datamanager/DataManagerSurveys.kt     |   8 +-
 .../com/mifos/mifosxdroid/HomeActivity.kt     |   2 +-
 .../com/mifos/mifosxdroid/SettingsFragment.kt |  11 +-
 .../mifos/mifosxdroid/SplashScreenActivity.kt |   4 +-
 .../pathtracking/PathTrackingActivity.kt      |  21 +-
 .../pathtracking/PathTrackingService.kt       |   9 +-
 .../mifosxdroid/core/MifosBaseActivity.kt     |   4 +-
 .../injection/module/ApplicationModule.kt     |  14 +-
 .../SyncCenterPayloadsFragment.kt             |   5 +-
 .../SyncClientPayloadsFragment.kt             |   5 +-
 .../SyncGroupPayloadsFragment.kt              |   5 +-
 .../SyncLoanRepaymentTransactionFragment.kt   |   5 +-
 .../SyncSavingsAccountTransactionFragment.kt  |   5 +-
 .../offlinejobs/OfflineSyncCenter.kt          |   2 +-
 .../offlinejobs/OfflineSyncClient.kt          |   2 +-
 .../offlinejobs/OfflineSyncGroup.kt           |   2 +-
 .../offlinejobs/OfflineSyncLoanRepayment.kt   |   2 +-
 .../offlinejobs/OfflineSyncSavingsAccount.kt  |   2 +-
 .../online/SurveyQuestionActivity.kt          |   2 +-
 .../com/mifos/ui/activities/LoginActivity.kt  |  28 +--
 .../utils/CheckSelfPermissionAndRequest.kt    |   8 +-
 .../main/java/com/mifos/utils/Constants.kt    |   4 +-
 .../java/com/mifos/utils/ImageLoaderUtils.kt  |   9 +-
 .../com/mifos/utils/MifosResponseHandler.kt   |   5 +-
 .../main/java/com/mifos/utils/PrefManager.kt  | 205 +++---------------
 .../com/mifos/viewmodels/LoginViewModel.kt    |   2 +
 .../mifos/viewmodels/SurveyListViewModel.kt   |   2 +-
 38 files changed, 159 insertions(+), 379 deletions(-)

diff --git a/mifosng-android/src/main/java/com/mifos/api/BaseApiManager.kt b/mifosng-android/src/main/java/com/mifos/api/BaseApiManager.kt
index 27326c0e2c3..fa83717609f 100644
--- a/mifosng-android/src/main/java/com/mifos/api/BaseApiManager.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/BaseApiManager.kt
@@ -23,7 +23,7 @@ import com.mifos.api.services.SearchService
 import com.mifos.api.services.StaffService
 import com.mifos.api.services.SurveyService
 import com.mifos.utils.JsonDateSerializer
-import com.mifos.utils.PrefManager.instanceUrl
+import com.mifos.utils.PrefManager
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
@@ -155,7 +155,7 @@ class BaseApiManager {
             val gson = GsonBuilder()
                 .registerTypeAdapter(Date::class.java, JsonDateSerializer()).create()
             mRetrofit = Retrofit.Builder()
-                .baseUrl(instanceUrl)
+                .baseUrl(PrefManager.getInstanceUrl())
                 .addConverterFactory(ScalarsConverterFactory.create())
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
diff --git a/mifosng-android/src/main/java/com/mifos/api/MifosInterceptor.kt b/mifosng-android/src/main/java/com/mifos/api/MifosInterceptor.kt
index 3d43567caf1..c408a58d6d7 100644
--- a/mifosng-android/src/main/java/com/mifos/api/MifosInterceptor.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/MifosInterceptor.kt
@@ -4,9 +4,7 @@
  */
 package com.mifos.api
 
-import com.mifos.utils.PrefManager.isAuthenticated
-import com.mifos.utils.PrefManager.tenant
-import com.mifos.utils.PrefManager.token
+import com.mifos.utils.PrefManager
 import okhttp3.Interceptor
 import okhttp3.Response
 import java.io.IOException
@@ -19,8 +17,8 @@ class MifosInterceptor : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val chianrequest = chain.request()
         val builder = chianrequest.newBuilder()
-            .header(HEADER_TENANT, tenant)
-        if (isAuthenticated) builder.header(HEADER_AUTH, token)
+            .header(HEADER_TENANT, PrefManager.getTenant())
+        if (PrefManager.isAuthenticated()) builder.header(HEADER_AUTH, PrefManager.getToken())
         val request = builder.build()
         return chain.proceed(request)
     }
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerAuth.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerAuth.kt
index ab94e8b202a..aaecdb9363b 100644
--- a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerAuth.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerAuth.kt
@@ -18,9 +18,10 @@ class DataManagerAuth @Inject constructor(private val baseApiManager: BaseApiMan
      * @return Basic OAuth
      */
     fun login(username: String, password: String): Observable<PostAuthenticationResponse> {
-        val body = PostAuthenticationRequest()
-        body.username = username
-        body.password = password
+        val body = PostAuthenticationRequest().apply {
+            this.username = username
+            this.password = password
+        }
         return baseApiManager.getAuthApi().authenticate(body, true)
     }
 }
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerCenter.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerCenter.kt
index 736269f1232..fd07bae59db 100644
--- a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerCenter.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerCenter.kt
@@ -45,8 +45,8 @@ class DataManagerCenter @Inject constructor(
      */
     fun getCenters(paged: Boolean, offset: Int, limit: Int): Observable<Page<Center>> {
         return when (userStatus) {
-            0 -> mBaseApiManager.centerApi.getCenters(paged, offset, limit)
-            1 -> {
+            false -> mBaseApiManager.centerApi.getCenters(paged, offset, limit)
+            true -> {
                 /**
                  * Return All Centers List from DatabaseHelperCenter only one time.
                  * If offset is zero this means this is first request and
@@ -54,8 +54,6 @@ class DataManagerCenter @Inject constructor(
                  */
                 if (offset == 0) mDatabaseHelperCenter.readAllCenters() else Observable.just(Page())
             }
-
-            else -> Observable.just(Page())
         }
     }
 
@@ -102,14 +100,12 @@ class DataManagerCenter @Inject constructor(
 
     fun createCenter(centerPayload: CenterPayload): Observable<SaveResponse> {
         return when (userStatus) {
-            0 -> mBaseApiManager.centerApi.createCenter(centerPayload)
-            1 ->
+            false -> mBaseApiManager.centerApi.createCenter(centerPayload)
+            true ->
                 /**
                  * Save CenterPayload in Database table.
                  */
                 mDatabaseHelperCenter.saveCenterPayload(centerPayload)
-
-            else -> Observable.just(SaveResponse())
         }
     }
 
@@ -120,14 +116,12 @@ class DataManagerCenter @Inject constructor(
      */
     fun getCenterWithAssociations(centerId: Int): Observable<CenterWithAssociations> {
         return when (userStatus) {
-            0 -> mBaseApiManager.centerApi.getAllGroupsForCenter(centerId)
-            1 ->
+            false -> mBaseApiManager.centerApi.getAllGroupsForCenter(centerId)
+            true ->
                 /**
                  * Return Groups from DatabaseHelperGroups.
                  */
                 mDatabaseHelperCenter.getCenterAssociateGroups(centerId)
-
-            else -> Observable.just(CenterWithAssociations())
         }
     }
 
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerCharge.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerCharge.kt
index 44e2909d1a6..c7a41e26fc8 100644
--- a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerCharge.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerCharge.kt
@@ -35,13 +35,13 @@ class DataManagerCharge @Inject constructor(
      */
     fun getClientCharges(clientId: Int, offset: Int, limit: Int): Observable<Page<Charges>> {
         return when (userStatus) {
-            0 -> mBaseApiManager.chargeApi.getListOfCharges(clientId, offset, limit)
+            false -> mBaseApiManager.chargeApi.getListOfCharges(clientId, offset, limit)
                 .concatMap { chargesPage ->
                     mDatabaseHelperCharge.saveClientCharges(chargesPage, clientId)
                     Observable.just(chargesPage)
                 }
 
-            1 -> {
+            true -> {
                 /**
                  * Return Client Charges from DatabaseHelperClient only one time.
                  */
@@ -49,8 +49,6 @@ class DataManagerCharge @Inject constructor(
                     Page()
                 )
             }
-
-            else -> Observable.just(Page())
         }
     }
 }
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerClient.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerClient.kt
index 87cfc6ae42e..713563d69b4 100644
--- a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerClient.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerClient.kt
@@ -19,7 +19,6 @@ import com.mifos.utils.PrefManager.userStatus
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
 import rx.Observable
-import rx.functions.Func1
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -31,7 +30,8 @@ import javax.inject.Singleton
 @Singleton
 class DataManagerClient @Inject constructor(
     val mBaseApiManager: BaseApiManager,
-    val mDatabaseHelperClient: DatabaseHelperClient
+    val mDatabaseHelperClient: DatabaseHelperClient,
+    private val baseApiManager: org.mifos.core.apimanager.BaseApiManager
 ) {
     /**
      * This Method sending the Request to REST API if UserStatus is 0 and
@@ -51,10 +51,10 @@ class DataManagerClient @Inject constructor(
      */
     fun getAllClients(paged: Boolean, offset: Int, limit: Int): Observable<Page<Client>> {
         return when (userStatus) {
-            0 -> mBaseApiManager.clientsApi.getAllClients(paged, offset, limit)
+            false -> mBaseApiManager.clientsApi.getAllClients(paged, offset, limit)
                 .concatMap { clientPage -> Observable.just(clientPage) }
 
-            1 -> {
+            true -> {
                 /**
                  * Return All Clients List from DatabaseHelperClient only one time.
                  * If offset is zero this means this is first request and
@@ -62,8 +62,6 @@ class DataManagerClient @Inject constructor(
                  */
                 if (offset == 0) mDatabaseHelperClient.readAllClients() else Observable.just(Page())
             }
-
-            else -> Observable.just(Page())
         }
     }
 
@@ -84,16 +82,14 @@ class DataManagerClient @Inject constructor(
      */
     fun getClient(clientId: Int): Observable<Client> {
         return when (userStatus) {
-            0 -> mBaseApiManager.clientsApi.getClient(clientId)
+            false -> mBaseApiManager.clientsApi.getClient(clientId)
                 .concatMap { client -> Observable.just(client) }
 
-            1 ->
+            true ->
                 /**
                  * Return Clients from DatabaseHelperClient only one time.
                  */
                 mDatabaseHelperClient.getClient(clientId)
-
-            else -> Observable.just(Client())
         }
     }
 
@@ -114,14 +110,12 @@ class DataManagerClient @Inject constructor(
      */
     fun getClientAccounts(clientId: Int): Observable<ClientAccounts> {
         return when (userStatus) {
-            0 -> mBaseApiManager.clientsApi.getClientAccounts(clientId)
-            1 ->
+            false -> mBaseApiManager.clientsApi.getClientAccounts(clientId)
+            true ->
                 /**
                  * Return Clients from DatabaseHelperClient only one time.
                  */
                 mDatabaseHelperClient.realClientAccounts(clientId)
-
-            else -> Observable.just(ClientAccounts())
         }
     }
 
@@ -181,14 +175,14 @@ class DataManagerClient @Inject constructor(
      */
     val clientTemplate: Observable<ClientsTemplate>
         get() = when (userStatus) {
-            0 -> mBaseApiManager.clientsApi.clientTemplate
+            false -> mBaseApiManager.clientsApi.clientTemplate
                 .concatMap { clientsTemplate ->
                     mDatabaseHelperClient.saveClientTemplate(
                         clientsTemplate
                     )
                 }
 
-            1 ->
+            true ->
                 /**
                  * Return Clients from DatabaseHelperClient only one time.
                  */
@@ -196,8 +190,6 @@ class DataManagerClient @Inject constructor(
                  * Return Clients from DatabaseHelperClient only one time.
                  */
                 mDatabaseHelperClient.readClientTemplate()
-
-            else -> Observable.just(ClientsTemplate())
         }
 
     /**
@@ -210,17 +202,15 @@ class DataManagerClient @Inject constructor(
      */
     fun createClient(clientPayload: ClientPayload): Observable<Client> {
         return when (userStatus) {
-            0 -> mBaseApiManager.clientsApi.createClient(clientPayload)
+            false -> mBaseApiManager.clientsApi.createClient(clientPayload)
                 .concatMap { client -> Observable.just(client) }
 
-            1 ->
+            true ->
                 /**
                  * If user is in offline mode and he is making client. client payload will be saved
                  * in Database for future synchronization to sever.
                  */
                 mDatabaseHelperClient.saveClientPayloadToDB(clientPayload)
-
-            else -> Observable.just(Client())
         }
     }
 
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerGroups.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerGroups.kt
index f46be37e2b8..e9c8aab3c78 100644
--- a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerGroups.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerGroups.kt
@@ -46,8 +46,8 @@ class DataManagerGroups @Inject constructor(
      */
     fun getGroups(paged: Boolean, offset: Int, limit: Int): Observable<Page<Group>> {
         return when (userStatus) {
-            0 -> mBaseApiManager.groupApi.getGroups(paged, offset, limit)
-            1 -> {
+            false -> mBaseApiManager.groupApi.getGroups(paged, offset, limit)
+            true -> {
                 /**
                  * offset : is the value from which position we want to fetch the list, It means
                  * if offset is 0 and User is in the Offline Mode So fetch all groups
@@ -59,8 +59,6 @@ class DataManagerGroups @Inject constructor(
                     Page()
                 )
             }
-
-            else -> Observable.just(Page())
         }
     }
 
@@ -82,14 +80,12 @@ class DataManagerGroups @Inject constructor(
      */
     fun getGroup(groupId: Int): Observable<Group> {
         return when (userStatus) {
-            0 -> mBaseApiManager.groupApi.getGroup(groupId)
-            1 ->
+            false -> mBaseApiManager.groupApi.getGroup(groupId)
+            true ->
                 /**
                  * Return Groups from DatabaseHelperGroups.
                  */
                 mDatabaseHelperGroups.getGroup(groupId)
-
-            else -> Observable.just(Group())
         }
     }
 
@@ -110,14 +106,12 @@ class DataManagerGroups @Inject constructor(
      */
     fun getGroupWithAssociations(groupId: Int): Observable<GroupWithAssociations> {
         return when (userStatus) {
-            0 -> mBaseApiManager.groupApi.getGroupWithAssociations(groupId)
-            1 ->
+            false -> mBaseApiManager.groupApi.getGroupWithAssociations(groupId)
+            true ->
                 /**
                  * Return Groups from DatabaseHelperGroups.
                  */
                 mDatabaseHelperClient.getGroupAssociateClients(groupId)
-
-            else -> Observable.just(GroupWithAssociations())
         }
     }
 
@@ -130,14 +124,12 @@ class DataManagerGroups @Inject constructor(
      */
     fun getGroupAccounts(groupId: Int): Observable<GroupAccounts> {
         return when (userStatus) {
-            0 -> mBaseApiManager.groupApi.getGroupAccounts(groupId)
-            1 ->
+            false -> mBaseApiManager.groupApi.getGroupAccounts(groupId)
+            true ->
                 /**
                  * Return Groups from DatabaseHelperGroups.
                  */
                 mDatabaseHelperGroups.readGroupAccounts(groupId)
-
-            else -> Observable.just(GroupAccounts())
         }
     }
 
@@ -167,14 +159,12 @@ class DataManagerGroups @Inject constructor(
      */
     fun createGroup(groupPayload: GroupPayload): Observable<SaveResponse> {
         return when (userStatus) {
-            0 -> mBaseApiManager.groupApi.createGroup(groupPayload)
-            1 ->
+            false -> mBaseApiManager.groupApi.createGroup(groupPayload)
+            true ->
                 /**
                  * Save GroupPayload in Database table.
                  */
                 mDatabaseHelperGroups.saveGroupPayload(groupPayload)
-
-            else -> Observable.just(SaveResponse())
         }
     }
 
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerLoan.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerLoan.kt
index 1a3857a3d35..afdf89bcdb8 100644
--- a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerLoan.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerLoan.kt
@@ -43,14 +43,12 @@ class DataManagerLoan @Inject constructor(
      */
     fun getLoanById(loanId: Int): Observable<LoanWithAssociations> {
         return when (userStatus) {
-            0 -> mBaseApiManager.loanApi.getLoanByIdWithAllAssociations(loanId)
-            1 ->
+            false -> mBaseApiManager.loanApi.getLoanByIdWithAllAssociations(loanId)
+            true ->
                 /**
                  * Return LoanWithAssociation from DatabaseHelperLoan.
                  */
                 mDatabaseHelperLoan.getLoanById(loanId)
-
-            else -> Observable.just(LoanWithAssociations())
         }
     }
 
@@ -105,14 +103,12 @@ class DataManagerLoan @Inject constructor(
      */
     fun getLoanRepayTemplate(loanId: Int): Observable<LoanRepaymentTemplate> {
         return when (userStatus) {
-            0 -> mBaseApiManager.loanApi.getLoanRepaymentTemplate(loanId)
-            1 ->
+            false -> mBaseApiManager.loanApi.getLoanRepaymentTemplate(loanId)
+            true ->
                 /**
                  * Return LoanRepaymentTemplate from DatabaseHelperLoan.
                  */
                 mDatabaseHelperLoan.getLoanRepayTemplate(loanId)
-
-            else -> Observable.just(LoanRepaymentTemplate())
         }
     }
 
@@ -158,16 +154,14 @@ class DataManagerLoan @Inject constructor(
         request: LoanRepaymentRequest
     ): Observable<LoanRepaymentResponse> {
         return when (userStatus) {
-            0 -> mBaseApiManager.loanApi.submitPayment(loanId, request)
+            false -> mBaseApiManager.loanApi.submitPayment(loanId, request)
                 .concatMap { loanRepaymentResponse -> Observable.just(loanRepaymentResponse) }
 
-            1 ->
+            true ->
                 /**
                  * Return LoanRepaymentResponse from DatabaseHelperLoan.
                  */
                 mDatabaseHelperLoan.saveLoanRepaymentTransaction(loanId, request)
-
-            else -> Observable.just(LoanRepaymentResponse())
         }
     }
 
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerOffices.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerOffices.kt
index c0e40012f6c..38464534afa 100644
--- a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerOffices.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerOffices.kt
@@ -25,13 +25,13 @@ class DataManagerOffices @Inject constructor(
      */
     val offices: Observable<List<Office>>
         get() = when (userStatus) {
-            0 -> mBaseApiManager.officeApi.allOffices
+            false -> mBaseApiManager.officeApi.allOffices
                 .concatMap { offices ->
                     mDatabaseHelperOffices.saveAllOffices(offices)
                     Observable.just(offices)
                 }
 
-            1 ->
+            true ->
                 /**
                  * return all List of Offices from DatabaseHelperOffices
                  */
@@ -39,10 +39,5 @@ class DataManagerOffices @Inject constructor(
                  * return all List of Offices from DatabaseHelperOffices
                  */
                 mDatabaseHelperOffices.readAllOffices()
-
-            else -> {
-                val offices: List<Office> = ArrayList()
-                Observable.just(offices)
-            }
         }
 }
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSavings.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSavings.kt
index 7d0d4c90205..e74d0acfa5d 100644
--- a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSavings.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSavings.kt
@@ -45,17 +45,15 @@ class DataManagerSavings @Inject constructor(
         type: String?, savingsAccountId: Int, association: String?
     ): Observable<SavingsAccountWithAssociations> {
         return when (userStatus) {
-            0 -> mBaseApiManager.savingsApi.getSavingsAccountWithAssociations(
+            false -> mBaseApiManager.savingsApi.getSavingsAccountWithAssociations(
                 type, savingsAccountId, association
             )
 
-            1 ->
+            true ->
                 /**
                  * Return SavingsAccountWithAssociations from DatabaseHelperSavings.
                  */
                 mDatabaseHelperSavings.readSavingsAccount(savingsAccountId)
-
-            else -> Observable.just(SavingsAccountWithAssociations())
         }
     }
 
@@ -115,20 +113,16 @@ class DataManagerSavings @Inject constructor(
         type: String?, savingsAccountId: Int, transactionType: String?
     ): Observable<SavingsAccountTransactionTemplate> {
         return when (userStatus) {
-            0 -> mBaseApiManager.savingsApi.getSavingsAccountTransactionTemplate(
+            false -> mBaseApiManager.savingsApi.getSavingsAccountTransactionTemplate(
                 type,
                 savingsAccountId, transactionType
             )
 
-            1 ->
+            true ->
                 /**
                  * Return SavingsAccountTransactionTemplate from DatabaseHelperSavings.
                  */
                 mDatabaseHelperSavings.readSavingsAccountTransactionTemplate(savingsAccountId)
-
-            else -> Observable.just(
-                SavingsAccountTransactionTemplate()
-            )
         }
     }
 
@@ -177,12 +171,12 @@ class DataManagerSavings @Inject constructor(
         request: SavingsAccountTransactionRequest
     ): Observable<SavingsAccountTransactionResponse> {
         return when (userStatus) {
-            0 -> mBaseApiManager.savingsApi.processTransaction(
+            false -> mBaseApiManager.savingsApi.processTransaction(
                 savingsAccountType,
                 savingsAccountId, transactionType, request
             )
 
-            1 ->
+            true ->
                 /**
                  * Return SavingsAccountTransactionResponse from DatabaseHelperSavings.
                  */
@@ -191,10 +185,6 @@ class DataManagerSavings @Inject constructor(
                         savingsAccountType, savingsAccountId,
                         transactionType, request
                     )
-
-            else -> Observable.just(
-                SavingsAccountTransactionResponse()
-            )
         }
     }
 
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerStaff.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerStaff.kt
index 0941b5211fd..0551eb5aa56 100644
--- a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerStaff.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerStaff.kt
@@ -23,22 +23,17 @@ class DataManagerStaff @Inject constructor(
      */
     fun getStaffInOffice(officeId: Int): Observable<List<Staff>> {
         return when (userStatus) {
-            0 -> mBaseApiManager.staffApi.getStaffForOffice(officeId)
+            false -> mBaseApiManager.staffApi.getStaffForOffice(officeId)
                 .concatMap { staffs ->
                     mDatabaseHelperStaff.saveAllStaffOfOffices(staffs)
                     Observable.just(staffs)
                 }
 
-            1 ->
+            true ->
                 /**
                  * return all List of Staffs of Office from DatabaseHelperOffices
                  */
                 mDatabaseHelperStaff.readAllStaffOffices(officeId)
-
-            else -> {
-                val staffs: List<Staff> = ArrayList()
-                Observable.just(staffs)
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSurveys.kt b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSurveys.kt
index 9cb3f36eb46..2b8b568dec7 100644
--- a/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSurveys.kt
+++ b/mifosng-android/src/main/java/com/mifos/api/datamanager/DataManagerSurveys.kt
@@ -31,12 +31,8 @@ class DataManagerSurveys @Inject constructor(
     </Survey></Survey> */
     val allSurvey: Observable<List<Survey>>
         get() = when (userStatus) {
-            0 -> mBaseApiManager.surveyApi.allSurveys
-            1 -> mDatabaseHelperSurveys.readAllSurveys()
-            else -> {
-                val defaultSurveyList: List<Survey> = ArrayList()
-                Observable.just(defaultSurveyList)
-            }
+            false -> mBaseApiManager.surveyApi.allSurveys
+            true -> mDatabaseHelperSurveys.readAllSurveys()
         }
 
     /**
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt
index 61e748f35cd..1f8e230775a 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/HomeActivity.kt
@@ -149,7 +149,7 @@ open class HomeActivity : MifosBaseActivity(), NavigationView.OnNavigationItemSe
      */
     private fun loadClientDetails() {
         // download logged in user
-        val loggedInUser = PrefManager.user
+        val loggedInUser = PrefManager.getUser()
         navHeaderBinding.tvUserName.text = loggedInUser.username
         navHeaderBinding.ivUserPicture.setImageResource(R.drawable.ic_dp_placeholder)
     }
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
index 2c2d51dc10b..9f0d3bebe3f 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SettingsFragment.kt
@@ -4,7 +4,6 @@ package com.mifos.mifosxdroid
 
 import android.content.Intent
 import android.content.SharedPreferences
-import android.os.Build
 import android.os.Bundle
 import androidx.preference.*
 import androidx.preference.Preference.OnPreferenceChangeListener
@@ -60,7 +59,7 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
         mInstanceUrlPref = (findPreference(
             requireContext().getString(R.string.hint_instance_url)
         ) as EditTextPreference?)!!
-        val instanceUrl = PrefManager.instanceUrl
+        val instanceUrl = PrefManager.getInstanceUrl()
         mInstanceUrlPref.text = instanceUrl
         mInstanceUrlPref.isSelectable = true
         mInstanceUrlPref.dialogTitle = "Edit Instance Url"
@@ -69,14 +68,10 @@ class SettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedP
             OnPreferenceChangeListener { _, o ->
                 val newUrl = o.toString()
                 if (newUrl != instanceUrl) {
-                    PrefManager.instanceUrl = newUrl
+                    PrefManager.setInstanceUrl(newUrl)
                     Toast.makeText(activity, newUrl, Toast.LENGTH_SHORT).show()
                     startActivity(Intent(activity, DashboardActivity::class.java))
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                        activity?.finishAffinity()
-                    } else {
-                        activity?.finish()
-                    }
+                    activity?.finishAffinity()
                 }
                 true
             }
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SplashScreenActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SplashScreenActivity.kt
index a8efd3dacc1..c5d3c856c6f 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/SplashScreenActivity.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/SplashScreenActivity.kt
@@ -22,8 +22,8 @@ class SplashScreenActivity : MifosBaseActivity() {
         val splashScreen = installSplashScreen()
         super.onCreate(savedInstanceState)
         splashScreen.setKeepOnScreenCondition { true }
-        if (!PrefManager.isAuthenticated) {
-            PrefManager.instanceUrl = (BaseUrl.PROTOCOL_HTTPS
+        if (!PrefManager.isAuthenticated()) {
+            PrefManager.setInstanceUrl(BaseUrl.PROTOCOL_HTTPS
                     + BaseUrl.API_ENDPOINT + BaseUrl.API_PATH)
             startActivity(Intent(this@SplashScreenActivity, LoginActivity::class.java))
         } else {
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingActivity.kt
index 1d62099e829..b463c929ef0 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingActivity.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingActivity.kt
@@ -31,12 +31,9 @@ import com.mifos.objects.user.UserLocation
 import com.mifos.states.PathTrackingUiState
 import com.mifos.utils.CheckSelfPermissionAndRequest
 import com.mifos.utils.Constants
-import com.mifos.utils.PrefManager.getBoolean
-import com.mifos.utils.PrefManager.putBoolean
-import com.mifos.utils.PrefManager.userId
+import com.mifos.utils.PrefManager
 import com.mifos.viewmodels.PathTrackingViewModel
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 /**
  * @author fomenkoo
@@ -62,7 +59,7 @@ class PathTrackingActivity : MifosBaseActivity(), OnRefreshListener {
         intentLocationService = Intent(this, PathTrackingService::class.java)
         createNotificationReceiver()
         showUserInterface()
-        viewModel.loadPathTracking(userId)
+        viewModel.loadPathTracking(PrefManager.getUserId())
         binding.layoutError.findViewById<Button>(R.id.btnTryAgain).setOnClickListener {
             reloadOnError()
         }
@@ -122,7 +119,7 @@ class PathTrackingActivity : MifosBaseActivity(), OnRefreshListener {
     }
 
     override fun onRefresh() {
-        viewModel.loadPathTracking(userId)
+        viewModel.loadPathTracking(PrefManager.getUserId())
     }
 
     private fun showPathTracking(userLocations: List<UserLocation>) {
@@ -133,7 +130,7 @@ class PathTrackingActivity : MifosBaseActivity(), OnRefreshListener {
 
     private fun reloadOnError() {
         sweetUIErrorHandler?.hideSweetErrorLayoutUI(binding.rvPathTracker, binding.layoutError)
-        viewModel.loadPathTracking(userId)
+        viewModel.loadPathTracking(PrefManager.getUserId())
     }
 
     private fun showEmptyPathTracking() {
@@ -230,7 +227,7 @@ class PathTrackingActivity : MifosBaseActivity(), OnRefreshListener {
             R.id.menu_start_path_track -> {
                 if (checkPermissionAndRequest()) {
                     startService(intentLocationService)
-                    putBoolean(Constants.SERVICE_STATUS, true)
+                    PrefManager.userStatus = true
                     invalidateOptionsMenu()
                 }
                 true
@@ -238,7 +235,7 @@ class PathTrackingActivity : MifosBaseActivity(), OnRefreshListener {
 
             R.id.menu_stop_path_track -> {
                 stopService(intentLocationService)
-                putBoolean(Constants.SERVICE_STATUS, false)
+                PrefManager.userStatus = false
                 invalidateOptionsMenu()
                 true
             }
@@ -250,9 +247,9 @@ class PathTrackingActivity : MifosBaseActivity(), OnRefreshListener {
     override fun onPrepareOptionsMenu(menu: Menu): Boolean {
         super.onPrepareOptionsMenu(menu)
         menu.findItem(R.id.menu_start_path_track).isVisible =
-            !getBoolean(Constants.SERVICE_STATUS, false)
+            !PrefManager.userStatus
         menu.findItem(R.id.menu_stop_path_track).isVisible =
-            getBoolean(Constants.SERVICE_STATUS, false)
+            PrefManager.userStatus
         return true
     }
 
@@ -262,7 +259,7 @@ class PathTrackingActivity : MifosBaseActivity(), OnRefreshListener {
                 val action = intent.action
                 if (Constants.STOP_TRACKING == action) {
                     invalidateOptionsMenu()
-                    viewModel.loadPathTracking(userId)
+                    viewModel.loadPathTracking(PrefManager.getUserId())
                 }
             }
         }
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingService.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingService.kt
index f2bd39801bb..74f057aebea 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingService.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/activity/pathtracking/PathTrackingService.kt
@@ -35,8 +35,7 @@ import com.mifos.objects.user.UserLocation
 import com.mifos.utils.Constants
 import com.mifos.utils.DateHelper
 import com.mifos.utils.DateHelper.getCurrentDateTime
-import com.mifos.utils.PrefManager.putBoolean
-import com.mifos.utils.PrefManager.userId
+import com.mifos.utils.PrefManager
 import rx.Subscriber
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
@@ -252,9 +251,9 @@ class PathTrackingService : Service(), ConnectionCallbacks, OnConnectionFailedLi
         googleApiClient!!.disconnect()
         stopNotification()
         unregisterReceiver(notificationReceiver)
-        putBoolean(Constants.SERVICE_STATUS, false)
+        PrefManager.userStatus = false
         stopTime = getCurrentDateTime(DateHelper.TIME_FORMAT_VALUE)
-        addPathTracking(userId, buildUserLocation())
+        addPathTracking(PrefManager.getUserId(), buildUserLocation())
         super.onDestroy()
     }
 
@@ -276,7 +275,7 @@ class PathTrackingService : Service(), ConnectionCallbacks, OnConnectionFailedLi
         userLocation.startTime = startTime
         userLocation.stopTime = stopTime
         userLocation.date = date
-        userLocation.userId = userId
+        userLocation.userId = PrefManager.getUserId()
         return userLocation
     }
 
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.kt
index 58da5ddd3c5..36b3112ca7c 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/core/MifosBaseActivity.kt
@@ -15,7 +15,6 @@ import androidx.appcompat.widget.SwitchCompat
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import com.mifos.App
 import com.mifos.mifosxdroid.R
 import com.mifos.mifosxdroid.SplashScreenActivity
 import com.mifos.mifosxdroid.passcode.PassCodeActivity
@@ -23,7 +22,6 @@ import com.mifos.mobile.passcode.BasePassCodeActivity
 import com.mifos.utils.Constants
 import com.mifos.utils.LanguageHelper
 import com.mifos.utils.PrefManager
-import com.mifos.utils.PrefManager.clearPrefs
 
 /**
  * @author fomenkoo
@@ -115,7 +113,7 @@ open class MifosBaseActivity : BasePassCodeActivity(), BaseActivityCallback {
             .setPositiveButton(
                 getString(R.string.logout)
             ) { dialog, which ->
-                clearPrefs()
+                PrefManager.clear()
                 startActivity(
                     Intent(
                         this@MifosBaseActivity,
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/module/ApplicationModule.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/module/ApplicationModule.kt
index cb4a013b13a..588c443fd0f 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/module/ApplicationModule.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/module/ApplicationModule.kt
@@ -2,14 +2,17 @@ package com.mifos.mifosxdroid.injection.module
 
 import android.content.Context
 import com.mifos.utils.NetworkUtilsWrapper
+import com.mifos.utils.PrefManager
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import org.mifos.core.apimanager.BaseApiManager
+import org.mifos.core.apimanager.BaseApiManager.Companion.getInstance
 import javax.inject.Singleton
 
+
 /**
  * @author Rajan Maurya
  * Provide application-level dependencies.
@@ -27,7 +30,16 @@ class ApplicationModule {
     @Provides
     @Singleton
     fun provideSdkBaseApiManager(): BaseApiManager {
-        return BaseApiManager.getInstance()
+        val usernamePassword: Pair<String, String> = PrefManager.usernamePassword
+        val baseManager = getInstance()
+        baseManager.createService(
+            usernamePassword.first,
+            usernamePassword.second,
+            PrefManager.getInstanceUrl(),
+            PrefManager.getTenant(),
+            false
+        )
+        return baseManager
     }
 
     @Provides
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsFragment.kt
index 280f5157890..5595c733846 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/synccenterpayloads/SyncCenterPayloadsFragment.kt
@@ -237,7 +237,7 @@ class SyncCenterPayloadsFragment : MifosBaseFragment(),
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_sync) {
             when (userStatus) {
-                0 -> if (centerPayloads?.size != 0) {
+                false -> if (centerPayloads?.size != 0) {
                     mCenterSyncIndex = 0
                     syncCenterPayload()
                 } else {
@@ -247,8 +247,7 @@ class SyncCenterPayloadsFragment : MifosBaseFragment(),
                     )
                 }
 
-                1 -> showOfflineModeDialog()
-                else -> {}
+                true -> showOfflineModeDialog()
             }
         }
         return super.onOptionsItemSelected(item)
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsFragment.kt
index 08d2960e649..3b139b089d4 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncclientpayloads/SyncClientPayloadsFragment.kt
@@ -270,7 +270,7 @@ class SyncClientPayloadsFragment : MifosBaseFragment(), DialogInterface.OnClickL
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_sync) {
             when (userStatus) {
-                0 -> if (clientPayloads!!.isNotEmpty()) {
+                false -> if (clientPayloads!!.isNotEmpty()) {
                     mClientSyncIndex = 0
                     syncClientPayload()
                 } else {
@@ -280,8 +280,7 @@ class SyncClientPayloadsFragment : MifosBaseFragment(), DialogInterface.OnClickL
                     )
                 }
 
-                1 -> showOfflineModeDialog()
-                else -> {}
+                true -> showOfflineModeDialog()
             }
         }
         return super.onOptionsItemSelected(item)
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsFragment.kt
index 5a2f7714742..a4f2196929f 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncgrouppayloads/SyncGroupPayloadsFragment.kt
@@ -242,7 +242,7 @@ class SyncGroupPayloadsFragment : MifosBaseFragment(), DialogInterface.OnClickLi
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_sync) {
             when (userStatus) {
-                0 -> if (groupPayloads?.size != 0) {
+                false -> if (groupPayloads?.size != 0) {
                     mClientSyncIndex = 0
                     syncGroupPayload()
                 } else {
@@ -252,8 +252,7 @@ class SyncGroupPayloadsFragment : MifosBaseFragment(), DialogInterface.OnClickLi
                     )
                 }
 
-                1 -> showOfflineModeDialog()
-                else -> {}
+                true -> showOfflineModeDialog()
             }
         }
         return super.onOptionsItemSelected(item)
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionFragment.kt
index 0ed236dcacb..d4fb5230ee5 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncloanrepaymenttransacition/SyncLoanRepaymentTransactionFragment.kt
@@ -249,7 +249,7 @@ class SyncLoanRepaymentTransactionFragment : MifosBaseFragment(), DialogInterfac
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_sync) {
             when (userStatus) {
-                0 -> if (mLoanRepaymentRequests!!.isNotEmpty()) {
+                false -> if (mLoanRepaymentRequests!!.isNotEmpty()) {
                     mClientSyncIndex = 0
                     syncGroupPayload()
                 } else {
@@ -259,8 +259,7 @@ class SyncLoanRepaymentTransactionFragment : MifosBaseFragment(), DialogInterfac
                     )
                 }
 
-                1 -> showOfflineModeDialog()
-                else -> {}
+                true -> showOfflineModeDialog()
             }
         }
         return super.onOptionsItemSelected(item)
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionFragment.kt
index d50fce957ac..1b248173597 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offline/syncsavingsaccounttransaction/SyncSavingsAccountTransactionFragment.kt
@@ -197,9 +197,8 @@ class SyncSavingsAccountTransactionFragment : MifosBaseFragment(), OnRefreshList
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_sync) {
             when (userStatus) {
-                0 -> checkNetworkConnectionAndSync()
-                1 -> showOfflineModeDialog()
-                else -> {}
+                false -> checkNetworkConnectionAndSync()
+                true -> showOfflineModeDialog()
             }
         }
         return super.onOptionsItemSelected(item)
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncCenter.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncCenter.kt
index 4be66229901..7fe0db89752 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncCenter.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncCenter.kt
@@ -29,7 +29,7 @@ class OfflineSyncCenter : Job() {
     override fun onRunJob(params: Params): Result {
         mSubscriptions = CompositeSubscription()
         centerPayloads = ArrayList()
-        return if (userStatus == 0) {
+        return if (!userStatus) {
             loadDatabaseCenterPayload()
             Result.SUCCESS
         } else {
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncClient.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncClient.kt
index 4fbe90f97a4..391f6e3b062 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncClient.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncClient.kt
@@ -27,7 +27,7 @@ class OfflineSyncClient : Job() {
     private var mClientSyncIndex = 0
     override fun onRunJob(params: Params): Result {
         mSubscriptions = CompositeSubscription()
-        return if (userStatus == 0) {
+        return if (!userStatus) {
             loadDatabaseClientPayload()
             Result.SUCCESS
         } else {
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncGroup.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncGroup.kt
index ca94c6d0bb5..b644879757e 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncGroup.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncGroup.kt
@@ -27,7 +27,7 @@ class OfflineSyncGroup : Job() {
     private var mClientSyncIndex = 0
     override fun onRunJob(params: Params): Result {
         mSubscriptions = CompositeSubscription()
-        return if (userStatus == 0) {
+        return if (!userStatus) {
             loadDatabaseGroupPayload()
             Result.SUCCESS
         } else {
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncLoanRepayment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncLoanRepayment.kt
index 7e85ac4ed5e..6a6333ab059 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncLoanRepayment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncLoanRepayment.kt
@@ -27,7 +27,7 @@ class OfflineSyncLoanRepayment : Job() {
     private var mClientSyncIndex = 0
     override fun onRunJob(params: Params): Result {
         mSubscriptions = CompositeSubscription()
-        return if (userStatus == 0) {
+        return if (!userStatus) {
             loadDatabaseLoanRepaymentTransactions()
             Result.SUCCESS
         } else {
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncSavingsAccount.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncSavingsAccount.kt
index 1d4fa0a72c1..31c9819e9bf 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncSavingsAccount.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/offlinejobs/OfflineSyncSavingsAccount.kt
@@ -32,7 +32,7 @@ class OfflineSyncSavingsAccount : Job() {
     override fun onRunJob(params: Params): Result {
         mSubscriptions = CompositeSubscription()
         mSavingsAccountTransactionRequests = ArrayList()
-        return if (userStatus == 0) {
+        return if (!userStatus) {
             loadDatabaseSavingsAccountTransactions()
             Result.SUCCESS
         } else {
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt
index c5d53e1e340..18067b2db0a 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/SurveyQuestionActivity.kt
@@ -118,7 +118,7 @@ class SurveyQuestionActivity : MifosBaseActivity(), OnAnswerSelectedListener, Di
             listScorecardValues.add(value)
         }
         mScorecard.clientId = clientId
-        mScorecard.userId = PrefManager.userId
+        mScorecard.userId = PrefManager.getUserId()
         mScorecard.createdOn = Date()
         mScorecard.scorecardValues = listScorecardValues
     }
diff --git a/mifosng-android/src/main/java/com/mifos/ui/activities/LoginActivity.kt b/mifosng-android/src/main/java/com/mifos/ui/activities/LoginActivity.kt
index 86e5ffcf4a0..5ce8f6a6488 100644
--- a/mifosng-android/src/main/java/com/mifos/ui/activities/LoginActivity.kt
+++ b/mifosng-android/src/main/java/com/mifos/ui/activities/LoginActivity.kt
@@ -28,14 +28,8 @@ import com.mifos.states.LoginUiState
 import com.mifos.utils.Constants
 import com.mifos.utils.Network
 import com.mifos.utils.PrefManager
-import com.mifos.utils.PrefManager.instanceDomain
-import com.mifos.utils.PrefManager.instanceUrl
-import com.mifos.utils.PrefManager.passCodeStatus
-import com.mifos.utils.PrefManager.port
+import com.mifos.utils.PrefManager.savePostAuthenticationResponse
 import com.mifos.utils.PrefManager.saveToken
-import com.mifos.utils.PrefManager.saveUser
-import com.mifos.utils.PrefManager.tenant
-import com.mifos.utils.PrefManager.userId
 import com.mifos.utils.ValidationUtil
 import com.mifos.viewmodels.LoginViewModel
 import dagger.hilt.android.AndroidEntryPoint
@@ -90,8 +84,8 @@ class LoginActivity : MifosBaseActivity(){
         title = null
         setContentView(binding.root)
         binding.etInstancePort.inputType = InputType.TYPE_CLASS_NUMBER
-        if (port != "80") binding.etInstancePort.setText(port)
-        binding.etInstanceURL.setText(instanceDomain)
+        if (PrefManager.getPort() != "80") binding.etInstancePort.setText(PrefManager.getPort())
+        binding.etInstanceURL.setText(PrefManager.getInstanceDomain())
         binding.etInstanceURL.addTextChangedListener(urlWatcher)
         binding.etInstancePort.addTextChangedListener(urlWatcher)
         urlWatcher.afterTextChanged(Editable.Factory.getInstance().newEditable(""))
@@ -179,15 +173,15 @@ class LoginActivity : MifosBaseActivity(){
 
     private fun onLoginSuccessful(user: PostAuthenticationResponse) {
         // Saving userID
-        userId = user.userId!!.toInt()
+        PrefManager.setUserId(user.userId!!.toInt())
         // Saving user's token
         saveToken("Basic " + user.base64EncodedAuthenticationKey)
         // Saving user
-        saveUser(user)
+        savePostAuthenticationResponse(user)
         Toast.makeText(
             this, getString(R.string.toast_welcome) + " " + user.username, Toast.LENGTH_SHORT
         ).show()
-        if (passCodeStatus) {
+        if (PrefManager.getPassCodeStatus()) {
             startActivity(Intent(this, HomeActivity::class.java))
         } else {
             val intent = Intent(this, PassCodeActivity::class.java)
@@ -215,16 +209,16 @@ class LoginActivity : MifosBaseActivity(){
             return
         }
         // Saving tenant
-        tenant = binding.etTenantIdentifier.editableText.toString()
+        PrefManager.setTenant(binding.etTenantIdentifier.editableText.toString())
         // Saving InstanceURL for next usages
-        instanceUrl = instanceURL
+        PrefManager.setInstanceUrl(instanceURL)
         // Saving domain name
-        instanceDomain = binding.etInstanceURL.editableText.toString()
+        PrefManager.setInstanceDomain(binding.etInstanceURL.editableText.toString())
         // Saving port
-        port = binding.etInstancePort.editableText.toString()
+        PrefManager.setPort(binding.etInstancePort.editableText.toString())
         // Updating Services
         BaseApiManager.createService()
-        baseApiManager.createService(username,password,instanceUrl,tenant,true)
+        baseApiManager.createService(username,password,PrefManager.getInstanceUrl(),PrefManager.getTenant(),true)
         if (Network.isOnline(this)) {
             viewModel.login(username, password)
         } else {
diff --git a/mifosng-android/src/main/java/com/mifos/utils/CheckSelfPermissionAndRequest.kt b/mifosng-android/src/main/java/com/mifos/utils/CheckSelfPermissionAndRequest.kt
index af96cdde619..e54cad30226 100644
--- a/mifosng-android/src/main/java/com/mifos/utils/CheckSelfPermissionAndRequest.kt
+++ b/mifosng-android/src/main/java/com/mifos/utils/CheckSelfPermissionAndRequest.kt
@@ -13,8 +13,6 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.mifos.mifosxdroid.R
 import com.mifos.mifosxdroid.core.MaterialDialog
-import com.mifos.utils.PrefManager.getBoolean
-import com.mifos.utils.PrefManager.putBoolean
 
 /**
  * This Class is the Generic Class to Request the Dangerous permissions that are not granted
@@ -85,7 +83,7 @@ object CheckSelfPermissionAndRequest {
         permissionRequestCode: Int,
         dialogMessageRetry: String?,
         messageNeverAskAgain: String?,
-        permissionDeniedStatus: String?
+        permissionDeniedStatus: String
     ) {
         // Should we show an explanation?
         if (ActivityCompat.shouldShowRequestPermissionRationale(activity, permission)) {
@@ -110,8 +108,8 @@ object CheckSelfPermissionAndRequest {
         } else {
 
             //Requesting Permission, first time to the device.
-            if (getBoolean(permissionDeniedStatus, true)) {
-                putBoolean(permissionDeniedStatus, false)
+            if (PrefManager.getPermissionDeniedStatus(permissionDeniedStatus)) {
+                PrefManager.setPermissionDeniedStatus(permissionDeniedStatus, false)
                 ActivityCompat.requestPermissions(
                     activity, arrayOf(permission),
                     permissionRequestCode
diff --git a/mifosng-android/src/main/java/com/mifos/utils/Constants.kt b/mifosng-android/src/main/java/com/mifos/utils/Constants.kt
index 689b6bd7566..78136eded68 100644
--- a/mifosng-android/src/main/java/com/mifos/utils/Constants.kt
+++ b/mifosng-android/src/main/java/com/mifos/utils/Constants.kt
@@ -134,8 +134,8 @@ object Constants {
      * User Logged In Status
      * 0 for Online and 1 for Offline
      */
-    const val USER_ONLINE = 0
-    const val USER_OFFLINE = 1
+    const val USER_ONLINE = false
+    const val USER_OFFLINE = true
 
     /**
      * Constants to determine in the generic DataTableListFragment, the type of query that
diff --git a/mifosng-android/src/main/java/com/mifos/utils/ImageLoaderUtils.kt b/mifosng-android/src/main/java/com/mifos/utils/ImageLoaderUtils.kt
index 4b4584df818..2724da9c343 100644
--- a/mifosng-android/src/main/java/com/mifos/utils/ImageLoaderUtils.kt
+++ b/mifosng-android/src/main/java/com/mifos/utils/ImageLoaderUtils.kt
@@ -10,16 +10,13 @@ import com.bumptech.glide.request.target.BitmapImageViewTarget
 import com.bumptech.glide.signature.ObjectKey
 import com.mifos.api.MifosInterceptor
 import com.mifos.mifosxdroid.R
-import com.mifos.utils.PrefManager.instanceUrl
-import com.mifos.utils.PrefManager.tenant
-import com.mifos.utils.PrefManager.token
 
 /**
  * Created by Rajan Maurya on 05/02/17.
  */
 object ImageLoaderUtils {
     private fun buildImageUrl(clientId: Int): String {
-        return (instanceUrl
+        return (PrefManager.getInstanceUrl()
                 + "clients/"
                 + clientId
                 + "/images?maxHeight=120&maxWidth=120")
@@ -28,8 +25,8 @@ object ImageLoaderUtils {
     private fun buildGlideUrl(clientId: Int): GlideUrl {
         return GlideUrl(
             buildImageUrl(clientId), LazyHeaders.Builder()
-                .addHeader(MifosInterceptor.HEADER_TENANT, tenant)
-                .addHeader(MifosInterceptor.HEADER_AUTH, token)
+                .addHeader(MifosInterceptor.HEADER_TENANT, PrefManager.getTenant())
+                .addHeader(MifosInterceptor.HEADER_AUTH, PrefManager.getToken())
                 .addHeader("Accept", "application/octet-stream")
                 .build()
         )
diff --git a/mifosng-android/src/main/java/com/mifos/utils/MifosResponseHandler.kt b/mifosng-android/src/main/java/com/mifos/utils/MifosResponseHandler.kt
index 43994fcc56f..0538d5a9c9e 100644
--- a/mifosng-android/src/main/java/com/mifos/utils/MifosResponseHandler.kt
+++ b/mifosng-android/src/main/java/com/mifos/utils/MifosResponseHandler.kt
@@ -8,8 +8,7 @@ import com.mifos.utils.PrefManager.userStatus
 object MifosResponseHandler {
     val response: String
         get() = when (userStatus) {
-            0 -> "created successfully"
-            1 -> "Saved into DB Successfully"
-            else -> ""
+            false -> "created successfully"
+            true -> "Saved into DB Successfully"
         }
 }
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt b/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt
index a23d307ac55..ee90914930a 100644
--- a/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt
+++ b/mifosng-android/src/main/java/com/mifos/utils/PrefManager.kt
@@ -2,202 +2,55 @@ package com.mifos.utils
 
 import android.content.SharedPreferences
 import android.preference.PreferenceManager
-import android.text.TextUtils
-import com.google.gson.Gson
 import com.mifos.App
-import com.mifos.api.BaseUrl
 import com.mifos.objects.user.User
 import org.apache.fineract.client.models.PostAuthenticationResponse
+import org.mifos.core.sharedpreference.Key
+import org.mifos.core.sharedpreference.UserPreferences
 
 /**
- * @author fomenkoo
+ * Created by Aditya Gupta on 19/08/23.
  */
-object PrefManager {
-    private const val USER_ID = "preferences_user_id"
-    private const val TOKEN = "preferences_token"
-    private const val TENANT = "preferences_tenant"
-    private const val INSTANCE_URL = "preferences_instance"
-    private const val INSTANCE_DOMAIN = "preferences_domain"
-    private const val PORT = "preferences_port"
-    private const val USER_STATUS = "user_status"
-    private const val USER_DETAILS = "user_details"
-    private const val PASSCODE = "passcode"
-    private const val PASSCODE_STATUS = "passcode_status"
-    private const val FIRST_TIME_APP_LAUNCH = "preferences_app_launched"
-    private val gson = Gson()
-
-    private val preferences: SharedPreferences
-        get() = PreferenceManager.getDefaultSharedPreferences(
-            App.instance
-                ?.applicationContext
-        )
-
-
-    fun clearPrefs() {
-        val editor = preferences.edit()
-        preferences.let { prefs ->
-            for (key in prefs.all.keys) {
-                if (key != "language_type") {
-                    editor?.remove(key)
-                }
-            }
-        }
-        editor?.apply()
-    }
-
-    fun getInt(preferenceKey: String?, preferenceDefaultValue: Int): Int {
-        return preferences.getInt(preferenceKey, preferenceDefaultValue)
-    }
-
-    fun putInt(preferenceKey: String?, preferenceValue: Int) {
-        preferences.edit()?.putInt(preferenceKey, preferenceValue)?.apply()
-    }
-
-    fun getLong(preferenceKey: String?, preferenceDefaultValue: Long): Long {
-        return preferences.getLong(preferenceKey, preferenceDefaultValue)
-    }
-
-    fun putLong(preferenceKey: String?, preferenceValue: Long) {
-        preferences.edit()?.putLong(preferenceKey, preferenceValue)?.apply()
-    }
-
-    fun getFloat(preferenceKey: String?, preferenceDefaultValue: Float): Float {
-        return preferences.getFloat(preferenceKey, preferenceDefaultValue)
-    }
-
-    fun putFloat(preferenceKey: String?, preferenceValue: Float) {
-        preferences.edit()?.putFloat(preferenceKey, preferenceValue)?.apply()
-    }
-
-    fun getBoolean(preferenceKey: String?, preferenceDefaultValue: Boolean): Boolean {
-        return preferences.getBoolean(preferenceKey, preferenceDefaultValue)
-    }
 
-    fun putBoolean(preferenceKey: String?, preferenceValue: Boolean) {
-        preferences.edit()?.putBoolean(preferenceKey, preferenceValue)?.apply()
-    }
+object  PrefManager : UserPreferences<User>() {
 
-    fun getString(preferenceKey: String?, preferenceDefaultValue: String?): String {
-        return preferences.getString(preferenceKey, preferenceDefaultValue).toString()
-    }
+    private const val USER_DETAILS = "user_details"
+    private const val AUTH_USERNAME = "auth_username"
+    private const val AUTH_PASSWORD = "auth_password"
 
-    fun putString(preferenceKey: String?, preferenceValue: String?) {
-        preferences.edit()?.putString(preferenceKey, preferenceValue)?.apply()
-    }
+    override val preference: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.instance?.applicationContext)
 
-    fun putStringSet(preferencesKey: String?, values: Set<String?>?) {
-        preferences.edit()?.putStringSet(preferencesKey, values)?.apply()
+    override fun getUser(): User {
+        return get(Key.Custom(USER_DETAILS))
     }
 
-    fun getStringSet(preferencesKey: String?): Set<String>? {
-        return preferences.getStringSet(preferencesKey, null)
+    override fun saveUser(user: User) {
+        put(Key.Custom(USER_DETAILS), user)
     }
-    // Concrete methods
-    /**
-     * Authentication
-     */
 
-    fun saveUser(user: PostAuthenticationResponse) {
-        putString(USER_DETAILS, gson.toJson(user))
+    // Created this to store userDetails
+    fun savePostAuthenticationResponse(user : PostAuthenticationResponse) {
+        put(Key.Custom(USER_DETAILS),user)
     }
 
-    val user: User
-        get() = gson.fromJson(
-            getString(USER_DETAILS, "null"),
-            User::class.java
-        )
+    var userStatus: Boolean
+        get() = get(Key.Custom(Constants.SERVICE_STATUS), false)
+        set(status) {
+            put(Key.Custom(Constants.SERVICE_STATUS), status)
+        }
 
-    fun saveToken(token: String?) {
-        putString(TOKEN, token)
+    fun setPermissionDeniedStatus(permissionDeniedStatus: String, status: Boolean) {
+        put(Key.Custom(permissionDeniedStatus), status)
     }
 
-    fun clearToken() {
-        putString(TOKEN, "")
+    fun getPermissionDeniedStatus(permissionDeniedStatus: String): Boolean {
+        return get(Key.Custom(permissionDeniedStatus), true)
     }
 
-
-    val token: String
-        get() = getString(TOKEN, "")
-    val isAuthenticated: Boolean
-        get() = !TextUtils.isEmpty(token)
-
-    var userId: Int
-        get() = getInt(USER_ID, -1)
-        set(id) {
-            putInt(USER_ID, id)
-        }
-
-    var tenant: String
-        get() = getString(TENANT, "default")
-        set(tenant) {
-            if (!TextUtils.isEmpty(tenant)) putString(TENANT, tenant)
-        }
-
-    /**
-     * Connection
-     */
-    var instanceUrl: String
-        get() = getString(INSTANCE_URL, "")
-        set(instanceUrl) {
-            putString(INSTANCE_URL, instanceUrl)
-        }
-
-    var instanceDomain: String
-        get() = getString(INSTANCE_DOMAIN, BaseUrl.API_ENDPOINT)
-        set(instanceDomain) {
-            putString(INSTANCE_DOMAIN, instanceDomain)
-        }
-
-    var port: String
-        get() = getString(PORT, BaseUrl.PORT)
-        set(port) {
-            if (!TextUtils.isEmpty(port)) putString(PORT, port)
-        }
-    var passCode: String
-        get() = getString(PASSCODE, "")
-        set(passCode) {
-            putString(PASSCODE, passCode)
-            passCodeStatus = true
-        }
-    /**
-     * @return the Pref value of User status.
-     * default is 0(User is online)
-     */
-    /**
-     * Set User Status,
-     * If O then user is Online
-     * If 1 then User is offline
-     */
-    var userStatus: Int
-        get() = getInt(USER_STATUS, 0)
-        set(statusCode) {
-            putInt(USER_STATUS, statusCode)
-        }
-    /**
-     * @return the Pref value of pass code status.
-     * default is false(pass code is not set)
-     */
-    /**
-     * Set Pass Code Status,
-     * If false then pass code is not set
-     * If true then pass code is set
-     */
-    var passCodeStatus: Boolean
-        get() = getBoolean(PASSCODE_STATUS, false)
-        set(statusCode) {
-            putBoolean(PASSCODE_STATUS, true)
-        }
-
-    /**
-     * @return true if app is launched is first time and set the value to
-     * false which is returned whenever next time it is called
-     */
-    val isAppFirstTimeLaunched: Boolean
-        get() {
-            val result = getBoolean(FIRST_TIME_APP_LAUNCH, true)
-            if (result) {
-                putBoolean(FIRST_TIME_APP_LAUNCH, false)
-            }
-            return result
+    var usernamePassword : Pair<String, String>
+        get() = Pair(get(Key.Custom(AUTH_USERNAME)), get(Key.Custom(AUTH_PASSWORD)))
+        set(value) {
+            put(Key.Custom(AUTH_USERNAME), value.first)
+            put(Key.Custom(AUTH_PASSWORD), value.second)
         }
 }
\ No newline at end of file
diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/LoginViewModel.kt b/mifosng-android/src/main/java/com/mifos/viewmodels/LoginViewModel.kt
index 7ec1b70c121..70475705751 100644
--- a/mifosng-android/src/main/java/com/mifos/viewmodels/LoginViewModel.kt
+++ b/mifosng-android/src/main/java/com/mifos/viewmodels/LoginViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.mifos.repositories.LoginRepository
 import com.mifos.states.LoginUiState
+import com.mifos.utils.PrefManager
 import dagger.hilt.android.lifecycle.HiltViewModel
 import org.apache.fineract.client.models.PostAuthenticationResponse
 import rx.Subscriber
@@ -39,6 +40,7 @@ class LoginViewModel @Inject constructor(private val loginRepository: LoginRepos
 
                 override fun onNext(user: PostAuthenticationResponse) {
                     _loginUiState.value = LoginUiState.ShowLoginSuccessful(user)
+                    PrefManager.usernamePassword = Pair(username,password)
                 }
             })
     }
diff --git a/mifosng-android/src/main/java/com/mifos/viewmodels/SurveyListViewModel.kt b/mifosng-android/src/main/java/com/mifos/viewmodels/SurveyListViewModel.kt
index 6b6e9045668..2317540930e 100644
--- a/mifosng-android/src/main/java/com/mifos/viewmodels/SurveyListViewModel.kt
+++ b/mifosng-android/src/main/java/com/mifos/viewmodels/SurveyListViewModel.kt
@@ -69,7 +69,7 @@ class SurveyListViewModel @Inject constructor(private val repository: SurveyList
 
                 override fun onNext(surveyList: List<Survey>) {
                     mDbSurveyList = surveyList
-                    if (PrefManager.userStatus == 1) {
+                    if (PrefManager.userStatus) {
                         for (survey in mSyncSurveyList) {
                             loadDatabaseQuestionData(survey.id, survey)
                         }