From a96a2bf1bc561d0f0b59c49be4d56e7da20e6486 Mon Sep 17 00:00:00 2001
From: sachinkadam <sachinkadamsk01@gmail.com>
Date: Sat, 17 Feb 2024 11:36:58 +0530
Subject: [PATCH 1/4] #1305 | Fix UI for addMore button in multiselectFile form
 element

(cherry picked from commit b980b840bcb7c684b283ab8f09711a735ae25c62)
---
 .../src/views/form/formElement/MultiSelectFileFormElement.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/openchs-android/src/views/form/formElement/MultiSelectFileFormElement.js b/packages/openchs-android/src/views/form/formElement/MultiSelectFileFormElement.js
index 8ef0a2ca4..f3a40dfb5 100644
--- a/packages/openchs-android/src/views/form/formElement/MultiSelectFileFormElement.js
+++ b/packages/openchs-android/src/views/form/formElement/MultiSelectFileFormElement.js
@@ -77,7 +77,6 @@ class MultiSelectFileFormElement extends FileFormElement {
                 {_.map(_.range(0, this.state.mediaCount), index => this.renderMedia(index))}
                 <Button disabled={isDisabled}
                         style={{
-                            height: 22,
                             backgroundColor: isDisabled ? Colors.DisabledButtonColor : Colors.ActionButtonColor,
                             alignSelf: 'flex-end',
                             marginTop: 10,

From 401167b3382f988e1eba0b8a5248ea72e50bc7f4 Mon Sep 17 00:00:00 2001
From: Joy A <itsjoy@gmail.com>
Date: Fri, 23 Feb 2024 14:52:45 +0530
Subject: [PATCH 2/4] #1319 | Bump versionCode multiplier from 4 to 8

---
 packages/openchs-android/android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/openchs-android/android/app/build.gradle b/packages/openchs-android/android/app/build.gradle
index 4bdb3ffbf..995bd045a 100644
--- a/packages/openchs-android/android/app/build.gradle
+++ b/packages/openchs-android/android/app/build.gradle
@@ -92,7 +92,7 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode System.getenv("versionCode") ? 4 * 1048576 + System.getenv("versionCode").toInteger() : 1
+        versionCode System.getenv("versionCode") ? 8 * 1048576 + System.getenv("versionCode").toInteger() : 1
         //Our convention of versionCode from now in is to form the number from digits in versionName. E.g. for versionName 2.6.1, the versionCode should be 261. This is to avoid conflicts of versionCodes between different branches.
         // Major.Minor.Patch. We should not change major version every release, just change the minor. Each number allows for two digits
         // https://medium.com/@maxirosson/versioning-android-apps-d6ec171cfd82

From 51d741458a2b724302aedd9c8ca9d0b60816dac9 Mon Sep 17 00:00:00 2001
From: Vivek Singh <petmongrels@gmail.com>
Date: Mon, 26 Feb 2024 12:56:26 +0530
Subject: [PATCH 3/4] #1309 - removed message from JSON as it requires
 parameter and is not translated. keep awake during database upgrade.

---
 .../config/beforeSyncMessages.en.json              |  1 -
 packages/openchs-android/package-lock.json         | 14 +++++++-------
 packages/openchs-android/package.json              |  2 +-
 packages/openchs-android/src/App.js                |  7 +++++--
 .../src/service/BackupRestoreRealm.js              |  5 ++---
 .../src/views/program/ProgramEncounterView.js      |  2 --
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/openchs-android/config/beforeSyncMessages.en.json b/packages/openchs-android/config/beforeSyncMessages.en.json
index 4d4c39e18..6dbd9803c 100644
--- a/packages/openchs-android/config/beforeSyncMessages.en.json
+++ b/packages/openchs-android/config/beforeSyncMessages.en.json
@@ -40,7 +40,6 @@
   "restoreCheckDb": "Finding pre-existing database",
   "restoreDownloadPreparedDb": "Downloading prepared database",
   "restoringDb": "Restoring database",
-  "migratingDb": "Restoring database (Updating database to current version)",
   "restoreComplete": "Restore complete",
   "restoreFailed": "Restore failed, will sync from server",
   "restoreFailedTitle": "Fast sync failed",
diff --git a/packages/openchs-android/package-lock.json b/packages/openchs-android/package-lock.json
index 4959fc602..611db2445 100644
--- a/packages/openchs-android/package-lock.json
+++ b/packages/openchs-android/package-lock.json
@@ -34,7 +34,7 @@
         "lodash": "4.17.21",
         "moment": "2.29.4",
         "native-base": "3.4.9",
-        "openchs-models": "1.31.37",
+        "openchs-models": "1.31.39",
         "prop-types": "15.8.1",
         "react": "18.2.0",
         "react-native": "0.72.3",
@@ -16439,9 +16439,9 @@
       }
     },
     "node_modules/openchs-models": {
-      "version": "1.31.37",
-      "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.31.37.tgz",
-      "integrity": "sha512-YtXYVF6qPlvszAz+caQXtm9MggfQHA6jOirwdrcbk9x/7HMPszse0pKp3bibL4SJwamH9q0stlTFo3X2CBulIg==",
+      "version": "1.31.39",
+      "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.31.39.tgz",
+      "integrity": "sha512-+wPmXmJmrU4cVpC0NseC1bOQmJLc8d3JNWHCqGRCPx+xLWwPBmfJG3snVrvF1yeIt8EcGCtImypYYEeqW4dqJA==",
       "dependencies": {
         "uuid": "^9.0.1"
       },
@@ -35170,9 +35170,9 @@
       }
     },
     "openchs-models": {
-      "version": "1.31.37",
-      "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.31.37.tgz",
-      "integrity": "sha512-YtXYVF6qPlvszAz+caQXtm9MggfQHA6jOirwdrcbk9x/7HMPszse0pKp3bibL4SJwamH9q0stlTFo3X2CBulIg==",
+      "version": "1.31.39",
+      "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.31.39.tgz",
+      "integrity": "sha512-+wPmXmJmrU4cVpC0NseC1bOQmJLc8d3JNWHCqGRCPx+xLWwPBmfJG3snVrvF1yeIt8EcGCtImypYYEeqW4dqJA==",
       "requires": {
         "uuid": "^9.0.1"
       }
diff --git a/packages/openchs-android/package.json b/packages/openchs-android/package.json
index ee32824e9..dcc838277 100644
--- a/packages/openchs-android/package.json
+++ b/packages/openchs-android/package.json
@@ -58,7 +58,7 @@
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "native-base": "3.4.9",
-    "openchs-models": "1.31.37",
+    "openchs-models": "1.31.39",
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-native": "0.72.3",
diff --git a/packages/openchs-android/src/App.js b/packages/openchs-android/src/App.js
index af66378f1..f1b9f51ce 100644
--- a/packages/openchs-android/src/App.js
+++ b/packages/openchs-android/src/App.js
@@ -15,8 +15,9 @@ import General from "./utility/General";
 import EnvironmentConfig from "./framework/EnvironmentConfig";
 import Config from './framework/Config';
 import JailMonkey from 'jail-monkey';
-
 const {TamperCheckModule} = NativeModules;
+import KeepAwake from 'react-native-keep-awake';
+import moment from "moment";
 
 class App extends Component {
     static childContextTypes = {
@@ -127,11 +128,13 @@ class App extends Component {
         if (!_.isNil(GlobalContext.getInstance().routes) && this.state.isInitialisationDone) {
             return GlobalContext.getInstance().routes
         }
+        const message = `Upgrading database. Please do not close the App. May take upto 5 minutes on slow devices. Start Time: ${moment().format("hh:mm")}`
         return (
             <View style={{flex: 1, alignItems: 'center', justifyContent: 'center'}}>
                 <Image source={{uri: `asset:/logo.png`}}
                        style={{height: 120, width: 120, alignSelf: 'center'}} resizeMode={'center'}/>
-                <Text>Upgrading data, Please do not close the App.</Text>
+                <KeepAwake/>
+                <Text>{message}</Text>
             </View>);
     }
 }
diff --git a/packages/openchs-android/src/service/BackupRestoreRealm.js b/packages/openchs-android/src/service/BackupRestoreRealm.js
index 3bb319a4a..cc7a9d0d5 100644
--- a/packages/openchs-android/src/service/BackupRestoreRealm.js
+++ b/packages/openchs-android/src/service/BackupRestoreRealm.js
@@ -17,6 +17,7 @@ import IndividualService from "./IndividualService";
 import SubjectMigrationService from "./SubjectMigrationService";
 import FormMappingService from "./FormMappingService";
 import UserInfoService from './UserInfoService';
+import moment from "moment";
 
 const REALM_FILE_NAME = "default.realm";
 const REALM_FILE_FULL_PATH = `${fs.DocumentDirectoryPath}/${REALM_FILE_NAME}`;
@@ -77,8 +78,6 @@ export default class BackupRestoreRealmService extends BaseService {
             });
     }
 
-
-
     restore(cb) {
         let settingsService = this.getService(SettingsService);
         let mediaService = this.getService(MediaService);
@@ -125,7 +124,7 @@ export default class BackupRestoreRealmService extends BaseService {
                         })
                         .then(() => {
                             General.logDebug("BackupRestoreRealmService", "Migrating database");
-                            cb(92, "migratingDb");
+                            cb(92, `Upgrading database. May take upto 5 minutes on slow devices. Start Time: ${moment().format("hh:mm")}`);
                         })
                         .then(() => this.dumpFileRestoreCompleted())
                         .then(() => {
diff --git a/packages/openchs-android/src/views/program/ProgramEncounterView.js b/packages/openchs-android/src/views/program/ProgramEncounterView.js
index 937c63c3e..f8a67b0d4 100644
--- a/packages/openchs-android/src/views/program/ProgramEncounterView.js
+++ b/packages/openchs-android/src/views/program/ProgramEncounterView.js
@@ -24,11 +24,9 @@ import GeolocationFormElement from "../form/formElement/GeolocationFormElement";
 import ProgramEncounterService from "../../service/program/ProgramEncounterService";
 import moment from "moment";
 import NewVisitPageView from "./NewVisitPageView";
-import IndividualEncounterView from "../individual/IndividualEncounterView";
 import {AvniAlert} from "../common/AvniAlert";
 import {RejectionMessage} from "../approval/RejectionMessage";
 import SummaryButton from "../common/SummaryButton";
-import ProgramEnrolmentState from "../../state/ProgramEnrolmentState";
 import BackgroundTimer from "react-native-background-timer";
 import Timer from "../common/Timer";
 import RuleEvaluationService from "../../service/RuleEvaluationService";

From 93de021f72a194f7810e8005ba4296c0e58c761d Mon Sep 17 00:00:00 2001
From: Vivek Singh <petmongrels@gmail.com>
Date: Mon, 26 Feb 2024 14:22:19 +0530
Subject: [PATCH 4/4] #1309 - compact database

---
 packages/openchs-android/src/GlobalContext.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/openchs-android/src/GlobalContext.js b/packages/openchs-android/src/GlobalContext.js
index 0c01d849f..49dacc56e 100644
--- a/packages/openchs-android/src/GlobalContext.js
+++ b/packages/openchs-android/src/GlobalContext.js
@@ -27,6 +27,7 @@ class GlobalContext {
 
     async initialiseGlobalContext(appStore, realmFactory) {
         this.db =  await realmFactory.createRealm();
+        this.db.realmDb.compact();
         this.beanRegistry.init(this.db);
         this.reduxStore = appStore.create(this.beanRegistry.beansMap);
         this.beanRegistry.setReduxStore(this.reduxStore);