Skip to content

Commit ae662b4

Browse files
vaneck237vaneck237
committed
fix connection failed error
1 parent b6480e5 commit ae662b4

5 files changed

Lines changed: 22 additions & 16 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 23
2828
targetSdkVersion 32
2929
versionCode 4
30-
versionName "2.3.0"
30+
versionName "2.3.1"
3131
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3232
}
3333
buildTypes {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,4 +208,6 @@
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>
212+
<string name="FailedToCreateClaim">Failed to create claim</string>
211213
</resources>

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.openimis.imisclaims.domain.entity.Program;
4949
import org.openimis.imisclaims.domain.entity.Service;
5050
import org.openimis.imisclaims.domain.entity.SubServiceItem;
51+
import org.openimis.imisclaims.network.exception.HttpException;
5152
import org.openimis.imisclaims.tools.Log;
5253
import org.openimis.imisclaims.usecase.FetchClaimAdmins;
5354
import org.openimis.imisclaims.usecase.FetchControls;
@@ -62,10 +63,13 @@
6263

6364
import java.io.File;
6465
import java.io.FileOutputStream;
66+
import java.net.UnknownHostException;
6567
import java.time.LocalDateTime;
6668
import java.util.ArrayList;
6769
import java.util.Date;
6870
import java.util.List;
71+
import java.util.Objects;
72+
6973
public class MainActivity extends ImisActivity {
7074
private static final int REQUEST_PERMISSIONS_CODE = 1;
7175
private static final int REQUEST_ALL_FILES_ACCESS_CODE = 2;
@@ -488,7 +492,11 @@ public void run() {
488492
e.printStackTrace();
489493
runOnUiThread(() -> {
490494
progressDialog.dismiss();
491-
ErrorDialogBox(e.getMessage());
495+
if(Objects.requireNonNull(e.getMessage()).contains("Failed to execute http call")){
496+
ErrorDialogBox(getResources().getString(R.string.ConnectionFailed));
497+
}else{
498+
ErrorDialogBox(e.getMessage());
499+
}
492500
});
493501
}
494502
}

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,38 +165,31 @@ private void handleUploadClaims() {
165165
try {
166166
Integer status = new CreateClaim().execute(claim, Integer.parseInt(adminId),Integer.parseInt(hfId),insureeId,programId, diagnosisId, programCode);
167167
if(status == STATUS_ERROR){
168-
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR, getResources().getString(R.string.SomethingWentWrongServer));
168+
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR, getResources().getString(R.string.FailedToCreateClaim));
169169
}else{
170170
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.SUCCESS, null);
171171
}
172172
} catch (HttpException e){
173173
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR, getResources().getString(R.string.SomethingWentWrongServer));
174-
} catch ( Exception e ){
175-
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR, getResources().getString(R.string.SomethingWentWrongServer));
176174
}
177175
results.add(result);
178176
}
179177
} catch (HttpException e){
180178
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,getResources().getString(R.string.SomethingWentWrongServer));
181179
results.add(result);
182-
} catch (Exception e){
183-
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,getResources().getString(R.string.SomethingWentWrongServer));
184-
results.add(result);
185180
}
186181
}
187182
} else {
188183
//upload claim
189184
try {
190185
Integer status = new CreateClaim().execute(claim, Integer.parseInt(adminId),Integer.parseInt(hfId),insureeId,programId, diagnosisId, programCode);
191186
if(status == STATUS_ERROR){
192-
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR, getResources().getString(R.string.SomethingWentWrongServer));
187+
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR, getResources().getString(R.string.FailedToCreateClaim));
193188
}else{
194189
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.SUCCESS, null);
195190
}
196191
} catch (HttpException e){
197192
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR, getResources().getString(R.string.SomethingWentWrongServer));
198-
} catch ( Exception e ){
199-
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR, getResources().getString(R.string.SomethingWentWrongServer));
200193
}
201194
results.add(result);
202195
}
@@ -208,19 +201,20 @@ private void handleUploadClaims() {
208201
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR, getResources().getString(R.string.NoInsureeFound));
209202
}
210203
results.add(result);
211-
} catch (Exception e){
212-
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,getResources().getString(R.string.SomethingWentWrongServer));
213-
results.add(result);
214204
}
215205
} else{
216206
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,getResources().getString(R.string.ClaimNumberExist));
217207
results.add(result);
218208
}
219-
} catch (HttpException e){
209+
} catch (HttpException e){
220210
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,e.getMessage());
221211
results.add(result);
222212
} catch (Exception e){
223-
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,getResources().getString(R.string.SomethingWentWrongServer));
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{
216+
result = new PostNewClaims.Result(claim.getClaimNumber(), PostNewClaims.Result.Status.ERROR,getResources().getString(R.string.SomethingWentWrongServer));
217+
}
224218
results.add(result);
225219
}
226220
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,4 +553,6 @@
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>
557+
<string name="FailedToCreateClaim">Échec lors de la création de la prestation</string>
556558
</resources>

0 commit comments

Comments
 (0)