Added internet connectivity check before loading client info

openMF · Jul 8, 2021 · f4b2be9 · f4b2be9
1 parent 310c2f2
commit f4b2be9
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 5 deletions.
diff --git a/mifosng-android/gradle/wrapper/gradle-wrapper.jar b/mifosng-android/gradle/wrapper/gradle-wrapper.jar
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
@@ -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/...ndroid/src/instrumentTest/java/com/mifos/mifosxdroid/tests/ClientDetailsFragmentTest.java b/...ndroid/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/...ng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java b/...ng-android/src/main/java/com/mifos/mifosxdroid/injection/component/ActivityComponent.java
@@ -19,6 +19,7 @@
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxFragment;
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxPendingTasksActivity;
 import com.mifos.mifosxdroid.online.checkerinbox.CheckerInboxTasksFragment;
+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;
@@ -33,7 +34,6 @@
 import com.mifos.mifosxdroid.online.centerdetails.CenterDetailsFragment;
 import com.mifos.mifosxdroid.online.centerlist.CenterListFragment;
 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/...android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.kt b/...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/...ndroid/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsPresenter.kt b/...ndroid/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
@@ -163,4 +163,8 @@
     <string name="lang_changed">S\'ha canviat l\'idioma</string>
     <string name="lang_change_description">Seleccioneu l\'idioma en què voleu veure l\'aplicació</string>
     <string name="dark_mode">mode fosc</string>
+
+    <string name="client_not_found">No s\'ha trobat el client.</string>
+    <string name="device_not_connected_to_internet">Dispositiu no connectat a Internet</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-en/strings.xml b/mifosng-android/src/main/res/values-en/strings.xml
@@ -187,6 +187,8 @@
     <string name="product_name">Product Name</string>
     <string name="valid">Valid</string>
     <string name="surveyEmpty">This Survey is Empty</string>
+    <string name="client_not_found">Client not found.</string>
+    <string name="device_not_connected_to_internet">Device not connected to internet</string>
 
 
 </resources>
diff --git a/mifosng-android/src/main/res/values-es/strings.xml b/mifosng-android/src/main/res/values-es/strings.xml
@@ -163,4 +163,8 @@
     <string name="lang_changed">Idioma cambiado</string>
     <string name="lang_change_description">Seleccione el idioma en el que desea ver la aplicación</string>
     <string name="dark_mode">modo oscuro</string>
+
+    <string name="client_not_found">Cliente no encontrado.</string>
+    <string name="device_not_connected_to_internet">Dispositivo no conectado a internet</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-fr/strings.xml b/mifosng-android/src/main/res/values-fr/strings.xml
@@ -610,4 +610,8 @@
     <string name="lang_change_description">Sélectionnez la langue dans laquelle vous souhaitez afficher l\'application</string>
     <string name="dark_mode">mode sombre</string>
 
+
+    <string name="client_not_found">Client introuvable.</string>
+    <string name="device_not_connected_to_internet">Appareil non connecté à Internet</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-hi/strings.xml b/mifosng-android/src/main/res/values-hi/strings.xml
@@ -614,6 +614,8 @@
     <string name="collectionsheet_submit_success">कलेक्शन शीट सफलतापूर्वक जमा कर दी गई</string>
     <string name="individual_collection_sheet">व्यक्तिगत कलेक्शन शीट</string>
     <string name="due_collection">कलेक्शन का देय</string>
+    <string name="client_not_found">ग्राहक नहीं मिला।</string>
+    <string name="device_not_connected_to_internet">डिवाइस इंटरनेट से कनेक्ट नहीं है</string>
 
     !-- About App -->
     <string name="about_app">फील्ड ऑफिसर एप्लीकेशन एक एप्लीकेशन है बैंक स्टाफ फील्ड ऑफिसर के लिए विकसित किया गया

diff --git a/mifosng-android/src/main/res/values-kn/strings.xml b/mifosng-android/src/main/res/values-kn/strings.xml
@@ -593,4 +593,8 @@
     <string name="lang_changed">ಭಾಷೆ ಬದಲಾಗಿದೆ</string>
     <string name="lang_change_description">ನೀವು ಅಪ್ಲಿಕೇಶನ್ ವೀಕ್ಷಿಸಲು ಬಯಸುವ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
     <string name="dark_mode">ಡಾರ್ಕ್ ಮೋಡ್</string>
+
+    <string name="client_not_found">ಗ್ರಾಹಕ ಕಂಡುಬಂದಿಲ್ಲ.</string>
+    <string name="device_not_connected_to_internet">ಸಾಧನ ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-sw/strings.xml b/mifosng-android/src/main/res/values-sw/strings.xml
@@ -722,6 +722,8 @@
     <string name="failed_to_load_db_clients">Upakio wa wateja wa hifadhidata umefeli</string>
     <string name="failed_to_load_db_groups">Upakio wa makundi ya hifadhidata umefeli</string>
     <string name="browse">Vinjari</string>
+    <string name="client_not_found">Mteja hajapatikana.</string>
+    <string name="device_not_connected_to_internet">Kifaa hakijaunganishwa kwenye mtandao</string>
 
     <!-- Language -->
     <string name="language">Lugha</string>

diff --git a/mifosng-android/src/main/res/values-zh/strings.xml b/mifosng-android/src/main/res/values-zh/strings.xml
@@ -711,6 +711,8 @@
     <string name="incorrect_passcode">密码错误</string>
     <string name="incorrect_passcode_more_than_three">您已经输错三次密码了，请再次尝试</string>
     <string name="error_passcode">密码应该是4位数</string>
+    <string name="client_not_found">找不到客户端。</string>
+    <string name="device_not_connected_to_internet">设备未连接到互联网</string>
 
     <!-- Language -->
     <string name="language">语</string>

diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
@@ -834,6 +834,7 @@
     <string name="something_went_wrong">Something went wrong</string>
     <string name="entry">ENTRY</string>
     <string name="network_issue">Network Issue</string>
+
     <string name="dark_mode">Dark Mode</string>
     <string name="ui">UI</string>
     <string name="dark_mode_def_value">MODE_NIGHT_FOLLOW_SYSTEM</string>
@@ -902,4 +903,7 @@
     <string name="change_passcode">Change Passcode</string>
     <string name="change_app_passcode">Change App Passcode</string>
 
+    <string name="client_not_found">Client not found.</string>
+    <string name="device_not_connected_to_internet">Device not connected to internet</string>
+
 </resources>