If dump restore fails for some reason then prompt user for the messag…

…e to retry or perform slow sync.

packages/openchs-android/src/action/LoginActions.js

@@ -26,7 +26,10 @@ class LoginActions {
 
     static onLoad(state, action, context) {
         const userInfo = context.get(UserInfoService).getUserInfo();
-        return _.assignIn({}, state, userInfo ? {userId: userInfo.username, loggedInUser: userInfo.username, percentProgress: null} : {percentProgress: null, dumpRestoreMessage: null});
+        return _.assignIn({}, state, userInfo ? {userId: userInfo.username, loggedInUser: userInfo.username, percentProgress: null} : {
+            percentProgress: null,
+            dumpRestoreMessage: null
+        });
     }
 
     static onUserIdChange(state, action) {
@@ -70,21 +73,26 @@ class LoginActions {
                 return _.isEmpty(anEntity);
             })
             .then((doRestoreDump) => {
-                General.logInfo("LoginActions", `Dump restore required = ${doRestoreDump}`);
+                General.logInfo("LoginActions", `Dump restore can be done = ${doRestoreDump}`);
                 if (doRestoreDump) {
-                    let restoreService = context.get(BackupRestoreRealmService);
-                    restoreService.restore((percentProgress, message) => {
-                        if (percentProgress === 100) action.successCb();
-                        else action.onLoginProgress(percentProgress, message);
-                    });
+                    LoginActions.restoreDump(context, action);
                 } else {
                     action.successCb();
                 }
             });
         return newState;
     }
 
-    static onStateChange(state, action, context) {
+    static restoreDump(context, action) {
+        let restoreService = context.get(BackupRestoreRealmService);
+        restoreService.restore((percentProgress, message, failed = false, failureMessage) => {
+            if (failed) action.checkForRetry(failureMessage);
+            else if (percentProgress === 100) action.successCb();
+            else action.onLoginProgress(percentProgress, message);
+        });
+    }
+
+    static onStateChange(state, action) {
         return _.assignIn({}, state, action.newState);
     }
 
@@ -101,6 +109,12 @@ class LoginActions {
         newState.dumpRestoring = action.percentProgress !== 100;
         return newState;
     }
+
+    static onDumpRestoreRetry(state, action, context) {
+        let newState = _.assignIn({}, state, {percentProgress: 0});
+        LoginActions.restoreDump(context, action);
+        return newState;
+    }
 }
 
 const LoginActionsNames = {
@@ -112,7 +126,8 @@ const LoginActionsNames = {
     ON_TOGGLE_SHOW_PASSWORD: "LA.ON_TOGGLE_SHOW_PASSWORD",
     ON_EMPTY_LOGIN: "LA.ON_EMPTY_LOGIN",
     ON_LOAD: 'LA.ON_LOAD',
-    ON_DUMP_RESTORING: 'LA.ON_DUMP_RESTORING'
+    ON_DUMP_RESTORING: 'LA.ON_DUMP_RESTORING',
+    ON_DUMP_RESTORE_RETRY: 'LA.ON_DUMP_RESTORE_RETRY'
 };
 
 const LoginActionsMap = new Map([
@@ -124,6 +139,7 @@ const LoginActionsMap = new Map([
     [LoginActionsNames.ON_LOAD, LoginActions.onLoad],
     [LoginActionsNames.ON_EMPTY_LOGIN, LoginActions.onEmptyLogin],
     [LoginActionsNames.ON_DUMP_RESTORING, LoginActions.onDumpRestoring],
+    [LoginActionsNames.ON_DUMP_RESTORE_RETRY, LoginActions.onDumpRestoreRetry]
 ]);
 
 export {LoginActionsNames, LoginActionsMap, LoginActions} ;

packages/openchs-android/src/service/BackupRestoreRealm.js

@@ -80,10 +80,10 @@ export default class BackupRestoreRealmService extends BaseService {
                 General.logDebug("BackupRestoreRealmService", `Backup file exists:${exists}`);
                 if (exists === "true") {
                     authService.getAuthToken()
-                        .then((authToken) => get(`${settingsService.getSettings().serverURL}/media/mobileDatabaseBackupUrl/download`, authToken)
+                        .then((authToken) => get(`${settingsService.getSettings().serverURL}/media/mobileDatabaseBackupUrl/download`, authToken))
                         .then((url) => mediaService.downloadFromUrl(url, downloadedFile, (received, total) => {
-                            cb(1 + (received * 85) / total, "restoreDownloadPreparedDb")
-                        })))
+                                cb(1 + (received * 85) / total, "restoreDownloadPreparedDb")
+                            }))
                         .then(() => {
                             General.logDebug("BackupRestoreRealmService", "Decompressing downloaded database dump");
                             cb(87, "restoringDb");
@@ -127,15 +127,15 @@ export default class BackupRestoreRealmService extends BaseService {
                         })
                         .catch((error) => {
                             General.logErrorAsInfo("BackupRestoreRealm", error);
-                            cb(100, "restoreFailed");
+                            cb(100, "restoreFailed", true, error.message);
                         });
                 } else {
                     cb(100, "restoreNoDump");
                 }
             })
             .catch((error) => {
                 General.logErrorAsInfo("BackupRestoreRealm", error);
-                cb(100, "restoreFailed");
+                cb(100, "restoreFailed", true, error.message);
             });
     }
 

packages/openchs-android/src/views/LoginView.js

@@ -4,12 +4,9 @@ import AbstractComponent from "../framework/view/AbstractComponent";
 import Path from "../framework/routing/Path";
 import {
     Alert,
-    Dimensions,
-    Modal,
     StatusBar,
     Text,
     TouchableNativeFeedback,
-    TouchableWithoutFeedback,
     View,
 } from "react-native";
 import TextFormElement from "./form/formElement/TextFormElement";
@@ -24,7 +21,7 @@ import CHSContent from "./common/CHSContent";
 import Styles from "./primitives/Styles";
 import Colors from "./primitives/Colors";
 import _ from "lodash";
-import {Button, CheckBox, Spinner} from "native-base";
+import {CheckBox, Spinner} from "native-base";
 import General from "../utility/General";
 import AuthService from "../service/AuthService";
 import {ConfirmDialog} from 'react-native-simple-dialogs';
@@ -148,11 +145,22 @@ class LoginView extends AbstractComponent {
         </ConfirmDialog>);
     }
 
+    restoreFailureAlert(errorMessage) {
+        Alert.alert(this.I18n.t("restoreFailedTitle"), errorMessage, [{
+                text: this.I18n.t('tryAgain'),
+                onPress: () => this.dispatchAction(Actions.ON_DUMP_RESTORE_RETRY, this.dumpRestoreAction())
+            },
+                {text: this.I18n.t('performNormalSync'), onPress: () => this.loginComplete(), style: 'cancel'}
+            ]
+        );
+    }
+
     render() {
         General.logDebug("LoginView", 'render');
         return (
             <CHSContainer>
-                <ProgressBarView progress={this.state.percentProgress / 100} message={this.state.dumpRestoreMessage} syncing={this.state.dumpRestoring} onPress={_.noop} notifyUserOnCompletion={false}/>
+                <ProgressBarView progress={this.state.percentProgress / 100} message={this.state.dumpRestoreMessage} syncing={this.state.dumpRestoring} onPress={_.noop}
+                                 notifyUserOnCompletion={false}/>
                 <CHSContent>
                     {this.renderMultiUserLoginFailure()}
                     <StatusBar backgroundColor={Styles.blackColor} barStyle="light-content"/>
@@ -282,12 +290,21 @@ class LoginView extends AbstractComponent {
         this.dispatchAction(Actions.ON_LOGIN, {
             failure: this.loginFailure.bind(this),
             newPasswordRequired: this.newPasswordRequired.bind(this),
+            ...this.dumpRestoreAction()
+        });
+    }
+
+    dumpRestoreAction() {
+        return {
             onLoginProgress: (percentProgress, message) => {
                 General.logDebug("LoginView", message);
                 this.dispatchAction(Actions.ON_DUMP_RESTORING, {percentProgress: percentProgress, message: message});
             },
+            checkForRetry: (errorMessage) => {
+                this.restoreFailureAlert(errorMessage);
+            },
             successCb: this.loginComplete.bind(this)
-        });
+        }
     }
 }
 

packages/openchs-android/translations/en.json

@@ -413,9 +413,11 @@
     "restoringDb": "Restoring database",
     "restoreComplete": "Restore complete",
     "restoreFailed": "Restore failed, will sync from server",
+    "restoreFailedTitle": "Fast sync failed",
     "restoreNoDump": "No dump present, will sync fully from server",
+    "performNormalSync": "Perform slow sync",
     "audioFileTitle": "Only audio file supported",
     "audioFileDescription": "Please select an audio file.",
     "recordingStartedMessage": "Recording started, use stop button to stop it."
   }
-}
+}

packages/openchs-android/translations/hi_IN.json

@@ -294,6 +294,14 @@
     "backPressMessage": "क्या आप वाकई वापस जाना चाहते हैं? आप सभी भरे हुए डेटा को बरबाद कर देंगे।",
     "subjectSummary": "सारांश",
     "homePressTitle": "होम स्क्रीन पर जाएं",
-    "homePressMessage": "क्या आप वाकई होम स्क्रीन पर वापस जाना चाहते हैं? आप सभी प्रपत्र परिवर्तनों को खो देंगे।"
+    "homePressMessage": "क्या आप वाकई होम स्क्रीन पर वापस जाना चाहते हैं? आप सभी प्रपत्र परिवर्तनों को खो देंगे।",
+    "restoreCheckDb": "देटाबसे चेक जारी",
+    "restoreDownloadPreparedDb": "देटाबसे डाउनलोड चालू",
+    "restoringDb": "देटाबसे लोड चालू",
+    "restoreComplete": "देटाबसे लोड ख़त्म",
+    "restoreFailedTitle": "देटाबसे रेस्टॉर फ़ेल",
+    "restoreFailedMessage": "फ़ास्ट सिंक फ़ेल",
+    "restoreNoDump": "कोई डम्प मौजूद नहीं, फ़्रेश सिंक चालू",
+    "performNormalSync": "स्लो सिंक करो"
   }
 }