Skip to content

Commit 3fe6878

Browse files
Blue-B-codeBlue-B-code
committed
refactor(claims): rename RAR terminology to ZIP across app
- rename BuildConfig key RAR_PASSWORD to ZIP_PASSWORD - update password APIs/fields and SharedPreferences key to zip naming - update settings layout ids and localized string resources - keep export behavior on ZIP (zip4j/.zip) while aligning wording
1 parent e530891 commit 3fe6878

13 files changed

Lines changed: 64 additions & 64 deletions

File tree

‎claimManagement/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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
resValue "string", "release_tag", "release/25.04"
6565
resValue "string", "sentry_dsn", ""

‎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/Global.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import javax.crypto.Cipher;
5858
import javax.crypto.spec.SecretKeySpec;
5959

60-
import static org.openimis.imisclaims.BuildConfig.RAR_PASSWORD;
60+
import static org.openimis.imisclaims.BuildConfig.ZIP_PASSWORD;
6161

6262
import org.openimis.imisclaims.tools.Log;
6363

@@ -73,7 +73,7 @@ public class Global extends Application {
7373
private int UserId;
7474
private String AppDirectory;
7575
private final Map<String, String> SubDirectories = new HashMap<>();
76-
private static final String _DefaultRarPassword = RAR_PASSWORD;
76+
private static final String _DefaultZipPassword = ZIP_PASSWORD;
7777
private Token JWTToken;
7878
private String[] permissions;
7979

@@ -101,8 +101,8 @@ public static Context getContext() {
101101
return instance.getApplicationContext();
102102
}
103103

104-
public String getDefaultRarPassword() {
105-
return _DefaultRarPassword;
104+
public String getDefaultZipPassword() {
105+
return _DefaultZipPassword;
106106
}
107107

108108
public String getOfficerCode() {
@@ -288,26 +288,26 @@ public String getSDCardStatus() {
288288
return Environment.getExternalStorageState();
289289
}
290290

291-
public String getRarPwd() {
291+
public String getZipPwd() {
292292
String password = "";
293293
SharedPreferences sharedPreferences = getDefaultSharedPreferences();
294-
if (!sharedPreferences.contains("rarPwd")) {
295-
password = getDefaultRarPassword();
294+
if (!sharedPreferences.contains("zipPwd")) {
295+
password = getDefaultZipPassword();
296296
} else {
297-
String encryptedRarPassword = sharedPreferences.getString("rarPwd", getDefaultRarPassword());
298-
String trimEncryptedPassword = encryptedRarPassword.trim();
297+
String encryptedZipPassword = sharedPreferences.getString("zipPwd", getDefaultZipPassword());
298+
String trimEncryptedPassword = encryptedZipPassword.trim();
299299
String salt = sharedPreferences.getString("salt", null);
300300
String trimSalt = salt.trim();
301301
try {
302-
password = decryptRarPwd(trimEncryptedPassword, trimSalt);
302+
password = decryptZipPwd(trimEncryptedPassword, trimSalt);
303303
} catch (Exception e) {
304304
e.printStackTrace();
305305
}
306306
}
307307
return password;
308308
}
309309

310-
private String decryptRarPwd(String dataToDecrypt, String decPassword) throws Exception {
310+
private String decryptZipPwd(String dataToDecrypt, String decPassword) throws Exception {
311311
SecretKeySpec key = generateKey(decPassword);
312312
Cipher c = Cipher.getInstance("AES");
313313
c.init(Cipher.DECRYPT_MODE, key);

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
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;
2323
Global global;
@@ -29,27 +29,27 @@ protected void onCreate(Bundle savedInstanceState) {
2929

3030
actionBar.setTitle("Settings");
3131

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

36-
btnSaveRarPwd.setOnClickListener(view -> {
37-
if(etRarPassword.getText().length() == 0){
38-
ShowDialog("Rar password required");
36+
btnSaveZipPwd.setOnClickListener(view -> {
37+
if(etZipPassword.getText().length() == 0){
38+
ShowDialog("Zip password required");
3939
}
4040
else {
41-
password = etRarPassword.getText().toString();
42-
saveRarPassword(password);
41+
password = etZipPassword.getText().toString();
42+
saveZipPassword(password);
4343
ShowDialog("Password has been changed");
44-
etRarPassword.setText("");
44+
etZipPassword.setText("");
4545
}
4646

4747
});
4848

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

5555
}
@@ -67,7 +67,7 @@ private SecretKeySpec generateKey(String encPassword) throws Exception {
6767
return secretKeySpec;
6868
}
6969

70-
public String encryptRarPwd(String dataToEncrypt, String encPassword) throws Exception{
70+
public String encryptZipPwd(String dataToEncrypt, String encPassword) throws Exception{
7171
SecretKeySpec key = generateKey(encPassword);
7272
Cipher c = Cipher.getInstance("AES");
7373
c.init(Cipher.ENCRYPT_MODE, key);
@@ -76,7 +76,7 @@ public String encryptRarPwd(String dataToEncrypt, String encPassword) throws Exc
7676
return encryptedValue;
7777
}
7878

79-
public String decryptRarPwd(String dataToDecrypt, String decPassword) throws Exception {
79+
public String decryptZipPwd(String dataToDecrypt, String decPassword) throws Exception {
8080
SecretKeySpec key = generateKey(decPassword);
8181
Cipher c = Cipher.getInstance("AES");
8282
c.init(Cipher.DECRYPT_MODE, key);
@@ -96,15 +96,15 @@ public String generateSalt(){
9696
return encodedSalt;
9797
}
9898

99-
public void saveRarPassword(String password){
99+
public void saveZipPassword(String password){
100100
try {
101101
SharedPreferences sharedPreferences = global.getDefaultSharedPreferences();
102102
SharedPreferences.Editor editor = sharedPreferences.edit();
103103
salt = generateSalt();
104104
String trimSalt = salt.trim();
105-
String encryptedPassword = encryptRarPwd(password, trimSalt);
105+
String encryptedPassword = encryptZipPwd(password, trimSalt);
106106
String trimEncryptedPassword = encryptedPassword.trim();
107-
editor.putString("rarPwd", trimEncryptedPassword);
107+
editor.putString("zipPwd", trimEncryptedPassword);
108108
editor.putString("salt", trimSalt);
109109
editor.apply();
110110
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ private Uri createClaimExportZip(ArrayList<File> exportedClaims) {
256256
String zipFilename = "Claims" + "_" + global.getOfficerCode() + "_" + d + ".zip";
257257
File zipFile = storageManager.createTempFile("exports/claim/" + zipFilename, true);
258258

259-
String password = global.getRarPwd();
259+
String password = global.getZipPwd();
260260
ZipUtils.zipFiles(exportedClaims, zipFile, password);
261261
FileUtils.deleteFiles(exportedClaims.toArray(new File[0]));
262262

‎claimManagement/src/main/res/layout/settings.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
android:textColor="@color/Black"
1313
android:layout_marginLeft="10dp"
1414
android:layout_marginTop="10dp"
15-
android:text="@string/RarPassword" />
15+
android:text="@string/ZipPassword" />
1616

1717
<EditText
18-
android:id="@+id/rarPassword"
18+
android:id="@+id/zipPassword"
1919
android:layout_width="match_parent"
2020
android:layout_height="50dp"
2121
android:paddingLeft="10dp"
@@ -24,17 +24,17 @@
2424
android:inputType="textPassword">
2525
</EditText>
2626

27-
<LinearLayout android:id="@+id/llSaveRarButton"
27+
<LinearLayout android:id="@+id/llSaveZipButton"
2828
android:layout_width="match_parent"
2929
android:layout_height="wrap_content"
3030
android:orientation="horizontal">
3131

3232
<Button
33-
android:id="@+id/btnSaveRarPwd"
33+
android:id="@+id/btnSaveZipPwd"
3434
android:layout_width="0dp"
3535
android:layout_height="wrap_content"
3636
android:layout_weight="1"
37-
android:text="@string/SaveRarPassword"
37+
android:text="@string/SaveZipPassword"
3838
android:layout_marginBottom="10dp"/>
3939
</LinearLayout>
4040

@@ -46,19 +46,19 @@
4646
android:textColor="@color/Black"
4747
android:layout_marginLeft="10dp"
4848
android:layout_marginTop="10dp"
49-
android:text="@string/DefaultRarPassword" />
49+
android:text="@string/DefaultZipPassword" />
5050

51-
<LinearLayout android:id="@+id/llDefaultRarPassword"
51+
<LinearLayout android:id="@+id/llDefaultZipPassword"
5252
android:layout_width="match_parent"
5353
android:layout_height="wrap_content"
5454
android:orientation="horizontal">
5555

5656
<Button
57-
android:id="@+id/btnDefaultRarPassword"
57+
android:id="@+id/btnDefaultZipPassword"
5858
android:layout_width="0dp"
5959
android:layout_height="wrap_content"
6060
android:layout_weight="1"
61-
android:text="@string/SaveRarPassword" />
61+
android:text="@string/SaveZipPassword" />
6262
</LinearLayout>
6363

6464
</LinearLayout>

0 commit comments

Comments
 (0)