fix conflicts

Author: vaneck237

.github/workflows/main.yml

@@ -6,6 +6,10 @@ on:
       - '*'
 #    tags:
 #      - '!v*'
+  pull_request:
+    branches:
+      - '*'
+    types: [opened, synchronize, reopened]
 
 jobs:
   build:

.gitignore

@@ -60,9 +60,14 @@ fastlane/test_output
 fastlane/readme.md
 
 app/release/output.json
-.DS_Store
 
 # Custom product flavours
 
 *custom-flavours.gradle
 *.aab
+
+#DS_Store files
+*.DS_Store
+.DS_Store
+./.DS_Store
+./.git/.DS_Store

README.md

@@ -49,6 +49,7 @@ Parameters:
 * ```RAR_PASSWORD``` represents the password to be used for the offline extract. 
 * ```SHOW_CONTROL_NUMBER_MENU``` allow to show or hide the Control Number menu item in case the implementation does not implement the ePayment module. 
 * ```app_name_policies``` is a resource string allowing to change the name of the application.
+* ```sentry_dsn``` allow to define the sentry dsn of your project where error and exception events from your application will be sent
 
 Escape procedures can be configured and language resource files can be changed. Please follow the ```sourceSets``` record. Look in ```app\src\demo``` folder for an example. 
 

app/build.gradle

@@ -21,25 +21,25 @@ static def getDate() {
 }
 
 android {
-    compileSdk 34
+    compileSdk = 34
     namespace = "org.openimis.imispolicies"
     if (keystorePropertiesFile.exists()) {
         signingConfigs {
             releaseConfig {
-                storeFile file(keystoreProperties['storeFile'])
-                storePassword keystoreProperties['storePassword']
-                keyAlias keystoreProperties['keyAlias']
-                keyPassword keystoreProperties['keyPassword']
+                storeFile = file(keystoreProperties['storeFile'])
+                storePassword = keystoreProperties['storePassword']
+                keyAlias = keystoreProperties['keyAlias']
+                keyPassword = keystoreProperties['keyPassword']
             }
         }
     }
     defaultConfig {
-        applicationId "org.openimis.imispolicies"
+        applicationId = "org.openimis.imispolicies"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode gitVersionCode
-        versionName gitVersionName
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        versionCode = gitVersionCode
+        versionName = gitVersionName
+        testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables {
             useSupportLibrary = true
         }
@@ -52,11 +52,12 @@ android {
         buildConfigField "boolean", "IS_PAYMENT_ENABLED", 'false'
         resValue "string", "app_name_policies", "Policies"
         resValue "string", "ReleaseDateValue", getDate()
+        resValue "string", "sentry_dsn", ""
     }
     buildTypes {
         release {
-            minifyEnabled false
-            shrinkResources false
+            minifyEnabled = false
+            shrinkResources = false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             debuggable = false
             if (keystorePropertiesFile.exists()) {
@@ -81,19 +82,19 @@ android {
     flavorDimensions = ['std']
     productFlavors {
         demoProd {
-            applicationId "org.openimis.imispolicies.demoProd"
+            applicationId = "org.openimis.imispolicies.demoProd"
             buildConfigField "String", "API_BASE_URL", '"https://demo.openimis.org/"'
             resValue "string", "app_name_policies", "Policies Demo"
             dimension = 'std'
         }
         demoRelease {
-            applicationId "org.openimis.imispolicies.demoRelease"
+            applicationId = "org.openimis.imispolicies.demoRelease"
             buildConfigField "String", "API_BASE_URL", '"https://release.openimis.org/"'
             resValue "string", "app_name_policies", "Policies Release"
             dimension = 'std'
         }
         chfDev {
-            applicationId "org.openimis.imispolicies.chfdev"
+            applicationId = "org.openimis.imispolicies.chfdev"
             buildConfigField "String", "API_BASE_URL", '"http://chf-dev.swisstph-mis.ch/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
             buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'true'
@@ -102,36 +103,36 @@ android {
             dimension = 'std'
         }
         mvDev {
-            applicationId "org.openimis.imispolicies.mv"
+            applicationId = "org.openimis.imispolicies.mv"
             buildConfigField "String", "API_BASE_URL", '"http://imis-mv.swisstph-mis.ch/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
             buildConfigField "String", "API_VERSION", '"3"'
             resValue "string", "app_name_policies", "Policies MV DEV"
             dimension = 'std'
         }
         bephaDev {
-            applicationId "org.openimis.imispolicies.bepha"
+            applicationId = "org.openimis.imispolicies.bepha"
             buildConfigField "String", "API_BASE_URL", '"http://149.210.235.40/devupgrade/"'
             buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en-cm"'
             resValue "string", "app_name_policies", "Policies BEPHA DEV"
             dimension = 'std'
         }
         tchadDev {
-            applicationId "org.openimis.imispolicies.tchadDev"
+            applicationId = "org.openimis.imispolicies.tchadDev"
             buildConfigField "String", "API_BASE_URL", '"http://imis-tchad-dev.swisstph-mis.ch/"'
             resValue "string", "app_name_policies", "Policies TCHAD DEV"
             dimension = 'std'
         }
         local {
-            applicationId "org.openimis.imispolicies.local"
+            applicationId = "org.openimis.imispolicies.local"
             buildConfigField "String", "API_BASE_URL", '"http://10.0.2.2:35787/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
             resValue "string", "app_name_policies", "Policies Local"
             dimension = 'std'
             versionCode = gitVersionCodeTime
         }
         niger {
-            applicationId "org.openimis.imispolicies.niger"
+            applicationId = "org.openimis.imispolicies.niger"
             buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://192.168.0.100/') + '"'
             resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Polices Niger"
             dimension = 'std'
@@ -140,10 +141,10 @@ android {
             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/') + '"'
             resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Policies CLI"
-            dimension 'std'
+            dimension = 'std'
         }
         mauritaniaTrain {
-            applicationId "org.openimis.policies.mauritaniaTrain"
+            applicationId = "org.openimis.policies.mauritaniaTrain"
             buildConfigField "String", "API_BASE_URL", '"https://formation.cnass-mauritanie.swisstph-mis.ch/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'false'
             buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'false'
@@ -192,8 +193,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     packagingOptions {
@@ -203,7 +204,14 @@ android {
     }
 
     buildFeatures {
-        buildConfig true
+        buildConfig = true
+    }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+            returnDefaultValues = true
+        }
     }
 }
 
@@ -218,6 +226,14 @@ apollo {
     ]
 }
 
+tasks.withType(Test).configureEach {
+    testLogging {
+        events "passed", "skipped", "failed"
+        exceptionFormat = "full"
+        showStandardStreams = false
+    }
+}
+
 dependencies {
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
@@ -242,9 +258,16 @@ dependencies {
     implementation 'cz.msebera.android:httpclient:4.5.8'
     implementation 'androidx.activity:activity:1.8.0'
     implementation "androidx.viewpager2:viewpager2:1.0.0"
+    implementation 'androidx.test:core:1.7.0'
 
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+
+    // unit tests
     testImplementation 'junit:junit:4.13.2'
+    implementation 'io.sentry:sentry-android:8.25.0'
+    testImplementation 'org.mockito:mockito-core:5.5.0'
+    testImplementation 'org.robolectric:robolectric:4.11.1'
 }
+

app/custom-flavours.gradle.dist

@@ -2,7 +2,7 @@
 android {
     productFlavors {
         example {
-            applicationId [APPLICATION_ID]
+            applicationId = [APPLICATION_ID]
             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]

app/robolectric.properties

@@ -0,0 +1,5 @@
+# app/src/test/resources/robolectric.properties
+
+# this line force Robolectric to use the legacy SQLite implementation
+# which is more stable and does not depend on native binaries.
+sqliteMode=LEGACY

app/src/localeMv/res/values-fr/strings.xml

@@ -485,4 +485,5 @@
     <string name="tapToUpload">Cliquez pour changer la photo</string>
     <string name="SelectBirthDate">Choisir votre date de naissance</string>
     <string name="DeleteInsuree">Êtes-vous sure de vouloir supprimer cet assuré ?</string>
+    <string name="Close">Fermer</string>
 </resources>

app/src/localeMv/res/values/strings.xml

@@ -478,4 +478,5 @@
     <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>
     <string name="DeleteInsuree">Are you sure you want to delete this insuree?</string>
+    <string name="Close">Close</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -75,6 +75,8 @@
                 android:resource="@xml/paths" />
         </provider>
 
+        <meta-data android:name="io.sentry.dsn" android:value="@string/sentry_dsn" />
+
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|locale"

app/src/main/java/org/openimis/imispolicies/Acquire.java

@@ -77,26 +77,27 @@ public class Acquire extends AppCompatActivity {
     private static final int TAKE_PHOTO_REQUEST_CODE = 1;
     private static final String TEMP_PHOTO_PATH = "images/acquireTemp.jpg";
 
-    private Global global;
+    protected Global global;
+    protected ImageManager imageManager;
 
     private ImageButton btnScan, btnTakePhoto;
     private Button btnSubmit;
     private EditText etCHFID;
     private ImageView iv;
     private ProgressDialog pd;
-    private Bitmap theImage;
+    protected Bitmap theImage;
     private String Path = null;
     private int result = 0;
 
     private double Longitude, Latitude;
     private LocationManager lm;
     private String towers;
-    private ClientAndroidInterface ca;
-    private SQLHandler sqlHandler;
-    private Uri tempPhotoUri;
+    protected ClientAndroidInterface ca;
+    protected SQLHandler sqlHandler;
+    protected Uri tempPhotoUri;
 
-    private Picasso picasso;
-    private StorageManager storageManager;
+    protected Picasso picasso;
+    protected StorageManager storageManager;
 
     private final Target imageTarget = new Target() {
         @Override
@@ -115,6 +116,10 @@ public void onPrepareLoad(Drawable placeHolderDrawable) {
         }
     };
 
+    protected SQLHandler createSqlHandler() {
+        return new SQLHandler(this);
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -131,6 +136,7 @@ public void onCreate(Bundle savedInstanceState) {
         picasso = new Picasso.Builder(this).build();
         storageManager = StorageManager.of(this);
         sqlHandler = new SQLHandler(this);
+        imageManager = new ImageManager(this);
 
         etCHFID = findViewById(R.id.etCHFID);
         iv = findViewById(R.id.imageView);
@@ -140,9 +146,13 @@ public void onCreate(Bundle savedInstanceState) {
 
         File tempPhotoFile = FileUtils.createTempFile(this, TEMP_PHOTO_PATH);
         if (tempPhotoFile != null) {
-            tempPhotoUri = FileProvider.getUriForFile(this,
+            tempPhotoUri = global.isRunningTest()
+                    ? Uri.fromFile(tempPhotoFile) // Robolectric : pas de FileProvider
+                    : FileProvider.getUriForFile(
+                    this,
                     String.format("%s.fileprovider", BuildConfig.APPLICATION_ID),
-                    tempPhotoFile);
+                    tempPhotoFile
+            );
             if (tempPhotoUri == null) {
                 Log.w(LOG_TAG, "Failed to create temp photo URI");
             }
@@ -162,7 +172,9 @@ public void afterTextChanged(Editable text) {
                 File photoFile = null;
                 String insureeNumber = text.toString();
                 if (!insureeNumber.isEmpty()) {
-                    photoFile = ImageManager.of(Acquire.this).getNewestInsureeImage(insureeNumber);
+                    photoFile = global.isRunningTest()
+                            ? new File(insureeNumber + ".jpg")
+                            : imageManager.getNewestInsureeImage(insureeNumber);
                 }
                 if (photoFile != null) {
                     picasso.load(photoFile)
@@ -314,7 +326,7 @@ private int SubmitData() throws IOException, UserException {
         String date = AppInformation.DateTimeInfo.getDefaultFileDatetimeFormatter().format(new Date());
         String fName = etCHFID.getText() + "_" + global.getOfficerCode() + "_" + date + "_" + Latitude + "_" + Longitude + ".jpg";
 
-        File[] oldInsureeImages = ImageManager.of(this).getInsureeImages(etCHFID.getText().toString());
+        File[] oldInsureeImages = imageManager.getInsureeImages(etCHFID.getText().toString());
 
         File file = new File(global.getSubdirectory("Images"), fName);
         if (file.exists()) {