fixed periodical sync

janwillemb · Aug 5, 2015 · 1e22338 · 1e22338
1 parent a001809
commit 1e22338
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 29 deletions.
diff --git a/EmaXamarin/EmaXamarin/App.cs b/EmaXamarin/EmaXamarin/App.cs
@@ -1,5 +1,4 @@
-using System.IO;
-using EmaXamarin.Api;
+using EmaXamarin.Api;
 using EmaXamarin.CloudStorage;
 using EmaXamarin.Pages;
 using Xamarin.Forms;
@@ -19,15 +18,15 @@ public App(IFileRepository fileRepository, IExternalBrowserService externalBrows
             {
                 fileRepository.StorageDirectory = PersistedState.CustomStorageDirectory;
             }
-            catch 
+            catch
             {
                 //can't do much about it now.
             }
 
             PageFactory.Initialize(service, fileRepository, externalBrowserService, _applicationEvents);
 
+            SyncBootstrapper.RefreshDropboxSync(fileRepository);
             SyncBootstrapper.RefreshFromSyncInterval();
-            SyncBootstrapper.RefreshForDropbox(fileRepository);
 
             MainPage = new NavigationPage(PageFactory.Current.CreateEmaWikiPage());
         }

diff --git a/EmaXamarin/EmaXamarin/CloudStorage/SyncBootstrapper.cs b/EmaXamarin/EmaXamarin/CloudStorage/SyncBootstrapper.cs
@@ -12,12 +12,13 @@ public class SyncBootstrapper
         private static readonly Dictionary<string, Synchronization> Synchronizations = new Dictionary<string, Synchronization>();
         private static readonly object LockObject = new object();
         private static bool _isSyncing;
-        private static ISyncProgress _syncProgress;
-        private static Exception _syncException;
         private static bool _stop;
         private static bool _taskIsActive;
         private static readonly Logging Logger = Logging.For<SyncBootstrapper>();
+        private static ISyncProgress _syncProgress;
+        private static Exception _syncException;
         private static int _intervalMinutes;
+        private static DateTime _lastSyncDateTime = DateTime.MinValue;
 
         public static bool CanSync
         {
@@ -63,11 +64,18 @@ private static void SyncPeriodically(int intervalMinutes)
             Task.Run(async () =>
             {
                 _taskIsActive = true;
+
+                //always wait a few seconds: allow the UI to appear, so we have a progressbar available to show
+                await Task.Delay(TimeSpan.FromSeconds(5));
+
                 while (!_stop)
                 {
-                    Logger.Info("Sync triggered by interval");
-                    await StartSync();
-                    await Task.Delay(_intervalMinutes*60*1000);
+                    if (_lastSyncDateTime.AddMinutes(_intervalMinutes) < DateTime.Now)
+                    {
+                        Logger.Info("Sync triggered by interval");
+                        await StartSync();
+                    }
+                    await Task.Delay(TimeSpan.FromSeconds(1));
                 }
                 _taskIsActive = false;
             });
@@ -83,18 +91,18 @@ private static async Task StartSync()
             if (_isSyncing)
                 return;
 
-            Synchronization[] synchronizations;
-            lock (LockObject)
+            try
             {
-                if (_isSyncing)
-                    return;
+                Synchronization[] synchronizations;
+                lock (LockObject)
+                {
+                    if (_isSyncing)
+                        return;
 
-                _isSyncing = true;
-                synchronizations = Synchronizations.Values.ToArray();
-            }
+                    _isSyncing = true;
+                    synchronizations = Synchronizations.Values.ToArray();
+                }
 
-            try
-            {
                 if (_syncProgress != null)
                     _syncProgress.OnSyncStart();
 
@@ -115,6 +123,7 @@ private static async Task StartSync()
             finally
             {
                 _isSyncing = false;
+                _lastSyncDateTime = DateTime.Now;
             }
         }
 
@@ -143,7 +152,7 @@ public static void RefreshFromSyncInterval()
             }
         }
 
-        public static void RefreshForDropbox(IFileRepository fileRepository)
+        public static void RefreshDropboxSync(IFileRepository fileRepository)
         {
             var userPermission = PersistedState.UserLogin;
             if (string.IsNullOrEmpty(userPermission.Secret) || string.IsNullOrEmpty(userPermission.Token))

diff --git a/EmaXamarin/EmaXamarin/Pages/SettingsPage.cs b/EmaXamarin/EmaXamarin/Pages/SettingsPage.cs
@@ -103,7 +103,7 @@ private void InitializeDropboxSettings(IExternalBrowserService externalBrowserSe
                 {
                     PersistedState.UserLogin = null;
                 }
-                SyncBootstrapper.RefreshForDropbox(_fileRepository);
+                SyncBootstrapper.RefreshDropboxSync(_fileRepository);
             };
         }
 
@@ -123,7 +123,7 @@ private async void ApplicationEventsOnResumed(object sender, EventArgs eventArgs
                     PersistedState.UserLogin = userPermission;
                 }
             }
-            SyncBootstrapper.RefreshForDropbox(_fileRepository);
+            SyncBootstrapper.RefreshDropboxSync(_fileRepository);
         }
 
         private void InitializeStorageSettings(IFileRepository fileRepository)

diff --git a/EmaXamarin/EmaXamarin/Pages/SyncProgressContentView.cs b/EmaXamarin/EmaXamarin/Pages/SyncProgressContentView.cs
@@ -26,22 +26,31 @@ public SyncProgressContentView()
 
         public void OnSyncStart()
         {
-            _progressbar.Progress = 0;
-            IsVisible = true;
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                _progressbar.Progress = 0;
+                IsVisible = true;
+            });
         }
 
-        public async void ReportProgress(int totalSteps, int currentStep, string label)
+        public void ReportProgress(int totalSteps, int currentStep, string label)
         {
-            var fraction = (double) currentStep/Math.Max(1, totalSteps);
-            double progress = Math.Min(1, Math.Max(0, fraction));
+            Device.BeginInvokeOnMainThread(async () =>
+            {
+                var fraction = (double) currentStep/Math.Max(1, totalSteps);
+                double progress = Math.Min(1, Math.Max(0, fraction));
 
-            _progressLabel.Text = label;
-            await _progressbar.ProgressTo(progress, 100, Easing.Linear);
+                _progressLabel.Text = label;
+                await _progressbar.ProgressTo(progress, 100, Easing.Linear);
+            });
         }
 
         public void OnSyncFinished()
         {
-            IsVisible = false;
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                IsVisible = false;
+            });
         }
     }
 }