Feature sync on refresh (#937)

* Added new option: Sync on refresh

* Removed unused field

* Fixed refreshing on disappearing & unnecessary codes removed

* Requested changes

* Calling storage service instead of a dedicated service function (mobile-specific)

src/App/Pages/Settings/SyncPage.xaml

@@ -16,22 +16,35 @@
         <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
     </ContentPage.ToolbarItems>
 
-    <ScrollView>
+    <ScrollView Padding="0, 0, 0, 20">
-        <StackLayout Spacing="10"
+        <StackLayout Padding="0" Spacing="20">
-                     Padding="10, 5"
+            <StackLayout StyleClass="box">
-                     VerticalOptions="Center"
+                <StackLayout StyleClass="box-row, box-row-switch">
-                     HorizontalOptions="FillAndExpand">
+                    <Label
-            <Button Text="{u:I18n SyncVaultNow}"
+                        Text="{u:I18n EnableSyncOnRefresh}"
-                    Clicked="Sync_Clicked"></Button>
+                        StyleClass="box-label, box-label-regular"
-            <Label StyleClass="text-muted, text-sm" HorizontalTextAlignment="Center">
+                        HorizontalOptions="StartAndExpand" />
-                <Label.FormattedText>
+                    <Switch
-                    <FormattedString>
+                        IsToggled="{Binding EnableSyncOnRefresh}"
-                        <Span Text="{u:I18n LastSync}" />
+                        StyleClass="box-value"
-                        <Span Text=" " />
+                        HorizontalOptions="End" />
-                        <Span Text="{Binding LastSync}" />
+                </StackLayout>
-                    </FormattedString>
+                <Label
-                </Label.FormattedText>
+                    Text="{u:I18n EnableSyncOnRefreshDescription}"
-            </Label>
+                    StyleClass="box-footer-label, box-footer-label-switch" />
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <Button Text="{u:I18n SyncVaultNow}" Clicked="Sync_Clicked"></Button>
+                <Label StyleClass="text-muted, text-sm" HorizontalTextAlignment="Center">
+                    <Label.FormattedText>
+                        <FormattedString>
+                            <Span Text="{u:I18n LastSync}" />
+                            <Span Text=" " />
+                            <Span Text="{Binding LastSync}" />
+                        </FormattedString>
+                    </Label.FormattedText>
+                </Label>
+            </StackLayout>
         </StackLayout>
     </ScrollView>
 

src/App/Pages/Settings/SyncPage.xaml.cs

@@ -21,7 +21,7 @@ namespace Bit.App.Pages
         protected async override void OnAppearing()
         {
             base.OnAppearing();
-            await _vm.SetLastSyncAsync();
+            await _vm.InitAsync();
         }
 
         private async void Sync_Clicked(object sender, EventArgs e)

src/App/Pages/Settings/SyncPageViewModel.cs

@@ -1,5 +1,6 @@
 using Bit.App.Abstractions;
 using Bit.App.Resources;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
@@ -11,25 +12,56 @@ namespace Bit.App.Pages
     {
         private readonly IDeviceActionService _deviceActionService;
         private readonly IPlatformUtilsService _platformUtilsService;
+        private readonly IStorageService _storageService;
         private readonly ISyncService _syncService;
 
         private string _lastSync = "--";
+        private bool _inited;
+        private bool _syncOnRefresh;
 
         public SyncPageViewModel()
         {
             _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
             _syncService = ServiceContainer.Resolve<ISyncService>("syncService");
 
             PageTitle = AppResources.Sync;
         }
 
+        public bool EnableSyncOnRefresh
+        {
+            get => _syncOnRefresh;
+            set
+            {
+                if (SetProperty(ref _syncOnRefresh, value))
+                {
+                    var task = UpdateSyncOnRefreshAsync();
+                }
+            }
+        }
+
         public string LastSync
         {
             get => _lastSync;
             set => SetProperty(ref _lastSync, value);
         }
 
+        public async Task InitAsync()
+        {
+            await SetLastSyncAsync();
+            EnableSyncOnRefresh = await _storageService.GetAsync<bool>(Constants.SyncOnRefreshKey);
+            _inited = true;
+        }
+
+        public async Task UpdateSyncOnRefreshAsync()
+        {
+            if (_inited)
+            {
+                await _storageService.SaveAsync(Constants.SyncOnRefreshKey, _syncOnRefresh);
+            }
+        }
+
         public async Task SetLastSyncAsync()
         {
             var last = await _syncService.GetLastSyncAsync();

src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs

@@ -194,6 +194,7 @@ namespace Bit.App.Pages
             base.OnDisappearing();
             IsBusy = false;
             _broadcasterService.Unsubscribe(_pageName);
+            _vm.DisableRefreshing();
         }
 
         private async void RowSelected(object sender, SelectedItemChangedEventArgs e)

src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs

@@ -27,6 +27,7 @@ namespace Bit.App.Pages
         private bool _showNoData;
         private bool _showList;
         private bool _websiteIconsEnabled;
+        private bool _syncRefreshing;
         private string _noDataText;
         private List<CipherView> _allCiphers;
         private Dictionary<string, int> _folderCounts = new Dictionary<string, int>();
@@ -44,6 +45,7 @@ namespace Bit.App.Pages
         private readonly IPlatformUtilsService _platformUtilsService;
         private readonly IMessagingService _messagingService;
         private readonly IStateService _stateService;
+        private readonly IStorageService _storageService;
 
         public GroupingsPageViewModel()
         {
@@ -57,6 +59,7 @@ namespace Bit.App.Pages
             _platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
             _messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
             _stateService = ServiceContainer.Resolve<IStateService>("stateService");
+            _storageService = ServiceContainer.Resolve<IStorageService>("storageService");
 
             Loading = true;
             PageTitle = AppResources.MyVault;
@@ -94,6 +97,11 @@ namespace Bit.App.Pages
             get => _refreshing;
             set => SetProperty(ref _refreshing, value);
         }
+        public bool SyncRefreshing
+        {
+            get => _syncRefreshing;
+            set => SetProperty(ref _syncRefreshing, value);
+        }
         public bool Loading
         {
             get => _loading;
@@ -149,6 +157,13 @@ namespace Bit.App.Pages
             {
                 return;
             }
+            if (await _storageService.GetAsync<bool>(Constants.SyncOnRefreshKey) && Refreshing && !SyncRefreshing)
+            {
+                SyncRefreshing = true;
+                await _syncService.FullSyncAsync(false);
+                return;
+            }
+
             _doingLoad = true;
             LoadedOnce = true;
             ShowNoData = false;
@@ -266,12 +281,18 @@ namespace Bit.App.Pages
                 _doingLoad = false;
                 Loaded = true;
                 Loading = false;
-                Refreshing = false;
                 ShowNoData = (MainPage && !HasCiphers) || !groupedItems.Any();
                 ShowList = !ShowNoData;
+                DisableRefreshing();
             }
         }
 
+        public void DisableRefreshing()
+        {
+            Refreshing = false;
+            SyncRefreshing = false;
+        }
+
         public async Task SelectCipherAsync(CipherView cipher)
         {
             var page = new ViewPage(cipher.Id);

src/App/Resources/AppResources.resx

@@ -1674,4 +1674,10 @@
     <value>Do you really want to send to the trash?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>
   </data>
+  <data name="EnableSyncOnRefresh" xml:space="preserve">
+    <value>Enable sync on refresh</value>
+  </data>
+  <data name="EnableSyncOnRefreshDescription" xml:space="preserve">
+    <value>Syncing vault with pull down gesture.</value>
+  </data>
 </root>

src/Core/Abstractions/ISyncService.cs

@@ -7,7 +7,6 @@ namespace Bit.Core.Abstractions
     public interface ISyncService
     {
         bool SyncInProgress { get; set; }
-
         Task<bool> FullSyncAsync(bool forceSync, bool allowThrowOnError = false);
         Task<DateTime?> GetLastSyncAsync();
         Task SetLastSyncAsync(DateTime date);

src/Core/Constants.cs

@@ -4,6 +4,7 @@
     {
         public const string AndroidAppProtocol = "androidapp://";
         public const string iOSAppProtocol = "iosapp://";
+        public static string SyncOnRefreshKey = "syncOnRefresh";
         public static string VaultTimeoutKey = "lockOption";
         public static string VaultTimeoutActionKey = "vaultTimeoutAction";
         public static string LastActiveKey = "lastActive";