Skip to content

Commit 123825e

Browse files
authored
Merge pull request #106 from mngoe/OP-2545
add update feedback process
2 parents 71d9491 + 19f1c58 commit 123825e

File tree

7 files changed

+11
-2
lines changed

7 files changed

+11
-2
lines changed

.DS_Store

-8 KB
Binary file not shown.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ fastlane/readme.md
8181
# Custom product flavours
8282
*custom-flavours.gradle
8383

84-
.DS_Store
84+
*.DS_Store

claimManagement/.DS_Store

-6 KB
Binary file not shown.

claimManagement/src/.DS_Store

-8 KB
Binary file not shown.

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ public void CheckUpdate(){
250250
JSONArray jsonarray = new JSONArray(response.toString());
251251
String lastVersion = "";
252252
String tag_name = "";
253+
String notes = "";
253254
for (int i = 0; i < jsonarray.length(); i++){
254255
JSONObject releaseObj = jsonarray.getJSONObject(i);
255256
if(releaseObj.getString("tag_name").equals(getResources().getString(R.string.release_tag))){
@@ -258,6 +259,7 @@ public void CheckUpdate(){
258259
if(!releaseName.equals(currentVersion)){
259260
lastVersion = releaseName;
260261
updateAvailable = true;
262+
notes = releaseObj.getString("body");
261263
}
262264
}
263265
}
@@ -266,12 +268,17 @@ public void CheckUpdate(){
266268
boolean finalUpdateAvailable = updateAvailable;
267269
String finalLastVersion = lastVersion;
268270
String finalTagName = tag_name;
271+
String finalNotes = notes;
269272
runOnUiThread(() -> {
270273
pd.dismiss();
271274
if (finalUpdateAvailable) {
272275
new AlertDialog.Builder(this)
273276
.setTitle(getResources().getString(R.string.updateAvailable))
274-
.setMessage(getResources().getString(R.string.newVersion) + " " + finalLastVersion )
277+
.setMessage(
278+
getResources().getString(R.string.newVersion) + " " + finalLastVersion + "\n \n"
279+
+ getResources().getString(R.string.News) + "\n"
280+
+ "\n" + finalNotes
281+
)
275282
.setPositiveButton(getResources().getString(R.string.download), (dialog, which) -> downloadUpdate(finalLastVersion, finalTagName))
276283
.setNegativeButton(getResources().getString(R.string.cancel), null)
277284
.show();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,4 +215,5 @@
215215
<string name="newVersion">Nouvelle version </string>
216216
<string name="claimUpdate">Mise à jour Claims</string>
217217
<string name="getVersion">Téléchargement version </string>
218+
<string name="News">Nouveautés:</string>
218219
</resources>

claimManagement/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,4 +251,5 @@
251251
<string name="newVersion">New version </string>
252252
<string name="claimUpdate">Update Claims</string>
253253
<string name="getVersion">Downloading version </string>
254+
<string name="News">New changes:</string>
254255
</resources>

0 commit comments

Comments
 (0)