Skip to content

Commit

Permalink
Added internet connectivity check before loading client info
Browse files Browse the repository at this point in the history
 Fix openMF#1559 - fixed toast message in client info page

inflateClientInformation() method modifiede in clientDetailsFragment.java to meet the cheecklist

Extracted string resource while displaying error toast. Also added language conversion of the same
  • Loading branch information
danishjamal104 committed Nov 17, 2020
1 parent c59191c commit afcd23a
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 2 deletions.
Binary file added mifosng-android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@

import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
Expand Down Expand Up @@ -224,7 +227,15 @@ void onClickActivateClient() {
}

public void inflateClientInformation() {
mClientDetailsPresenter.loadClientDetailsAndClientAccounts(clientId);
Context context = getContext();
Object systemService = context.getSystemService(Context.CONNECTIVITY_SERVICE);
ConnectivityManager connectivityManager = (ConnectivityManager) systemService;
NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
if (networkInfo != null && networkInfo.isConnected()) {
mClientDetailsPresenter.loadClientDetailsAndClientAccounts(clientId);
return;
}
showFetchingError(getString(R.string.device_not_connected_to_internet));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -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.accounts.ClientAccounts;
import com.mifos.objects.client.Client;
Expand Down Expand Up @@ -137,7 +139,8 @@ public void onCompleted() {
@Override
public void onError(Throwable e) {
getMvpView().showProgressbar(false);
getMvpView().showFetchingError("Client not found.");
String msg = App.getContext().getString(R.string.client_not_found);
getMvpView().showFetchingError(msg);
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions mifosng-android/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,6 @@
<string name="valid">Vàlid</string>
<string name="surveyEmpty"> Aquesta enquesta està buida</string>
<string name="back_again">Appuyez de nouveau sur la touche pour quitter</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>
2 changes: 2 additions & 0 deletions mifosng-android/src/main/res/values-en/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 2 additions & 0 deletions mifosng-android/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,6 @@
<string name="valid">Válido</string>
<string name="surveyEmpty">Esta encuesta está vacía</string>
<string name="back_again">Vuelva a pulsar para salir</string>
<string name="client_not_found">Cliente no encontrado.</string>
<string name="device_not_connected_to_internet">Dispositivo no conectado a internet</string>
</resources>
2 changes: 2 additions & 0 deletions mifosng-android/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -602,4 +602,6 @@
<item>prêts</item>
<item>comptes d\'épargne</item>
</string-array>
<string name="client_not_found">Client introuvable.</string>
<string name="device_not_connected_to_internet">Appareil non connecté à Internet</string>
</resources>
2 changes: 2 additions & 0 deletions mifosng-android/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -611,5 +611,7 @@
<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>

</resources>
2 changes: 2 additions & 0 deletions mifosng-android/src/main/res/values-kn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -586,4 +586,6 @@
<string name="overdue_x_number">ಮಿತಿಮೀರಿದ ಎಕ್ಸ್ ಸಂಖ್ಯೆ</string>
<string name="overdue_y_number">ಮಿತಿಮೀರಿದ ವೈ ಸಂಖ್ಯೆ</string>
<string name="error_select_group">ದಯವಿಟ್ಟು ಒಂದು ಗುಂಪನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
<string name="client_not_found">ಗ್ರಾಹಕ ಕಂಡುಬಂದಿಲ್ಲ.</string>
<string name="device_not_connected_to_internet">ಸಾಧನ ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ</string>
</resources>
2 changes: 2 additions & 0 deletions mifosng-android/src/main/res/values-sw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>


</resources>
2 changes: 2 additions & 0 deletions mifosng-android/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>


</resources>
2 changes: 2 additions & 0 deletions mifosng-android/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -834,5 +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="client_not_found">Client not found.</string>
<string name="device_not_connected_to_internet">Device not connected to internet</string>

</resources>

0 comments on commit afcd23a

Please sign in to comment.