From 98ca7af592ff7bbb63ada8fe66f2c3e11e44e32f Mon Sep 17 00:00:00 2001
From: Aditya Gupta <ashishgupta9936ad@gmail.com>
Date: Thu, 2 Feb 2023 19:38:06 +0530
Subject: [PATCH] Fixed an error during Login

---
 app/src/debug/java/org/mifos/mobile/api/BaseURL.kt           | 4 ++--
 .../java/org/mifos/mobile/api/SelfServiceInterceptor.kt      | 5 ++++-
 app/src/release/java/org/mifos/mobile/api/BaseURL.kt         | 2 +-
 build.gradle                                                 | 2 +-
 gradle.properties                                            | 2 +-
 gradle/wrapper/gradle-wrapper.properties                     | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/debug/java/org/mifos/mobile/api/BaseURL.kt b/app/src/debug/java/org/mifos/mobile/api/BaseURL.kt
index f9e7d8a4c..6198ddb07 100644
--- a/app/src/debug/java/org/mifos/mobile/api/BaseURL.kt
+++ b/app/src/debug/java/org/mifos/mobile/api/BaseURL.kt
@@ -7,7 +7,7 @@ package org.mifos.mobile.api
 class BaseURL {
     val url: String? = null
         get() = field
-                ?: PROTOCOL_HTTPS + API_ENDPOINT + API_PATH
+            ?: (PROTOCOL_HTTPS + API_ENDPOINT + API_PATH)
     val defaultBaseUrl: String
         get() = PROTOCOL_HTTPS + API_ENDPOINT
 
@@ -17,7 +17,7 @@ class BaseURL {
 
     companion object {
         const val API_ENDPOINT = "demo.mifos.community"
-        const val API_PATH = "/fineract-provider/api/v1/self/"
+        const val API_PATH = "/fineract-provider/api/v1/"
         const val PROTOCOL_HTTPS = "https://"
     }
 }
diff --git a/app/src/debug/java/org/mifos/mobile/api/SelfServiceInterceptor.kt b/app/src/debug/java/org/mifos/mobile/api/SelfServiceInterceptor.kt
index 3cd1928b7..eb412b3f3 100644
--- a/app/src/debug/java/org/mifos/mobile/api/SelfServiceInterceptor.kt
+++ b/app/src/debug/java/org/mifos/mobile/api/SelfServiceInterceptor.kt
@@ -5,6 +5,7 @@
 package org.mifos.mobile.api
 
 import android.text.TextUtils
+import android.util.Log
 
 import okhttp3.Interceptor
 import okhttp3.Response
@@ -22,6 +23,7 @@ class SelfServiceInterceptor(private val tenant: String?, private val authToken:
         val chainRequest = chain.request()
         val builder = chainRequest.newBuilder()
                 .header(HEADER_TENANT, tenant)
+                .header(CONTENT_TYPE,"application/json")
         if (!TextUtils.isEmpty(authToken)) {
             builder.header(HEADER_AUTH, authToken)
         }
@@ -32,6 +34,7 @@ class SelfServiceInterceptor(private val tenant: String?, private val authToken:
     companion object {
         const val HEADER_TENANT = "Fineract-Platform-TenantId"
         const val HEADER_AUTH = "Authorization"
-        const val DEFAULT_TENANT = "mobile"
+        const val DEFAULT_TENANT = "default"
+        const val CONTENT_TYPE = "Content-Type"
     }
 }
\ No newline at end of file
diff --git a/app/src/release/java/org/mifos/mobile/api/BaseURL.kt b/app/src/release/java/org/mifos/mobile/api/BaseURL.kt
index 4fde45605..efc5e8b2e 100644
--- a/app/src/release/java/org/mifos/mobile/api/BaseURL.kt
+++ b/app/src/release/java/org/mifos/mobile/api/BaseURL.kt
@@ -19,7 +19,7 @@ class BaseURL {
 
     companion object {
         const val API_ENDPOINT = "demo.mifos.community"
-        const val API_PATH = "/fineract-provider/api/v1/self/"
+        const val API_PATH = "/fineract-provider/api/v1/"
         const val PROTOCOL_HTTPS = "https://"
     }
 }
diff --git a/build.gradle b/build.gradle
index 7c3dcbee8..f2ae844c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,7 +59,7 @@ ext {
     retrofitVersion = '2.2.0'
     okHttp3Version = '3.6.0'
     butterKnifeVersion = '8.0.1'
-    dbflowVersion = '4.1.2'
+    dbflowVersion = '4.2.4'
     playServicesVersion = '17.0.0'
     firebaseMessagingVersion = '21.0.1'
     oss_licenses = '17.0.0'
diff --git a/gradle.properties b/gradle.properties
index 5a879d237..70564ff8b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-org.gradle.jvmargs=-XX:MaxPermSize=2048m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 289a14c98..5fabd8ddc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip