Skip to content

Commit 54728d1

Browse files
vaneck237vaneck237
committed
updgrade sentry dependence version
1 parent ff65dd2 commit 54728d1

16 files changed

Lines changed: 60 additions & 54 deletions

‎claimManagement/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ android {
172172
}
173173

174174
compileOptions {
175-
sourceCompatibility JavaVersion.VERSION_1_8
176-
targetCompatibility JavaVersion.VERSION_1_8
175+
sourceCompatibility JavaVersion.VERSION_11
176+
targetCompatibility JavaVersion.VERSION_11
177177
}
178178
buildFeatures {
179179
viewBinding true
@@ -221,6 +221,6 @@ dependencies {
221221
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
222222
implementation group: 'com.squareup.picasso', name: 'picasso', version: '2.71828'
223223
implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '1.2.7'
224-
implementation 'io.sentry:sentry-android:5.3.0'
224+
implementation 'io.sentry:sentry-android:8.25.0'
225225

226226
}

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

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -112,53 +112,49 @@ public boolean onCreateOptionsMenu(Menu menu) {
112112
@Override
113113
protected void onCreate(Bundle savedInstanceState) {
114114
super.onCreate(savedInstanceState);
115-
try {
116-
setContentView(R.layout.activity_main);
115+
setContentView(R.layout.activity_main);
117116

118-
isSDCardAvailable();
117+
isSDCardAvailable();
119118

120-
broadcastList = new ArrayList<>();
121-
broadcastList.add(SynchronizeService.ACTION_CLAIM_COUNT_RESULT);
119+
broadcastList = new ArrayList<>();
120+
broadcastList.add(SynchronizeService.ACTION_CLAIM_COUNT_RESULT);
122121

123-
progressDialog = new ProgressDialog(this);
124-
progressDialog.setCancelable(false);
122+
progressDialog = new ProgressDialog(this);
123+
progressDialog.setCancelable(false);
125124

126-
Toolbar toolbar = findViewById(R.id.toolbar);
127-
setSupportActionBar(toolbar);
128-
actionBar = getSupportActionBar();
125+
Toolbar toolbar = findViewById(R.id.toolbar);
126+
setSupportActionBar(toolbar);
127+
actionBar = getSupportActionBar();
129128

130-
new Thread(this::checkForUpdates).start();
129+
new Thread(this::checkForUpdates).start();
131130

132-
drawer = findViewById(R.id.drawer_layout);
133-
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
134-
this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
135-
drawer.addDrawerListener(toggle);
136-
toggle.syncState();
131+
drawer = findViewById(R.id.drawer_layout);
132+
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
133+
this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
134+
drawer.addDrawerListener(toggle);
135+
toggle.syncState();
137136

138-
NavigationView navigationView = findViewById(R.id.nav_view);
139-
navigationView.setNavigationItemSelectedListener(this::onNavigationItemSelected);
137+
NavigationView navigationView = findViewById(R.id.nav_view);
138+
navigationView.setNavigationItemSelectedListener(this::onNavigationItemSelected);
140139

141-
View header = navigationView.getHeaderView(0);
142-
loginText = header.findViewById(R.id.LoginText);
143-
loginText.setText(global.isLoggedIn() ? R.string.Logout : R.string.Login);
144-
RelativeLayout loginButton = header.findViewById(R.id.LoginButton);
145-
loginButton.setOnClickListener((view) -> changeLoginState());
140+
View header = navigationView.getHeaderView(0);
141+
loginText = header.findViewById(R.id.LoginText);
142+
loginText.setText(global.isLoggedIn() ? R.string.Logout : R.string.Login);
143+
RelativeLayout loginButton = header.findViewById(R.id.LoginButton);
144+
loginButton.setOnClickListener((view) -> changeLoginState());
146145

147-
accepted_count = findViewById(R.id.accepted_count);
148-
rejected_count = findViewById(R.id.rejected_count);
149-
entered_Count = findViewById(R.id.entered_count);
146+
accepted_count = findViewById(R.id.accepted_count);
147+
rejected_count = findViewById(R.id.rejected_count);
148+
entered_Count = findViewById(R.id.entered_count);
150149

151-
accepted_count.setText("0");
152-
rejected_count.setText("0");
153-
entered_Count.setText("0");
150+
accepted_count.setText("0");
151+
rejected_count.setText("0");
152+
entered_Count.setText("0");
154153

155-
AdminName = findViewById(R.id.AdminName);
154+
AdminName = findViewById(R.id.AdminName);
156155

157-
if (checkRequirements()) {
158-
onAllRequirementsMet();
159-
}
160-
} catch (Exception exception) {
161-
Sentry.captureException(exception);
156+
if (checkRequirements()) {
157+
onAllRequirementsMet();
162158
}
163159
}
164160

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
import java.net.URL;
3737
import java.util.ArrayList;
3838

39+
import io.sentry.Sentry;
40+
3941
public class SynchronizeActivity extends ImisActivity {
4042
private static final String LOG_TAG = "SYNCACTIVITY";
4143
private static final int PICK_FILE_REQUEST_CODE = 1;
@@ -129,6 +131,7 @@ protected void onBroadcastReceived(Context context, Intent intent) {
129131
showDialog(getResources().getString(R.string.BulkUpload));
130132
}
131133
} catch (JSONException e) {
134+
Sentry.captureException(e);
132135
Log.e(LOG_TAG, "Error while processing claim response", e);
133136
}
134137
break;
@@ -289,6 +292,7 @@ public void CheckUpdate(){
289292
Toast.LENGTH_SHORT).show();
290293
});
291294
} catch (Exception e) {
295+
Sentry.captureException(e);
292296
runOnUiThread(() -> {
293297
pd.dismiss();
294298
Toast.makeText(this,
@@ -320,6 +324,7 @@ public void downloadUpdate(String lastVersion, String tagName) {
320324

321325
} catch (Exception e) {
322326
Toast.makeText(this, getResources().getString(R.string.downloadUpdateFail), Toast.LENGTH_SHORT).show();
327+
Sentry.captureException(e);
323328
Log.e("DownloadUpdate", "Erreur: ", e);
324329
}
325330
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import java.util.List;
3232
import java.util.Locale;
3333

34+
import io.sentry.Sentry;
35+
3436
public class SynchronizeService extends JobIntentService {
3537
private static final int JOB_ID = 6541259; //Random unique Job id
3638
private static final String LOG_TAG = "SYNCSERVICE";
@@ -114,6 +116,7 @@ private void handleUploadClaims() {
114116
broadcastSyncSuccess(claimStatus);
115117
} catch (Exception e) {
116118
e.printStackTrace();
119+
Sentry.captureException(e);
117120
broadcastError(getResources().getString(R.string.ErrorOccurred) + ": " + e.getMessage(), ACTION_UPLOAD_CLAIMS);
118121
}
119122
}
@@ -195,6 +198,7 @@ private void handleExportClaims() {
195198
AppInformation.DateTimeInfo.getDefaultIsoDatetimeFormatter().format(new Date()),
196199
SQLHandler.CLAIM_UPLOAD_STATUS_EXPORTED, null);
197200
} catch (JSONException e) {
201+
Sentry.captureException(e);
198202
Log.e(LOG_TAG, "Exception while exporting claims", e);
199203
}
200204
}
@@ -219,6 +223,7 @@ private File createClaimFile(JSONObject details) {
219223
String filename = "Claim_" + details.getString("HFCode") + "_" + details.getString("ClaimCode") + "_" + d + ".xml";
220224
return storageManager.createTempFile("exports/claim/" + filename);
221225
} catch (JSONException e) {
226+
Sentry.captureException(e);
222227
Log.e(LOG_TAG, "Parsing claim JSON failed", e);
223228
}
224229
return null;

‎claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ public List<Medication> getMedications() {
392392
return medications;
393393
}
394394

395-
public static final Creator<Claim> CREATOR = new Creator<Claim>() {
395+
public static final Creator<Claim> CREATOR = new Creator<>() {
396396
@Override
397397
public Claim createFromParcel(Parcel in) {
398398
return new Claim(in);
@@ -501,7 +501,7 @@ public String getJustification() {
501501
return justification;
502502
}
503503

504-
public static final Creator<Service> CREATOR = new Creator<Service>() {
504+
public static final Creator<Service> CREATOR = new Creator<>() {
505505
@Override
506506
public Service createFromParcel(Parcel in) {
507507
return new Service(in);
@@ -611,7 +611,7 @@ public String getJustification() {
611611
return justification;
612612
}
613613

614-
public static final Creator<Medication> CREATOR = new Creator<Medication>() {
614+
public static final Creator<Medication> CREATOR = new Creator<>() {
615615
@Override
616616
public Medication createFromParcel(Parcel in) {
617617
return new Medication(in);

‎claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/ClaimAdmin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public String getHealthFacilityCode() {
7272
return hfCode;
7373
}
7474

75-
public static final Creator<ClaimAdmin> CREATOR = new Creator<ClaimAdmin>() {
75+
public static final Creator<ClaimAdmin> CREATOR = new Creator<>() {
7676
@Override
7777
public ClaimAdmin createFromParcel(Parcel in) {
7878
return new ClaimAdmin(in);

‎claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/DiagnosesServicesMedications.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public List<Medication> getMedications() {
7070
return medications;
7171
}
7272

73-
public static final Creator<DiagnosesServicesMedications> CREATOR = new Creator<DiagnosesServicesMedications>() {
73+
public static final Creator<DiagnosesServicesMedications> CREATOR = new Creator<>() {
7474
@Override
7575
public DiagnosesServicesMedications createFromParcel(Parcel in) {
7676
return new DiagnosesServicesMedications(in);

‎claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Diagnosis.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public String getName() {
4646
return name;
4747
}
4848

49-
public static final Creator<Diagnosis> CREATOR = new Creator<Diagnosis>() {
49+
public static final Creator<Diagnosis> CREATOR = new Creator<>() {
5050
@Override
5151
public Diagnosis createFromParcel(Parcel in) {
5252
return new Diagnosis(in);

‎claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/HealthFacility.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public String getCode(){
4646
public String getName(){
4747
return name;
4848
}
49-
public static final Creator<HealthFacility> CREATOR = new Creator<HealthFacility>() {
49+
public static final Creator<HealthFacility> CREATOR = new Creator<>() {
5050
@Override
5151
public HealthFacility createFromParcel(Parcel in) {
5252
return new HealthFacility(in);

‎claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Insuree.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public List<Policy> getPolicies() {
105105
return policies;
106106
}
107107

108-
public static final Creator<Insuree> CREATOR = new Creator<Insuree>() {
108+
public static final Creator<Insuree> CREATOR = new Creator<>() {
109109
@Override
110110
public Insuree createFromParcel(Parcel in) {
111111
return new Insuree(in);

0 commit comments

Comments
 (0)