Lock syncing until initial data load

standardnotes · May 12, 2019 · dd3ac05 · dd3ac05
1 parent 62b04a1
commit dd3ac05
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/screens/ComponentView.js b/src/screens/ComponentView.js
@@ -50,7 +50,7 @@ export default class ComponentView extends Component {
   componentDidMount() {
     if(Platform.OS == "android" && Platform.Version <= 23) {
       // postMessage doesn't work on Android <= 6 (API version 23) https://github.com/facebook/react-native/issues/11594
-      Alert.alert('Editors Not Supported', `Your version of Android does not support web editors. Changes you make may not be properly saved. Please switch to the Plain Editor for the best experience.`, [{text: 'OK'}])
+      Alert.alert('Editors Not Supported', `Web editors require Android 7.0 or greater. Your version does not support web editors. Changes you make may not be properly saved. Please switch to the Plain Editor for the best experience.`, [{text: 'OK'}])
     }
   }
 

diff --git a/src/screens/Root.js b/src/screens/Root.js
@@ -163,6 +163,9 @@ export default class Root extends Abstract {
   }
 
   initializeData() {
+    // Ensure no sync executes until initial data load
+    Sync.get().lockSyncing();
+
     let encryptionEnabled = KeysManager.get().isOfflineEncryptionEnabled();
     this.setSubTitle(encryptionEnabled ? "Decrypting items..." : "Loading items...");
     let incrementalCallback = (current, total) => {
@@ -176,6 +179,7 @@ export default class Root extends Abstract {
     }
 
     let loadLocalCompletion = (items) => {
+      Sync.get().unlockSyncing();
       this.setSubTitle("Syncing...");
       this.dataLoaded = true;
       // perform initial sync