diff --git a/mifosng-android/gradle/wrapper/gradle-wrapper.jar b/mifosng-android/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000000..f6b961fd5a8
Binary files /dev/null and b/mifosng-android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/ClientChargesTest.java b/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/ClientChargesTest.java
index e2c6df65caa..88149e87c6c 100644
--- a/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/ClientChargesTest.java
+++ b/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/ClientChargesTest.java
@@ -16,7 +16,6 @@
import com.mifos.mifosxdroid.dialogfragments.chargedialog.ChargeDialogFragment;
import com.mifos.mifosxdroid.online.ClientActivity;
import com.mifos.mifosxdroid.online.clientcharge.ClientChargeFragment;
-import com.mifos.mifosxdroid.online.clientdetails.ClientDetailsFragment;
import com.mifos.utils.Constants;
import static androidx.test.espresso.Espresso.onView;
diff --git a/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/ClientDetailsFragmentTest.java b/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/ClientDetailsFragmentTest.java
index dc9003597cc..477d3b6c7dd 100755
--- a/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/ClientDetailsFragmentTest.java
+++ b/mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/ClientDetailsFragmentTest.java
@@ -14,7 +14,6 @@
import com.mifos.mifosxdroid.R;
import com.mifos.mifosxdroid.online.ClientActivity;
-import com.mifos.mifosxdroid.online.clientdetails.ClientDetailsFragment;
import com.mifos.utils.Constants;
import com.mifos.utils.FragmentConstants;
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
index 9c5ed1048a3..000485f9e00 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
@@ -23,6 +23,7 @@
import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.IndividualCollectionSheetDetailsFragment;
import com.mifos.mifosxdroid.online.collectionsheetindividual.NewIndividualCollectionSheetFragment;
import com.mifos.mifosxdroid.online.collectionsheetindividualdetails.PaymentDetailsFragment;
+import com.mifos.mifosxdroid.online.clientdetails.ClientDetailsFragment;
import com.mifos.mifosxdroid.online.runreports.report.ReportFragment;
import com.mifos.mifosxdroid.online.runreports.reportcategory.ReportCategoryFragment;
import com.mifos.mifosxdroid.online.runreports.reportdetail.ReportDetailFragment;
@@ -37,7 +38,6 @@
import com.mifos.mifosxdroid.online.activate.ActivateFragment;
import com.mifos.mifosxdroid.online.centerdetails.CenterDetailsFragment;
import com.mifos.mifosxdroid.online.clientcharge.ClientChargeFragment;
-import com.mifos.mifosxdroid.online.clientdetails.ClientDetailsFragment;
import com.mifos.mifosxdroid.online.clientidentifiers.ClientIdentifiersFragment;
import com.mifos.mifosxdroid.online.clientlist.ClientListFragment;
import com.mifos.mifosxdroid.online.collectionsheet.CollectionSheetFragment;
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.kt
index 9cb47c682eb..433ada4d918 100755
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.kt
@@ -6,10 +6,12 @@ package com.mifos.mifosxdroid.online.clientdetails
import android.Manifest
import android.app.Activity
+import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.graphics.Bitmap
import android.graphics.BitmapFactory
+import android.net.ConnectivityManager
import android.net.Uri
import android.os.Bundle
import android.os.Environment
@@ -174,7 +176,15 @@ class ClientDetailsFragment : MifosBaseFragment(), ClientDetailsMvpView {
}
fun inflateClientInformation() {
- mClientDetailsPresenter!!.loadClientDetailsAndClientAccounts(clientId)
+ val context = context
+ val systemService = context!!.getSystemService(Context.CONNECTIVITY_SERVICE)
+ val connectivityManager = systemService as ConnectivityManager
+ val networkInfo = connectivityManager.activeNetworkInfo
+ if (networkInfo != null && networkInfo.isConnected) {
+ mClientDetailsPresenter!!.loadClientDetailsAndClientAccounts(clientId)
+ return
+ }
+ showFetchingError(getString(R.string.device_not_connected_to_internet))
}
override fun onAttach(activity: Activity) {
diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsPresenter.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsPresenter.kt
index 626339f1e76..42018ceff50 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsPresenter.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsPresenter.kt
@@ -1,7 +1,9 @@
package com.mifos.mifosxdroid.online.clientdetails
+import com.mifos.App
import com.mifos.api.datamanager.DataManagerClient
import com.mifos.api.datamanager.DataManagerDataTable
+import com.mifos.mifosxdroid.R
import com.mifos.mifosxdroid.base.BasePresenter
import com.mifos.objects.zipmodels.ClientAndClientAccounts
import okhttp3.MediaType
@@ -98,7 +100,8 @@ class ClientDetailsPresenter @Inject constructor(private val mDataManagerDataTab
override fun onCompleted() {}
override fun onError(e: Throwable) {
mvpView!!.showProgressbar(false)
- mvpView!!.showFetchingError("Client not found.")
+ val msg = App.getContext().getString(R.string.client_not_found)
+ mvpView!!.showFetchingError(msg)
}
override fun onNext(clientAndClientAccounts: ClientAndClientAccounts?) {
diff --git a/mifosng-android/src/main/res/values-ca/strings.xml b/mifosng-android/src/main/res/values-ca/strings.xml
index d9c15acc25d..3927e6a3acc 100755
--- a/mifosng-android/src/main/res/values-ca/strings.xml
+++ b/mifosng-android/src/main/res/values-ca/strings.xml
@@ -166,4 +166,7 @@
Comptes
+ No s\'ha trobat el client.
+ Dispositiu no connectat a Internet
+
diff --git a/mifosng-android/src/main/res/values-en/strings.xml b/mifosng-android/src/main/res/values-en/strings.xml
index b3e6177f53b..0984c687dca 100755
--- a/mifosng-android/src/main/res/values-en/strings.xml
+++ b/mifosng-android/src/main/res/values-en/strings.xml
@@ -189,5 +189,8 @@
This Survey is Empty
Accounts
+ Client not found.
+ Device not connected to internet
+
diff --git a/mifosng-android/src/main/res/values-es/strings.xml b/mifosng-android/src/main/res/values-es/strings.xml
index 1a50d0cf69a..94810cd186f 100755
--- a/mifosng-android/src/main/res/values-es/strings.xml
+++ b/mifosng-android/src/main/res/values-es/strings.xml
@@ -166,4 +166,7 @@
cuenta
+ Cliente no encontrado.
+ Dispositivo no conectado a internet
+
diff --git a/mifosng-android/src/main/res/values-fr/strings.xml b/mifosng-android/src/main/res/values-fr/strings.xml
index 14ff27c3882..9c331d06756 100644
--- a/mifosng-android/src/main/res/values-fr/strings.xml
+++ b/mifosng-android/src/main/res/values-fr/strings.xml
@@ -612,4 +612,7 @@
Compte
+ Client introuvable.
+ Appareil non connecté à Internet
+
diff --git a/mifosng-android/src/main/res/values-hi/strings.xml b/mifosng-android/src/main/res/values-hi/strings.xml
index bf3f4ebc12e..519f4bf4ed0 100644
--- a/mifosng-android/src/main/res/values-hi/strings.xml
+++ b/mifosng-android/src/main/res/values-hi/strings.xml
@@ -616,6 +616,9 @@
कलेक्शन का देय
खाता
+ ग्राहक नहीं मिला।
+ डिवाइस इंटरनेट से कनेक्ट नहीं है
+
!-- About App -->
फील्ड ऑफिसर एप्लीकेशन एक एप्लीकेशन है बैंक स्टाफ फील्ड ऑफिसर के लिए विकसित किया गया
ग्राहकों का केंद्र, समूह, ऋण खाता, बचत खाता, आदि।ट्रैक रखने के लिए
diff --git a/mifosng-android/src/main/res/values-kn/strings.xml b/mifosng-android/src/main/res/values-kn/strings.xml
index 90c5dc1613d..236f8ce4b02 100644
--- a/mifosng-android/src/main/res/values-kn/strings.xml
+++ b/mifosng-android/src/main/res/values-kn/strings.xml
@@ -596,4 +596,7 @@
ಖಾತೆ
+ ಗ್ರಾಹಕ ಕಂಡುಬಂದಿಲ್ಲ.
+ ಸಾಧನ ಇಂಟರ್ನೆಟ್ಗೆ ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ
+
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values-sw/strings.xml b/mifosng-android/src/main/res/values-sw/strings.xml
index b34a47b0525..6718564fb73 100644
--- a/mifosng-android/src/main/res/values-sw/strings.xml
+++ b/mifosng-android/src/main/res/values-sw/strings.xml
@@ -724,6 +724,9 @@
Vinjari
akaunti
+ Mteja hajapatikana.
+ Kifaa hakijaunganishwa kwenye mtandao
+
Lugha
language_type
diff --git a/mifosng-android/src/main/res/values-zh/strings.xml b/mifosng-android/src/main/res/values-zh/strings.xml
index 57f7dd06a02..72fad7cb059 100755
--- a/mifosng-android/src/main/res/values-zh/strings.xml
+++ b/mifosng-android/src/main/res/values-zh/strings.xml
@@ -713,6 +713,9 @@
密码应该是4位数
帳戶
+ 找不到客户端。
+ 设备未连接到互联网
+
语
language_type
diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
index 8e158453661..a7d1eca43f0 100755
--- a/mifosng-android/src/main/res/values/strings.xml
+++ b/mifosng-android/src/main/res/values/strings.xml
@@ -914,4 +914,7 @@
Instance Url
+ Client not found.
+ Device not connected to internet
+