Merge branch 'master' into PM-171-remove-restore-confirm-alert

src/App/Pages/Settings/BlockAutofillUrisPage.xaml

@@ -7,7 +7,6 @@
     xmlns:u="clr-namespace:Bit.App.Utilities"
     xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
     x:DataType="pages:BlockAutofillUrisPageViewModel"
-    NavigationPage.HasBackButton="False"
     Title="{u:I18n BlockAutoFill}">
     <ContentPage.BindingContext>
         <pages:BlockAutofillUrisPageViewModel />

src/App/Pages/Vault/CipherDetailsPageViewModel.cs

@@ -409,12 +409,6 @@ namespace Bit.App.Pages
                     AppResources.InternetConnectionRequiredTitle);
                 return false;
             }
-            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.DoYouReallyWantToRestoreCipher,
-                null, AppResources.Yes, AppResources.Cancel);
-            if (!confirmed)
-            {
-                return false;
-            }
             try
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.Restoring);

src/App/Resources/AppResources.Designer.cs

@@ -2092,15 +2092,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Do you really want to restore this item?.
-        /// </summary>
-        public static string DoYouReallyWantToRestoreCipher {
-            get {
-                return ResourceManager.GetString("DoYouReallyWantToRestoreCipher", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Do you really want to send to the trash?.
         /// </summary>

src/App/Resources/AppResources.resx

@@ -1741,10 +1741,6 @@ Scanning will happen automatically.</value>
     <value>Do you really want to permanently delete? This cannot be undone.</value>
     <comment>Confirmation alert message when permanently deleteing a cipher.</comment>
   </data>
-  <data name="DoYouReallyWantToRestoreCipher" xml:space="preserve">
-    <value>Do you really want to restore this item?</value>
-    <comment>Confirmation alert message when restoring a soft-deleted cipher.</comment>
-  </data>
   <data name="DoYouReallyWantToSoftDeleteCipher" xml:space="preserve">
     <value>Do you really want to send to the trash?</value>
     <comment>Confirmation alert message when soft-deleting a cipher.</comment>

src/App/Services/PushNotificationListenerService.cs

@@ -131,24 +131,6 @@ namespace Bit.App.Services
                         _messagingService.Value.Send("logout");
                     }
                     break;
-                case NotificationType.SyncSendCreate:
-                case NotificationType.SyncSendUpdate:
-                    var sendCreateUpdateMessage = JsonConvert.DeserializeObject<SyncSendNotification>(
-                        notification.Payload);
-                    if (isAuthenticated && sendCreateUpdateMessage.UserId == myUserId)
-                    {
-                        await _syncService.Value.SyncUpsertSendAsync(sendCreateUpdateMessage,
-                            notification.Type == NotificationType.SyncSendUpdate);
-                    }
-                    break;
-                case NotificationType.SyncSendDelete:
-                    var sendDeleteMessage = JsonConvert.DeserializeObject<SyncSendNotification>(
-                        notification.Payload);
-                    if (isAuthenticated && sendDeleteMessage.UserId == myUserId)
-                    {
-                        await _syncService.Value.SyncDeleteSendAsync(sendDeleteMessage);
-                    }
-                    break;
                 case NotificationType.AuthRequest:
                     var passwordlessLoginMessage = JsonConvert.DeserializeObject<PasswordlessRequestNotification>(notification.Payload);
 

src/Core/Abstractions/ISyncService.cs

@@ -12,10 +12,8 @@ namespace Bit.Core.Abstractions
         Task SetLastSyncAsync(DateTime date);
         Task<bool> SyncDeleteCipherAsync(SyncCipherNotification notification);
         Task<bool> SyncDeleteFolderAsync(SyncFolderNotification notification);
-        Task<bool> SyncDeleteSendAsync(SyncSendNotification notification);
         Task<bool> SyncUpsertCipherAsync(SyncCipherNotification notification, bool isEdit);
         Task<bool> SyncUpsertFolderAsync(SyncFolderNotification notification, bool isEdit);
-        Task<bool> SyncUpsertSendAsync(SyncSendNotification notification, bool isEdit);
         // Passwordless code will be moved to an independent service in future techdept
         Task SyncPasswordlessLoginRequestsAsync();
     }

src/Core/Models/Response/NotificationResponse.cs

@@ -34,13 +34,6 @@ namespace Bit.Core.Models.Response
         public DateTime Date { get; set; }
     }
 
-    public class SyncSendNotification
-    {
-        public string Id { get; set; }
-        public string UserId { get; set; }
-        public DateTime RevisionDate { get; set; }
-    }
-
     public class PasswordlessRequestNotification
     {
         public string UserId { get; set; }

src/Core/Services/SyncService.cs

@@ -274,66 +274,6 @@ namespace Bit.Core.Services
             return SyncCompleted(false);
         }
 
-        public async Task<bool> SyncUpsertSendAsync(SyncSendNotification notification, bool isEdit)
-        {
-            SyncStarted();
-            if (!await _stateService.IsAuthenticatedAsync())
-            {
-                return SyncCompleted(false);
-            }
-
-            try
-            {
-                var localSend = await _sendService.GetAsync(notification.Id);
-                if ((localSend != null && localSend.RevisionDate >= notification.RevisionDate)
-                    || (isEdit && localSend == null) || (!isEdit && localSend != null))
-                {
-                    return SyncCompleted(false);
-                }
-
-                var remoteSend = await _apiService.GetSendAsync(notification.Id);
-                if (remoteSend != null)
-                {
-                    var userId = await _stateService.GetActiveUserIdAsync();
-                    await _sendService.UpsertAsync(new SendData(remoteSend, userId));
-                    _messagingService.Send("syncedUpsertedSend", new Dictionary<string, string>
-                    {
-                        ["sendId"] = notification.Id
-                    });
-                    return SyncCompleted(true);
-                }
-            }
-            catch (ApiException e)
-            {
-                if (e.Error != null && e.Error.StatusCode == System.Net.HttpStatusCode.NotFound && isEdit)
-                {
-                    await _sendService.DeleteAsync(notification.Id);
-                    _messagingService.Send("syncedDeletedSend", new Dictionary<string, string>
-                    {
-                        ["sendId"] = notification.Id
-                    });
-                    return SyncCompleted(true);
-                }
-            }
-
-            return SyncCompleted(false);
-        }
-
-        public async Task<bool> SyncDeleteSendAsync(SyncSendNotification notification)
-        {
-            SyncStarted();
-            if (await _stateService.IsAuthenticatedAsync())
-            {
-                await _sendService.DeleteAsync(notification.Id);
-                _messagingService.Send("syncedDeletedSend", new Dictionary<string, string>
-                {
-                    ["sendId"] = notification.Id
-                });
-                return SyncCompleted(true);
-            }
-            return SyncCompleted(false);
-        }
-
         // Helpers
 
         private void SyncStarted()