Skip to content

Commit a78bb09

Browse files
vaneck237vaneck237
committed
fix user connection error
1 parent 892f01c commit a78bb09

7 files changed

Lines changed: 40 additions & 13 deletions

File tree

‎claimManagement/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
minSdkVersion 26
2828
targetSdkVersion 32
2929
versionCode 4
30-
versionName "2.3.2"
30+
versionName "2.3.4"
3131
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3232
}
3333
buildTypes {

‎claimManagement/src/csu/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
<string name="MissingTdr">Please select Tdr result</string>
209209
<string name="InvalidChequeNumber">Invalid Cheque Number</string>
210210
<string name="NonUsedChequeNumber">This cheque number was not attribute to beneficiary</string>
211-
<string name="ConnectionFailed">Connection failed</string>
211+
<string name="CheckConnection">Check your internet connection</string>
212212
<string name="FailedToCreateClaim">Failed to create claim</string>
213213
<string name="Error">Error occured</string>
214214
</resources>

‎claimManagement/src/main/java/org/openimis/imisclaims/Global.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,10 @@ public boolean isNetworkAvailable() {
254254
ConnectivityManager cm = (ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);
255255
NetworkInfo ni = cm.getActiveNetworkInfo();
256256

257-
return (ni != null && ni.isConnected());
257+
if(ni == null){
258+
return false;
259+
}
260+
return ni.isConnectedOrConnecting();
258261
}
259262

260263
public void setLanguage(Context c, String Language) {

‎claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,8 @@ public void run() {
492492
e.printStackTrace();
493493
runOnUiThread(() -> {
494494
progressDialog.dismiss();
495-
if(Objects.requireNonNull(e.getMessage()).contains("Failed to execute http call")){
496-
ErrorDialogBox(getResources().getString(R.string.ConnectionFailed));
495+
if(!global.isNetworkAvailable()){
496+
ErrorDialogBox(getResources().getString(R.string.CheckConnection));
497497
}else{
498498
ErrorDialogBox(e.getMessage());
499499
}
@@ -624,6 +624,11 @@ public void downloadServices(@NonNull final String claimAdminCode) {
624624
}
625625
} catch ( Exception e) {
626626
e.printStackTrace();
627+
if(!global.isNetworkAvailable()){
628+
Toast.makeText(MainActivity.this, getResources().getString(R.string.CheckConnection), Toast.LENGTH_LONG).show();
629+
} else {
630+
Toast.makeText(MainActivity.this, getResources().getString(R.string.downloadFail), Toast.LENGTH_LONG).show();
631+
}
627632
runOnUiThread(() -> progressDialog.dismiss());
628633
}
629634
});
@@ -666,6 +671,11 @@ public void downloadItems(@NonNull final String claimAdminCode) {
666671
}
667672
} catch (Exception e) {
668673
e.printStackTrace();
674+
if(!global.isNetworkAvailable()){
675+
Toast.makeText(MainActivity.this, getResources().getString(R.string.CheckConnection), Toast.LENGTH_LONG).show();
676+
} else {
677+
Toast.makeText(MainActivity.this, getResources().getString(R.string.downloadFail), Toast.LENGTH_LONG).show();
678+
}
669679
runOnUiThread(() -> progressDialog.dismiss());
670680
}
671681
});
@@ -766,7 +776,11 @@ public void run() {
766776
e.printStackTrace();
767777
runOnUiThread(() -> {
768778
progressDialog.dismiss();
769-
Toast.makeText(MainActivity.this, e.getMessage() + "-" + getResources().getString(R.string.SomethingWentWrongServer), Toast.LENGTH_LONG).show();
779+
if(!global.isNetworkAvailable()){
780+
Toast.makeText(MainActivity.this, e.getMessage() + "-" + getResources().getString(R.string.CheckConnection), Toast.LENGTH_LONG).show();
781+
} else {
782+
Toast.makeText(MainActivity.this, e.getMessage() + "-" + getResources().getString(R.string.SomethingWentWrongServer), Toast.LENGTH_LONG).show();
783+
}
770784
ClaimAdminDialogBox();
771785
});
772786
}

‎claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeActivity.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -670,9 +670,15 @@ public void CheckUpdate(){
670670
} catch (Exception e) {
671671
runOnUiThread(() -> {
672672
pd.dismiss();
673-
Toast.makeText(this,
674-
e.getMessage(),
675-
Toast.LENGTH_SHORT).show();
673+
if(!global.isNetworkAvailable()){
674+
Toast.makeText(this,
675+
getResources().getString(R.string.CheckConnection),
676+
Toast.LENGTH_SHORT).show();
677+
} else {
678+
Toast.makeText(this,
679+
e.getMessage(),
680+
Toast.LENGTH_SHORT).show();
681+
}
676682
});
677683
}
678684
});

‎claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ private void handleUploadClaims() {
210210
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,e.getMessage());
211211
results.add(result);
212212
} catch (Exception e){
213-
if(Objects.requireNonNull(e.getMessage()).contains("Failed to execute http")){
214-
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,getResources().getString(R.string.ConnectionFailed));
215-
} else{
213+
if(!global.isNetworkAvailable()){
214+
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,getResources().getString(R.string.CheckConnection));
215+
} else {
216216
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,getResources().getString(R.string.SomethingWentWrongServer));
217217
}
218218
results.add(result);
@@ -226,6 +226,10 @@ private void handleUploadClaims() {
226226
}
227227
}
228228

229+
public void isConnected(){
230+
231+
}
232+
229233
private List<Claim> claimFromJSONObject(
230234
@NonNull JSONArray array
231235
)throws JSONException {

‎claimManagement/src/main/res/values-fr/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@
553553
<string name="NotFound">L\'entrée n\'existe pas.</string>
554554
<string name="qtyAlert">La quantité maximale pour ce produit est</string>
555555
<string name="qtyAlertAsk">La quantité autorisée pour ce produit est</string>
556-
<string name="ConnectionFailed">Échec de connexion</string>
556+
<string name="CheckConnection">Vérifier votre connexion</string>
557557
<string name="FailedToCreateClaim">Échec lors de la création de la prestation</string>
558558
<string name="Update">Mise à jour</string>
559559
<string name="checkUpdate">Vérifier la mise à jour</string>

0 commit comments

Comments
 (0)