From 893e5e59a59eba3b6d06a5e5c2a3e6ab1db80c5e Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Tue, 8 Nov 2022 17:55:38 +0500
Subject: [PATCH 01/20] Add more info to sync stats screen

---
 opensrp-core/build.gradle                     |   3 +-
 opensrp-core/res/layout/fragment_stats.xml    | 440 +++++++++++++++---
 opensrp-core/res/values/strings.xml           |  17 +
 .../java/org/smartregister/AllConstants.java  |  13 +
 .../view/contract/StatsFragmentContract.java  |   4 +-
 .../view/fragment/StatsFragment.java          |  52 ++-
 .../interactor/StatsFragmentInteractor.java   | 119 +++--
 .../presenter/StatsFragmentPresenter.java     |   8 +-
 .../presenter/StatsFragmentPresenterTest.java |   2 +-
 9 files changed, 564 insertions(+), 94 deletions(-)

diff --git a/opensrp-core/build.gradle b/opensrp-core/build.gradle
index 01c12289b..9a1b3ad3f 100644
--- a/opensrp-core/build.gradle
+++ b/opensrp-core/build.gradle
@@ -92,7 +92,8 @@ android {
         buildConfigField "int", "DB_ENCRYPTION_VERSION", '1'
         buildConfigField("int", "VERSION_CODE", "${defaultConfig.versionCode}")
         buildConfigField("String", "VERSION_NAME", "\"${defaultConfig.versionName}\"")
-    } 
+        buildConfigField "int", "DATABASE_VERSION", '1'
+    }
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
diff --git a/opensrp-core/res/layout/fragment_stats.xml b/opensrp-core/res/layout/fragment_stats.xml
index f268f118e..d0d46cdc7 100644
--- a/opensrp-core/res/layout/fragment_stats.xml
+++ b/opensrp-core/res/layout/fragment_stats.xml
@@ -1,22 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 
     <LinearLayout
         android:id="@+id/summary_forms_group"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:layout_marginTop="50dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
+        android:layout_marginTop="50dp"
         android:layout_marginEnd="20dp"
+        android:orientation="vertical"
         android:visibility="visible">
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:paddingEnd="56dp"
+            android:text="@string/sync_statistics"
+            android:textColor="@color/text_black"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
             android:orientation="horizontal"
             android:weightSum="2">
 
@@ -25,17 +36,18 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:text="@string/synced_events"/>
+                android:text="@string/synced_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/synced_events"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
@@ -46,21 +58,22 @@
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/unsynced_events_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:id="@+id/unsynced_events_label"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:text="@string/unsynced_events"/>
+                android:text="@string/unsynced_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/unsynced_events"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
@@ -71,47 +84,49 @@
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/task_unprocessed_events_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:id="@+id/task_unprocessed_events_label"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:text="@string/task_unprocessed_events"/>
+                android:text="@string/task_unprocessed_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/task_unprocessed_events"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="8dp"
             android:orientation="horizontal"
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/synced_clients_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:id="@+id/synced_clients_label"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:text="@string/synced_clients"/>
+                android:text="@string/synced_clients"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/synced_clients"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
@@ -122,47 +137,49 @@
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/unsynced_clients_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:id="@+id/unsynced_clients_label"
-                android:textStyle="bold"
-                android:text="@string/unsynced_clients"/>
+                android:text="@string/unsynced_clients"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/unsynced_clients"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
             android:orientation="horizontal"
-            android:layout_marginTop="30dp"
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/validated_events_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:id="@+id/validated_events_label"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:text="@string/validated_events"/>
+                android:text="@string/validated_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/validated_events"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
@@ -173,34 +190,351 @@
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/validated_clients_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:id="@+id/validated_clients_label"
-                android:textStyle="bold"
-                android:text="@string/validated_clients"/>
+                android:text="@string/validated_clients"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/validated_clients"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="@string/user_info"
+            android:textColor="@color/text_black"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/user_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/user"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/user_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/team_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/team"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/team_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/locality"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/locality"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/locality_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="@string/app_info"
+            android:textColor="@color/text_black"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="16dp"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/app_version"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/app_version_name"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/app_version_name_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/app_version_code"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/app_version_code"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/app_version_code_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/db_version"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/database_version"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/db_version_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/build_date"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/build_date_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="@string/device_info"
+            android:textColor="@color/text_black"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/manufacturer_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/manufacturer"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/manufacturer_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/device_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/device"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/device_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/os_version"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/os_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/date"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/date_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
+
         <Button
             android:id="@+id/refresh_button"
             android:layout_width="300dp"
             android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:gravity="center_horizontal|center_vertical"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="30dp"
             android:layout_marginStart="20dp"
+            android:layout_marginTop="30dp"
             android:layout_marginEnd="20dp"
+            android:background="@color/white"
+            android:gravity="center_horizontal|center_vertical"
             android:text="@string/refresh"
             android:textAllCaps="false"
             android:textColor="@color/text_black"
@@ -208,4 +542,4 @@
 
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/opensrp-core/res/values/strings.xml b/opensrp-core/res/values/strings.xml
index 8b587d131..b0ce57604 100644
--- a/opensrp-core/res/values/strings.xml
+++ b/opensrp-core/res/values/strings.xml
@@ -457,4 +457,21 @@
     <string name="return_to_register">Return</string>
     <string name="summary_forms">Other Forms</string>
     <string name="permission_write_external_storage_rationale">Write access to the device internal storage is required for database download.</string>
+
+    <string name="app_version_name">App Version Name:</string>
+    <string name="app_version_code">App Version Code:</string>
+    <string name="database_version">Database Version:</string>
+    <string name="team">Team:</string>
+    <string name="locality">Locality:</string>
+    <string name="sync">Sync</string>
+    <string name="app_info">App Info</string>
+    <string name="device_info">Device Info</string>
+    <string name="manufacturer">Manufacturer:</string>
+    <string name="device">Device:</string>
+    <string name="os_version">OS Version:</string>
+    <string name="sync_statistics">Sync Statistics</string>
+    <string name="user_info">User Info</string>
+    <string name="build_date">Build Date:</string>
+    <string name="date">Date:</string>
+    <string name="user">User:</string>
 </resources>
diff --git a/opensrp-core/src/main/java/org/smartregister/AllConstants.java b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
index 26b50309e..ac7d2369f 100644
--- a/opensrp-core/src/main/java/org/smartregister/AllConstants.java
+++ b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
@@ -236,6 +236,7 @@ public interface ClientProcessing {
     public interface DatabaseKeys {
         String SYNC_STATUS = "syncStatus";
         String VALIDATION_STATUS = "validationStatus";
+        String DB_VERSION = "db_version";
     }
 
     public interface SyncInfo {
@@ -249,6 +250,18 @@ public interface SyncInfo {
         String INVALID_CLIENTS = "INValidClients";
         String TASK_UNPROCESSED_EVENTS = "taskUnprocessedEvents";
         String NULL_EVENT_SYNC_STATUS = "nullEventSyncStatus";
+        String USER_NAME = "user";
+        String USER_TEAM = "user_team";
+        String USER_LOCALITY = "user_locality";
+        String APP_VERSION_NAME = "app_ver_name";
+        String APP_VERSION_CODE = "app_ver_code";
+        String APP_BUILD_DATE = "app_build_date";
+    }
+
+    public interface DeviceInfo {
+        String MANUFACTURER = "manufacturer";
+        String MODEL = "model";
+        String OS_VERSION = "os_version";
     }
 
     public interface ECClientType {
diff --git a/opensrp-core/src/main/java/org/smartregister/view/contract/StatsFragmentContract.java b/opensrp-core/src/main/java/org/smartregister/view/contract/StatsFragmentContract.java
index 8c51df68c..4353c7d4a 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/contract/StatsFragmentContract.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/contract/StatsFragmentContract.java
@@ -7,7 +7,7 @@
 public interface StatsFragmentContract {
     interface Presenter {
 
-        void onECSyncInfoFetched(Map<String, Integer> syncInfoMap);
+        void onECSyncInfoFetched(Map<String, String> syncInfoMap);
 
         void fetchSyncInfo();
 
@@ -16,7 +16,7 @@ interface Presenter {
     interface View {
         Context getContext();
 
-        void refreshECSyncInfo(Map<String, Integer> syncInfoMap);
+        void refreshECSyncInfo(Map<String, String> syncInfoMap);
     }
 
     interface Interactor {
diff --git a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
index 04d46464c..8ff27a4d8 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
@@ -16,13 +16,25 @@
 import org.smartregister.view.contract.StatsFragmentContract;
 import org.smartregister.view.presenter.StatsFragmentPresenter;
 
+import java.text.DateFormat;
+import java.util.Date;
 import java.util.Map;
 
+import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
+import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
+import static org.smartregister.AllConstants.DeviceInfo.MODEL;
+import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
+import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
 import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
+import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
+import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
 import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
 
@@ -37,6 +49,17 @@ public class StatsFragment extends Fragment implements StatsFragmentContract.Vie
     private TextView tvValidatedEvents;
     private TextView tvValidatedClients;
     private TextView tvTaskUnprocessedEvents;
+    private TextView tvUserName;
+    private TextView tvAppVersionName;
+    private TextView tvAppVersionCode;
+    private TextView tvDBVersion;
+    private TextView tvTeam;
+    private TextView tvLocality;
+    private TextView tvManufacturer;
+    private TextView tvDevice;
+    private TextView tvOS;
+    private TextView tvBuildDate;
+    private TextView tvCurrentDate;
 
     public static StatsFragment newInstance(Bundle bundle) {
         StatsFragment fragment = new StatsFragment();
@@ -70,6 +93,17 @@ private void initializeViews(View view) {
         tvValidatedEvents = view.findViewById(R.id.validated_events);
         tvValidatedClients = view.findViewById(R.id.validated_clients);
         tvTaskUnprocessedEvents = view.findViewById(R.id.task_unprocessed_events);
+        tvUserName = view.findViewById(R.id.user_value);
+        tvAppVersionName = view.findViewById(R.id.app_version_name_value);
+        tvAppVersionCode = view.findViewById(R.id.app_version_code_value);
+        tvDBVersion = view.findViewById(R.id.db_version_value);
+        tvTeam = view.findViewById(R.id.team_value);
+        tvLocality = view.findViewById(R.id.locality_value);
+        tvManufacturer = view.findViewById(R.id.manufacturer_value);
+        tvDevice = view.findViewById(R.id.device_value);
+        tvOS = view.findViewById(R.id.os_value);
+        tvBuildDate = view.findViewById(R.id.build_date_value);
+        tvCurrentDate = view.findViewById(R.id.date_value);
 
         Button btnRefreshStats = view.findViewById(R.id.refresh_button);
         btnRefreshStats.setOnClickListener(v -> presenter.fetchSyncInfo());
@@ -79,7 +113,7 @@ private void initializeViews(View view) {
 
     @SuppressLint("SetTextI18n")
     @Override
-    public void refreshECSyncInfo(Map<String, Integer> syncInfoMap) {
+    public void refreshECSyncInfo(Map<String, String> syncInfoMap) {
 
         tvSyncedEvents.setText(syncInfoMap.get(SYNCED_EVENTS) + "");
         tvUnSyncedEvents.setText(syncInfoMap.get(UNSYNCED_EVENTS) + "");
@@ -88,8 +122,22 @@ public void refreshECSyncInfo(Map<String, Integer> syncInfoMap) {
         tvSyncedClient.setText(syncInfoMap.get(SYNCED_CLIENTS) + "");
         tvUnSyncedClients.setText(syncInfoMap.get(UNSYNCED_CLIENTS) + "");
 
-        tvValidatedEvents.setText(syncInfoMap.get(VALID_EVENTS) + "");
+        tvValidatedEvents.setText(syncInfoMap.get(VALID_EVENTS));
         tvValidatedClients.setText(syncInfoMap.get(VALID_CLIENTS) + "");
+
+        tvUserName.setText(syncInfoMap.get(USER_NAME));
+        tvAppVersionName.setText(syncInfoMap.get(APP_VERSION_NAME));
+        tvAppVersionCode.setText(syncInfoMap.get(APP_VERSION_CODE));
+        tvDBVersion.setText(syncInfoMap.get(DB_VERSION));
+        tvBuildDate.setText(syncInfoMap.get(APP_BUILD_DATE));
+
+        tvTeam.setText(syncInfoMap.get(USER_TEAM));
+        tvLocality.setText(syncInfoMap.get(USER_LOCALITY));
+
+        tvManufacturer.setText(syncInfoMap.get(MANUFACTURER));
+        tvDevice.setText(syncInfoMap.get(MODEL));
+        tvOS.setText(syncInfoMap.get(OS_VERSION));
+        tvCurrentDate.setText(DateFormat.getDateTimeInstance().format(new Date()));
     }
 
 }
diff --git a/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java b/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
index 59ab35bd4..72663b568 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
@@ -1,20 +1,14 @@
 package org.smartregister.view.interactor;
 
-import net.sqlcipher.Cursor;
-import net.sqlcipher.database.SQLiteDatabase;
-
-import org.smartregister.repository.BaseRepository;
-import org.smartregister.util.AppExecutors;
-import org.smartregister.view.activity.DrishtiApplication;
-import org.smartregister.view.contract.StatsFragmentContract;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import timber.log.Timber;
-
+import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
 import static org.smartregister.AllConstants.DatabaseKeys.SYNC_STATUS;
 import static org.smartregister.AllConstants.DatabaseKeys.VALIDATION_STATUS;
+import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
+import static org.smartregister.AllConstants.DeviceInfo.MODEL;
+import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
+import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
 import static org.smartregister.AllConstants.SyncInfo.INVALID_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.INVALID_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.NULL_EVENT_SYNC_STATUS;
@@ -23,9 +17,32 @@
 import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
+import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
+import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
 import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
 
+import android.content.Context;
+import android.os.Build;
+
+import net.sqlcipher.Cursor;
+import net.sqlcipher.database.SQLiteDatabase;
+
+import org.smartregister.CoreLibrary;
+import org.smartregister.repository.AllSharedPreferences;
+import org.smartregister.repository.BaseRepository;
+import org.smartregister.util.AppExecutors;
+import org.smartregister.util.Utils;
+import org.smartregister.view.activity.DrishtiApplication;
+import org.smartregister.view.contract.StatsFragmentContract;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import timber.log.Timber;
+
 public class StatsFragmentInteractor implements StatsFragmentContract.Interactor {
 
     private AppExecutors appExecutors;
@@ -34,7 +51,7 @@ public class StatsFragmentInteractor implements StatsFragmentContract.Interactor
 
     private StatsFragmentContract.Presenter presenter;
 
-    private Map<String, Integer> syncInfoMap = new HashMap<>();
+    private Map<String, String> syncInfoMap = new HashMap<>();
 
     public StatsFragmentInteractor(StatsFragmentContract.Presenter presenter) {
         this.presenter = presenter;
@@ -45,16 +62,16 @@ public StatsFragmentInteractor(StatsFragmentContract.Presenter presenter) {
     @Override
     public void fetchECSyncInfo() {
         syncInfoMap = new HashMap<>();
-        syncInfoMap.put(SYNCED_EVENTS, 0);
-        syncInfoMap.put(SYNCED_CLIENTS, 0);
-        syncInfoMap.put(UNSYNCED_EVENTS, 0);
-        syncInfoMap.put(UNSYNCED_CLIENTS, 0);
-        syncInfoMap.put(VALID_EVENTS, 0);
-        syncInfoMap.put(INVALID_EVENTS, 0);
-        syncInfoMap.put(VALID_CLIENTS, 0);
-        syncInfoMap.put(INVALID_CLIENTS, 0);
-        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, 0);
-        syncInfoMap.put(NULL_EVENT_SYNC_STATUS, 0);
+        syncInfoMap.put(SYNCED_EVENTS, "0");
+        syncInfoMap.put(SYNCED_CLIENTS, "0");
+        syncInfoMap.put(UNSYNCED_EVENTS, "0");
+        syncInfoMap.put(UNSYNCED_CLIENTS, "0");
+        syncInfoMap.put(VALID_EVENTS, "0");
+        syncInfoMap.put(INVALID_EVENTS, "0");
+        syncInfoMap.put(VALID_CLIENTS, "0");
+        syncInfoMap.put(INVALID_CLIENTS, "0");
+        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "0");
+        syncInfoMap.put(NULL_EVENT_SYNC_STATUS, "0");
 
         String eventSyncSql = "select count(*), syncStatus from event group by syncStatus";
         String clientSyncSql = "select count(*), syncStatus from client group by syncStatus";
@@ -90,6 +107,9 @@ public void fetchECSyncInfo() {
 
             cursor.close();
 
+            populateUserInfo();
+            populateBuildInfo();
+
             appExecutors.mainThread().execute(new Runnable() {
                 @Override
                 public void run() {
@@ -108,40 +128,71 @@ public void run() {
     private void populateEventSyncInfo(Cursor cursor) {
         String syncStatus = cursor.getString(cursor.getColumnIndex(SYNC_STATUS));
         if (BaseRepository.TYPE_Synced.equals(syncStatus)) {
-            syncInfoMap.put(SYNCED_EVENTS, cursor.getInt(0));
+            syncInfoMap.put(SYNCED_EVENTS, String.valueOf(cursor.getInt(0)));
         } else if (BaseRepository.TYPE_Unsynced.equals(syncStatus)) {
-            syncInfoMap.put(UNSYNCED_EVENTS, cursor.getInt(0));
+            syncInfoMap.put(UNSYNCED_EVENTS, String.valueOf(cursor.getInt(0)));
         } else if (BaseRepository.TYPE_Task_Unprocessed.equals(syncStatus)) {
-            syncInfoMap.put(TASK_UNPROCESSED_EVENTS, cursor.getInt(0));
+            syncInfoMap.put(TASK_UNPROCESSED_EVENTS, String.valueOf(cursor.getInt(0)));
         } else if (syncStatus == null) {
-            syncInfoMap.put(NULL_EVENT_SYNC_STATUS, cursor.getInt(0));
+            syncInfoMap.put(NULL_EVENT_SYNC_STATUS, String.valueOf(cursor.getInt(0)));
         }
     }
 
     private void populateClientSyncInfo(Cursor cursor) {
         String syncStatus = cursor.getString(cursor.getColumnIndex(SYNC_STATUS));
         if (BaseRepository.TYPE_Synced.equals(syncStatus)) {
-            syncInfoMap.put(SYNCED_CLIENTS, cursor.getInt(0));
+            syncInfoMap.put(SYNCED_CLIENTS, String.valueOf(cursor.getInt(0)));
         } else if (BaseRepository.TYPE_Unsynced.equals(syncStatus)) {
-            syncInfoMap.put(UNSYNCED_CLIENTS, cursor.getInt(0));
+            syncInfoMap.put(UNSYNCED_CLIENTS, String.valueOf(cursor.getInt(0)));
         }
     }
 
     private void populateValidatedEventsInfo(Cursor cursor) {
         String syncStatus = cursor.getString(cursor.getColumnIndex(VALIDATION_STATUS));
         if (BaseRepository.TYPE_Valid.equals(syncStatus)) {
-            syncInfoMap.put(VALID_EVENTS, cursor.getInt(0));
+            syncInfoMap.put(VALID_EVENTS, String.valueOf(cursor.getInt(0)));
         } else if (BaseRepository.TYPE_InValid.equals(syncStatus)) {
-            syncInfoMap.put(INVALID_EVENTS, cursor.getInt(0));
+            syncInfoMap.put(INVALID_EVENTS, String.valueOf(cursor.getInt(0)));
         }
     }
 
     private void populateValidatedClientsInfo(Cursor cursor) {
         String validationStatus = cursor.getString(cursor.getColumnIndex(VALIDATION_STATUS));
         if (BaseRepository.TYPE_Valid.equals(validationStatus)) {
-            syncInfoMap.put(VALID_CLIENTS, cursor.getInt(0));
+            syncInfoMap.put(VALID_CLIENTS, String.valueOf(cursor.getInt(0)));
         } else if (BaseRepository.TYPE_InValid.equals(validationStatus)) {
-            syncInfoMap.put(INVALID_CLIENTS, cursor.getInt(0));
+            syncInfoMap.put(INVALID_CLIENTS, String.valueOf(cursor.getInt(0)));
         }
     }
+
+    public void populateUserInfo() {
+        AllSharedPreferences sharedPreferences = CoreLibrary.getInstance().context().userService().getAllSharedPreferences();
+        syncInfoMap.put(USER_NAME, sharedPreferences.fetchRegisteredANM());
+        syncInfoMap.put(USER_TEAM, sharedPreferences.fetchDefaultTeam(sharedPreferences.fetchRegisteredANM()));
+        syncInfoMap.put(USER_LOCALITY, sharedPreferences.fetchCurrentLocality());
+    }
+
+
+    private void populateBuildInfo() {
+        try {
+            syncInfoMap.put(APP_VERSION_NAME, getBuildConfigValue("VERSION_NAME"));
+            syncInfoMap.put(APP_VERSION_CODE, getBuildConfigValue("VERSION_CODE"));
+            syncInfoMap.put(DB_VERSION, getBuildConfigValue("DATABASE_VERSION"));
+            syncInfoMap.put(MANUFACTURER, Build.MANUFACTURER);
+            syncInfoMap.put(MODEL, Build.MODEL);
+            syncInfoMap.put(APP_BUILD_DATE, Utils.getBuildDate(true));
+
+            String osName = Build.VERSION_CODES.class.getFields()[android.os.Build.VERSION.SDK_INT].getName();
+            syncInfoMap.put(OS_VERSION, osName);
+        } catch (Exception e) {
+            Timber.e(e);
+        }
+    }
+
+    private String getBuildConfigValue(String fieldName) throws Exception {
+        Context context = CoreLibrary.getInstance().context().applicationContext();
+        Class<?> clazz = Class.forName(context.getPackageName() + ".BuildConfig");
+        Field field = clazz.getField(fieldName);
+        return String.valueOf(field.get(null));
+    }
 }
diff --git a/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java b/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java
index 018e94134..cf27edc49 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java
@@ -1,5 +1,11 @@
 package org.smartregister.view.presenter;
 
+import android.os.Build;
+
+import androidx.core.os.BuildCompat;
+
+import org.smartregister.CoreLibrary;
+import org.smartregister.repository.AllSharedPreferences;
 import org.smartregister.view.contract.StatsFragmentContract;
 import org.smartregister.view.interactor.StatsFragmentInteractor;
 
@@ -16,7 +22,7 @@ public StatsFragmentPresenter(StatsFragmentContract.View view) {
     }
 
     @Override
-    public void onECSyncInfoFetched(Map<String, Integer> syncInfoMap) {
+    public void onECSyncInfoFetched(Map<String, String> syncInfoMap) {
         view.refreshECSyncInfo(syncInfoMap);
     }
 
diff --git a/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java b/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java
index 980d15aec..da555f93e 100644
--- a/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java
@@ -31,7 +31,7 @@ public void setUp() {
 
     @Test
     public void onECSyncInfoFetchedRefreshesECSyncInfo() {
-        Map<String, Integer> syncInfoMap = new HashMap<>();
+        Map<String, String> syncInfoMap = new HashMap<>();
         presenter.onECSyncInfoFetched(syncInfoMap);
         Mockito.verify(view).refreshECSyncInfo(ArgumentMatchers.eq(syncInfoMap));
     }

From a45506a3b281f2ac40d0749cd17d2c472a7aacbe Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Tue, 8 Nov 2022 17:56:02 +0500
Subject: [PATCH 02/20] Increment library version

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 62d9b98c6..02e82eb63 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=6.0.0-SNAPSHOT
+VERSION_NAME=6.0.1-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application

From 1f00244f2fd94b973e80b9e1210074ef97430482 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Tue, 8 Nov 2022 18:41:27 +0500
Subject: [PATCH 03/20] Fix failing tests

---
 .../view/fragment/StatsFragmentTest.java      | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
index 2bdc289cb..2e82aaa29 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
@@ -17,6 +17,7 @@
 import android.widget.TextView;
 
 import androidx.fragment.app.FragmentManager;
+import androidx.test.core.app.ApplicationProvider;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -26,7 +27,6 @@
 import org.mockito.Mockito;
 import org.mockito.Spy;
 import org.powermock.reflect.Whitebox;
-import androidx.test.core.app.ApplicationProvider;
 import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.BaseUnitTest;
 import org.smartregister.R;
@@ -95,14 +95,14 @@ public void onCreateViewInitsViewsAndReturnsCorrectView() {
 
     @Test
     public void refreshECSyncInfoUpdatesViews() {
-        Map<String, Integer> syncInfoMap = new HashMap<>();
-        syncInfoMap.put(SYNCED_EVENTS, 2);
-        syncInfoMap.put(UNSYNCED_EVENTS, 3);
-        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, 4);
-        syncInfoMap.put(SYNCED_CLIENTS, 5);
-        syncInfoMap.put(UNSYNCED_CLIENTS, 6);
-        syncInfoMap.put(VALID_EVENTS, 7);
-        syncInfoMap.put(VALID_CLIENTS, 8);
+        Map<String, String> syncInfoMap = new HashMap<>();
+        syncInfoMap.put(SYNCED_EVENTS, "2");
+        syncInfoMap.put(UNSYNCED_EVENTS, "3");
+        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "4");
+        syncInfoMap.put(SYNCED_CLIENTS, "5");
+        syncInfoMap.put(UNSYNCED_CLIENTS, "6");
+        syncInfoMap.put(VALID_EVENTS, "7");
+        syncInfoMap.put(VALID_CLIENTS, "8");
 
         View rootView = LayoutInflater.from(ApplicationProvider.getApplicationContext()).inflate(R.layout.fragment_stats, null);
 
@@ -116,6 +116,17 @@ public void refreshECSyncInfoUpdatesViews() {
         ReflectionHelpers.setField(statsFragment, "tvUnSyncedClients", rootView.findViewById(R.id.unsynced_clients));
         ReflectionHelpers.setField(statsFragment, "tvValidatedEvents", rootView.findViewById(R.id.validated_events));
         ReflectionHelpers.setField(statsFragment, "tvValidatedClients", rootView.findViewById(R.id.validated_clients));
+        ReflectionHelpers.setField(statsFragment, "tvUserName", rootView.findViewById(R.id.user_value));
+        ReflectionHelpers.setField(statsFragment, "tvAppVersionName", rootView.findViewById(R.id.app_version_name_value));
+        ReflectionHelpers.setField(statsFragment, "tvAppVersionCode", rootView.findViewById(R.id.app_version_code_value));
+        ReflectionHelpers.setField(statsFragment, "tvDBVersion", rootView.findViewById(R.id.db_version_value));
+        ReflectionHelpers.setField(statsFragment, "tvTeam", rootView.findViewById(R.id.team_value));
+        ReflectionHelpers.setField(statsFragment, "tvLocality", rootView.findViewById(R.id.locality_value));
+        ReflectionHelpers.setField(statsFragment, "tvManufacturer", rootView.findViewById(R.id.manufacturer_value));
+        ReflectionHelpers.setField(statsFragment, "tvDevice", rootView.findViewById(R.id.device_value));
+        ReflectionHelpers.setField(statsFragment, "tvOS", rootView.findViewById(R.id.os_value));
+        ReflectionHelpers.setField(statsFragment, "tvBuildDate", rootView.findViewById(R.id.build_date_value));
+        ReflectionHelpers.setField(statsFragment, "tvCurrentDate", rootView.findViewById(R.id.date_value));
 
         statsFragment.refreshECSyncInfo(syncInfoMap);
         Assert.assertEquals("2", tvSyncedEvents.getText());

From 9907890c545b0435d8f256675af412832a426f56 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Wed, 9 Nov 2022 14:07:39 +0500
Subject: [PATCH 04/20] Increase code coverage

---
 .../StatsFragmentInteractorTest.java          | 150 ++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java

diff --git a/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java b/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java
new file mode 100644
index 000000000..9e56c8b7a
--- /dev/null
+++ b/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java
@@ -0,0 +1,150 @@
+package org.smartregister.interactor;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
+import static org.smartregister.AllConstants.DatabaseKeys.VALIDATION_STATUS;
+import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
+import static org.smartregister.AllConstants.DeviceInfo.MODEL;
+import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
+import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
+import static org.smartregister.AllConstants.SyncInfo.INVALID_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
+import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
+import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
+import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import net.sqlcipher.Cursor;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.robolectric.util.ReflectionHelpers;
+import org.smartregister.BaseUnitTest;
+import org.smartregister.Context;
+import org.smartregister.CoreLibrary;
+import org.smartregister.repository.AllSharedPreferences;
+import org.smartregister.repository.BaseRepository;
+import org.smartregister.service.UserService;
+import org.smartregister.view.contract.StatsFragmentContract;
+import org.smartregister.view.interactor.StatsFragmentInteractor;
+import org.smartregister.view.presenter.StatsFragmentPresenter;
+
+import java.util.Map;
+
+public class StatsFragmentInteractorTest extends BaseUnitTest {
+
+    @Spy
+    StatsFragmentContract.View view;
+    private StatsFragmentInteractor interactor;
+    private StatsFragmentPresenter presenter;
+
+    @Before
+    public void setUp() {
+        presenter = Mockito.mock(StatsFragmentPresenter.class, Mockito.CALLS_REAL_METHODS);
+        interactor = Mockito.mock(StatsFragmentInteractor.class, Mockito.CALLS_REAL_METHODS);
+        ReflectionHelpers.setField(presenter, "interactor", interactor);
+        ReflectionHelpers.setField(presenter, "view", view);
+    }
+
+    @Test
+    public void testPopulateUserInfoPopulatesCorrectValues() {
+        StatsFragmentInteractor statsFragmentInteractor = new StatsFragmentInteractor(presenter);
+
+        CoreLibrary coreLibrary = Mockito.mock(CoreLibrary.class);
+        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
+//
+        Context context = Mockito.mock(Context.class);
+        UserService userService = Mockito.mock(UserService.class);
+        AllSharedPreferences sharedPreferences = Mockito.mock(AllSharedPreferences.class);
+//
+        Mockito.doReturn(context).when(coreLibrary).context();
+        Mockito.doReturn(userService).when(context).userService();
+        Mockito.doReturn(sharedPreferences).when(userService).getAllSharedPreferences();
+        Mockito.doReturn("user").when(sharedPreferences).fetchRegisteredANM();
+        Mockito.doReturn("team").when(sharedPreferences).fetchDefaultTeam(Mockito.anyString());
+        Mockito.doReturn("locality").when(sharedPreferences).fetchCurrentLocality();
+
+        ReflectionHelpers.callInstanceMethod(statsFragmentInteractor, "populateUserInfo");
+
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
+
+        Assert.assertEquals("user", syncInfoMap.get(USER_NAME));
+        Assert.assertEquals("team", syncInfoMap.get(USER_TEAM));
+        Assert.assertEquals("locality", syncInfoMap.get(USER_LOCALITY));
+    }
+
+    @Test
+    public void testPopulateBuildInfoPopulatesCorrectValues() {
+        StatsFragmentInteractor statsFragmentInteractor = new StatsFragmentInteractor(presenter);
+
+        CoreLibrary coreLibrary = Mockito.mock(CoreLibrary.class);
+        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
+//
+        Context context = Mockito.mock(Context.class);
+        android.content.Context appContext = Mockito.spy(ApplicationProvider.getApplicationContext());
+
+        Mockito.doReturn(context).when(coreLibrary).context();
+        Mockito.doReturn(appContext).when(context).applicationContext();
+        Mockito.doReturn("org.smartregister").when(appContext).getPackageName();
+
+        ReflectionHelpers.callInstanceMethod(statsFragmentInteractor, "populateBuildInfo");
+
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
+
+        Assert.assertEquals("6.0.1-SNAPSHOT", syncInfoMap.get(APP_VERSION_NAME));
+        Assert.assertEquals("1", syncInfoMap.get(APP_VERSION_CODE));
+        Assert.assertEquals("1", syncInfoMap.get(DB_VERSION));
+        Assert.assertEquals("robolectric", syncInfoMap.get(MANUFACTURER));
+        Assert.assertEquals("robolectric", syncInfoMap.get(MODEL));
+        Assert.assertEquals("28 Apr 2020", syncInfoMap.get(APP_BUILD_DATE));
+        Assert.assertEquals("Q", syncInfoMap.get(OS_VERSION));
+    }
+
+    @Test
+    public void testPopulateValidatedEventsInfoAddValidEventsCountWhenStatusIsValid() {
+        StatsFragmentInteractor statsFragmentInteractor = new StatsFragmentInteractor(presenter);
+
+        Cursor cursor = Mockito.mock(Cursor.class);
+
+        Mockito.doReturn(1).when(cursor).getColumnIndex(eq(VALIDATION_STATUS));
+        Mockito.doReturn(BaseRepository.TYPE_Valid).when(cursor).getString(eq(1));
+        Mockito.doReturn(10).when(cursor).getInt(eq(0));
+
+        ReflectionHelpers.callInstanceMethod(statsFragmentInteractor, "populateValidatedEventsInfo",
+                ReflectionHelpers.ClassParameter.from(Cursor.class, cursor));
+
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
+        Assert.assertEquals("10", syncInfoMap.get(VALID_EVENTS));
+
+    }
+
+    @Test
+    public void testPopulateValidatedEventsInfoAddInvalidEventsCountWhenStatusIsInvalid() {
+        StatsFragmentInteractor statsFragmentInteractor = new StatsFragmentInteractor(presenter);
+
+        Cursor cursor = Mockito.mock(Cursor.class);
+
+        Mockito.doReturn(1).when(cursor).getColumnIndex(eq(VALIDATION_STATUS));
+        Mockito.doReturn(BaseRepository.TYPE_InValid).when(cursor).getString(eq(1));
+        Mockito.doReturn(10).when(cursor).getInt(eq(0));
+
+        ReflectionHelpers.callInstanceMethod(statsFragmentInteractor, "populateValidatedEventsInfo",
+                ReflectionHelpers.ClassParameter.from(Cursor.class, cursor));
+
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
+        Assert.assertEquals("10", syncInfoMap.get(INVALID_EVENTS));
+
+    }
+
+    @After
+    public void destroy() {
+        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+    }
+}

From 6d0e58406f2df9cf16b431311aed7ba704bf037c Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Wed, 9 Nov 2022 14:21:53 +0500
Subject: [PATCH 05/20] Fix codacy errors

---
 .../smartregister/view/presenter/StatsFragmentPresenter.java | 5 -----
 .../interactor/StatsFragmentInteractorTest.java              | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java b/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java
index cf27edc49..6003c5a23 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java
@@ -1,11 +1,6 @@
 package org.smartregister.view.presenter;
 
-import android.os.Build;
 
-import androidx.core.os.BuildCompat;
-
-import org.smartregister.CoreLibrary;
-import org.smartregister.repository.AllSharedPreferences;
 import org.smartregister.view.contract.StatsFragmentContract;
 import org.smartregister.view.interactor.StatsFragmentInteractor;
 
diff --git a/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java b/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java
index 9e56c8b7a..4831aeb05 100644
--- a/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java
@@ -42,13 +42,12 @@ public class StatsFragmentInteractorTest extends BaseUnitTest {
 
     @Spy
     StatsFragmentContract.View view;
-    private StatsFragmentInteractor interactor;
     private StatsFragmentPresenter presenter;
 
     @Before
     public void setUp() {
         presenter = Mockito.mock(StatsFragmentPresenter.class, Mockito.CALLS_REAL_METHODS);
-        interactor = Mockito.mock(StatsFragmentInteractor.class, Mockito.CALLS_REAL_METHODS);
+        StatsFragmentInteractor interactor = Mockito.mock(StatsFragmentInteractor.class, Mockito.CALLS_REAL_METHODS);
         ReflectionHelpers.setField(presenter, "interactor", interactor);
         ReflectionHelpers.setField(presenter, "view", view);
     }

From bec14aa94b85407095638d27a357a41f3c0ec6d1 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 10 Nov 2022 14:09:38 +0500
Subject: [PATCH 06/20] PR feedback changes

---
 gradle.properties                             |  2 +-
 .../interactor/StatsFragmentInteractor.java   | 26 +++++++++----
 .../StatsFragmentInteractorTest.java          | 38 ++++++++-----------
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 02e82eb63..ab52d5fa0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=6.0.1-SNAPSHOT
+VERSION_NAME=6.1.0-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application
diff --git a/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java b/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
index 72663b568..33b5242a6 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
@@ -109,6 +109,7 @@ public void fetchECSyncInfo() {
 
             populateUserInfo();
             populateBuildInfo();
+            populateDeviceInfo();
 
             appExecutors.mainThread().execute(new Runnable() {
                 @Override
@@ -174,10 +175,13 @@ public void populateUserInfo() {
 
 
     private void populateBuildInfo() {
+        syncInfoMap.put(APP_VERSION_NAME, getBuildConfigValue("VERSION_NAME"));
+        syncInfoMap.put(APP_VERSION_CODE, getBuildConfigValue("VERSION_CODE"));
+        syncInfoMap.put(DB_VERSION, getBuildConfigValue("DATABASE_VERSION"));
+    }
+
+    private void populateDeviceInfo() {
         try {
-            syncInfoMap.put(APP_VERSION_NAME, getBuildConfigValue("VERSION_NAME"));
-            syncInfoMap.put(APP_VERSION_CODE, getBuildConfigValue("VERSION_CODE"));
-            syncInfoMap.put(DB_VERSION, getBuildConfigValue("DATABASE_VERSION"));
             syncInfoMap.put(MANUFACTURER, Build.MANUFACTURER);
             syncInfoMap.put(MODEL, Build.MODEL);
             syncInfoMap.put(APP_BUILD_DATE, Utils.getBuildDate(true));
@@ -187,12 +191,18 @@ private void populateBuildInfo() {
         } catch (Exception e) {
             Timber.e(e);
         }
+
     }
 
-    private String getBuildConfigValue(String fieldName) throws Exception {
-        Context context = CoreLibrary.getInstance().context().applicationContext();
-        Class<?> clazz = Class.forName(context.getPackageName() + ".BuildConfig");
-        Field field = clazz.getField(fieldName);
-        return String.valueOf(field.get(null));
+    private String getBuildConfigValue(String fieldName) {
+        try {
+            Context context = CoreLibrary.getInstance().context().applicationContext();
+            Class<?> clazz = Class.forName(context.getPackageName() + ".BuildConfig");
+            Field field = clazz.getField(fieldName);
+            return String.valueOf(field.get(null));
+        } catch (Exception e) {
+            Timber.e(e);
+            return "0";
+        }
     }
 }
diff --git a/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java b/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java
index 4831aeb05..5a56198f3 100644
--- a/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java
@@ -24,7 +24,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.Spy;
 import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.BaseUnitTest;
 import org.smartregister.Context;
@@ -32,7 +31,6 @@
 import org.smartregister.repository.AllSharedPreferences;
 import org.smartregister.repository.BaseRepository;
 import org.smartregister.service.UserService;
-import org.smartregister.view.contract.StatsFragmentContract;
 import org.smartregister.view.interactor.StatsFragmentInteractor;
 import org.smartregister.view.presenter.StatsFragmentPresenter;
 
@@ -40,29 +38,23 @@
 
 public class StatsFragmentInteractorTest extends BaseUnitTest {
 
-    @Spy
-    StatsFragmentContract.View view;
-    private StatsFragmentPresenter presenter;
+    private StatsFragmentInteractor statsFragmentInteractor;
 
     @Before
     public void setUp() {
-        presenter = Mockito.mock(StatsFragmentPresenter.class, Mockito.CALLS_REAL_METHODS);
-        StatsFragmentInteractor interactor = Mockito.mock(StatsFragmentInteractor.class, Mockito.CALLS_REAL_METHODS);
-        ReflectionHelpers.setField(presenter, "interactor", interactor);
-        ReflectionHelpers.setField(presenter, "view", view);
+        StatsFragmentPresenter presenter = Mockito.mock(StatsFragmentPresenter.class, Mockito.CALLS_REAL_METHODS);
+        statsFragmentInteractor = new StatsFragmentInteractor(presenter);
     }
 
     @Test
     public void testPopulateUserInfoPopulatesCorrectValues() {
-        StatsFragmentInteractor statsFragmentInteractor = new StatsFragmentInteractor(presenter);
-
         CoreLibrary coreLibrary = Mockito.mock(CoreLibrary.class);
         ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
-//
+
         Context context = Mockito.mock(Context.class);
         UserService userService = Mockito.mock(UserService.class);
         AllSharedPreferences sharedPreferences = Mockito.mock(AllSharedPreferences.class);
-//
+
         Mockito.doReturn(context).when(coreLibrary).context();
         Mockito.doReturn(userService).when(context).userService();
         Mockito.doReturn(sharedPreferences).when(userService).getAllSharedPreferences();
@@ -81,11 +73,9 @@ public void testPopulateUserInfoPopulatesCorrectValues() {
 
     @Test
     public void testPopulateBuildInfoPopulatesCorrectValues() {
-        StatsFragmentInteractor statsFragmentInteractor = new StatsFragmentInteractor(presenter);
-
         CoreLibrary coreLibrary = Mockito.mock(CoreLibrary.class);
         ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
-//
+
         Context context = Mockito.mock(Context.class);
         android.content.Context appContext = Mockito.spy(ApplicationProvider.getApplicationContext());
 
@@ -97,9 +87,17 @@ public void testPopulateBuildInfoPopulatesCorrectValues() {
 
         Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
 
-        Assert.assertEquals("6.0.1-SNAPSHOT", syncInfoMap.get(APP_VERSION_NAME));
+        Assert.assertEquals("6.1.0-SNAPSHOT", syncInfoMap.get(APP_VERSION_NAME));
         Assert.assertEquals("1", syncInfoMap.get(APP_VERSION_CODE));
-        Assert.assertEquals("1", syncInfoMap.get(DB_VERSION));
+        Assert.assertEquals("0", syncInfoMap.get(DB_VERSION));
+    }
+
+    @Test
+    public void testPopulateDeviceInfoPopulatesCorrectValues() {
+        ReflectionHelpers.callInstanceMethod(statsFragmentInteractor, "populateDeviceInfo");
+
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
+
         Assert.assertEquals("robolectric", syncInfoMap.get(MANUFACTURER));
         Assert.assertEquals("robolectric", syncInfoMap.get(MODEL));
         Assert.assertEquals("28 Apr 2020", syncInfoMap.get(APP_BUILD_DATE));
@@ -108,8 +106,6 @@ public void testPopulateBuildInfoPopulatesCorrectValues() {
 
     @Test
     public void testPopulateValidatedEventsInfoAddValidEventsCountWhenStatusIsValid() {
-        StatsFragmentInteractor statsFragmentInteractor = new StatsFragmentInteractor(presenter);
-
         Cursor cursor = Mockito.mock(Cursor.class);
 
         Mockito.doReturn(1).when(cursor).getColumnIndex(eq(VALIDATION_STATUS));
@@ -126,8 +122,6 @@ public void testPopulateValidatedEventsInfoAddValidEventsCountWhenStatusIsValid(
 
     @Test
     public void testPopulateValidatedEventsInfoAddInvalidEventsCountWhenStatusIsInvalid() {
-        StatsFragmentInteractor statsFragmentInteractor = new StatsFragmentInteractor(presenter);
-
         Cursor cursor = Mockito.mock(Cursor.class);
 
         Mockito.doReturn(1).when(cursor).getColumnIndex(eq(VALIDATION_STATUS));

From 2e7fda6f4b06a5188c893d9fb45ad195632d01c3 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 10 Nov 2022 15:16:39 +0500
Subject: [PATCH 07/20] Trigger CI


From 6fb7335959408fd1bd00682891375d39818a09e8 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 10 Nov 2022 16:34:51 +0500
Subject: [PATCH 08/20] Fix failing test

---
 opensrp-core/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/opensrp-core/build.gradle b/opensrp-core/build.gradle
index 9a1b3ad3f..5d386030a 100644
--- a/opensrp-core/build.gradle
+++ b/opensrp-core/build.gradle
@@ -92,7 +92,6 @@ android {
         buildConfigField "int", "DB_ENCRYPTION_VERSION", '1'
         buildConfigField("int", "VERSION_CODE", "${defaultConfig.versionCode}")
         buildConfigField("String", "VERSION_NAME", "\"${defaultConfig.versionName}\"")
-        buildConfigField "int", "DATABASE_VERSION", '1'
     }
     sourceSets {
         main {

From fbd15061fb6660c5900ce4f20fb8057482878043 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 17 Nov 2022 11:48:14 +0500
Subject: [PATCH 09/20] Add unsynced events stats for vaccines, weight and
 height

---
 README.md                                     |  5 +-
 opensrp-core/res/layout/fragment_stats.xml    | 77 +++++++++++++++++++
 opensrp-core/res/values/strings.xml           |  3 +
 .../java/org/smartregister/AllConstants.java  |  4 +
 .../view/fragment/StatsFragment.java          | 57 +++++++++-----
 .../interactor/StatsFragmentInteractor.java   | 27 +++++++
 opensrp-core/src/test/assets/app.properties   |  1 +
 .../view/fragment/StatsFragmentTest.java      | 11 +++
 sample/src/main/assets/app.properties         |  1 +
 9 files changed, 166 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index b1f2e8da5..247577a0e 100644
--- a/README.md
+++ b/README.md
@@ -307,11 +307,12 @@ By placing a file named `app.properties` in your implementation assets folder (S
 ### Configurable Settings
 
 | Configuration                            | Type    | Default | Description                                                                                                                                         |
-| ---------------------------------------- | ------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ---------------------------------------- | ------- | ------- |-----------------------------------------------------------------------------------------------------------------------------------------------------|
 | `system.toaster.centered`                | Boolean | false   | Position toaster(s) at the center of the view(s)                                                                                                    |
 | `disable.location.picker.view`           | Boolean | false   | Disables LocationPicker View                                                                                                                        |
 | `location.picker.tag.shown`              | Boolean | false   | Hides/Shows the location tag in the location picker tree view                                                                                       |
 | `encrypt.shared.preferences`             | Boolean | false   | Enable/disables encrypting SharedPreferences                                                                                                        |
 | `allow.offline.login.with.invalid.token` | Boolean | false   | Allow offline login when token is no longer valid after a successful login when online and user is forcefully logged out                            |
 | `enable.search.button`                   | Boolean | false   | Enable/Disable search to be triggered only after clicking the search icon in `org.smartregister.view.fragment.BaseRegisterFragment` or its subclass |
-| `feature.profile.images.disabled`            | Boolean | false    | Disable profile image capturing and rendering     |
\ No newline at end of file
+| `feature.profile.images.disabled`            | Boolean | false    | Disable profile image capturing and rendering                                                                                                       |
+| `monitor.height`            | Boolean | false    | Show height unsynced events count in stats view                                                                                                     |
\ No newline at end of file
diff --git a/opensrp-core/res/layout/fragment_stats.xml b/opensrp-core/res/layout/fragment_stats.xml
index d0d46cdc7..3572d6b7e 100644
--- a/opensrp-core/res/layout/fragment_stats.xml
+++ b/opensrp-core/res/layout/fragment_stats.xml
@@ -209,6 +209,83 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/synced_vaccine_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/synced_vaccine_events"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/unsynced_weight_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/synced_weight_events"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/height_stats"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/unsynced_height_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/synced_height_events"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/opensrp-core/res/values/strings.xml b/opensrp-core/res/values/strings.xml
index b0ce57604..68376462e 100644
--- a/opensrp-core/res/values/strings.xml
+++ b/opensrp-core/res/values/strings.xml
@@ -474,4 +474,7 @@
     <string name="build_date">Build Date:</string>
     <string name="date">Date:</string>
     <string name="user">User:</string>
+    <string name="synced_vaccine_events">Unynced vaccine events:</string>
+    <string name="unsynced_weight_events">Unsynced weight events:</string>
+    <string name="unsynced_height_events">Unsynced height events:</string>
 </resources>
diff --git a/opensrp-core/src/main/java/org/smartregister/AllConstants.java b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
index ac7d2369f..d694dd719 100644
--- a/opensrp-core/src/main/java/org/smartregister/AllConstants.java
+++ b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
@@ -256,6 +256,9 @@ public interface SyncInfo {
         String APP_VERSION_NAME = "app_ver_name";
         String APP_VERSION_CODE = "app_ver_code";
         String APP_BUILD_DATE = "app_build_date";
+        String UNSYNCED_VACCINE_EVENTS = "unsuncyed_vaccine_events";
+        String UNSYNCED_WEIGHT_EVENTS = "unsuncyed_weight_events";
+        String UNSYNCED_HEIGHT_EVENTS = "unsuncyed_height_events";
     }
 
     public interface DeviceInfo {
@@ -349,6 +352,7 @@ public static class PROPERTY {
         public static final String IGNORE_LOCATION_DELETION = "ignore.location.deletion";
         public static final String ENABLE_SEARCH_BUTTON = "enable.search.button";
         public static final String DISABLE_PROFILE_IMAGES_FEATURE = "feature.profile.images.disabled";
+        public static final String MONITOR_HEIGHT = "monitor.height";
     }
 
     public static class HTTP_REQUEST_HEADERS {
diff --git a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
index 8ff27a4d8..f3e3dae61 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
@@ -1,5 +1,26 @@
 package org.smartregister.view.fragment;
 
+import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
+import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
+import static org.smartregister.AllConstants.DeviceInfo.MODEL;
+import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
+import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
+import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_HEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_VACCINE_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_WEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
+import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
+import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
+import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
+
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,6 +33,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import org.smartregister.AllConstants;
+import org.smartregister.CoreLibrary;
 import org.smartregister.R;
 import org.smartregister.view.contract.StatsFragmentContract;
 import org.smartregister.view.presenter.StatsFragmentPresenter;
@@ -20,24 +43,6 @@
 import java.util.Date;
 import java.util.Map;
 
-import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
-import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
-import static org.smartregister.AllConstants.DeviceInfo.MODEL;
-import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
-import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
-import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
-import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
-import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
-import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
-import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
-import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
-
 public class StatsFragment extends Fragment implements StatsFragmentContract.View {
 
     private StatsFragmentPresenter presenter;
@@ -60,6 +65,9 @@ public class StatsFragment extends Fragment implements StatsFragmentContract.Vie
     private TextView tvOS;
     private TextView tvBuildDate;
     private TextView tvCurrentDate;
+    private TextView tvUnsyncedVaccineEvents;
+    private TextView tvUnsyncedWeightEvents;
+    private TextView tvUnsyncedHeightEvents;
 
     public static StatsFragment newInstance(Bundle bundle) {
         StatsFragment fragment = new StatsFragment();
@@ -104,6 +112,9 @@ private void initializeViews(View view) {
         tvOS = view.findViewById(R.id.os_value);
         tvBuildDate = view.findViewById(R.id.build_date_value);
         tvCurrentDate = view.findViewById(R.id.date_value);
+        tvUnsyncedVaccineEvents = view.findViewById(R.id.synced_vaccine_events);
+        tvUnsyncedHeightEvents = view.findViewById(R.id.synced_height_events);
+        tvUnsyncedWeightEvents = view.findViewById(R.id.synced_weight_events);
 
         Button btnRefreshStats = view.findViewById(R.id.refresh_button);
         btnRefreshStats.setOnClickListener(v -> presenter.fetchSyncInfo());
@@ -125,6 +136,16 @@ public void refreshECSyncInfo(Map<String, String> syncInfoMap) {
         tvValidatedEvents.setText(syncInfoMap.get(VALID_EVENTS));
         tvValidatedClients.setText(syncInfoMap.get(VALID_CLIENTS) + "");
 
+        tvUnsyncedVaccineEvents.setText(syncInfoMap.get(UNSYNCED_VACCINE_EVENTS) + "");
+        tvUnsyncedWeightEvents.setText(syncInfoMap.get(UNSYNCED_WEIGHT_EVENTS) + "");
+        // Only show height stats if they are record height is enabled
+        if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT))
+            tvUnsyncedHeightEvents.setText(syncInfoMap.get(UNSYNCED_HEIGHT_EVENTS) + "");
+        else {
+            if (getView() != null) {
+                getView().findViewById(R.id.height_stats).setVisibility(View.GONE);
+            }
+        }
         tvUserName.setText(syncInfoMap.get(USER_NAME));
         tvAppVersionName.setText(syncInfoMap.get(APP_VERSION_NAME));
         tvAppVersionCode.setText(syncInfoMap.get(APP_VERSION_CODE));
diff --git a/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java b/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
index 33b5242a6..5a8c5c8a0 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
@@ -17,6 +17,9 @@
 import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_HEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_VACCINE_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_WEIGHT_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
 import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
 import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
@@ -29,6 +32,7 @@
 import net.sqlcipher.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
 
+import org.smartregister.AllConstants;
 import org.smartregister.CoreLibrary;
 import org.smartregister.repository.AllSharedPreferences;
 import org.smartregister.repository.BaseRepository;
@@ -72,6 +76,9 @@ public void fetchECSyncInfo() {
         syncInfoMap.put(INVALID_CLIENTS, "0");
         syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "0");
         syncInfoMap.put(NULL_EVENT_SYNC_STATUS, "0");
+        syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, "0");
+        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "0");
+        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "0");
 
         String eventSyncSql = "select count(*), syncStatus from event group by syncStatus";
         String clientSyncSql = "select count(*), syncStatus from client group by syncStatus";
@@ -79,6 +86,10 @@ public void fetchECSyncInfo() {
         String validatedEventsSql = "select count(*), validationStatus from event group by validationStatus";
         String validatedClientsSql = "select count(*), validationStatus from client group by validationStatus";
 
+        String unsyncedVaccineEventsSQL = "SELECT COUNT(*) FROM vaccines WHERE sync_status = 'Unsynced'";
+        String unsyncedWeightEventsSQL = "SELECT COUNT(*) FROM weights WHERE sync_status = 'Unsynced'";
+        String unsyncedHeightEventsSQL = "SELECT COUNT(*) FROM heights WHERE sync_status = 'Unsynced'";
+
         Cursor cursor = null;
 
         try {
@@ -105,6 +116,22 @@ public void fetchECSyncInfo() {
                 populateValidatedClientsInfo(cursor);
             }
 
+            cursor = database.rawQuery(unsyncedVaccineEventsSQL, new String[]{});
+            while (cursor.moveToNext()) {
+                syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, String.valueOf(cursor.getInt(0)));
+            }
+
+            cursor = database.rawQuery(unsyncedWeightEventsSQL, new String[]{});
+            while (cursor.moveToNext()) {
+                syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
+            }
+            if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT)) {
+                cursor = database.rawQuery(unsyncedHeightEventsSQL, new String[]{});
+                while (cursor.moveToNext()) {
+                    syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
+                }
+            }
+
             cursor.close();
 
             populateUserInfo();
diff --git a/opensrp-core/src/test/assets/app.properties b/opensrp-core/src/test/assets/app.properties
index 06a6d97c6..e2b16d4bc 100644
--- a/opensrp-core/src/test/assets/app.properties
+++ b/opensrp-core/src/test/assets/app.properties
@@ -3,3 +3,4 @@ PORT=-1
 SHOULD_VERIFY_CERTIFICATE=false
 SYNC_DOWNLOAD_BATCH_SIZE=10
 system.toaster.centered=true
+monitor.height=true
diff --git a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
index 2e82aaa29..9a3843198 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
@@ -6,6 +6,9 @@
 import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_HEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_VACCINE_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_WEIGHT_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
 
@@ -103,11 +106,15 @@ public void refreshECSyncInfoUpdatesViews() {
         syncInfoMap.put(UNSYNCED_CLIENTS, "6");
         syncInfoMap.put(VALID_EVENTS, "7");
         syncInfoMap.put(VALID_CLIENTS, "8");
+        syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, "1");
+        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "1");
+        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "1");
 
         View rootView = LayoutInflater.from(ApplicationProvider.getApplicationContext()).inflate(R.layout.fragment_stats, null);
 
         TextView tvSyncedEvents = rootView.findViewById(R.id.synced_events);
         TextView tvUnSyncedEvents = rootView.findViewById(R.id.unsynced_events);
+        TextView tvUnsyncedHeightEvents = rootView.findViewById(R.id.synced_height_events);
 
         ReflectionHelpers.setField(statsFragment, "tvSyncedEvents", tvSyncedEvents);
         ReflectionHelpers.setField(statsFragment, "tvUnSyncedEvents", tvUnSyncedEvents);
@@ -127,10 +134,14 @@ public void refreshECSyncInfoUpdatesViews() {
         ReflectionHelpers.setField(statsFragment, "tvOS", rootView.findViewById(R.id.os_value));
         ReflectionHelpers.setField(statsFragment, "tvBuildDate", rootView.findViewById(R.id.build_date_value));
         ReflectionHelpers.setField(statsFragment, "tvCurrentDate", rootView.findViewById(R.id.date_value));
+        ReflectionHelpers.setField(statsFragment, "tvUnsyncedVaccineEvents", rootView.findViewById(R.id.synced_vaccine_events));
+        ReflectionHelpers.setField(statsFragment, "tvUnsyncedWeightEvents", rootView.findViewById(R.id.synced_weight_events));
+        ReflectionHelpers.setField(statsFragment, "tvUnsyncedHeightEvents", tvUnsyncedHeightEvents);
 
         statsFragment.refreshECSyncInfo(syncInfoMap);
         Assert.assertEquals("2", tvSyncedEvents.getText());
         Assert.assertEquals("3", tvUnSyncedEvents.getText());
+        Assert.assertEquals("1", tvUnsyncedHeightEvents.getText());
     }
 
     @Test
diff --git a/sample/src/main/assets/app.properties b/sample/src/main/assets/app.properties
index 8f3a78921..1f87af565 100644
--- a/sample/src/main/assets/app.properties
+++ b/sample/src/main/assets/app.properties
@@ -6,3 +6,4 @@ system.toaster.centered=false
 encrypt.shared.preferences=false
 allow.offline.login.with.invalid.token=false
 ignore.location.deletion = false
+monitor.height=true
\ No newline at end of file

From 5a5c1e5d53bb4570fb6b2a6546989e65d9fe2b3b Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 17 Nov 2022 12:38:18 +0500
Subject: [PATCH 10/20] Fix failing test

---
 .../src/test/java/org/smartregister/util/UtilsTest.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
index 41fc50626..086e49421 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
@@ -706,11 +706,12 @@ public void dobStringToDateTimeShouldHandleInvalidDateTimeStrings() {
     public void getPropertiesShouldLoadPropertiesInPropertiesFile() {
         AppProperties appProperties = Utils.getProperties(ApplicationProvider.getApplicationContext());
 
-        assertEquals(5, appProperties.size());
+        assertEquals(6, appProperties.size());
         assertEquals("", appProperties.getProperty("DRISHTI_BASE_URL"));
         assertEquals("false", appProperties.getProperty("SHOULD_VERIFY_CERTIFICATE"));
         assertEquals("true", appProperties.getProperty("system.toaster.centered"));
         assertEquals("10", appProperties.getProperty("SYNC_DOWNLOAD_BATCH_SIZE"));
+        assertEquals("true", appProperties.getProperty("monitor.height"));
     }
 
     @Test

From 36ee1f0a0af31afe378c0562564ab32900539cee Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 17 Nov 2022 13:48:28 +0500
Subject: [PATCH 11/20] PR feedback changes

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 247577a0e..63b63095e 100644
--- a/README.md
+++ b/README.md
@@ -307,12 +307,11 @@ By placing a file named `app.properties` in your implementation assets folder (S
 ### Configurable Settings
 
 | Configuration                            | Type    | Default | Description                                                                                                                                         |
-| ---------------------------------------- | ------- | ------- |-----------------------------------------------------------------------------------------------------------------------------------------------------|
+| ---------------------------------------- | ------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `system.toaster.centered`                | Boolean | false   | Position toaster(s) at the center of the view(s)                                                                                                    |
 | `disable.location.picker.view`           | Boolean | false   | Disables LocationPicker View                                                                                                                        |
 | `location.picker.tag.shown`              | Boolean | false   | Hides/Shows the location tag in the location picker tree view                                                                                       |
 | `encrypt.shared.preferences`             | Boolean | false   | Enable/disables encrypting SharedPreferences                                                                                                        |
 | `allow.offline.login.with.invalid.token` | Boolean | false   | Allow offline login when token is no longer valid after a successful login when online and user is forcefully logged out                            |
 | `enable.search.button`                   | Boolean | false   | Enable/Disable search to be triggered only after clicking the search icon in `org.smartregister.view.fragment.BaseRegisterFragment` or its subclass |
-| `feature.profile.images.disabled`            | Boolean | false    | Disable profile image capturing and rendering                                                                                                       |
-| `monitor.height`            | Boolean | false    | Show height unsynced events count in stats view                                                                                                     |
\ No newline at end of file
+| `feature.profile.images.disabled`            | Boolean | false    | Disable profile image capturing and rendering                                                                                                       |
\ No newline at end of file

From 8ef2f1ac6ef3d812e7da36cbb01dbe9c878984c2 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 17 Nov 2022 19:34:39 +0500
Subject: [PATCH 12/20] Code Refactor

---
 .../org/smartregister/util/StatsUtils.java    | 210 +++++++++++++++++
 .../interactor/StatsFragmentInteractor.java   | 213 +-----------------
 sample/src/main/assets/app.properties         |   3 +-
 3 files changed, 216 insertions(+), 210 deletions(-)
 create mode 100644 opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java

diff --git a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
new file mode 100644
index 000000000..c82c5357a
--- /dev/null
+++ b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
@@ -0,0 +1,210 @@
+package org.smartregister.util;
+
+import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
+import static org.smartregister.AllConstants.DatabaseKeys.SYNC_STATUS;
+import static org.smartregister.AllConstants.DatabaseKeys.VALIDATION_STATUS;
+import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
+import static org.smartregister.AllConstants.DeviceInfo.MODEL;
+import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
+import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
+import static org.smartregister.AllConstants.SyncInfo.INVALID_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.INVALID_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.NULL_EVENT_SYNC_STATUS;
+import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_HEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_VACCINE_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_WEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
+import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
+import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
+import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
+
+import android.content.Context;
+import android.os.Build;
+
+import net.sqlcipher.Cursor;
+import net.sqlcipher.database.SQLiteDatabase;
+
+import org.smartregister.AllConstants;
+import org.smartregister.CoreLibrary;
+import org.smartregister.repository.AllSharedPreferences;
+import org.smartregister.repository.BaseRepository;
+import org.smartregister.view.activity.DrishtiApplication;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import timber.log.Timber;
+
+public class StatsUtils {
+
+    private final Map<String, String> syncInfoMap = new HashMap<>();
+    private final SQLiteDatabase database;
+
+    public StatsUtils() {
+        database = DrishtiApplication.getInstance().getRepository().getReadableDatabase();
+    }
+
+    public Map<String, String> fetchStatsInfo() {
+        syncInfoMap.put(SYNCED_EVENTS, "0");
+        syncInfoMap.put(SYNCED_CLIENTS, "0");
+        syncInfoMap.put(UNSYNCED_EVENTS, "0");
+        syncInfoMap.put(UNSYNCED_CLIENTS, "0");
+        syncInfoMap.put(VALID_EVENTS, "0");
+        syncInfoMap.put(INVALID_EVENTS, "0");
+        syncInfoMap.put(VALID_CLIENTS, "0");
+        syncInfoMap.put(INVALID_CLIENTS, "0");
+        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "0");
+        syncInfoMap.put(NULL_EVENT_SYNC_STATUS, "0");
+        syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, "0");
+        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "0");
+        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "0");
+
+        String eventSyncSql = "select count(*), syncStatus from event group by syncStatus";
+        String clientSyncSql = "select count(*), syncStatus from client group by syncStatus";
+
+        String validatedEventsSql = "select count(*), validationStatus from event group by validationStatus";
+        String validatedClientsSql = "select count(*), validationStatus from client group by validationStatus";
+
+        String unsyncedVaccineEventsSQL = "SELECT COUNT(*) FROM vaccines WHERE sync_status = 'Unsynced'";
+        String unsyncedWeightEventsSQL = "SELECT COUNT(*) FROM weights WHERE sync_status = 'Unsynced'";
+        String unsyncedHeightEventsSQL = "SELECT COUNT(*) FROM heights WHERE sync_status = 'Unsynced'";
+
+        Cursor cursor;
+
+        cursor = database.rawQuery(eventSyncSql, new String[]{});
+        while (cursor.moveToNext()) {
+            populateEventSyncInfo(cursor);
+        }
+        cursor.close();
+
+        cursor = database.rawQuery(clientSyncSql, new String[]{});
+        while (cursor.moveToNext()) {
+            populateClientSyncInfo(cursor);
+        }
+        cursor.close();
+
+        cursor = database.rawQuery(validatedEventsSql, new String[]{});
+        while (cursor.moveToNext()) {
+            populateValidatedEventsInfo(cursor);
+        }
+        cursor.close();
+
+        cursor = database.rawQuery(validatedClientsSql, new String[]{});
+        while (cursor.moveToNext()) {
+            populateValidatedClientsInfo(cursor);
+        }
+
+        cursor = database.rawQuery(unsyncedVaccineEventsSQL, new String[]{});
+        while (cursor.moveToNext()) {
+            syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, String.valueOf(cursor.getInt(0)));
+        }
+
+        cursor = database.rawQuery(unsyncedWeightEventsSQL, new String[]{});
+        while (cursor.moveToNext()) {
+            syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
+        }
+        if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT)) {
+            cursor = database.rawQuery(unsyncedHeightEventsSQL, new String[]{});
+            while (cursor.moveToNext()) {
+                syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
+            }
+        }
+
+        cursor.close();
+
+        populateUserInfo();
+        populateBuildInfo();
+        populateDeviceInfo();
+        return syncInfoMap;
+    }
+
+    private void populateEventSyncInfo(Cursor cursor) {
+        String syncStatus = cursor.getString(cursor.getColumnIndex(SYNC_STATUS));
+        if (BaseRepository.TYPE_Synced.equals(syncStatus)) {
+            syncInfoMap.put(SYNCED_EVENTS, String.valueOf(cursor.getInt(0)));
+        } else if (BaseRepository.TYPE_Unsynced.equals(syncStatus)) {
+            syncInfoMap.put(UNSYNCED_EVENTS, String.valueOf(cursor.getInt(0)));
+        } else if (BaseRepository.TYPE_Task_Unprocessed.equals(syncStatus)) {
+            syncInfoMap.put(TASK_UNPROCESSED_EVENTS, String.valueOf(cursor.getInt(0)));
+        } else if (syncStatus == null) {
+            syncInfoMap.put(NULL_EVENT_SYNC_STATUS, String.valueOf(cursor.getInt(0)));
+        }
+    }
+
+    private void populateClientSyncInfo(Cursor cursor) {
+        String syncStatus = cursor.getString(cursor.getColumnIndex(SYNC_STATUS));
+        if (BaseRepository.TYPE_Synced.equals(syncStatus)) {
+            syncInfoMap.put(SYNCED_CLIENTS, String.valueOf(cursor.getInt(0)));
+        } else if (BaseRepository.TYPE_Unsynced.equals(syncStatus)) {
+            syncInfoMap.put(UNSYNCED_CLIENTS, String.valueOf(cursor.getInt(0)));
+        }
+    }
+
+    private void populateValidatedEventsInfo(Cursor cursor) {
+        String syncStatus = cursor.getString(cursor.getColumnIndex(VALIDATION_STATUS));
+        if (BaseRepository.TYPE_Valid.equals(syncStatus)) {
+            syncInfoMap.put(VALID_EVENTS, String.valueOf(cursor.getInt(0)));
+        } else if (BaseRepository.TYPE_InValid.equals(syncStatus)) {
+            syncInfoMap.put(INVALID_EVENTS, String.valueOf(cursor.getInt(0)));
+        }
+    }
+
+    private void populateValidatedClientsInfo(Cursor cursor) {
+        String validationStatus = cursor.getString(cursor.getColumnIndex(VALIDATION_STATUS));
+        if (BaseRepository.TYPE_Valid.equals(validationStatus)) {
+            syncInfoMap.put(VALID_CLIENTS, String.valueOf(cursor.getInt(0)));
+        } else if (BaseRepository.TYPE_InValid.equals(validationStatus)) {
+            syncInfoMap.put(INVALID_CLIENTS, String.valueOf(cursor.getInt(0)));
+        }
+    }
+
+    public void populateUserInfo() {
+        AllSharedPreferences sharedPreferences = CoreLibrary.getInstance().context().userService().getAllSharedPreferences();
+        syncInfoMap.put(USER_NAME, sharedPreferences.fetchRegisteredANM());
+        syncInfoMap.put(USER_TEAM, sharedPreferences.fetchDefaultTeam(sharedPreferences.fetchRegisteredANM()));
+        syncInfoMap.put(USER_LOCALITY, sharedPreferences.fetchCurrentLocality());
+    }
+
+
+    private void populateBuildInfo() {
+        syncInfoMap.put(APP_VERSION_NAME, getBuildConfigValue("VERSION_NAME"));
+        syncInfoMap.put(APP_VERSION_CODE, getBuildConfigValue("VERSION_CODE"));
+        syncInfoMap.put(DB_VERSION, getBuildConfigValue("DATABASE_VERSION"));
+    }
+
+    private void populateDeviceInfo() {
+        try {
+            syncInfoMap.put(MANUFACTURER, Build.MANUFACTURER);
+            syncInfoMap.put(MODEL, Build.MODEL);
+            syncInfoMap.put(APP_BUILD_DATE, Utils.getBuildDate(true));
+
+            String osName = Build.VERSION_CODES.class.getFields()[android.os.Build.VERSION.SDK_INT].getName();
+            syncInfoMap.put(OS_VERSION, osName);
+        } catch (Exception e) {
+            Timber.e(e);
+        }
+
+    }
+
+    public String getBuildConfigValue(String fieldName) {
+        try {
+            Context context = CoreLibrary.getInstance().context().applicationContext();
+            Class<?> clazz = Class.forName(context.getPackageName() + ".BuildConfig");
+            Field field = clazz.getField(fieldName);
+            return String.valueOf(field.get(null));
+        } catch (Exception e) {
+            Timber.e(e);
+            return "0";
+        }
+    }
+
+}
diff --git a/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java b/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
index 5a8c5c8a0..5a0e16e62 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
@@ -1,235 +1,32 @@
 package org.smartregister.view.interactor;
 
-import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
-import static org.smartregister.AllConstants.DatabaseKeys.SYNC_STATUS;
-import static org.smartregister.AllConstants.DatabaseKeys.VALIDATION_STATUS;
-import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
-import static org.smartregister.AllConstants.DeviceInfo.MODEL;
-import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
-import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
-import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
-import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
-import static org.smartregister.AllConstants.SyncInfo.INVALID_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.INVALID_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.NULL_EVENT_SYNC_STATUS;
-import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_HEIGHT_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_VACCINE_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_WEIGHT_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
-import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
-import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
-import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
-
-import android.content.Context;
-import android.os.Build;
-
-import net.sqlcipher.Cursor;
-import net.sqlcipher.database.SQLiteDatabase;
-
-import org.smartregister.AllConstants;
-import org.smartregister.CoreLibrary;
-import org.smartregister.repository.AllSharedPreferences;
-import org.smartregister.repository.BaseRepository;
 import org.smartregister.util.AppExecutors;
-import org.smartregister.util.Utils;
-import org.smartregister.view.activity.DrishtiApplication;
+import org.smartregister.util.StatsUtils;
 import org.smartregister.view.contract.StatsFragmentContract;
 
-import java.lang.reflect.Field;
-import java.util.HashMap;
 import java.util.Map;
 
 import timber.log.Timber;
 
 public class StatsFragmentInteractor implements StatsFragmentContract.Interactor {
 
-    private AppExecutors appExecutors;
+    private final AppExecutors appExecutors;
 
-    private SQLiteDatabase database;
-
-    private StatsFragmentContract.Presenter presenter;
-
-    private Map<String, String> syncInfoMap = new HashMap<>();
+    private final StatsFragmentContract.Presenter presenter;
 
     public StatsFragmentInteractor(StatsFragmentContract.Presenter presenter) {
         this.presenter = presenter;
         appExecutors = new AppExecutors();
-        database = DrishtiApplication.getInstance().getRepository().getReadableDatabase();
     }
 
     @Override
     public void fetchECSyncInfo() {
-        syncInfoMap = new HashMap<>();
-        syncInfoMap.put(SYNCED_EVENTS, "0");
-        syncInfoMap.put(SYNCED_CLIENTS, "0");
-        syncInfoMap.put(UNSYNCED_EVENTS, "0");
-        syncInfoMap.put(UNSYNCED_CLIENTS, "0");
-        syncInfoMap.put(VALID_EVENTS, "0");
-        syncInfoMap.put(INVALID_EVENTS, "0");
-        syncInfoMap.put(VALID_CLIENTS, "0");
-        syncInfoMap.put(INVALID_CLIENTS, "0");
-        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "0");
-        syncInfoMap.put(NULL_EVENT_SYNC_STATUS, "0");
-        syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, "0");
-        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "0");
-        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "0");
-
-        String eventSyncSql = "select count(*), syncStatus from event group by syncStatus";
-        String clientSyncSql = "select count(*), syncStatus from client group by syncStatus";
-
-        String validatedEventsSql = "select count(*), validationStatus from event group by validationStatus";
-        String validatedClientsSql = "select count(*), validationStatus from client group by validationStatus";
-
-        String unsyncedVaccineEventsSQL = "SELECT COUNT(*) FROM vaccines WHERE sync_status = 'Unsynced'";
-        String unsyncedWeightEventsSQL = "SELECT COUNT(*) FROM weights WHERE sync_status = 'Unsynced'";
-        String unsyncedHeightEventsSQL = "SELECT COUNT(*) FROM heights WHERE sync_status = 'Unsynced'";
-
-        Cursor cursor = null;
-
-        try {
-            cursor = database.rawQuery(eventSyncSql, new String[]{});
-            while (cursor.moveToNext()) {
-                populateEventSyncInfo(cursor);
-            }
-            cursor.close();
-
-            cursor = database.rawQuery(clientSyncSql, new String[]{});
-            while (cursor.moveToNext()) {
-                populateClientSyncInfo(cursor);
-            }
-            cursor.close();
-
-            cursor = database.rawQuery(validatedEventsSql, new String[]{});
-            while (cursor.moveToNext()) {
-                populateValidatedEventsInfo(cursor);
-            }
-            cursor.close();
-
-            cursor = database.rawQuery(validatedClientsSql, new String[]{});
-            while (cursor.moveToNext()) {
-                populateValidatedClientsInfo(cursor);
-            }
-
-            cursor = database.rawQuery(unsyncedVaccineEventsSQL, new String[]{});
-            while (cursor.moveToNext()) {
-                syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, String.valueOf(cursor.getInt(0)));
-            }
-
-            cursor = database.rawQuery(unsyncedWeightEventsSQL, new String[]{});
-            while (cursor.moveToNext()) {
-                syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
-            }
-            if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT)) {
-                cursor = database.rawQuery(unsyncedHeightEventsSQL, new String[]{});
-                while (cursor.moveToNext()) {
-                    syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
-                }
-            }
-
-            cursor.close();
-
-            populateUserInfo();
-            populateBuildInfo();
-            populateDeviceInfo();
-
-            appExecutors.mainThread().execute(new Runnable() {
-                @Override
-                public void run() {
-                    presenter.onECSyncInfoFetched(syncInfoMap);
-                }
-            });
-        } catch (Exception e) {
-            Timber.e(e);
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-    }
-
-    private void populateEventSyncInfo(Cursor cursor) {
-        String syncStatus = cursor.getString(cursor.getColumnIndex(SYNC_STATUS));
-        if (BaseRepository.TYPE_Synced.equals(syncStatus)) {
-            syncInfoMap.put(SYNCED_EVENTS, String.valueOf(cursor.getInt(0)));
-        } else if (BaseRepository.TYPE_Unsynced.equals(syncStatus)) {
-            syncInfoMap.put(UNSYNCED_EVENTS, String.valueOf(cursor.getInt(0)));
-        } else if (BaseRepository.TYPE_Task_Unprocessed.equals(syncStatus)) {
-            syncInfoMap.put(TASK_UNPROCESSED_EVENTS, String.valueOf(cursor.getInt(0)));
-        } else if (syncStatus == null) {
-            syncInfoMap.put(NULL_EVENT_SYNC_STATUS, String.valueOf(cursor.getInt(0)));
-        }
-    }
-
-    private void populateClientSyncInfo(Cursor cursor) {
-        String syncStatus = cursor.getString(cursor.getColumnIndex(SYNC_STATUS));
-        if (BaseRepository.TYPE_Synced.equals(syncStatus)) {
-            syncInfoMap.put(SYNCED_CLIENTS, String.valueOf(cursor.getInt(0)));
-        } else if (BaseRepository.TYPE_Unsynced.equals(syncStatus)) {
-            syncInfoMap.put(UNSYNCED_CLIENTS, String.valueOf(cursor.getInt(0)));
-        }
-    }
-
-    private void populateValidatedEventsInfo(Cursor cursor) {
-        String syncStatus = cursor.getString(cursor.getColumnIndex(VALIDATION_STATUS));
-        if (BaseRepository.TYPE_Valid.equals(syncStatus)) {
-            syncInfoMap.put(VALID_EVENTS, String.valueOf(cursor.getInt(0)));
-        } else if (BaseRepository.TYPE_InValid.equals(syncStatus)) {
-            syncInfoMap.put(INVALID_EVENTS, String.valueOf(cursor.getInt(0)));
-        }
-    }
-
-    private void populateValidatedClientsInfo(Cursor cursor) {
-        String validationStatus = cursor.getString(cursor.getColumnIndex(VALIDATION_STATUS));
-        if (BaseRepository.TYPE_Valid.equals(validationStatus)) {
-            syncInfoMap.put(VALID_CLIENTS, String.valueOf(cursor.getInt(0)));
-        } else if (BaseRepository.TYPE_InValid.equals(validationStatus)) {
-            syncInfoMap.put(INVALID_CLIENTS, String.valueOf(cursor.getInt(0)));
-        }
-    }
-
-    public void populateUserInfo() {
-        AllSharedPreferences sharedPreferences = CoreLibrary.getInstance().context().userService().getAllSharedPreferences();
-        syncInfoMap.put(USER_NAME, sharedPreferences.fetchRegisteredANM());
-        syncInfoMap.put(USER_TEAM, sharedPreferences.fetchDefaultTeam(sharedPreferences.fetchRegisteredANM()));
-        syncInfoMap.put(USER_LOCALITY, sharedPreferences.fetchCurrentLocality());
-    }
-
-
-    private void populateBuildInfo() {
-        syncInfoMap.put(APP_VERSION_NAME, getBuildConfigValue("VERSION_NAME"));
-        syncInfoMap.put(APP_VERSION_CODE, getBuildConfigValue("VERSION_CODE"));
-        syncInfoMap.put(DB_VERSION, getBuildConfigValue("DATABASE_VERSION"));
-    }
-
-    private void populateDeviceInfo() {
         try {
-            syncInfoMap.put(MANUFACTURER, Build.MANUFACTURER);
-            syncInfoMap.put(MODEL, Build.MODEL);
-            syncInfoMap.put(APP_BUILD_DATE, Utils.getBuildDate(true));
-
-            String osName = Build.VERSION_CODES.class.getFields()[android.os.Build.VERSION.SDK_INT].getName();
-            syncInfoMap.put(OS_VERSION, osName);
+            Map<String, String> syncInfoMap = new StatsUtils().fetchStatsInfo();
+            appExecutors.mainThread().execute(() -> presenter.onECSyncInfoFetched(syncInfoMap));
         } catch (Exception e) {
             Timber.e(e);
         }
-
     }
 
-    private String getBuildConfigValue(String fieldName) {
-        try {
-            Context context = CoreLibrary.getInstance().context().applicationContext();
-            Class<?> clazz = Class.forName(context.getPackageName() + ".BuildConfig");
-            Field field = clazz.getField(fieldName);
-            return String.valueOf(field.get(null));
-        } catch (Exception e) {
-            Timber.e(e);
-            return "0";
-        }
-    }
 }
diff --git a/sample/src/main/assets/app.properties b/sample/src/main/assets/app.properties
index 1f87af565..d995c774a 100644
--- a/sample/src/main/assets/app.properties
+++ b/sample/src/main/assets/app.properties
@@ -5,5 +5,4 @@ SYNC_DOWNLOAD_BATCH_SIZE=10
 system.toaster.centered=false
 encrypt.shared.preferences=false
 allow.offline.login.with.invalid.token=false
-ignore.location.deletion = false
-monitor.height=true
\ No newline at end of file
+ignore.location.deletion = false
\ No newline at end of file

From 398a1dee17e1fbf8d2475d24f25862dd8dcd1b56 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 17 Nov 2022 19:50:56 +0500
Subject: [PATCH 13/20] Refactor Tests

---
 .../StatsUtilsTest.java}                      | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)
 rename opensrp-core/src/test/java/org/smartregister/{interactor/StatsFragmentInteractorTest.java => util/StatsUtilsTest.java} (80%)

diff --git a/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
similarity index 80%
rename from opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java
rename to opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
index 5a56198f3..b0294634f 100644
--- a/opensrp-core/src/test/java/org/smartregister/interactor/StatsFragmentInteractorTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
@@ -1,4 +1,4 @@
-package org.smartregister.interactor;
+package org.smartregister.util;
 
 import static org.mockito.ArgumentMatchers.eq;
 import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
@@ -26,24 +26,22 @@
 import org.mockito.Mockito;
 import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.BaseUnitTest;
+import org.smartregister.BuildConfig;
 import org.smartregister.Context;
 import org.smartregister.CoreLibrary;
 import org.smartregister.repository.AllSharedPreferences;
 import org.smartregister.repository.BaseRepository;
 import org.smartregister.service.UserService;
-import org.smartregister.view.interactor.StatsFragmentInteractor;
-import org.smartregister.view.presenter.StatsFragmentPresenter;
 
 import java.util.Map;
 
-public class StatsFragmentInteractorTest extends BaseUnitTest {
+public class StatsUtilsTest extends BaseUnitTest {
 
-    private StatsFragmentInteractor statsFragmentInteractor;
+    private StatsUtils statsUtils;
 
     @Before
     public void setUp() {
-        StatsFragmentPresenter presenter = Mockito.mock(StatsFragmentPresenter.class, Mockito.CALLS_REAL_METHODS);
-        statsFragmentInteractor = new StatsFragmentInteractor(presenter);
+        statsUtils = new StatsUtils();
     }
 
     @Test
@@ -62,9 +60,9 @@ public void testPopulateUserInfoPopulatesCorrectValues() {
         Mockito.doReturn("team").when(sharedPreferences).fetchDefaultTeam(Mockito.anyString());
         Mockito.doReturn("locality").when(sharedPreferences).fetchCurrentLocality();
 
-        ReflectionHelpers.callInstanceMethod(statsFragmentInteractor, "populateUserInfo");
+        ReflectionHelpers.callInstanceMethod(statsUtils, "populateUserInfo");
 
-        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
 
         Assert.assertEquals("user", syncInfoMap.get(USER_NAME));
         Assert.assertEquals("team", syncInfoMap.get(USER_TEAM));
@@ -83,20 +81,20 @@ public void testPopulateBuildInfoPopulatesCorrectValues() {
         Mockito.doReturn(appContext).when(context).applicationContext();
         Mockito.doReturn("org.smartregister").when(appContext).getPackageName();
 
-        ReflectionHelpers.callInstanceMethod(statsFragmentInteractor, "populateBuildInfo");
+        ReflectionHelpers.callInstanceMethod(statsUtils, "populateBuildInfo");
 
-        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
 
-        Assert.assertEquals("6.1.0-SNAPSHOT", syncInfoMap.get(APP_VERSION_NAME));
+        Assert.assertEquals(BuildConfig.VERSION_NAME, syncInfoMap.get(APP_VERSION_NAME));
         Assert.assertEquals("1", syncInfoMap.get(APP_VERSION_CODE));
         Assert.assertEquals("0", syncInfoMap.get(DB_VERSION));
     }
 
     @Test
     public void testPopulateDeviceInfoPopulatesCorrectValues() {
-        ReflectionHelpers.callInstanceMethod(statsFragmentInteractor, "populateDeviceInfo");
+        ReflectionHelpers.callInstanceMethod(statsUtils, "populateDeviceInfo");
 
-        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
 
         Assert.assertEquals("robolectric", syncInfoMap.get(MANUFACTURER));
         Assert.assertEquals("robolectric", syncInfoMap.get(MODEL));
@@ -112,10 +110,10 @@ public void testPopulateValidatedEventsInfoAddValidEventsCountWhenStatusIsValid(
         Mockito.doReturn(BaseRepository.TYPE_Valid).when(cursor).getString(eq(1));
         Mockito.doReturn(10).when(cursor).getInt(eq(0));
 
-        ReflectionHelpers.callInstanceMethod(statsFragmentInteractor, "populateValidatedEventsInfo",
+        ReflectionHelpers.callInstanceMethod(statsUtils, "populateValidatedEventsInfo",
                 ReflectionHelpers.ClassParameter.from(Cursor.class, cursor));
 
-        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
         Assert.assertEquals("10", syncInfoMap.get(VALID_EVENTS));
 
     }
@@ -128,10 +126,10 @@ public void testPopulateValidatedEventsInfoAddInvalidEventsCountWhenStatusIsInva
         Mockito.doReturn(BaseRepository.TYPE_InValid).when(cursor).getString(eq(1));
         Mockito.doReturn(10).when(cursor).getInt(eq(0));
 
-        ReflectionHelpers.callInstanceMethod(statsFragmentInteractor, "populateValidatedEventsInfo",
+        ReflectionHelpers.callInstanceMethod(statsUtils, "populateValidatedEventsInfo",
                 ReflectionHelpers.ClassParameter.from(Cursor.class, cursor));
 
-        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsFragmentInteractor, "syncInfoMap");
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
         Assert.assertEquals("10", syncInfoMap.get(INVALID_EVENTS));
 
     }

From fe0cda29437ed29a18887b8d5cfddca88a6cebb4 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Tue, 31 Jan 2023 14:45:41 +0500
Subject: [PATCH 14/20] Merge v5 branch changes

---
 opensrp-core/res/layout/fragment_stats.xml    | 11 ++++
 opensrp-core/res/values/strings.xml           |  2 +-
 .../java/org/smartregister/AllConstants.java  |  1 -
 .../org/smartregister/util/StatsUtils.java    | 66 +++++++++----------
 .../java/org/smartregister/util/Utils.java    |  5 ++
 .../view/fragment/StatsFragment.java          | 21 +++---
 opensrp-core/src/test/assets/app.properties   |  3 +-
 .../org/smartregister/TestApplication.java    | 12 +++-
 .../presenter/StatsFragmentPresenterTest.java | 20 ++++--
 .../smartregister/util/StatsUtilsTest.java    | 19 ++++--
 .../org/smartregister/util/UtilsTest.java     |  3 +-
 .../view/fragment/StatsFragmentTest.java      | 47 +++++++------
 12 files changed, 124 insertions(+), 86 deletions(-)

diff --git a/opensrp-core/res/layout/fragment_stats.xml b/opensrp-core/res/layout/fragment_stats.xml
index 3572d6b7e..70b1f63bb 100644
--- a/opensrp-core/res/layout/fragment_stats.xml
+++ b/opensrp-core/res/layout/fragment_stats.xml
@@ -317,6 +317,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -343,6 +344,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -369,6 +371,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -406,6 +409,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -432,6 +436,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -458,6 +463,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -483,6 +489,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -520,6 +527,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -546,6 +554,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -571,6 +580,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -596,6 +606,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
diff --git a/opensrp-core/res/values/strings.xml b/opensrp-core/res/values/strings.xml
index 68376462e..4a29333b7 100644
--- a/opensrp-core/res/values/strings.xml
+++ b/opensrp-core/res/values/strings.xml
@@ -474,7 +474,7 @@
     <string name="build_date">Build Date:</string>
     <string name="date">Date:</string>
     <string name="user">User:</string>
-    <string name="synced_vaccine_events">Unynced vaccine events:</string>
+    <string name="synced_vaccine_events">Unsynced vaccine events:</string>
     <string name="unsynced_weight_events">Unsynced weight events:</string>
     <string name="unsynced_height_events">Unsynced height events:</string>
 </resources>
diff --git a/opensrp-core/src/main/java/org/smartregister/AllConstants.java b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
index d694dd719..4d7c0a6ce 100644
--- a/opensrp-core/src/main/java/org/smartregister/AllConstants.java
+++ b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
@@ -352,7 +352,6 @@ public static class PROPERTY {
         public static final String IGNORE_LOCATION_DELETION = "ignore.location.deletion";
         public static final String ENABLE_SEARCH_BUTTON = "enable.search.button";
         public static final String DISABLE_PROFILE_IMAGES_FEATURE = "feature.profile.images.disabled";
-        public static final String MONITOR_HEIGHT = "monitor.height";
     }
 
     public static class HTTP_REQUEST_HEADERS {
diff --git a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
index c82c5357a..752c604ee 100644
--- a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
+++ b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
@@ -26,19 +26,17 @@
 import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
 
-import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.Build;
 
 import net.sqlcipher.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
 
-import org.smartregister.AllConstants;
 import org.smartregister.CoreLibrary;
 import org.smartregister.repository.AllSharedPreferences;
 import org.smartregister.repository.BaseRepository;
 import org.smartregister.view.activity.DrishtiApplication;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -54,19 +52,19 @@ public StatsUtils() {
     }
 
     public Map<String, String> fetchStatsInfo() {
-        syncInfoMap.put(SYNCED_EVENTS, "0");
-        syncInfoMap.put(SYNCED_CLIENTS, "0");
-        syncInfoMap.put(UNSYNCED_EVENTS, "0");
-        syncInfoMap.put(UNSYNCED_CLIENTS, "0");
-        syncInfoMap.put(VALID_EVENTS, "0");
-        syncInfoMap.put(INVALID_EVENTS, "0");
-        syncInfoMap.put(VALID_CLIENTS, "0");
-        syncInfoMap.put(INVALID_CLIENTS, "0");
-        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "0");
-        syncInfoMap.put(NULL_EVENT_SYNC_STATUS, "0");
-        syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, "0");
-        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "0");
-        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "0");
+        syncInfoMap.put(SYNCED_EVENTS, "-");
+        syncInfoMap.put(SYNCED_CLIENTS, "-");
+        syncInfoMap.put(UNSYNCED_EVENTS, "-");
+        syncInfoMap.put(UNSYNCED_CLIENTS, "-");
+        syncInfoMap.put(VALID_EVENTS, "-");
+        syncInfoMap.put(INVALID_EVENTS, "-");
+        syncInfoMap.put(VALID_CLIENTS, "-");
+        syncInfoMap.put(INVALID_CLIENTS, "-");
+        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "-");
+        syncInfoMap.put(NULL_EVENT_SYNC_STATUS, "-");
+        syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, "-");
+        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "-");
+        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "-");
 
         String eventSyncSql = "select count(*), syncStatus from event group by syncStatus";
         String clientSyncSql = "select count(*), syncStatus from client group by syncStatus";
@@ -112,7 +110,7 @@ public Map<String, String> fetchStatsInfo() {
         while (cursor.moveToNext()) {
             syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
         }
-        if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT)) {
+        if (CoreLibrary.getInstance().context().getAppProperties().isTrue("monitor.height")) { // Constant is defined in growth-monitoring module
             cursor = database.rawQuery(unsyncedHeightEventsSQL, new String[]{});
             while (cursor.moveToNext()) {
                 syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
@@ -176,9 +174,24 @@ public void populateUserInfo() {
 
 
     private void populateBuildInfo() {
-        syncInfoMap.put(APP_VERSION_NAME, getBuildConfigValue("VERSION_NAME"));
-        syncInfoMap.put(APP_VERSION_CODE, getBuildConfigValue("VERSION_CODE"));
-        syncInfoMap.put(DB_VERSION, getBuildConfigValue("DATABASE_VERSION"));
+        try {
+            syncInfoMap.put(APP_VERSION_NAME, Utils.getVersion(CoreLibrary.getInstance().context().applicationContext()));
+        } catch (PackageManager.NameNotFoundException e) {
+            syncInfoMap.put(APP_VERSION_NAME, "-");
+            Timber.e(e);
+        }
+        try {
+            syncInfoMap.put(APP_VERSION_CODE, String.valueOf(Utils.getVersionCode(CoreLibrary.getInstance().context().applicationContext())));
+        } catch (PackageManager.NameNotFoundException e) {
+            syncInfoMap.put(APP_VERSION_CODE, "-");
+            Timber.e(e);
+        }
+        try {
+            syncInfoMap.put(DB_VERSION, String.valueOf(Utils.getDatabaseVersion()));
+        } catch (Exception e) {
+            syncInfoMap.put(DB_VERSION, "-");
+            Timber.e(e);
+        }
     }
 
     private void populateDeviceInfo() {
@@ -194,17 +207,4 @@ private void populateDeviceInfo() {
         }
 
     }
-
-    public String getBuildConfigValue(String fieldName) {
-        try {
-            Context context = CoreLibrary.getInstance().context().applicationContext();
-            Class<?> clazz = Class.forName(context.getPackageName() + ".BuildConfig");
-            Field field = clazz.getField(fieldName);
-            return String.valueOf(field.get(null));
-        } catch (Exception e) {
-            Timber.e(e);
-            return "0";
-        }
-    }
-
 }
diff --git a/opensrp-core/src/main/java/org/smartregister/util/Utils.java b/opensrp-core/src/main/java/org/smartregister/util/Utils.java
index c50cdcf42..79c36736a 100644
--- a/opensrp-core/src/main/java/org/smartregister/util/Utils.java
+++ b/opensrp-core/src/main/java/org/smartregister/util/Utils.java
@@ -77,6 +77,7 @@
 import org.smartregister.domain.jsonmapping.util.TreeNode;
 import org.smartregister.receiver.SyncStatusBroadcastReceiver;
 import org.smartregister.repository.AllSharedPreferences;
+import org.smartregister.view.activity.DrishtiApplication;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -1038,4 +1039,8 @@ public static String extractTranslatableValue(String value) {
     }
         return  value;
     }
+
+    public static int getDatabaseVersion() {
+        return DrishtiApplication.getInstance().getRepository().getReadableDatabase().getVersion();
+    }
 }
\ No newline at end of file
diff --git a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
index f3e3dae61..b2c2ff011 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
@@ -33,7 +33,6 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import org.smartregister.AllConstants;
 import org.smartregister.CoreLibrary;
 import org.smartregister.R;
 import org.smartregister.view.contract.StatsFragmentContract;
@@ -126,21 +125,21 @@ private void initializeViews(View view) {
     @Override
     public void refreshECSyncInfo(Map<String, String> syncInfoMap) {
 
-        tvSyncedEvents.setText(syncInfoMap.get(SYNCED_EVENTS) + "");
-        tvUnSyncedEvents.setText(syncInfoMap.get(UNSYNCED_EVENTS) + "");
-        tvTaskUnprocessedEvents.setText(syncInfoMap.get(TASK_UNPROCESSED_EVENTS) + "");
+        tvSyncedEvents.setText(syncInfoMap.get(SYNCED_EVENTS));
+        tvUnSyncedEvents.setText(syncInfoMap.get(UNSYNCED_EVENTS));
+        tvTaskUnprocessedEvents.setText(syncInfoMap.get(TASK_UNPROCESSED_EVENTS));
 
-        tvSyncedClient.setText(syncInfoMap.get(SYNCED_CLIENTS) + "");
-        tvUnSyncedClients.setText(syncInfoMap.get(UNSYNCED_CLIENTS) + "");
+        tvSyncedClient.setText(syncInfoMap.get(SYNCED_CLIENTS));
+        tvUnSyncedClients.setText(syncInfoMap.get(UNSYNCED_CLIENTS));
 
         tvValidatedEvents.setText(syncInfoMap.get(VALID_EVENTS));
-        tvValidatedClients.setText(syncInfoMap.get(VALID_CLIENTS) + "");
+        tvValidatedClients.setText(syncInfoMap.get(VALID_CLIENTS));
 
-        tvUnsyncedVaccineEvents.setText(syncInfoMap.get(UNSYNCED_VACCINE_EVENTS) + "");
-        tvUnsyncedWeightEvents.setText(syncInfoMap.get(UNSYNCED_WEIGHT_EVENTS) + "");
+        tvUnsyncedVaccineEvents.setText(syncInfoMap.get(UNSYNCED_VACCINE_EVENTS));
+        tvUnsyncedWeightEvents.setText(syncInfoMap.get(UNSYNCED_WEIGHT_EVENTS));
         // Only show height stats if they are record height is enabled
-        if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT))
-            tvUnsyncedHeightEvents.setText(syncInfoMap.get(UNSYNCED_HEIGHT_EVENTS) + "");
+        if (CoreLibrary.getInstance().context().getAppProperties().isTrue("monitor.height")) // Constant is defined in growth-monitoring module
+            tvUnsyncedHeightEvents.setText(syncInfoMap.get(UNSYNCED_HEIGHT_EVENTS));
         else {
             if (getView() != null) {
                 getView().findViewById(R.id.height_stats).setVisibility(View.GONE);
diff --git a/opensrp-core/src/test/assets/app.properties b/opensrp-core/src/test/assets/app.properties
index e2b16d4bc..4847bbc01 100644
--- a/opensrp-core/src/test/assets/app.properties
+++ b/opensrp-core/src/test/assets/app.properties
@@ -2,5 +2,4 @@ DRISHTI_BASE_URL=
 PORT=-1
 SHOULD_VERIFY_CERTIFICATE=false
 SYNC_DOWNLOAD_BATCH_SIZE=10
-system.toaster.centered=true
-monitor.height=true
+system.toaster.centered=true
\ No newline at end of file
diff --git a/opensrp-core/src/test/java/org/smartregister/TestApplication.java b/opensrp-core/src/test/java/org/smartregister/TestApplication.java
index 5c006c2d4..11176eaad 100644
--- a/opensrp-core/src/test/java/org/smartregister/TestApplication.java
+++ b/opensrp-core/src/test/java/org/smartregister/TestApplication.java
@@ -14,8 +14,11 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
+import net.sqlcipher.database.SQLiteDatabase;
+
 /**
  * Created by samuelgithengi on 12/30/19.
  */
@@ -45,8 +48,13 @@ public void logoutCurrentUser() {
 
     @Override
     public Repository getRepository() {
-        if (repository == null)
-            repository = mock(Repository.class);
+        if (repository == null) {
+            Repository mockRepository = mock(Repository.class);
+            SQLiteDatabase mockSqLiteDatabase = mock(SQLiteDatabase.class);
+            doReturn(mockSqLiteDatabase).when(mockRepository).getReadableDatabase();
+            doReturn(1).when(mockSqLiteDatabase).getVersion();
+            repository = mockRepository;
+        }
         return repository;
     }
 
diff --git a/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java b/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java
index da555f93e..d5dfbcc27 100644
--- a/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java
@@ -3,10 +3,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentMatchers;
+import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.Spy;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.util.ReflectionHelpers;
-import org.smartregister.BaseUnitTest;
 import org.smartregister.view.contract.StatsFragmentContract;
 import org.smartregister.view.interactor.StatsFragmentInteractor;
 import org.smartregister.view.presenter.StatsFragmentPresenter;
@@ -14,17 +14,23 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class StatsFragmentPresenterTest extends BaseUnitTest {
 
-    @Spy
-    StatsFragmentContract.View view;
+public class StatsFragmentPresenterTest {
+
+    @Mock
     private StatsFragmentInteractor interactor;
+
     private StatsFragmentPresenter presenter;
 
+    @Mock
+    StatsFragmentContract.View view;
+
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
         presenter = Mockito.mock(StatsFragmentPresenter.class, Mockito.CALLS_REAL_METHODS);
-        interactor = Mockito.mock(StatsFragmentInteractor.class, Mockito.CALLS_REAL_METHODS);
+        view = Mockito.spy(view);
+        interactor = Mockito.spy(interactor);
         ReflectionHelpers.setField(presenter, "interactor", interactor);
         ReflectionHelpers.setField(presenter, "view", view);
     }
@@ -33,7 +39,7 @@ public void setUp() {
     public void onECSyncInfoFetchedRefreshesECSyncInfo() {
         Map<String, String> syncInfoMap = new HashMap<>();
         presenter.onECSyncInfoFetched(syncInfoMap);
-        Mockito.verify(view).refreshECSyncInfo(ArgumentMatchers.eq(syncInfoMap));
+        Mockito.verify(view, Mockito.times(2)).refreshECSyncInfo(ArgumentMatchers.eq(syncInfoMap));
     }
 
     @Test
diff --git a/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
index b0294634f..523cd234b 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
@@ -5,7 +5,6 @@
 import static org.smartregister.AllConstants.DatabaseKeys.VALIDATION_STATUS;
 import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
 import static org.smartregister.AllConstants.DeviceInfo.MODEL;
-import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
 import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
 import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
 import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
@@ -15,6 +14,9 @@
 import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
 import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
 
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
 import androidx.test.core.app.ApplicationProvider;
 
 import net.sqlcipher.Cursor;
@@ -26,7 +28,6 @@
 import org.mockito.Mockito;
 import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.BaseUnitTest;
-import org.smartregister.BuildConfig;
 import org.smartregister.Context;
 import org.smartregister.CoreLibrary;
 import org.smartregister.repository.AllSharedPreferences;
@@ -70,7 +71,7 @@ public void testPopulateUserInfoPopulatesCorrectValues() {
     }
 
     @Test
-    public void testPopulateBuildInfoPopulatesCorrectValues() {
+    public void testPopulateBuildInfoPopulatesCorrectValues() throws PackageManager.NameNotFoundException {
         CoreLibrary coreLibrary = Mockito.mock(CoreLibrary.class);
         ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
 
@@ -79,15 +80,22 @@ public void testPopulateBuildInfoPopulatesCorrectValues() {
 
         Mockito.doReturn(context).when(coreLibrary).context();
         Mockito.doReturn(appContext).when(context).applicationContext();
+
+        PackageManager packageManager = Mockito.mock(PackageManager.class);
+        PackageInfo packageInfo = Mockito.mock(PackageInfo.class);
+        packageInfo.versionName = "v1.0.0";
+        packageInfo.versionCode = 1;
+        Mockito.doReturn(packageManager).when(appContext).getPackageManager();
         Mockito.doReturn("org.smartregister").when(appContext).getPackageName();
+        Mockito.doReturn(packageInfo).when(packageManager).getPackageInfo(eq("org.smartregister"), eq(0));
 
         ReflectionHelpers.callInstanceMethod(statsUtils, "populateBuildInfo");
 
         Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
 
-        Assert.assertEquals(BuildConfig.VERSION_NAME, syncInfoMap.get(APP_VERSION_NAME));
+        Assert.assertEquals("v1.0.0", syncInfoMap.get(APP_VERSION_NAME));
         Assert.assertEquals("1", syncInfoMap.get(APP_VERSION_CODE));
-        Assert.assertEquals("0", syncInfoMap.get(DB_VERSION));
+        Assert.assertEquals("1", syncInfoMap.get(DB_VERSION));
     }
 
     @Test
@@ -99,7 +107,6 @@ public void testPopulateDeviceInfoPopulatesCorrectValues() {
         Assert.assertEquals("robolectric", syncInfoMap.get(MANUFACTURER));
         Assert.assertEquals("robolectric", syncInfoMap.get(MODEL));
         Assert.assertEquals("28 Apr 2020", syncInfoMap.get(APP_BUILD_DATE));
-        Assert.assertEquals("Q", syncInfoMap.get(OS_VERSION));
     }
 
     @Test
diff --git a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
index 086e49421..41fc50626 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
@@ -706,12 +706,11 @@ public void dobStringToDateTimeShouldHandleInvalidDateTimeStrings() {
     public void getPropertiesShouldLoadPropertiesInPropertiesFile() {
         AppProperties appProperties = Utils.getProperties(ApplicationProvider.getApplicationContext());
 
-        assertEquals(6, appProperties.size());
+        assertEquals(5, appProperties.size());
         assertEquals("", appProperties.getProperty("DRISHTI_BASE_URL"));
         assertEquals("false", appProperties.getProperty("SHOULD_VERIFY_CERTIFICATE"));
         assertEquals("true", appProperties.getProperty("system.toaster.centered"));
         assertEquals("10", appProperties.getProperty("SYNC_DOWNLOAD_BATCH_SIZE"));
-        assertEquals("true", appProperties.getProperty("monitor.height"));
     }
 
     @Test
diff --git a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
index 9a3843198..024d129a8 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
@@ -1,6 +1,5 @@
 package org.smartregister.view.fragment;
 
-import static org.mockito.Mockito.doReturn;
 import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
@@ -17,10 +16,10 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.fragment.app.FragmentManager;
-import androidx.test.core.app.ApplicationProvider;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -28,13 +27,15 @@
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.Spy;
+import org.mockito.MockitoAnnotations;
 import org.powermock.reflect.Whitebox;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.BaseUnitTest;
 import org.smartregister.R;
-import org.smartregister.view.contract.StatsFragmentContract;
 import org.smartregister.view.presenter.StatsFragmentPresenter;
+import org.smartregister.view.contract.StatsFragmentContract;
+
 
 import java.util.HashMap;
 import java.util.Map;
@@ -54,11 +55,9 @@ public class StatsFragmentTest extends BaseUnitTest {
     @Mock
     private Bundle savedInstanceState;
 
-    @Spy
-    private StatsFragmentContract.View view;
-
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
         statsFragment = Mockito.mock(StatsFragment.class, Mockito.CALLS_REAL_METHODS);
     }
 
@@ -85,7 +84,11 @@ public void onCreateViewInitsViewsAndReturnsCorrectView() {
         View rootView = Mockito.spy(Mockito.mock(View.class));
         statsFragment = Mockito.spy(statsFragment);
 
-        presenter = Mockito.spy(new StatsFragmentPresenter(view));
+        StatsFragmentContract.Interactor interactor = Mockito.mock(StatsFragmentContract.Interactor.class);
+        Mockito.doNothing().when(interactor).fetchECSyncInfo();
+
+        presenter = Mockito.spy(Mockito.mock(StatsFragmentPresenter.class));
+        ReflectionHelpers.setField(presenter, "interactor", interactor);
         ReflectionHelpers.setField(statsFragment, "presenter", presenter);
 
         Mockito.doReturn(btnRefreshStats).when(rootView).findViewById(R.id.refresh_button);
@@ -110,11 +113,13 @@ public void refreshECSyncInfoUpdatesViews() {
         syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "1");
         syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "1");
 
-        View rootView = LayoutInflater.from(ApplicationProvider.getApplicationContext()).inflate(R.layout.fragment_stats, null);
+        View rootView = LayoutInflater.from(RuntimeEnvironment.application).inflate(R.layout.fragment_stats, null);
+        Mockito.doReturn(rootView).when(statsFragment).getView();
 
         TextView tvSyncedEvents = rootView.findViewById(R.id.synced_events);
         TextView tvUnSyncedEvents = rootView.findViewById(R.id.unsynced_events);
         TextView tvUnsyncedHeightEvents = rootView.findViewById(R.id.synced_height_events);
+        LinearLayout layoutUnsyncedHeightEvents = rootView.findViewById(R.id.height_stats);
 
         ReflectionHelpers.setField(statsFragment, "tvSyncedEvents", tvSyncedEvents);
         ReflectionHelpers.setField(statsFragment, "tvUnSyncedEvents", tvUnSyncedEvents);
@@ -141,7 +146,7 @@ public void refreshECSyncInfoUpdatesViews() {
         statsFragment.refreshECSyncInfo(syncInfoMap);
         Assert.assertEquals("2", tvSyncedEvents.getText());
         Assert.assertEquals("3", tvUnSyncedEvents.getText());
-        Assert.assertEquals("1", tvUnsyncedHeightEvents.getText());
+        Assert.assertEquals(View.GONE, layoutUnsyncedHeightEvents.getVisibility());
     }
 
     @Test
@@ -151,7 +156,7 @@ public void assertStatsFragmentInitsCorrectly() {
 
     @Test
     public void assertTestLabels() {
-        View rootView = LayoutInflater.from(ApplicationProvider.getApplicationContext()).inflate(R.layout.fragment_stats, null);
+        View rootView = LayoutInflater.from(RuntimeEnvironment.application).inflate(R.layout.fragment_stats, null);
         TextView tvSyncedEventsLabel = rootView.findViewById(R.id.synced_events_label);
         TextView tvUnsyncedEventsLabel = rootView.findViewById(R.id.unsynced_events_label);
         TextView tvTaskUnprocessedEventsLabel = rootView.findViewById(R.id.task_unprocessed_events_label);
@@ -170,7 +175,7 @@ public void assertTestLabels() {
 
     @Test
     public void assertTestLabelsNotNull() {
-        View rootView = LayoutInflater.from(ApplicationProvider.getApplicationContext()).inflate(R.layout.fragment_stats, null);
+        View rootView = LayoutInflater.from(RuntimeEnvironment.application).inflate(R.layout.fragment_stats, null);
         TextView tvSyncedEventsLabel = rootView.findViewById(R.id.synced_events_label);
         TextView tvUnsyncedEventsLabel = rootView.findViewById(R.id.unsynced_events_label);
         TextView tvTaskUnprocessedEventsLabel = rootView.findViewById(R.id.task_unprocessed_events_label);
@@ -189,8 +194,8 @@ public void assertTestLabelsNotNull() {
 
     @Test
     public void testUpdatedLabels() {
-        View parentLayout = LayoutInflater.from(ApplicationProvider.getApplicationContext().getApplicationContext()).inflate(R.layout.fragment_stats, null, false);
-        doReturn(parentLayout).when(layoutInflater).inflate(R.layout.fragment_base_register, container, false);
+        View parentLayout = LayoutInflater.from(RuntimeEnvironment.application.getApplicationContext()).inflate(R.layout.fragment_stats, null, false);
+        Mockito.doReturn(parentLayout).when(layoutInflater).inflate(R.layout.fragment_base_register, container, false);
 
         TextView tvSyncedEventsLabel = parentLayout.findViewById(R.id.synced_events_label);
         TextView tvUnsyncedEventsLabel = parentLayout.findViewById(R.id.unsynced_events_label);
@@ -208,13 +213,13 @@ public void testUpdatedLabels() {
         Assert.assertNotNull(tvValidatedEventsLabel);
         Assert.assertNotNull(tvValidatedClientsLabel);
 
-        String synced_events = ApplicationProvider.getApplicationContext().getResources().getString(R.string.synced_events);
-        String unsynced_events = ApplicationProvider.getApplicationContext().getResources().getString(R.string.unsynced_events);
-        String task_unprocessed_events = ApplicationProvider.getApplicationContext().getResources().getString(R.string.task_unprocessed_events);
-        String synced_clients = ApplicationProvider.getApplicationContext().getResources().getString(R.string.synced_clients);
-        String unsynced_clients = ApplicationProvider.getApplicationContext().getResources().getString(R.string.unsynced_clients);
-        String validated_events = ApplicationProvider.getApplicationContext().getResources().getString(R.string.validated_events);
-        String validated_clients = ApplicationProvider.getApplicationContext().getResources().getString(R.string.validated_clients);
+        String synced_events = RuntimeEnvironment.application.getResources().getString(R.string.synced_events);
+        String unsynced_events = RuntimeEnvironment.application.getResources().getString(R.string.unsynced_events);
+        String task_unprocessed_events = RuntimeEnvironment.application.getResources().getString(R.string.task_unprocessed_events);
+        String synced_clients = RuntimeEnvironment.application.getResources().getString(R.string.synced_clients);
+        String unsynced_clients = RuntimeEnvironment.application.getResources().getString(R.string.unsynced_clients);
+        String validated_events = RuntimeEnvironment.application.getResources().getString(R.string.validated_events);
+        String validated_clients = RuntimeEnvironment.application.getResources().getString(R.string.validated_clients);
 
         Assert.assertEquals(synced_events, tvSyncedEventsLabel.getText().toString());
         Assert.assertEquals(unsynced_events, tvUnsyncedEventsLabel.getText().toString());

From b6c81cb751bd79be72c4fad5b1cb86312c138230 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Tue, 31 Jan 2023 15:15:24 +0500
Subject: [PATCH 15/20] Increase test coverage

---
 .../populateform/ModelTest.java                 | 17 +++++++++++++++++
 .../java/org/smartregister/util/UtilsTest.java  | 10 ++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java

diff --git a/opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java b/opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java
new file mode 100644
index 000000000..38b5470d0
--- /dev/null
+++ b/opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java
@@ -0,0 +1,17 @@
+package org.smartregister.clientandeventmodel.populateform;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.smartregister.BaseUnitTest;
+import org.smartregister.clientandeventmodel.populateform.Model;
+
+public class ModelTest extends BaseUnitTest {
+
+
+    @Test
+    public void testConstructorNotNull() {
+        Model model = new Model("","","","");
+        Assert.assertNotNull(model);
+    }
+
+}
\ No newline at end of file
diff --git a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
index 41fc50626..792ae7a4e 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
@@ -753,5 +753,15 @@ public  void testExtractTrabslatableValue() throws JSONException
         assertEquals(result2,value);
 
     }
+
+    @Test
+    public void testTryParseLongShouldParseCorrectly() {
+        assertEquals(123L, (Long) Utils.tryParseLong("123", 0), 0);
+    }
+
+    @Test
+    public void testTryParseLongShouldParseShoouldReturnDefaultValueOnException() {
+        assertEquals(0L, (Long) Utils.tryParseLong("xyz", 0), 0);
+    }
 }
 

From eb00e14a8993d6bfefddb21f6acbb45103c6341a Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Tue, 31 Jan 2023 17:07:09 +0500
Subject: [PATCH 16/20] Increase test coverage

---
 .../populateform/ModelTest.java                  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java b/opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java
index 38b5470d0..1d1a06812 100644
--- a/opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java
@@ -1,17 +1,31 @@
 package org.smartregister.clientandeventmodel.populateform;
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.smartregister.BaseUnitTest;
 import org.smartregister.clientandeventmodel.populateform.Model;
 
 public class ModelTest extends BaseUnitTest {
 
+    private Model model;
+
+    @Before
+    public void setUp() {
+        model = new Model("tag","openMRSEntity","openMRSEntityId","OpenMRSEntityParent");
+    }
 
     @Test
     public void testConstructorNotNull() {
-        Model model = new Model("","","","");
         Assert.assertNotNull(model);
     }
 
+    @Test
+    public void testFieldMembers() {
+        Assert.assertEquals("tag", model.getTag());
+        Assert.assertEquals("openMRSEntity", model.getOpenMRSEntity());
+        Assert.assertEquals("openMRSEntityId", model.getOpenMRSEntityId());
+        Assert.assertEquals("OpenMRSEntityParent", model.getOpenMRSEntityParent());
+    }
+
 }
\ No newline at end of file

From 4e5c86d4ac62e44aaa45abe4fbbcfef5e677eda3 Mon Sep 17 00:00:00 2001
From: Simon Njoroge <snjoroge@ona.io>
Date: Tue, 7 Feb 2023 18:34:04 +0300
Subject: [PATCH 17/20] Cleanup

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 63b63095e..b1f2e8da5 100644
--- a/README.md
+++ b/README.md
@@ -314,4 +314,4 @@ By placing a file named `app.properties` in your implementation assets folder (S
 | `encrypt.shared.preferences`             | Boolean | false   | Enable/disables encrypting SharedPreferences                                                                                                        |
 | `allow.offline.login.with.invalid.token` | Boolean | false   | Allow offline login when token is no longer valid after a successful login when online and user is forcefully logged out                            |
 | `enable.search.button`                   | Boolean | false   | Enable/Disable search to be triggered only after clicking the search icon in `org.smartregister.view.fragment.BaseRegisterFragment` or its subclass |
-| `feature.profile.images.disabled`            | Boolean | false    | Disable profile image capturing and rendering                                                                                                       |
\ No newline at end of file
+| `feature.profile.images.disabled`            | Boolean | false    | Disable profile image capturing and rendering     |
\ No newline at end of file

From 5b0be55f67591833a9c94283fd453e14dec584a0 Mon Sep 17 00:00:00 2001
From: Simon Njoroge <snjoroge@ona.io>
Date: Thu, 9 Feb 2023 14:24:02 +0300
Subject: [PATCH 18/20] Update CoreLibrary tearDown methods

---
 .../org/smartregister/CoreLibraryTest.java    |  3 +-
 .../org/smartregister/TestP2pApplication.java |  7 ++--
 .../login/model/BaseLoginModelTest.java       | 19 +++++-----
 .../presenter/BaseLoginPresenterTest.java     | 25 ++++++-------
 .../sync/ClientProcessorForJavaTest.java      |  2 +-
 .../sync/helper/BaseHelperTest.java           |  2 +-
 .../helper/LocationServiceHelperTest.java     | 23 ++++++------
 .../smartregister/util/StatsUtilsTest.java    |  2 +-
 .../activity/BarcodeScanActivityTest.java     | 10 ++---
 .../view/activity/BaseLoginActivityTest.java  |  2 +-
 .../activity/BaseRegisterActivityTest.java    | 37 +++++++++----------
 .../view/activity/FormActivityTest.java       | 18 ++++-----
 .../view/activity/SecuredActivityTest.java    |  2 +-
 .../fragment/BaseRegisterFragmentTest.java    |  3 +-
 .../ConnectivityChangeReceiverTest.java       |  6 +--
 15 files changed, 77 insertions(+), 84 deletions(-)

diff --git a/opensrp-core/src/test/java/org/smartregister/CoreLibraryTest.java b/opensrp-core/src/test/java/org/smartregister/CoreLibraryTest.java
index f1585ca0e..12adff3a5 100644
--- a/opensrp-core/src/test/java/org/smartregister/CoreLibraryTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/CoreLibraryTest.java
@@ -74,8 +74,7 @@ public void initP2pLibrary() {
 
     @Test(expected = IllegalStateException.class)
     public void getInstanceShouldThrowException() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
-
+        CoreLibrary.destroyInstance();
         CoreLibrary.getInstance();
     }
 
diff --git a/opensrp-core/src/test/java/org/smartregister/TestP2pApplication.java b/opensrp-core/src/test/java/org/smartregister/TestP2pApplication.java
index 7b3f64647..c92f9cc19 100644
--- a/opensrp-core/src/test/java/org/smartregister/TestP2pApplication.java
+++ b/opensrp-core/src/test/java/org/smartregister/TestP2pApplication.java
@@ -1,10 +1,9 @@
 package org.smartregister;
 
-import org.robolectric.util.ReflectionHelpers;
-import org.smartregister.repository.AllSharedPreferences;
-
 import static android.preference.PreferenceManager.getDefaultSharedPreferences;
 
+import org.smartregister.repository.AllSharedPreferences;
+
 /**
  * Created by Ephraim Kigamba - nek.eam@gmail.com on 18-08-2020.
  */
@@ -18,7 +17,7 @@ public void onCreate() {
 
         AllSharedPreferences allSharedPreferences = new AllSharedPreferences(getDefaultSharedPreferences(context.applicationContext()));
         allSharedPreferences.updateANMUserName("demo");
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
         CoreLibrary.init(context, new TestSyncConfiguration(), 1588062490000l, new P2POptions(true));
     }
 }
diff --git a/opensrp-core/src/test/java/org/smartregister/login/model/BaseLoginModelTest.java b/opensrp-core/src/test/java/org/smartregister/login/model/BaseLoginModelTest.java
index e66804594..22a890173 100644
--- a/opensrp-core/src/test/java/org/smartregister/login/model/BaseLoginModelTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/login/model/BaseLoginModelTest.java
@@ -1,14 +1,5 @@
 package org.smartregister.login.model;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.robolectric.util.ReflectionHelpers;
-import org.smartregister.BaseRobolectricUnitTest;
-import org.smartregister.Context;
-import org.smartregister.CoreLibrary;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -17,6 +8,14 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.smartregister.BaseRobolectricUnitTest;
+import org.smartregister.Context;
+import org.smartregister.CoreLibrary;
+
 /**
  * Created by samuelgithengi on 8/18/20.
  */
@@ -34,7 +33,7 @@ public void setUp() {
 
     @After
     public void tearDown() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 
     @Test
diff --git a/opensrp-core/src/test/java/org/smartregister/login/presenter/BaseLoginPresenterTest.java b/opensrp-core/src/test/java/org/smartregister/login/presenter/BaseLoginPresenterTest.java
index 0c2f94e6c..8f9e7aca5 100644
--- a/opensrp-core/src/test/java/org/smartregister/login/presenter/BaseLoginPresenterTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/login/presenter/BaseLoginPresenterTest.java
@@ -1,5 +1,16 @@
 package org.smartregister.login.presenter;
 
+import static android.preference.PreferenceManager.getDefaultSharedPreferences;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 import android.content.res.Configuration;
 import android.view.ViewTreeObserver;
 import android.widget.RelativeLayout;
@@ -15,7 +26,6 @@
 import org.mockito.Spy;
 import org.powermock.reflect.Whitebox;
 import org.robolectric.Robolectric;
-import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.BaseRobolectricUnitTest;
 import org.smartregister.CoreLibrary;
 import org.smartregister.R;
@@ -25,17 +35,6 @@
 
 import java.lang.ref.WeakReference;
 
-import static android.preference.PreferenceManager.getDefaultSharedPreferences;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
 /**
  * Created by samuelgithengi on 8/18/20.
  */
@@ -66,7 +65,7 @@ public void setUp() {
 
     @After
     public void tearDown() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 
     @Test
diff --git a/opensrp-core/src/test/java/org/smartregister/sync/ClientProcessorForJavaTest.java b/opensrp-core/src/test/java/org/smartregister/sync/ClientProcessorForJavaTest.java
index 4dc3ad47e..ac1a36693 100644
--- a/opensrp-core/src/test/java/org/smartregister/sync/ClientProcessorForJavaTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/sync/ClientProcessorForJavaTest.java
@@ -651,7 +651,7 @@ public void processFieldShouldCreateCaseBasedOnObsValueFilled() {
 
     @After
     public void tearDown() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
         clientProcessor = null;
     }
 }
diff --git a/opensrp-core/src/test/java/org/smartregister/sync/helper/BaseHelperTest.java b/opensrp-core/src/test/java/org/smartregister/sync/helper/BaseHelperTest.java
index 7bab700ea..1af2c2b37 100644
--- a/opensrp-core/src/test/java/org/smartregister/sync/helper/BaseHelperTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/sync/helper/BaseHelperTest.java
@@ -26,6 +26,6 @@ public void getFormattedBaseUrl() {
         Assert.assertEquals("http://site.com", new BaseHelper().getFormattedBaseUrl());
 
         // Return the configuration to the previous state to fix the TaskServiceHelperTest failures
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 }
\ No newline at end of file
diff --git a/opensrp-core/src/test/java/org/smartregister/sync/helper/LocationServiceHelperTest.java b/opensrp-core/src/test/java/org/smartregister/sync/helper/LocationServiceHelperTest.java
index 5465c7792..420d4e610 100644
--- a/opensrp-core/src/test/java/org/smartregister/sync/helper/LocationServiceHelperTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/sync/helper/LocationServiceHelperTest.java
@@ -1,5 +1,15 @@
 package org.smartregister.sync.helper;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.smartregister.AllConstants.OPERATIONAL_AREAS;
+import static org.smartregister.sync.helper.LocationServiceHelper.LOCATION_LAST_SYNC_DATE;
+
 import com.google.gson.reflect.TypeToken;
 
 import net.sqlcipher.database.SQLiteDatabase;
@@ -13,7 +23,6 @@
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.powermock.reflect.Whitebox;
 import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.BaseRobolectricUnitTest;
@@ -41,16 +50,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.smartregister.AllConstants.OPERATIONAL_AREAS;
-import static org.smartregister.sync.helper.LocationServiceHelper.LOCATION_LAST_SYNC_DATE;
-
 public class LocationServiceHelperTest extends BaseRobolectricUnitTest {
 
     @Mock
@@ -354,6 +353,6 @@ public void testGetLocationHierarchyReturnsTreeForValidParentLocationId() {
 
     @After
     public void tearDown() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 }
\ No newline at end of file
diff --git a/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
index 523cd234b..9b7f85264 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
@@ -143,6 +143,6 @@ public void testPopulateValidatedEventsInfoAddInvalidEventsCountWhenStatusIsInva
 
     @After
     public void destroy() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 }
diff --git a/opensrp-core/src/test/java/org/smartregister/view/activity/BarcodeScanActivityTest.java b/opensrp-core/src/test/java/org/smartregister/view/activity/BarcodeScanActivityTest.java
index 8bdf1c95a..4585c91fd 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/activity/BarcodeScanActivityTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/activity/BarcodeScanActivityTest.java
@@ -1,9 +1,13 @@
 package org.smartregister.view.activity;
 
+import static org.mockito.Mockito.verify;
+
 import android.content.Intent;
 import android.util.Log;
 import android.util.SparseArray;
 
+import androidx.test.core.app.ApplicationProvider;
+
 import com.google.android.gms.vision.Detector;
 import com.google.android.gms.vision.barcode.Barcode;
 
@@ -15,15 +19,11 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.robolectric.Robolectric;
-import androidx.test.core.app.ApplicationProvider;
 import org.robolectric.android.controller.ActivityController;
-import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.BaseUnitTest;
 import org.smartregister.CoreLibrary;
 import org.smartregister.view.activity.mock.BarcodeScanActivityMock;
 
-import static org.mockito.Mockito.verify;
-
 public class BarcodeScanActivityTest extends BaseUnitTest {
 
     private BarcodeScanActivityMock barcodeScanActivity;
@@ -44,7 +44,7 @@ public class BarcodeScanActivityTest extends BaseUnitTest {
 
     @BeforeClass
     public static void resetCoreLibrary() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 
     @Before
diff --git a/opensrp-core/src/test/java/org/smartregister/view/activity/BaseLoginActivityTest.java b/opensrp-core/src/test/java/org/smartregister/view/activity/BaseLoginActivityTest.java
index 8b22ebfe1..7c6867ab6 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/activity/BaseLoginActivityTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/activity/BaseLoginActivityTest.java
@@ -54,7 +54,7 @@ public class BaseLoginActivityTest extends BaseRobolectricUnitTest {
 
     @BeforeClass
     public static void resetCoreLibrary() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 
     @Before
diff --git a/opensrp-core/src/test/java/org/smartregister/view/activity/BaseRegisterActivityTest.java b/opensrp-core/src/test/java/org/smartregister/view/activity/BaseRegisterActivityTest.java
index d532197c0..b77cb77dd 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/activity/BaseRegisterActivityTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/activity/BaseRegisterActivityTest.java
@@ -1,5 +1,22 @@
 package org.smartregister.view.activity;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+import static org.smartregister.view.activity.BaseRegisterActivity.BASE_REG_POSITION;
+
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -23,7 +40,6 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowToast;
-import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.AllConstants;
 import org.smartregister.AllConstants.BARCODE;
 import org.smartregister.BaseRobolectricUnitTest;
@@ -44,23 +60,6 @@
 import java.util.UUID;
 import java.util.concurrent.Executors;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
-import static org.smartregister.view.activity.BaseRegisterActivity.BASE_REG_POSITION;
-
 /**
  * Created by samuelgithengi on 6/30/20.
  */
@@ -93,7 +92,7 @@ public void setUp() {
 
     @After
     public void tearDown() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 
     @Test
diff --git a/opensrp-core/src/test/java/org/smartregister/view/activity/FormActivityTest.java b/opensrp-core/src/test/java/org/smartregister/view/activity/FormActivityTest.java
index 2dc94823e..6ad6a1467 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/activity/FormActivityTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/activity/FormActivityTest.java
@@ -1,8 +1,16 @@
 package org.smartregister.view.activity;
 
+import static org.mockito.Mockito.when;
+import static org.smartregister.AllConstants.ENTITY_ID_PARAM;
+import static org.smartregister.AllConstants.FIELD_OVERRIDES_PARAM;
+import static org.smartregister.AllConstants.FORM_NAME_PARAM;
+import static org.smartregister.view.activity.NativeECSmartRegisterActivityTest.locationJson;
+
 import android.content.Context;
 import android.content.Intent;
 
+import androidx.test.core.app.ApplicationProvider;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -10,21 +18,13 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.robolectric.Robolectric;
-import androidx.test.core.app.ApplicationProvider;
 import org.robolectric.android.controller.ActivityController;
-import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.BaseUnitTest;
 import org.smartregister.CoreLibrary;
 import org.smartregister.service.ZiggyService;
 import org.smartregister.view.activity.mock.FormActivityMock;
 import org.smartregister.view.controller.ANMLocationController;
 
-import static org.mockito.Mockito.when;
-import static org.smartregister.AllConstants.ENTITY_ID_PARAM;
-import static org.smartregister.AllConstants.FIELD_OVERRIDES_PARAM;
-import static org.smartregister.AllConstants.FORM_NAME_PARAM;
-import static org.smartregister.view.activity.NativeECSmartRegisterActivityTest.locationJson;
-
 /**
  * Created by kaderchowdhury on 12/11/17.
  */
@@ -47,7 +47,7 @@ public class FormActivityTest extends BaseUnitTest {
 
     @BeforeClass
     public static void resetCoreLibrarySingleton() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 
     @Before
diff --git a/opensrp-core/src/test/java/org/smartregister/view/activity/SecuredActivityTest.java b/opensrp-core/src/test/java/org/smartregister/view/activity/SecuredActivityTest.java
index 0c42a86c3..19c6090ba 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/activity/SecuredActivityTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/activity/SecuredActivityTest.java
@@ -64,7 +64,7 @@ public class SecuredActivityTest extends BaseRobolectricUnitTest {
 
     @BeforeClass
     public static void resetCoreLibrary() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 
     @Before
diff --git a/opensrp-core/src/test/java/org/smartregister/view/fragment/BaseRegisterFragmentTest.java b/opensrp-core/src/test/java/org/smartregister/view/fragment/BaseRegisterFragmentTest.java
index 5de3f7abf..0b4b8a00c 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/fragment/BaseRegisterFragmentTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/fragment/BaseRegisterFragmentTest.java
@@ -34,7 +34,6 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.robolectric.Robolectric;
-import androidx.test.core.app.ApplicationProvider;
 import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.AllConstants;
 import org.smartregister.BaseUnitTest;
@@ -151,7 +150,7 @@ public void setUp() {
 
     @After
     public void tearDown() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+        CoreLibrary.destroyInstance();
     }
 
     @Test
diff --git a/opensrp-core/src/test/java/org/smartregister/view/receiver/ConnectivityChangeReceiverTest.java b/opensrp-core/src/test/java/org/smartregister/view/receiver/ConnectivityChangeReceiverTest.java
index 3e65fbe9f..5e8ad2eeb 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/receiver/ConnectivityChangeReceiverTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/receiver/ConnectivityChangeReceiverTest.java
@@ -6,12 +6,13 @@
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
+import androidx.test.core.app.ApplicationProvider;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import androidx.test.core.app.ApplicationProvider;
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowAlarmManager;
 import org.robolectric.util.ReflectionHelpers;
@@ -44,8 +45,7 @@ public void tearDown(){
         Session session = ReflectionHelpers.getField(CoreLibrary.getInstance().context().userService(), "session");
         session.setPassword(null);
         session.start(0);
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
-
+        CoreLibrary.destroyInstance();
     }
 
     @Test

From 27d52c22cd49260b1ccfee61ee70a8eb21321a6d Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 9 Feb 2023 17:51:00 +0500
Subject: [PATCH 19/20] Update Sample

---
 .../smartregister/sample/MainActivity.java    | 65 +++++++++++++------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/sample/src/main/java/org/smartregister/sample/MainActivity.java b/sample/src/main/java/org/smartregister/sample/MainActivity.java
index 07f052acc..183f39d70 100644
--- a/sample/src/main/java/org/smartregister/sample/MainActivity.java
+++ b/sample/src/main/java/org/smartregister/sample/MainActivity.java
@@ -1,5 +1,6 @@
 package org.smartregister.sample;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -29,7 +30,11 @@
 import org.smartregister.util.AppHealthUtils;
 import org.smartregister.util.DateUtil;
 import org.smartregister.util.LangUtils;
+import org.smartregister.util.PermissionUtils;
+import org.smartregister.util.Utils;
+import org.smartregister.view.activity.DrishtiApplication;
 import org.smartregister.view.activity.MultiLanguageActivity;
+import org.smartregister.view.activity.StatsActivity;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -41,13 +46,14 @@
 
 import timber.log.Timber;
 
-public class MainActivity extends MultiLanguageActivity {
+public class MainActivity extends MultiLanguageActivity implements AppHealthUtils.HealthStatsView {
 
     DatePicker picker;
     Button btnGet;
     TextView tvw;
     CryptographicHelper cryptographicHelper = null;
     TextView encDecTextView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -173,10 +179,9 @@ public void onNothingSelected(AdapterView<?> parent) {
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 String keyAlias = "sample";
                 // Get or create a key with the Alias name sample or create one if id does not exist
-                if(cryptographicHelper.getKey(keyAlias)==null)
-                {
+                if (cryptographicHelper.getKey(keyAlias) == null) {
                     cryptographicHelper.generateKey(keyAlias);
-                    Timber.i("key with alias %s generated",keyAlias);
+                    Timber.i("key with alias %s generated", keyAlias);
                 }
 
                 if (isChecked) {
@@ -188,7 +193,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                         inputStream.read(inputBytes);
                         byte[] encryptedContents = CryptographicHelper.encrypt(inputBytes, keyAlias);
                         FileOutputStream fileOutputStream = openFileOutput(filename, Context.MODE_PRIVATE);
-                        Timber.i("encrypted stuff to write %S ",new String(encryptedContents));
+                        Timber.i("encrypted stuff to write %S ", new String(encryptedContents));
                         encDecTextView.setText(new String(encryptedContents));
                         fileOutputStream.write((encryptedContents));
                         fileOutputStream.flush();
@@ -199,26 +204,26 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     }
 
                 } else {
-                        try {
-                            //
-                            FileInputStream inputStream = openFileInput(filename);
-                            byte[] inputBytes = new byte[inputStream.available()];
-                            inputStream.read(inputBytes);
-                            Timber.i("before decryption %s", new String(inputBytes));
+                    try {
+                        //
+                        FileInputStream inputStream = openFileInput(filename);
+                        byte[] inputBytes = new byte[inputStream.available()];
+                        inputStream.read(inputBytes);
+                        Timber.i("before decryption %s", new String(inputBytes));
 
-                            byte[] decryptedStuff =  CryptographicHelper.decrypt(inputBytes, keyAlias);
-                            encDecTextView.setText(new String(decryptedStuff));
-                            Timber.i("decrypted content %s", new String(decryptedStuff));
+                        byte[] decryptedStuff = CryptographicHelper.decrypt(inputBytes, keyAlias);
+                        encDecTextView.setText(new String(decryptedStuff));
+                        Timber.i("decrypted content %s", new String(decryptedStuff));
 
-                            FileOutputStream fileOutputStream = openFileOutput(filename, Context.MODE_PRIVATE);
-                            fileOutputStream.write((decryptedStuff));
-                            fileOutputStream.flush();
+                        FileOutputStream fileOutputStream = openFileOutput(filename, Context.MODE_PRIVATE);
+                        fileOutputStream.write((decryptedStuff));
+                        fileOutputStream.flush();
 
 
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                            // Error occurred when opening raw file for reading.
-                        }
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        // Error occurred when opening raw file for reading.
+                    }
 
 
                 }
@@ -258,4 +263,22 @@ protected void onDestroy() {
         super.onDestroy();
         cryptographicHelper = null;
     }
+
+    @Override
+    public void performDatabaseDownload() {
+        if (PermissionUtils.isPermissionGranted(this, Manifest.permission.WRITE_EXTERNAL_STORAGE, PermissionUtils.WRITE_EXTERNAL_STORAGE_REQUEST_CODE)) {
+            try {
+                AppHealthUtils.triggerDBCopying(this);
+            } catch (SecurityException e) {
+                Utils.showToast(this, this.getString(org.smartregister.R.string.permission_write_external_storage_rationale));
+            }
+        }
+    }
+
+    @Override
+    public void showSyncStats() {
+        DrishtiApplication.getInstance().setPassword("123".getBytes());
+        Intent statsActivityIntent = new Intent(this, StatsActivity.class);
+        this.startActivity(statsActivityIntent);
+    }
 }

From e712e1f7b50a3b5e648c959d29dc5a620e9fd722 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 9 Feb 2023 17:51:27 +0500
Subject: [PATCH 20/20] Fix empty label on UI

---
 .../org/smartregister/util/StatsUtils.java    | 141 ++++++++++--------
 1 file changed, 76 insertions(+), 65 deletions(-)

diff --git a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
index 752c604ee..1b2af7776 100644
--- a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
+++ b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
@@ -32,6 +32,7 @@
 import net.sqlcipher.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
 
+import org.apache.commons.lang3.StringUtils;
 import org.smartregister.CoreLibrary;
 import org.smartregister.repository.AllSharedPreferences;
 import org.smartregister.repository.BaseRepository;
@@ -52,77 +53,84 @@ public StatsUtils() {
     }
 
     public Map<String, String> fetchStatsInfo() {
-        syncInfoMap.put(SYNCED_EVENTS, "-");
-        syncInfoMap.put(SYNCED_CLIENTS, "-");
-        syncInfoMap.put(UNSYNCED_EVENTS, "-");
-        syncInfoMap.put(UNSYNCED_CLIENTS, "-");
-        syncInfoMap.put(VALID_EVENTS, "-");
-        syncInfoMap.put(INVALID_EVENTS, "-");
-        syncInfoMap.put(VALID_CLIENTS, "-");
-        syncInfoMap.put(INVALID_CLIENTS, "-");
-        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "-");
-        syncInfoMap.put(NULL_EVENT_SYNC_STATUS, "-");
-        syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, "-");
-        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "-");
-        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "-");
-
-        String eventSyncSql = "select count(*), syncStatus from event group by syncStatus";
-        String clientSyncSql = "select count(*), syncStatus from client group by syncStatus";
-
-        String validatedEventsSql = "select count(*), validationStatus from event group by validationStatus";
-        String validatedClientsSql = "select count(*), validationStatus from client group by validationStatus";
-
-        String unsyncedVaccineEventsSQL = "SELECT COUNT(*) FROM vaccines WHERE sync_status = 'Unsynced'";
-        String unsyncedWeightEventsSQL = "SELECT COUNT(*) FROM weights WHERE sync_status = 'Unsynced'";
-        String unsyncedHeightEventsSQL = "SELECT COUNT(*) FROM heights WHERE sync_status = 'Unsynced'";
-
-        Cursor cursor;
-
-        cursor = database.rawQuery(eventSyncSql, new String[]{});
-        while (cursor.moveToNext()) {
-            populateEventSyncInfo(cursor);
-        }
-        cursor.close();
+        populateSyncStatistics();
+        populateUserInfo();
+        populateBuildInfo();
+        populateDeviceInfo();
+        return syncInfoMap;
+    }
 
-        cursor = database.rawQuery(clientSyncSql, new String[]{});
-        while (cursor.moveToNext()) {
-            populateClientSyncInfo(cursor);
-        }
-        cursor.close();
+    private void populateSyncStatistics() {
+        try {
+            syncInfoMap.put(SYNCED_EVENTS, "-");
+            syncInfoMap.put(SYNCED_CLIENTS, "-");
+            syncInfoMap.put(UNSYNCED_EVENTS, "-");
+            syncInfoMap.put(UNSYNCED_CLIENTS, "-");
+            syncInfoMap.put(VALID_EVENTS, "-");
+            syncInfoMap.put(INVALID_EVENTS, "-");
+            syncInfoMap.put(VALID_CLIENTS, "-");
+            syncInfoMap.put(INVALID_CLIENTS, "-");
+            syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "-");
+            syncInfoMap.put(NULL_EVENT_SYNC_STATUS, "-");
+            syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, "-");
+            syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "-");
+            syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "-");
+
+            String eventSyncSql = "select count(*), syncStatus from event group by syncStatus";
+            String clientSyncSql = "select count(*), syncStatus from client group by syncStatus";
+
+            String validatedEventsSql = "select count(*), validationStatus from event group by validationStatus";
+            String validatedClientsSql = "select count(*), validationStatus from client group by validationStatus";
+
+            String unsyncedVaccineEventsSQL = "SELECT COUNT(*) FROM vaccines WHERE sync_status = 'Unsynced'";
+            String unsyncedWeightEventsSQL = "SELECT COUNT(*) FROM weights WHERE sync_status = 'Unsynced'";
+            String unsyncedHeightEventsSQL = "SELECT COUNT(*) FROM heights WHERE sync_status = 'Unsynced'";
+
+            Cursor cursor;
+
+            cursor = database.rawQuery(eventSyncSql, new String[]{});
+            while (cursor.moveToNext()) {
+                populateEventSyncInfo(cursor);
+            }
+            cursor.close();
 
-        cursor = database.rawQuery(validatedEventsSql, new String[]{});
-        while (cursor.moveToNext()) {
-            populateValidatedEventsInfo(cursor);
-        }
-        cursor.close();
+            cursor = database.rawQuery(clientSyncSql, new String[]{});
+            while (cursor.moveToNext()) {
+                populateClientSyncInfo(cursor);
+            }
+            cursor.close();
 
-        cursor = database.rawQuery(validatedClientsSql, new String[]{});
-        while (cursor.moveToNext()) {
-            populateValidatedClientsInfo(cursor);
-        }
+            cursor = database.rawQuery(validatedEventsSql, new String[]{});
+            while (cursor.moveToNext()) {
+                populateValidatedEventsInfo(cursor);
+            }
+            cursor.close();
 
-        cursor = database.rawQuery(unsyncedVaccineEventsSQL, new String[]{});
-        while (cursor.moveToNext()) {
-            syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, String.valueOf(cursor.getInt(0)));
-        }
+            cursor = database.rawQuery(validatedClientsSql, new String[]{});
+            while (cursor.moveToNext()) {
+                populateValidatedClientsInfo(cursor);
+            }
 
-        cursor = database.rawQuery(unsyncedWeightEventsSQL, new String[]{});
-        while (cursor.moveToNext()) {
-            syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
-        }
-        if (CoreLibrary.getInstance().context().getAppProperties().isTrue("monitor.height")) { // Constant is defined in growth-monitoring module
-            cursor = database.rawQuery(unsyncedHeightEventsSQL, new String[]{});
+            cursor = database.rawQuery(unsyncedVaccineEventsSQL, new String[]{});
             while (cursor.moveToNext()) {
-                syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
+                syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, String.valueOf(cursor.getInt(0)));
             }
-        }
 
-        cursor.close();
+            cursor = database.rawQuery(unsyncedWeightEventsSQL, new String[]{});
+            while (cursor.moveToNext()) {
+                syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
+            }
+            if (CoreLibrary.getInstance().context().getAppProperties().isTrue("monitor.height")) { // Constant is defined in growth-monitoring module
+                cursor = database.rawQuery(unsyncedHeightEventsSQL, new String[]{});
+                while (cursor.moveToNext()) {
+                    syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
+                }
+            }
 
-        populateUserInfo();
-        populateBuildInfo();
-        populateDeviceInfo();
-        return syncInfoMap;
+            cursor.close();
+        } catch (Exception e) {
+            Timber.e(e);
+        }
     }
 
     private void populateEventSyncInfo(Cursor cursor) {
@@ -167,9 +175,12 @@ private void populateValidatedClientsInfo(Cursor cursor) {
 
     public void populateUserInfo() {
         AllSharedPreferences sharedPreferences = CoreLibrary.getInstance().context().userService().getAllSharedPreferences();
-        syncInfoMap.put(USER_NAME, sharedPreferences.fetchRegisteredANM());
-        syncInfoMap.put(USER_TEAM, sharedPreferences.fetchDefaultTeam(sharedPreferences.fetchRegisteredANM()));
-        syncInfoMap.put(USER_LOCALITY, sharedPreferences.fetchCurrentLocality());
+        String userName = sharedPreferences.fetchRegisteredANM();
+        String userTeam = sharedPreferences.fetchDefaultTeam(sharedPreferences.fetchRegisteredANM());
+        String userLocality = sharedPreferences.fetchCurrentLocality();
+        syncInfoMap.put(USER_NAME, StringUtils.isNotBlank(userName) ? userName : "-");
+        syncInfoMap.put(USER_TEAM, StringUtils.isNotBlank(userTeam) ? userTeam : "-");
+        syncInfoMap.put(USER_LOCALITY, StringUtils.isNotBlank(userLocality) ? userLocality : "-");
     }