Skip to content

Commit 6571672

Browse files
mngoemngoe
authored
Merge pull request #67 from mngoe/hotfix-csu
Hotfix csu
2 parents 678ef5d + 8548063 commit 6571672

16 files changed

Lines changed: 117 additions & 78 deletions

File tree

‎claimManagement/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
minSdkVersion 26
2828
targetSdkVersion 32
2929
versionCode 4
30-
versionName System.getenv("APP_VERSION") ?: "2.4.0"
30+
versionName System.getenv("APP_VERSION") ?: "2.4.1"
3131
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3232
}
3333
buildTypes {
@@ -59,7 +59,7 @@ android {
5959
resValue "string", "ReleaseDateValue", getDate()
6060
buildConfigField "String", "API_BASE_URL", '"http://demo.openimis.org/"'
6161
buildConfigField "String", "REST_API_PREFIX", '"rest"'
62-
buildConfigField "String", "RAR_PASSWORD", '")(#$1HsD"'
62+
buildConfigField "String", "ZIP_PASSWORD", '")(#$1HsD"'
6363
buildConfigField "String", "API_VERSION", '"3"'
6464
}
6565

‎claimManagement/custom-flavours.gradle.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66
buildConfigField "String", "API_BASE_URL", [API_BASE_URL]
77
buildConfigField "String", "APP_DIR", [APP_DIR_NAME]
88
buildConfigField "String", "API_VERSION", [API_VERSION]
9-
buildConfigField "String", "RAR_PASSWORD", [RAR_PASSWORD]
9+
buildConfigField "String", "ZIP_PASSWORD", [ZIP_PASSWORD]
1010
resValue "string", "app_name_claims", [APP_NAME]
1111
}
1212
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources>
33
<string name="settings">Settings</string>
4-
<string name="RarPassword">RAR Password</string>
5-
<string name="DefaultRarPassword">Set the default RAR password</string>
6-
<string name="SaveRarPassword">Save</string>
4+
<string name="ZipPassword">ZIP Password</string>
5+
<string name="DefaultZipPassword">Set the default ZIP password</string>
6+
<string name="SaveZipPassword">Save</string>
77
<string name="InsuranceNumber">Insuree number</string>
88
<string name="ErrorOccurred">Error occurred while processing data</string>
99
<string name="SomethingWrongServer">Something went wrong on the server.</string>

‎claimManagement/src/chf/res/values-sw/strings.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources>
33
<string name="settings">Mipangilio</string>
4-
<string name="RarPassword">Nenosiri la RAR</string>
5-
<string name="DefaultRarPassword">Weka nambari ya default ya RAR</string>
6-
<string name="SaveRarPassword">Hifadhi</string>
4+
<string name="ZipPassword">Nenosiri la ZIP</string>
5+
<string name="DefaultZipPassword">Weka nambari ya default ya ZIP</string>
6+
<string name="SaveZipPassword">Hifadhi</string>
77
<string name="InsuranceNumber">CHFID</string>
88
<string name="ErrorOccurred">Tatizo limetokea wakati wa kuchakata taarifa.</string>
99
<string name="SomethingWrongServer">Kuna kitu hakijakaa sawa kwenye kompuyta kuu.</string>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources>
33
<string name="settings">Settings</string>
4-
<string name="RarPassword">RAR Password</string>
5-
<string name="DefaultRarPassword">Set the default RAR password</string>
6-
<string name="SaveRarPassword">Save</string>
4+
<string name="ZipPassword">ZIP Password</string>
5+
<string name="DefaultZipPassword">Set the default ZIP password</string>
6+
<string name="SaveZipPassword">Save</string>
77
<string name="InsuranceNumber">CHF number</string>
88
<string name="ErrorOccurred">Error occurred while processing data</string>
99
<string name="SomethingWrongServer">Something went wrong on the server.</string>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Locale;
55

66
import static org.openimis.imisclaims.BuildConfig.API_BASE_URL;
7-
import static org.openimis.imisclaims.BuildConfig.RAR_PASSWORD;
7+
import static org.openimis.imisclaims.BuildConfig.ZIP_PASSWORD;
88
import static org.openimis.imisclaims.BuildConfig.API_VERSION;
99

1010
public final class AppInformation {
@@ -13,8 +13,8 @@ public static String getDomain() {
1313
return API_BASE_URL;
1414
}
1515

16-
public static String getDefaultRarPassword() {
17-
return RAR_PASSWORD;
16+
public static String getDefaultZipPassword() {
17+
return ZIP_PASSWORD;
1818
}
1919

2020
public static String getApiVersion() {

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

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
267267
btnPost.setOnClickListener(v -> {
268268
progressDialog = ProgressDialog.show(this, "", getResources().getString(R.string.Processing));
269269
runOnNewThread(
270-
() -> isValidData() && saveClaim(),
270+
() -> isValidData() && isValidDiagnosis() && saveClaim(),
271271
() -> runOnUiThread(() -> {
272272
ClearForm();
273273
progressDialog.dismiss();
@@ -832,6 +832,11 @@ private boolean isValidData() {
832832
return false;
833833
}
834834

835+
if(!isValidProgram()){
836+
showValidationDialog(etProgram, getResources().getString(R.string.InvalidProgram));
837+
return false;
838+
}
839+
835840
if(etClaimPrefix.getText().length() == 0){
836841
showValidationDialog(etClaimPrefix, getResources().getString(R.string.MissingChequeNumber));
837842
return false;
@@ -875,6 +880,31 @@ private boolean isValidInsureeNumber() {
875880
return escape.CheckCHFID(etInsureeNumber.getText().toString());
876881
}
877882

883+
private boolean isValidDiagnosis(){
884+
List<AutoCompleteTextView> diagnosisList = new ArrayList<>();
885+
diagnosisList.add(etDiagnosis);
886+
diagnosisList.add(etDiagnosis1);
887+
diagnosisList.add(etDiagnosis2);
888+
diagnosisList.add(etDiagnosis3);
889+
diagnosisList.add(etDiagnosis4);
890+
891+
for(AutoCompleteTextView diagnosis : diagnosisList){
892+
if(!diagnosis.getText().toString().isEmpty()){
893+
int diagnosisId = sqlHandler.getDiagnosisId(diagnosis.getText().toString());
894+
if(diagnosisId == 0){
895+
showValidationDialog(diagnosis, getResources().getString(R.string.invalidDisease));
896+
return false;
897+
}
898+
}
899+
}
900+
return true;
901+
}
902+
903+
private boolean isValidProgram(){
904+
int programId = sqlHandler.getProgamId(etProgram.getText().toString());
905+
return programId != 0;
906+
}
907+
878908
protected void showValidationDialog(View view, String msg) {
879909
runOnUiThread(() -> showDialog(msg, (dialog, which) -> {
880910
if (view instanceof EditText) {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
package org.openimis.imisclaims;
2727

28-
import static org.openimis.imisclaims.BuildConfig.RAR_PASSWORD;
28+
import static org.openimis.imisclaims.BuildConfig.ZIP_PASSWORD;
2929

3030
import android.Manifest;
3131
import android.app.Application;
@@ -72,7 +72,7 @@ public class Global extends Application {
7272
private int UserId;
7373
private String AppDirectory;
7474
private final Map<String, String> SubDirectories = new HashMap<>();
75-
private static final String _DefaultRarPassword = RAR_PASSWORD;
75+
private static final String _DefaultZipPassword = ZIP_PASSWORD;
7676
private Token JWTToken;
7777
private String[] permissions;
7878

@@ -91,8 +91,8 @@ public static Context getContext() {
9191
return instance.getApplicationContext();
9292
}
9393

94-
public String getDefaultRarPassword() {
95-
return _DefaultRarPassword;
94+
public String getDefaultZipPassword() {
95+
return _DefaultZipPassword;
9696
}
9797

9898
public String getOfficerCode() {
@@ -276,26 +276,26 @@ public String getSDCardStatus() {
276276
return Environment.getExternalStorageState();
277277
}
278278

279-
public String getRarPwd() {
279+
public String getZipPwd() {
280280
String password = "";
281281
SharedPreferences sharedPreferences = getDefaultSharedPreferences();
282-
if (!sharedPreferences.contains("rarPwd")) {
283-
password = getDefaultRarPassword();
282+
if (!sharedPreferences.contains("zipPwd")) {
283+
password = getDefaultZipPassword();
284284
} else {
285-
String encryptedRarPassword = sharedPreferences.getString("rarPwd", getDefaultRarPassword());
286-
String trimEncryptedPassword = encryptedRarPassword.trim();
285+
String encryptedZipPassword = sharedPreferences.getString("zipPwd", getDefaultZipPassword());
286+
String trimEncryptedPassword = encryptedZipPassword.trim();
287287
String salt = sharedPreferences.getString("salt", null);
288288
String trimSalt = salt.trim();
289289
try {
290-
password = decryptRarPwd(trimEncryptedPassword, trimSalt);
290+
password = decryptZipPwd(trimEncryptedPassword, trimSalt);
291291
} catch (Exception e) {
292292
e.printStackTrace();
293293
}
294294
}
295295
return password;
296296
}
297297

298-
private String decryptRarPwd(String dataToDecrypt, String decPassword) throws Exception {
298+
private String decryptZipPwd(String dataToDecrypt, String decPassword) throws Exception {
299299
SecretKeySpec key = generateKey(decPassword);
300300
Cipher c = Cipher.getInstance("AES");
301301
c.init(Cipher.DECRYPT_MODE, key);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ public boolean onNavigationItemSelected(MenuItem item) {
255255
Intent intent = new Intent(this, SearchClaimsActivity.class);
256256
startActivity(intent);
257257
});
258-
} else if (id == R.id.nav_settings) {
259-
Intent intent = new Intent(this, SettingsActivity.class);
260-
startActivity(intent);
258+
// } else if (id == R.id.nav_settings) {
259+
// Intent intent = new Intent(this, SettingsActivity.class);
260+
// startActivity(intent);
261261
}
262262

263263
drawer.closeDrawer(GravityCompat.START);

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

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616

1717
public class SettingsActivity extends ImisActivity {
1818

19-
Button btnSaveRarPwd, btnDefaultRarPassword;
20-
EditText etRarPassword;
19+
Button btnSaveZipPwd, btnDefaultZipPassword;
20+
EditText etZipPassword;
2121
private String salt, password;
2222
public static String generatedSalt;
23-
Global global;
2423

2524
@Override
2625
protected void onCreate(Bundle savedInstanceState) {
@@ -29,27 +28,27 @@ protected void onCreate(Bundle savedInstanceState) {
2928

3029
actionBar.setTitle("Settings");
3130

32-
btnSaveRarPwd = (Button)findViewById(R.id.btnSaveRarPwd);
33-
etRarPassword = (EditText)findViewById(R.id.rarPassword);
34-
btnDefaultRarPassword = (Button) findViewById(R.id.btnDefaultRarPassword);
31+
btnSaveZipPwd = (Button)findViewById(R.id.btnSaveZipPwd);
32+
etZipPassword = (EditText)findViewById(R.id.zipPassword);
33+
btnDefaultZipPassword = (Button) findViewById(R.id.btnDefaultZipPassword);
3534

36-
btnSaveRarPwd.setOnClickListener(view -> {
37-
if(etRarPassword.getText().length() == 0){
38-
ShowDialog("Rar password required");
35+
btnSaveZipPwd.setOnClickListener(view -> {
36+
if(etZipPassword.getText().length() == 0){
37+
ShowDialog("Zip password required");
3938
}
4039
else {
41-
password = etRarPassword.getText().toString();
42-
saveRarPassword(password);
40+
password = etZipPassword.getText().toString();
41+
saveZipPassword(password);
4342
ShowDialog("Password has been changed");
44-
etRarPassword.setText("");
43+
etZipPassword.setText("");
4544
}
4645

4746
});
4847

49-
btnDefaultRarPassword.setOnClickListener(view -> {
50-
password = global.getDefaultRarPassword();
51-
saveRarPassword(password);
52-
ShowDialog("Password has been changed to the default rar password");
48+
btnDefaultZipPassword.setOnClickListener(view -> {
49+
password = global.getDefaultZipPassword();
50+
saveZipPassword(password);
51+
ShowDialog("Password has been changed to the default zip password");
5352
});
5453

5554
}
@@ -67,7 +66,7 @@ private SecretKeySpec generateKey(String encPassword) throws Exception {
6766
return secretKeySpec;
6867
}
6968

70-
public String encryptRarPwd(String dataToEncrypt, String encPassword) throws Exception{
69+
public String encryptZipPwd(String dataToEncrypt, String encPassword) throws Exception{
7170
SecretKeySpec key = generateKey(encPassword);
7271
Cipher c = Cipher.getInstance("AES");
7372
c.init(Cipher.ENCRYPT_MODE, key);
@@ -76,7 +75,7 @@ public String encryptRarPwd(String dataToEncrypt, String encPassword) throws Exc
7675
return encryptedValue;
7776
}
7877

79-
public String decryptRarPwd(String dataToDecrypt, String decPassword) throws Exception {
78+
public String decryptZipPwd(String dataToDecrypt, String decPassword) throws Exception {
8079
SecretKeySpec key = generateKey(decPassword);
8180
Cipher c = Cipher.getInstance("AES");
8281
c.init(Cipher.DECRYPT_MODE, key);
@@ -96,15 +95,15 @@ public String generateSalt(){
9695
return encodedSalt;
9796
}
9897

99-
public void saveRarPassword(String password){
98+
public void saveZipPassword(String password){
10099
try {
101100
SharedPreferences sharedPreferences = global.getDefaultSharedPreferences();
102101
SharedPreferences.Editor editor = sharedPreferences.edit();
103102
salt = generateSalt();
104103
String trimSalt = salt.trim();
105-
String encryptedPassword = encryptRarPwd(password, trimSalt);
104+
String encryptedPassword = encryptZipPwd(password, trimSalt);
106105
String trimEncryptedPassword = encryptedPassword.trim();
107-
editor.putString("rarPwd", trimEncryptedPassword);
106+
editor.putString("zipPwd", trimEncryptedPassword);
108107
editor.putString("salt", trimSalt);
109108
editor.apply();
110109
}

0 commit comments

Comments
 (0)