Develop

app/build.gradle

@@ -8,7 +8,7 @@ apply from: "$project.rootDir/script-git-version.gradle"
 // Load keystore
 def keystorePropertiesFile = file("keystore.properties")
 def keystoreProperties = new Properties()
-if ( keystorePropertiesFile.exists() ) {
+if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
@@ -20,9 +20,9 @@ static def getDate() {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
-    if ( keystorePropertiesFile.exists() ) {
+    compileSdkVersion 33
+    buildToolsVersion '33.0.0'
+    if (keystorePropertiesFile.exists()) {
         signingConfigs {
             releaseConfig {
                 storeFile file(keystoreProperties['storeFile'])
@@ -35,11 +35,10 @@ android {
     defaultConfig {
         applicationId "org.openimis.imispolicies"
         minSdkVersion 19
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode gitVersionCode
         versionName gitVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        useLibrary('org.apache.http.legacy')
         vectorDrawables {
             useSupportLibrary = true
         }
@@ -50,7 +49,7 @@ android {
             shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             debuggable = false
-            if ( keystorePropertiesFile.exists() ) {
+            if (keystorePropertiesFile.exists()) {
                 signingConfig signingConfigs.releaseConfig
             }
             buildConfigField "boolean", "LOGGING_ENABLED", "false"
@@ -66,7 +65,7 @@ android {
 
             // Refer to https://developer.android.com/reference/android/util/Log for the log level values
             buildConfigField "int", "CONSOLE_LOG_LEVEL", '2' //Verbose
-            buildConfigField "int", "FILE_LOG_LEVEL", '2' //Verbose
+            buildConfigField "int", "FILE_LOG_LEVEL", '5' //Warn
         }
         flavorDimensions 'std'
     }
@@ -77,60 +76,56 @@ android {
         buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'false'
         buildConfigField "String", "RAR_PASSWORD", '")(#$1HsD"'
         buildConfigField "String", "API_VERSION", '"3"'
-        buildConfigField "String", "APP_DIR", '"IMIS"'
+        buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en"'
         resValue "string", "app_name_policies", "Policies"
         resValue "string", "ReleaseDateValue", getDate()
     }
     productFlavors {
         demoProd {
             applicationId "org.openimis.imispolicies.demoProd"
             buildConfigField "String", "API_BASE_URL", '"https://demo.openimis.org/rest/"'
-            buildConfigField "String", "APP_DIR", '"IMIS-DEMOPROD"'
             resValue "string", "app_name_policies", "Policies Demo"
             dimension = 'std'
         }
         demoRelease {
             applicationId "org.openimis.imispolicies.demoRelease"
-            buildConfigField "String", "API_BASE_URL", '"https://legacy-release.s1.openimis.org/rest/"'
-            buildConfigField "String", "APP_DIR", '"IMIS-DEMORELEASE"'
+            buildConfigField "String", "API_BASE_URL", '"https://release.openimis.org/rest/"'
             resValue "string", "app_name_policies", "Policies Release"
+            dimension = 'std'
         }
         chfDev {
             applicationId "org.openimis.imispolicies.chfdev"
             buildConfigField "String", "API_BASE_URL", '"http://chf-dev.swisstph-mis.ch/rest/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
             buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'true'
-            buildConfigField "String", "APP_DIR", '"IMIS-CHFDEV"'
+            buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en-tz"'
             resValue "string", "app_name_policies", "Policies CHF DEV"
             dimension = 'std'
         }
         mvDev {
             applicationId "org.openimis.imispolicies.mv"
             buildConfigField "String", "API_BASE_URL", '"http://imis-mv.swisstph-mis.ch/rest/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
-            buildConfigField "String", "APP_DIR", '"IMIS-MVDEV"'
             buildConfigField "String", "API_VERSION", '"3"'
             resValue "string", "app_name_policies", "Policies MV DEV"
             dimension = 'std'
         }
         bephaDev {
             applicationId "org.openimis.imispolicies.bepha"
             buildConfigField "String", "API_BASE_URL", '"http://149.210.235.40/devupgrade/rest/"'
-            buildConfigField "String", "APP_DIR", '"IMIS-BEPHADEV"'
+            buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en-cm"'
             resValue "string", "app_name_policies", "Policies BEPHA DEV"
             dimension = 'std'
         }
         tchadDev {
             applicationId "org.openimis.imispolicies.tchadDev"
             buildConfigField "String", "API_BASE_URL", '"http://imis-tchad-dev.swisstph-mis.ch/rest/"'
-            buildConfigField "String", "APP_DIR", '"IMIS-TCHADDEV"'
             resValue "string", "app_name_policies", "Policies TCHAD DEV"
             dimension = 'std'
         }
         local {
             applicationId "org.openimis.imispolicies.local"
             buildConfigField "String", "API_BASE_URL", '"http://10.0.2.2:35787/"'
-            buildConfigField "String", "APP_DIR", '"IMIS-LOCAL"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
             resValue "string", "app_name_policies", "Policies Local"
             dimension = 'std'
@@ -139,13 +134,12 @@ android {
         niger {
             applicationId "org.openimis.imispolicies.niger"
             buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://192.168.0.100/') + '"'
-            buildConfigField "String", "APP_DIR", '"' + (System.getenv("CLI_APP_DIR") ?: 'IMIS-POL') + '"'
             resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Polices Niger"
+            dimension = 'std'
         }
         cli {
             applicationIdSuffix System.getenv("APPLICATION_ID") ?: "org.openimis.imispolicies.cli"
             buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://10.0.2.2:35787/') + '"'
-            buildConfigField "String", "APP_DIR", '"' + (System.getenv("CLI_APP_DIR") ?: 'IMIS-CLI') + '"'
             resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Policies CLI"
             dimension 'std'
         }
@@ -154,23 +148,22 @@ android {
             buildConfigField "String", "API_BASE_URL", '"https://formation.cnass-mauritanie.swisstph-mis.ch/rest/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'false'
             buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'false'
-            buildConfigField "String", "APP_DIR", '"IMIS-MAURITANIA-TRAIN"'
             resValue "string", "app_name_policies", "Policies CNASS TRAIN"
             dimension = 'std'
         }
     }
     sourceSets {
         chfDev.java.srcDir 'src/chf/java'
-        chfDev.res.srcDir 'src/chf/res'
+        chfDev.res.srcDirs = ['src/chf/res', 'src/localeChf/res']
 
         mvDev.java.srcDir 'src/master/java'
-        mvDev.res.srcDirs 'src/master/res'
+        mvDev.res.srcDirs = ['src/master/res', 'src/localeMv/res']
 
         local.java.srcDir 'src/master/java'
-        local.res.srcDir 'src/master/res'
+        local.res.srcDirs = ['src/master/res', 'src/localeMv/res']
 
         bephaDev.java.srcDir 'src/bepha/java'
-        bephaDev.res.srcDir 'src/bepha/res'
+        bephaDev.res.srcDirs = ['src/bepha/res', 'src/localeBepha/res']
 
         niger.java.srcDir 'src/niger/java'
         niger.res.srcDir 'src/niger/res'
@@ -180,10 +173,10 @@ android {
         tchadDev.res.srcDir 'src/tchad/res'
 
         demoProd.java.srcDir 'src/master/java'
-        demoProd.res.srcDir 'src/demoProd/res'
+        demoProd.res.srcDirs = ['src/demoProd/res', 'src/localeMv/res']
 
         demoRelease.java.srcDir 'src/master/java'
-        demoRelease.res.srcDir 'src/demoRelease/res'
+        demoRelease.res.srcDirs = ['src/demoRelease/res', 'src/localeMv/res']
 
         cli.java.srcDir System.getenv("CLI_JAVA_DIR") ?: 'src/master/java'
         cli.res.srcDir System.getenv("CLI_RES_DIR") ?: 'src/demoProd/res'
@@ -194,19 +187,25 @@ android {
         mauritaniaTrain.java.srcDir 'src/master/java'
     }
 
-// Apply custom flavours
-    if(file('custom-flavours.gradle').exists()){
+    // Apply custom flavours
+    if (file('custom-flavours.gradle').exists()) {
         apply from: 'custom-flavours.gradle'
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/DEPENDENCIES']
+        }
+    }
 }
 
 dependencies {
-    implementation  fileTree(include: ['*.jar','*.aar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
@@ -215,11 +214,11 @@ dependencies {
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
-
+    implementation 'org.jetbrains:annotations:15.0'
+    implementation 'cz.msebera.android:httpclient:4.5.8'
 
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testImplementation 'junit:junit:4.13.1'
-    //compile 'com.android.support:support-annotations:27.1.1'
+    testImplementation 'junit:junit:4.13.2'
 }

app/custom-flavours.gradle.dist

@@ -6,7 +6,6 @@ android {
             buildConfigField "String", "API_BASE_URL", [API_BASE_URL]
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", [SHOW_PAYMENT_MENU]
             buildConfigField "boolean", "SHOW_BULK_CN_MENU", [SHOW_BULK_CN_MENU]
-            buildConfigField "String", "APP_DIR", [APP_DIR_NAME]
             buildConfigField "String", "API_VERSION", [API_VERSION]
             buildConfigField "String", "RAR_PASSWORD", [RAR_PASSWORD]
             resValue "string", "app_name_policies", [APP_NAME]

app/src/debug/java/org/openimis/imispolicies/tools/Log.java

@@ -1,11 +1,14 @@
 package org.openimis.imispolicies.tools;
 
+import android.content.Context;
 import android.net.Uri;
 import android.support.v4.content.FileProvider;
 
 import org.openimis.imispolicies.AppInformation;
 import org.openimis.imispolicies.BuildConfig;
 import org.openimis.imispolicies.Global;
+import org.openimis.imispolicies.util.FileUtils;
+import org.openimis.imispolicies.util.ZipUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -88,26 +91,30 @@ private static void log(String tag, String msg, int level) {
         }
     }
 
-    public static void zipLogFiles() {
-        File cacheDir = Global.getContext().getExternalCacheDir();
-        File[] logFiles = cacheDir.listFiles((dir, filename) -> filename.startsWith(logFilePrefix));
-        File targetFile = new File(cacheDir, logExportFileName);
+    public static void zipLogFiles(Context context) {
+        File cacheDir = Global.getContext().getCacheDir();
+        File logsDir = new File(cacheDir, "logs");
+        FileUtils.createDirectoryWithSubdirectories(logsDir);
+        File[] logFiles = logsDir.listFiles((dir, filename) -> filename.startsWith(logFilePrefix));
+        File targetFile = new File(logsDir, logExportFileName);
 
         if (logFiles != null) {
             ArrayList<File> filesToZip = new ArrayList<>(Arrays.asList(logFiles));
-            Compressor.zip(filesToZip, targetFile, "");
+            ZipUtils.zipFiles(filesToZip, targetFile, "");
         }
 
         Uri logExportUri = FileProvider.getUriForFile(Global.getContext(),
                 String.format("%s.fileprovider", BuildConfig.APPLICATION_ID),
                 targetFile);
 
-        Global.getGlobal().sendFile(logExportUri, "application/zip");
+        Global.getGlobal().sendFile(context, logExportUri, "application/octet-stream");
     }
 
     public static void deleteLogFiles() {
-        File cacheDir = Global.getContext().getExternalCacheDir();
-        File[] logFiles = cacheDir.listFiles((dir, filename) -> filename.startsWith(logFilePrefix));
+        File cacheDir = Global.getContext().getCacheDir();
+        File logsDir = new File(cacheDir, "logs");
+        FileUtils.createDirectoryWithSubdirectories(logsDir);
+        File[] logFiles = logsDir.listFiles((dir, filename) -> filename.startsWith(logFilePrefix));
         if (logFiles != null) {
             for (File f : logFiles) {
                 f.delete();
@@ -129,10 +136,12 @@ private synchronized static void storeLog(String tag, String msg, int level) {
 
     private static void initializeLogFile(Date date) {
         if (logFile == null || !logFile.exists()) {
-            File cacheDir = Global.getContext().getExternalCacheDir();
+            File cacheDir = Global.getContext().getCacheDir();
+            File logsDir = new File(cacheDir, "logs");
+            FileUtils.createDirectoryWithSubdirectories(logsDir);
 
             String filename = String.format("%s%s.txt",logFilePrefix, AppInformation.DateTimeInfo.getDefaultFileDatetimeFormatter().format(date));
-            logFile = new File(cacheDir, filename);
+            logFile = new File(logsDir, filename);
 
             try {
                 if (!logFile.createNewFile())

app/src/bepha/res/values/strings.xml → app/src/localeBepha/res/values-en-rCM/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- default en overridden with en-rCM for bepha builds -->
 <resources>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -445,4 +444,37 @@
     <string name="WaitXSeconds">Wait %1$s seconds</string>
     <string name="CnRequestComplete">Control number request finished. If the available CN amount does not increase, please try again in %1$s seconds.</string>
     <string name="CnLimitReached">CN limit reached</string>
+    <string name="NoCNReceived">No control numbers received from the server</string>
+    <string name="CNThresholdReached">You cannot receive more control numbers for this product</string>
+    <string name="ExportLogs">Export all logs:</string>
+    <string name="ExportLogsButton">Export logs</string>
+    <string name="ConfirmExportLogs">Do you want to export logs?</string>
+    <string name="ExportLogsCanceled">Export canceled. Export file can be found in external cache directory.</string>
+    <string name="ClearLogs">Clear all logs:</string>
+    <string name="ClearLogsButton">Clear logs</string>
+    <string name="ConfirmClearLogs">Do you want to clear logs?</string>
+    <string name="Wait">Wait</string>
+    <string name="Suspend">Suspend</string>
+    <string name="Enforce">Enforce</string>
+    <string name="WithoutPolicy">without a policy</string>
+    <string name="WithoutPremium">without a premium</string>
+    <string name="HttpResponse">HTTP response: %1$d — %2$s</string>
+    <string name="EnquireNoPolicies">No policies registered.</string>
+    <string name="UsedChequeNumber">This cheque number already used</string>
+    <string name="AbortedChequeNumber">This cheque number was aborted</string>
+    <string name="DownladChequeDataFail">Could not download cheque numbers data</string>
+    <string name="EnquirePolicyCovered">Policy Status: Covered</string>
+    <string name="EnquirePolicyNotCovered">Policy Status: Not Covered</string>
+    <string name="EnquirePolicyLabel">Policy Status</string>
+    <string name="NotExistChequeNumber">This cheque number not exist</string>
+    <string name="PhotoRequired">Please add a picture</string>
+    <string name="NotFound">Entry does not exist.</string>
+    <string name="Unauthorized">Authorization failed.</string>
+    <string name="UnknownError">Unknown Error.</string>
+    <string name="Forbidden">You are not allowed to take this action.</string>
+    <string name="LanguageCode">en_CM</string>
+    <string name="LanguageSettings">Language settings</string>
+    <string name="CurrentResourceLanguage">Current resource language: %1$s</string>
+    <string name="SystemLanguageNotSupported">Current system language is not supported. The app will use the default language.</string>
+    <string name="SupportedLanguages">Supported languages:\n%1$s</string>
 </resources>