opensrp · junaidwarsivd · Jan 21, 2021 · Feb 2, 2021 · Aug 30, 2021 · Aug 30, 2021
diff --git a/build.gradle b/build.gradle
@@ -53,8 +53,14 @@ allprojects {
         maven { url "https://cloudant.github.io/cloudant-sync-eap/repository" }
         maven { url 'https://maven.fabric.io/public' }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
-        maven { url 'https://nexus.pentaho.org/content/groups/omni/' }
-        maven { url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases' }
+       // maven { url 'https://nexus.pentaho.org/content/groups/omni/' }
+        maven {
+            url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases'
+            content {
+                // Does only include this group
+                includeGroup "com.ibm.fhir"
+            }
+        }
     }
 }
 
@@ -68,7 +74,7 @@ subprojects {
     ext.androidBuildToolsVersion = '29.0.3'
     ext.androidMinSdkVersion = 19
     ext.androidCompileSdkVersion = 30
-    ext.androidTargetSdkVersion = 30
+    ext.androidTargetSdkVersion = 31
 
     ext.androidAnnotationsVersion = '3.0.1'
     ext.androidAnnotationsAPIVersion = '3.0.1'

diff --git a/opensrp-chw/build.gradle b/opensrp-chw/build.gradle
@@ -63,8 +63,14 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
+    defaultConfig {
+        // Required when setting minSdkVersion to 20 or lower
+        multiDexEnabled true
+    }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -159,6 +165,7 @@ android {
             buildConfigField "int", "STOCK_USAGE_REPORT_MINUTES", '1440'
             buildConfigField "boolean", "USE_UNIFIED_REFERRAL_APPROACH", "true"
             buildConfigField "boolean", "BUILD_FOR_BORESHA_AFYA_SOUTH", "false"
+            buildConfigField "boolean", "LOG_CRASHLYTICS", "true"
         }
 
         debug {
@@ -177,8 +184,14 @@ android {
             buildConfigField "int", "STOCK_USAGE_REPORT_MINUTES", '1440'
             buildConfigField "boolean", "USE_UNIFIED_REFERRAL_APPROACH", "true"
             buildConfigField "boolean", "BUILD_FOR_BORESHA_AFYA_SOUTH", "false"
+            buildConfigField "boolean", "LOG_CRASHLYTICS", "false"
             testCoverageEnabled true
         }
+
+        preview {
+            initWith debug
+            buildConfigField "boolean", "LOG_CRASHLYTICS", "true"
+        }
     }
 
     packagingOptions {
@@ -223,8 +236,11 @@ android {
         ba {
             dimension = 'baseDimension'
             applicationIdSuffix ".ba"
-            versionCode 8
-            versionName "1.0.8"
+            versionCode 9
+            versionName "1.0.9"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "String", 'opensrp_url', '"https://boresha-afya.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/ba/"'
             buildConfigField "String", 'opensrp_url_debug', '"https://boresha-afya-stage.smartregister.org/opensrp/"'
@@ -234,13 +250,16 @@ android {
             buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"Ward", "MOH Jhpiego Facility Name", "Health Facility", "Village", "Village Sublocations"}'
             buildConfigField "String", 'DEFAULT_LOCATION', '"Village Sublocations"'
             buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"Village"'
-            buildConfigField "int", "DATABASE_VERSION", '23'
+            buildConfigField "int", "DATABASE_VERSION", '24'
         }
         chad {
             dimension = 'baseDimension'
             applicationIdSuffix ".chad"
-            versionCode 3
-            versionName "1.0.3"
+            versionCode 4
+            versionName "1.0.4"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-td.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/chad/"'
             buildConfigField "String", 'opensrp_url_debug', '"https://wcaro-stage.smartregister.org/opensrp/"'
@@ -249,16 +268,19 @@ android {
             buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"Clinic" , "CHSS" , "CHA"}'
             buildConfigField "String", 'DEFAULT_LOCATION', '"Village"'
             buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"CHA"'
-            buildConfigField "int", "DATABASE_VERSION", '15'
+            buildConfigField "int", "DATABASE_VERSION", '16'
             buildConfigField "int", "MAX_CONNECTION_TIMEOUT", '5'
             buildConfigField "int", "MAX_READ_TIMEOUT", '5'
         }
         drc {
             resConfigs "en", "fr"
             dimension = 'baseDimension'
             applicationIdSuffix ".drc"
-            versionCode 11
-            versionName "1.0.16"
+            versionCode 12
+            versionName "1.0.17"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-cd.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/drc/"'
             buildConfigField "String", 'opensrp_url_preview', '"https://wcaro-cd-preview.smartregister.org/opensrp/"'
@@ -270,13 +292,13 @@ android {
             buildConfigField "String", 'DEFAULT_LOCATION', '"VILLAGE/COMMUNAUTE"'
             buildConfigField "int", "MAX_CONNECTION_TIMEOUT", '5'
             buildConfigField "int", "MAX_READ_TIMEOUT", '5'
-            buildConfigField "int", "DATABASE_VERSION", '12'
+            buildConfigField "int", "DATABASE_VERSION", '13'
         }
         nigeria {
             dimension = 'baseDimension'
             applicationIdSuffix ".nigeria"
-            versionCode 5
-            versionName "1.0.5"
+            versionCode 6
+            versionName "1.0.6"
             buildConfigField "String", 'opensrp_url', '"https://dcis-ng.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/chad/"'
             buildConfigField "String", 'opensrp_url_debug', '"https://dcis-ng.labs.smartregister.org/opensrp/"'
@@ -285,13 +307,14 @@ android {
             buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"State" , "Lga" , "Ward","Community","Sub-Community"}'
             buildConfigField "String", 'DEFAULT_LOCATION', '"Sub-Community"'
             buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"Sub-Community"'
-            buildConfigField "int", "DATABASE_VERSION", '16'
+            buildConfigField "int", "DATABASE_VERSION", '17'
         }
         guinea {
             dimension = 'baseDimension'
             applicationIdSuffix ".guinea"
-            versionCode 4
-            versionName "1.0.3"
+            versionCode 5
+            versionName "1.0.4"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '1000'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '500'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-guinea.smartregister.org/opensrp/"'
@@ -305,13 +328,14 @@ android {
             buildConfigField "String", 'DEFAULT_LOCATION_PREVIEW', '"Village"'
             buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"CHW"'
             buildConfigField "String", 'DEFAULT_LOCATION', '"Village"'
-            buildConfigField "int", "DATABASE_VERSION", '8'
+            buildConfigField "int", "DATABASE_VERSION", '9'
         }
         togo {
             dimension = 'baseDimension'
             applicationIdSuffix ".togo"
-            versionCode 26
-            versionName "1.2.7"
+            versionCode 27
+            versionName "1.2.8"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '1000'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '500'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-tg.smartregister.org/opensrp/"'
@@ -324,12 +348,15 @@ android {
             buildConfigField "String", 'DEFAULT_LOCATION', '"Village"'
             buildConfigField "int", "MAX_CONNECTION_TIMEOUT", '10'
             buildConfigField "int", "MAX_READ_TIMEOUT", '10'
-            buildConfigField "int", "DATABASE_VERSION", '21'
+            buildConfigField "int", "DATABASE_VERSION", '22'
         }
         liberia {
             dimension = 'baseDimension'
-            versionCode 8
-            versionName "1.0.1"
+            versionCode 9
+            versionName "1.0.2"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-lr.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/liberia/"'
             buildConfigField "String", 'opensrp_url_debug', '"https://wcaro-stage.smartregister.org/opensrp/"'
@@ -340,22 +367,25 @@ android {
             buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"CHA"'
             buildConfigField "int", "MAX_CONNECTION_TIMEOUT", '5'
             buildConfigField "int", "MAX_READ_TIMEOUT", '5'
-            buildConfigField "int", "DATABASE_VERSION", '8'
+            buildConfigField "int", "DATABASE_VERSION", '9'
         }
         lmh {
             dimension = 'baseDimension'
             applicationIdSuffix ".lmh"
-            versionCode 2
-            versionName "0.1.7"
-            buildConfigField "String", 'opensrp_url', '"https://lmh-liberia.smartregister.org/opensrp/"'
+            versionCode 8
+            versionName "2.0.4"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '1'
+            buildConfigField "String", 'opensrp_url', '"https://liberiavts.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/lmh/"'
-            buildConfigField "String", 'opensrp_url_debug', '"https://lmh-stage.smartregister.org/opensrp/"'
+            buildConfigField "String", 'opensrp_url_debug', '"https://lmh-liberia-preview.smartregister.org/opensrp/"'
             buildConfigField "String[]", "LOCATION_HIERACHY", '{"Country" , "County" , "District", "Clinics", "CHSS", "Village","Commune"}'
             buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"Country" , "County" , "District", "Clinics", "CHSS", "Village","Commune"}'
-            buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"Clinic" , "CHSS" , "CHA"}'
+            buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"Country" , "County" , "District", "Clinics", "CHSS", "Village","Commune"}'
             buildConfigField "String", 'DEFAULT_LOCATION', '"Commune"'
-            buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"CHA"'
-            buildConfigField "int", "DATABASE_VERSION", '6'
+            buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"Commune"'
+            buildConfigField "int", "DATABASE_VERSION", '8'
         }
     }
 
@@ -365,7 +395,11 @@ android {
 }
 
 dependencies {
-    implementation('org.smartregister:opensrp-client-chw-core:2.1.3-SNAPSHOT@aar') {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+
+    implementation('com.google.android.gms:play-services-vision:17.0.2')
+
+    implementation('org.smartregister:opensrp-client-chw-core:2.1.4-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'androidx.legacy', module: 'legacy-support-v4'
@@ -376,8 +410,6 @@ dependencies {
         exclude group: 'stax', module: 'stax-api'
     }
 
-    debugImplementation 'com.amitshekhar.android:debug-db-encrypt:1.0.6'
-
     implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
     implementation('io.ona.kujaku:library:0.9.0') {
         exclude group: 'com.android.volley', module: 'volley'
@@ -398,6 +430,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'org.mockito:mockito-android:3.0.0'
 
+    //implementation 'com.github.lecho:hellocharts-android:1.5.8@aar'
     //For viewing PDFs in the app
     implementation 'com.github.barteksc:android-pdf-viewer:3.2.0-beta.1'
 
@@ -410,6 +443,15 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.3.1'
     testImplementation 'org.robolectric:shadows-support-v4:3.4-rc2'
     testImplementation 'androidx.test:core:1.3.0'
+    //  testImplementation 'com.ibm.fhir:fhir-model:4.7.0'
+    // testImplementation 'com.ibm.fhir:fhir-path:4.7.0'
+
+    // unit test
+    def powerMockVersion = '2.0.7'
+    testImplementation "org.powermock:powermock-module-junit4:$powerMockVersion"
+    testImplementation "org.powermock:powermock-module-junit4-rule:$powerMockVersion"
+    testImplementation "org.powermock:powermock-api-mockito2:$powerMockVersion"
+    testImplementation "org.powermock:powermock-classloading-xstream:$powerMockVersion"
 }
 
 def flavors = android.productFlavors.collect { flavor -> flavor.name }
@@ -449,6 +491,11 @@ task jacocoTestReport(type: JacocoReport, dependsOn: [
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
     maxHeapSize = "3g"
+
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+    }
 }
 
 tasks.coveralls {

diff --git a/opensrp-chw/src/ba/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java b/opensrp-chw/src/ba/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java
@@ -0,0 +1,4 @@
+package org.smartregister.chw.custom_view;
+
+public class FamilyFloatingMenuFlv extends DefaultFamilyFloatingMenuFlv {
+}
diff --git a/opensrp-chw/src/ba/java/org/smartregister/chw/custom_view/NavigationMenuFlv.java b/opensrp-chw/src/ba/java/org/smartregister/chw/custom_view/NavigationMenuFlv.java
@@ -6,7 +6,6 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.smartregister.chw.core.activity.CoreStockInventoryReportActivity;
 import org.smartregister.chw.core.activity.HIA2ReportsActivity;
-import org.smartregister.chw.core.custom_views.NavigationMenu;
 import org.smartregister.chw.core.utils.CoreConstants;
 import org.smartregister.chw.referral.util.Constants;
 
@@ -15,7 +14,7 @@
 import java.util.List;
 import java.util.Locale;
 
-public class NavigationMenuFlv implements NavigationMenu.Flavour {
+public class NavigationMenuFlv extends DefaultNavigationMenuFlv {
 
     @Override
     public List<Pair<String, Locale>> getSupportedLanguages() {

diff --git a/opensrp-chw/src/ba/java/org/smartregister/chw/interactor/PncHomeVisitInteractorFlv.java b/opensrp-chw/src/ba/java/org/smartregister/chw/interactor/PncHomeVisitInteractorFlv.java
@@ -759,7 +759,7 @@ protected void evaluateImmunization(Person baby) throws Exception {
                         .withBaseEntityID(baby.getBaseEntityID())
                         .withProcessingMode(BaseAncHomeVisitAction.ProcessingMode.SEPARATE)
                         .withDestinationFragment(BaseHomeVisitImmunizationFragment.getInstance(view, baby.getBaseEntityID(), details, displays))
-                        .withHelper(new ImmunizationActionHelper(context, wrappers))
+                        .withHelper(new ImmunizationActionHelper(context, () -> wrappers))
                         .build();
                 actionList.put(MessageFormat.format(context.getString(R.string.pnc_immunization_at_birth), baby.getFullName()), action);
 

diff --git a/opensrp-chw/src/ba/java/org/smartregister/chw/repository/ChwRepositoryFlv.java b/opensrp-chw/src/ba/java/org/smartregister/chw/repository/ChwRepositoryFlv.java
@@ -102,6 +102,9 @@ public static void onUpgrade(Context context, SQLiteDatabase db, int oldVersion,
                 case 23:
                     upgradeToVersion23(context, db);
                     break;
+                case 24:
+                    upgradeToVersion24(db);
+                    break;
                 default:
                     break;
             }
@@ -371,4 +374,8 @@ private static void upgradeToVersion23(Context context, SQLiteDatabase db) {
         }
     }
 
+    private static void upgradeToVersion24(SQLiteDatabase db) {
+        RepositoryUtils.updateClientValidateStatus(db);
+    }
+
 }
diff --git a/opensrp-chw/src/chad/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java b/opensrp-chw/src/chad/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java
@@ -0,0 +1,4 @@
+package org.smartregister.chw.custom_view;
+
+public class FamilyFloatingMenuFlv extends DefaultFamilyFloatingMenuFlv {
+}
diff --git a/opensrp-chw/src/chad/java/org/smartregister/chw/repository/ChwRepositoryFlv.java b/opensrp-chw/src/chad/java/org/smartregister/chw/repository/ChwRepositoryFlv.java
@@ -70,6 +70,9 @@ public static void onUpgrade(Context context, SQLiteDatabase db, int oldVersion,
                 case 15:
                     upgradeToVersion15(db);
                     break;
+                case 16:
+                    upgradeToVersion16(db);
+                    break;
                 default:
                     break;
             }
@@ -223,4 +226,8 @@ private static void initializeIndicatorDefinitions(ReportingLibrary reportingLib
             reportingLibrary.readConfigFile(configFile, sqLiteDatabase);
         }
     }
+
+    private static void upgradeToVersion16(SQLiteDatabase db) {
+        RepositoryUtils.updateClientValidateStatus(db);
+    }
 }
diff --git a/opensrp-chw/src/drc/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java b/opensrp-chw/src/drc/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java
@@ -0,0 +1,4 @@
+package org.smartregister.chw.custom_view;
+
+public class FamilyFloatingMenuFlv extends DefaultFamilyFloatingMenuFlv {
+}
diff --git a/opensrp-chw/src/drc/java/org/smartregister/chw/repository/ChwRepositoryFlv.java b/opensrp-chw/src/drc/java/org/smartregister/chw/repository/ChwRepositoryFlv.java
@@ -48,11 +48,15 @@ public static void onUpgrade(Context context, SQLiteDatabase db, int oldVersion,
                 case 12:
                     upgradeToVersion12(db);
                     break;
+                case 13:
+                    upgradeToVersion13(db);
+                    break;
                 default:
                     break;
             }
             upgradeTo++;
         }
+        RepositoryUtils.updateClientValidateStatus(db);
     }
 
     private static void upgradeToVersion2(Context context, SQLiteDatabase db) {
@@ -165,4 +169,8 @@ private static void upgradeToVersion11(SQLiteDatabase db) {
     private static void upgradeToVersion12(SQLiteDatabase db) {
         RepositoryUtils.updateNullEventIds(db);
     }
+
+    private static void upgradeToVersion13(SQLiteDatabase db) {
+        RepositoryUtils.updateClientValidateStatus(db);
+    }
 }
diff --git a/opensrp-chw/src/guinea/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java b/opensrp-chw/src/guinea/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java
@@ -0,0 +1,4 @@
+package org.smartregister.chw.custom_view;
+
+public class FamilyFloatingMenuFlv extends DefaultFamilyFloatingMenuFlv {
+}