From 3fe6878d3707f1fa8b6f504667db975d0e334aef Mon Sep 17 00:00:00 2001 From: paul sandjong Date: Mon, 13 Apr 2026 10:39:29 +0100 Subject: [PATCH] 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 --- claimManagement/build.gradle | 2 +- claimManagement/custom-flavours.gradle.dist | 2 +- .../src/bepha/res/values/strings.xml | 6 +-- .../src/chf/res/values-sw/strings.xml | 6 +-- .../src/chf/res/values/strings.xml | 6 +-- .../openimis/imisclaims/AppInformation.java | 6 +-- .../java/org/openimis/imisclaims/Global.java | 22 +++++----- .../openimis/imisclaims/SettingsActivity.java | 40 +++++++++---------- .../imisclaims/SynchronizeService.java | 2 +- .../src/main/res/layout/settings.xml | 18 ++++----- .../src/main/res/values-fr/strings.xml | 6 +-- .../src/main/res/values-sw/strings.xml | 6 +-- .../src/main/res/values/strings.xml | 6 +-- 13 files changed, 64 insertions(+), 64 deletions(-) diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle index 5bc67aa0..51cd0de7 100644 --- a/claimManagement/build.gradle +++ b/claimManagement/build.gradle @@ -59,7 +59,7 @@ android { resValue "string", "ReleaseDateValue", getDate() buildConfigField "String", "API_BASE_URL", '"http://demo.openimis.org/"' buildConfigField "String", "REST_API_PREFIX", '"rest"' - buildConfigField "String", "RAR_PASSWORD", '")(#$1HsD"' + buildConfigField "String", "ZIP_PASSWORD", '")(#$1HsD"' buildConfigField "String", "API_VERSION", '"3"' resValue "string", "release_tag", "release/25.04" resValue "string", "sentry_dsn", "" diff --git a/claimManagement/custom-flavours.gradle.dist b/claimManagement/custom-flavours.gradle.dist index 9562c71d..98c61bcc 100644 --- a/claimManagement/custom-flavours.gradle.dist +++ b/claimManagement/custom-flavours.gradle.dist @@ -6,7 +6,7 @@ android { buildConfigField "String", "API_BASE_URL", [API_BASE_URL] buildConfigField "String", "APP_DIR", [APP_DIR_NAME] buildConfigField "String", "API_VERSION", [API_VERSION] - buildConfigField "String", "RAR_PASSWORD", [RAR_PASSWORD] + buildConfigField "String", "ZIP_PASSWORD", [ZIP_PASSWORD] resValue "string", "app_name_claims", [APP_NAME] } } diff --git a/claimManagement/src/bepha/res/values/strings.xml b/claimManagement/src/bepha/res/values/strings.xml index 0fba8956..e446e6dc 100644 --- a/claimManagement/src/bepha/res/values/strings.xml +++ b/claimManagement/src/bepha/res/values/strings.xml @@ -1,9 +1,9 @@ Settings - RAR Password - Set the default RAR password - Save + ZIP Password + Set the default ZIP password + Save Insuree number Error occurred while processing data Something went wrong on the server. diff --git a/claimManagement/src/chf/res/values-sw/strings.xml b/claimManagement/src/chf/res/values-sw/strings.xml index 90e0ced2..5d412607 100644 --- a/claimManagement/src/chf/res/values-sw/strings.xml +++ b/claimManagement/src/chf/res/values-sw/strings.xml @@ -1,9 +1,9 @@ Mipangilio - Nenosiri la RAR - Weka nambari ya default ya RAR - Hifadhi + Nenosiri la ZIP + Weka nambari ya default ya ZIP + Hifadhi CHFID Tatizo limetokea wakati wa kuchakata taarifa. Kuna kitu hakijakaa sawa kwenye kompuyta kuu. diff --git a/claimManagement/src/chf/res/values/strings.xml b/claimManagement/src/chf/res/values/strings.xml index 7f0cccbb..e1d12ce1 100644 --- a/claimManagement/src/chf/res/values/strings.xml +++ b/claimManagement/src/chf/res/values/strings.xml @@ -1,9 +1,9 @@ Settings - RAR Password - Set the default RAR password - Save + ZIP Password + Set the default ZIP password + Save CHF number Error occurred while processing data Something went wrong on the server. diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/AppInformation.java b/claimManagement/src/main/java/org/openimis/imisclaims/AppInformation.java index 8f112c0b..9dbe6db5 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/AppInformation.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/AppInformation.java @@ -4,7 +4,7 @@ import java.util.Locale; import static org.openimis.imisclaims.BuildConfig.API_BASE_URL; -import static org.openimis.imisclaims.BuildConfig.RAR_PASSWORD; +import static org.openimis.imisclaims.BuildConfig.ZIP_PASSWORD; import static org.openimis.imisclaims.BuildConfig.API_VERSION; public final class AppInformation { @@ -13,8 +13,8 @@ public static String getDomain() { return API_BASE_URL; } - public static String getDefaultRarPassword() { - return RAR_PASSWORD; + public static String getDefaultZipPassword() { + return ZIP_PASSWORD; } public static String getApiVersion() { diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/Global.java b/claimManagement/src/main/java/org/openimis/imisclaims/Global.java index aa01e284..660568cd 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/Global.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/Global.java @@ -57,7 +57,7 @@ import javax.crypto.Cipher; import javax.crypto.spec.SecretKeySpec; -import static org.openimis.imisclaims.BuildConfig.RAR_PASSWORD; +import static org.openimis.imisclaims.BuildConfig.ZIP_PASSWORD; import org.openimis.imisclaims.tools.Log; @@ -73,7 +73,7 @@ public class Global extends Application { private int UserId; private String AppDirectory; private final Map SubDirectories = new HashMap<>(); - private static final String _DefaultRarPassword = RAR_PASSWORD; + private static final String _DefaultZipPassword = ZIP_PASSWORD; private Token JWTToken; private String[] permissions; @@ -101,8 +101,8 @@ public static Context getContext() { return instance.getApplicationContext(); } - public String getDefaultRarPassword() { - return _DefaultRarPassword; + public String getDefaultZipPassword() { + return _DefaultZipPassword; } public String getOfficerCode() { @@ -288,18 +288,18 @@ public String getSDCardStatus() { return Environment.getExternalStorageState(); } - public String getRarPwd() { + public String getZipPwd() { String password = ""; SharedPreferences sharedPreferences = getDefaultSharedPreferences(); - if (!sharedPreferences.contains("rarPwd")) { - password = getDefaultRarPassword(); + if (!sharedPreferences.contains("zipPwd")) { + password = getDefaultZipPassword(); } else { - String encryptedRarPassword = sharedPreferences.getString("rarPwd", getDefaultRarPassword()); - String trimEncryptedPassword = encryptedRarPassword.trim(); + String encryptedZipPassword = sharedPreferences.getString("zipPwd", getDefaultZipPassword()); + String trimEncryptedPassword = encryptedZipPassword.trim(); String salt = sharedPreferences.getString("salt", null); String trimSalt = salt.trim(); try { - password = decryptRarPwd(trimEncryptedPassword, trimSalt); + password = decryptZipPwd(trimEncryptedPassword, trimSalt); } catch (Exception e) { e.printStackTrace(); } @@ -307,7 +307,7 @@ public String getRarPwd() { return password; } - private String decryptRarPwd(String dataToDecrypt, String decPassword) throws Exception { + private String decryptZipPwd(String dataToDecrypt, String decPassword) throws Exception { SecretKeySpec key = generateKey(decPassword); Cipher c = Cipher.getInstance("AES"); c.init(Cipher.DECRYPT_MODE, key); diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SettingsActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/SettingsActivity.java index ef35f331..fdfc619b 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/SettingsActivity.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/SettingsActivity.java @@ -16,8 +16,8 @@ public class SettingsActivity extends ImisActivity { - Button btnSaveRarPwd, btnDefaultRarPassword; - EditText etRarPassword; + Button btnSaveZipPwd, btnDefaultZipPassword; + EditText etZipPassword; private String salt, password; public static String generatedSalt; Global global; @@ -29,27 +29,27 @@ protected void onCreate(Bundle savedInstanceState) { actionBar.setTitle("Settings"); - btnSaveRarPwd = (Button)findViewById(R.id.btnSaveRarPwd); - etRarPassword = (EditText)findViewById(R.id.rarPassword); - btnDefaultRarPassword = (Button) findViewById(R.id.btnDefaultRarPassword); + btnSaveZipPwd = (Button)findViewById(R.id.btnSaveZipPwd); + etZipPassword = (EditText)findViewById(R.id.zipPassword); + btnDefaultZipPassword = (Button) findViewById(R.id.btnDefaultZipPassword); - btnSaveRarPwd.setOnClickListener(view -> { - if(etRarPassword.getText().length() == 0){ - ShowDialog("Rar password required"); + btnSaveZipPwd.setOnClickListener(view -> { + if(etZipPassword.getText().length() == 0){ + ShowDialog("Zip password required"); } else { - password = etRarPassword.getText().toString(); - saveRarPassword(password); + password = etZipPassword.getText().toString(); + saveZipPassword(password); ShowDialog("Password has been changed"); - etRarPassword.setText(""); + etZipPassword.setText(""); } }); - btnDefaultRarPassword.setOnClickListener(view -> { - password = global.getDefaultRarPassword(); - saveRarPassword(password); - ShowDialog("Password has been changed to the default rar password"); + btnDefaultZipPassword.setOnClickListener(view -> { + password = global.getDefaultZipPassword(); + saveZipPassword(password); + ShowDialog("Password has been changed to the default zip password"); }); } @@ -67,7 +67,7 @@ private SecretKeySpec generateKey(String encPassword) throws Exception { return secretKeySpec; } - public String encryptRarPwd(String dataToEncrypt, String encPassword) throws Exception{ + public String encryptZipPwd(String dataToEncrypt, String encPassword) throws Exception{ SecretKeySpec key = generateKey(encPassword); Cipher c = Cipher.getInstance("AES"); c.init(Cipher.ENCRYPT_MODE, key); @@ -76,7 +76,7 @@ public String encryptRarPwd(String dataToEncrypt, String encPassword) throws Exc return encryptedValue; } - public String decryptRarPwd(String dataToDecrypt, String decPassword) throws Exception { + public String decryptZipPwd(String dataToDecrypt, String decPassword) throws Exception { SecretKeySpec key = generateKey(decPassword); Cipher c = Cipher.getInstance("AES"); c.init(Cipher.DECRYPT_MODE, key); @@ -96,15 +96,15 @@ public String generateSalt(){ return encodedSalt; } - public void saveRarPassword(String password){ + public void saveZipPassword(String password){ try { SharedPreferences sharedPreferences = global.getDefaultSharedPreferences(); SharedPreferences.Editor editor = sharedPreferences.edit(); salt = generateSalt(); String trimSalt = salt.trim(); - String encryptedPassword = encryptRarPwd(password, trimSalt); + String encryptedPassword = encryptZipPwd(password, trimSalt); String trimEncryptedPassword = encryptedPassword.trim(); - editor.putString("rarPwd", trimEncryptedPassword); + editor.putString("zipPwd", trimEncryptedPassword); editor.putString("salt", trimSalt); editor.apply(); } diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java b/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java index 10430787..465b8359 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java @@ -256,7 +256,7 @@ private Uri createClaimExportZip(ArrayList exportedClaims) { String zipFilename = "Claims" + "_" + global.getOfficerCode() + "_" + d + ".zip"; File zipFile = storageManager.createTempFile("exports/claim/" + zipFilename, true); - String password = global.getRarPwd(); + String password = global.getZipPwd(); ZipUtils.zipFiles(exportedClaims, zipFile, password); FileUtils.deleteFiles(exportedClaims.toArray(new File[0])); diff --git a/claimManagement/src/main/res/layout/settings.xml b/claimManagement/src/main/res/layout/settings.xml index 05bd3e51..9eea90cc 100644 --- a/claimManagement/src/main/res/layout/settings.xml +++ b/claimManagement/src/main/res/layout/settings.xml @@ -12,10 +12,10 @@ android:textColor="@color/Black" android:layout_marginLeft="10dp" android:layout_marginTop="10dp" - android:text="@string/RarPassword" /> + android:text="@string/ZipPassword" /> -