From a4cb5a5e65556f78008d3f3970dfe78e22223e4c Mon Sep 17 00:00:00 2001 From: Yu Muramatsu Date: Fri, 10 Sep 2021 21:48:18 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"=E9=80=94=E4=B8=AD"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 69cda43f1e904b9b384459ae31eda8cf3117c626. --- .../Covid19Radar.Android.csproj | 151 +++++++----------- Covid19Radar/Covid19Radar/Covid19Radar.csproj | 1 + .../Services/Logs/ILogShareService.cs | 13 -- .../SendLogConfirmationPageViewModel.cs | 3 - .../SendLogConfirmationPageViewModelTests.cs | 9 -- 5 files changed, 56 insertions(+), 121 deletions(-) delete mode 100644 Covid19Radar/Covid19Radar/Services/Logs/ILogShareService.cs diff --git a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj index ec7d56b99..567133036 100644 --- a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj +++ b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj @@ -1,4 +1,4 @@ - + Debug @@ -112,16 +112,12 @@ prompt MinimumRecommendedRules.ruleset true - true + false true apk true CJK Xamarin.Android.Net.AndroidClientHandler - false - false - false - false @@ -210,136 +206,92 @@ - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + @@ -498,7 +450,14 @@ - + + + + + + + + @@ -562,4 +521,4 @@ - \ No newline at end of file + diff --git a/Covid19Radar/Covid19Radar/Covid19Radar.csproj b/Covid19Radar/Covid19Radar/Covid19Radar.csproj index e1ffc2289..9a434c0c5 100644 --- a/Covid19Radar/Covid19Radar/Covid19Radar.csproj +++ b/Covid19Radar/Covid19Radar/Covid19Radar.csproj @@ -146,6 +146,7 @@ + diff --git a/Covid19Radar/Covid19Radar/Services/Logs/ILogShareService.cs b/Covid19Radar/Covid19Radar/Services/Logs/ILogShareService.cs deleted file mode 100644 index 3d9b7d095..000000000 --- a/Covid19Radar/Covid19Radar/Services/Logs/ILogShareService.cs +++ /dev/null @@ -1,13 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - - -namespace Covid19Radar.Services.Logs -{ - public interface ILogShareService - { - string Combine(); - string RequestAsync(); - } -} diff --git a/Covid19Radar/Covid19Radar/ViewModels/HelpPage/SendLogConfirmationPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HelpPage/SendLogConfirmationPageViewModel.cs index 83a09718f..1caa186c4 100644 --- a/Covid19Radar/Covid19Radar/ViewModels/HelpPage/SendLogConfirmationPageViewModel.cs +++ b/Covid19Radar/Covid19Radar/ViewModels/HelpPage/SendLogConfirmationPageViewModel.cs @@ -17,7 +17,6 @@ namespace Covid19Radar.ViewModels public class SendLogConfirmationPageViewModel : ViewModelBase { private readonly ILoggerService loggerService; - private readonly ILogShareService LogShareService; private readonly ILogFileService logFileService; private readonly ILogUploadService logUploadService; private readonly ILogPathService logPathService; @@ -30,14 +29,12 @@ public class SendLogConfirmationPageViewModel : ViewModelBase public SendLogConfirmationPageViewModel( INavigationService navigationService, - ILogShareService logShareService, ILogFileService logFileService, ILoggerService loggerService, ILogUploadService logUploadService, ILogPathService logPathService) : base(navigationService) { this.loggerService = loggerService; - this.LogShareService = logShareService; this.logFileService = logFileService; this.logUploadService = logUploadService; this.logPathService = logPathService; diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/SendLogConfirmationPageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/SendLogConfirmationPageViewModelTests.cs index ff626a725..87ffef494 100644 --- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/SendLogConfirmationPageViewModelTests.cs +++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/SendLogConfirmationPageViewModelTests.cs @@ -20,7 +20,6 @@ public class SendLogConfirmationPageViewModelTests private readonly MockRepository mockRepository; private readonly Mock mockUserDialogs; private readonly Mock mockNavigationService; - private readonly Mock mockLogShareService; private readonly Mock mockLogFileService; private readonly Mock mockLoggerService; private readonly Mock mockLogUploadService; @@ -34,7 +33,6 @@ public SendLogConfirmationPageViewModelTests() UserDialogs.Instance = mockUserDialogs.Object; mockNavigationService = mockRepository.Create(); - mockLogShareService = mockRepository.Create(); mockLogFileService = mockRepository.Create(); mockLoggerService = mockRepository.Create(); mockLogUploadService = mockRepository.Create(); @@ -45,7 +43,6 @@ private SendLogConfirmationPageViewModel CreateViewModel() { var vm = new SendLogConfirmationPageViewModel( mockNavigationService.Object, - mockLogShareService.Object, mockLogFileService.Object, mockLoggerService.Object, mockLogUploadService.Object, @@ -116,8 +113,6 @@ public void OnClickConfirmLogCommandTests_Success() mockLogFileService.Setup(x => x.CreateLogUploadingFileToTmpPath(testZipFileName)).Returns(true); mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(true); - var path = Path.Combine("~/.cocoa/logs", testZipFileName); - var unitUnderTest = CreateViewModel(); unitUnderTest.Initialize(new NavigationParameters()); @@ -129,10 +124,6 @@ public void OnClickConfirmLogCommandTests_Success() mockUserDialogs.Verify(x => x.ShowLoading(It.IsAny(), null), Times.Once()); mockUserDialogs.Verify(x => x.HideLoading(), Times.Once()); -<<<<<<< Updated upstream -======= - mockLogShareService.Verify(x => x.RequestAsync(), Times.Once()); ->>>>>>> Stashed changes } [Fact]