Merge pull request #1108 from cocoa-mhlw/feature/notofication-off-war…

…ning-text

Fixed the conditions for displaying notification off warning text

Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs

@@ -458,13 +458,15 @@ private async Task UpdateView()
  IsVisibleENStatusActiveLayout = false;
  IsVisibleENStatusUnconfirmedLayout = false;
  IsVisibleENStatusStoppedLayout = true;
+ IsVisibleLocalNotificationOffWarningLayout = false;
  }
  else if (!canConfirmExposure)
  {
  loggerService.Info("canConfirmExposure is false");
  IsVisibleENStatusActiveLayout = false;
  IsVisibleENStatusUnconfirmedLayout = true;
  IsVisibleENStatusStoppedLayout = false;
+ IsVisibleLocalNotificationOffWarningLayout = false;
 
  var isMaxPerDayExposureDetectionAPILimitReached = _userDataRepository.IsMaxPerDayExposureDetectionAPILimitReached();
  EnStatusUnconfirmedDescription1 = isMaxPerDayExposureDetectionAPILimitReached
@@ -478,6 +480,7 @@ private async Task UpdateView()
  IsVisibleENStatusActiveLayout = true;
  IsVisibleENStatusUnconfirmedLayout = false;
  IsVisibleENStatusStoppedLayout = false;
+ IsVisibleLocalNotificationOffWarningLayout = await localNotificationService.IsWarnedLocalNotificationOffAsync();
 
  var latestUtcDate = _userDataRepository.GetLastConfirmedDate();
  if (latestUtcDate == null)
@@ -498,8 +501,6 @@ private async Task UpdateView()
  }
  }
 
- IsVisibleLocalNotificationOffWarningLayout = await localNotificationService.IsWarnedLocalNotificationOffAsync();
-
  loggerService.EndMethod();
  }
 

Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/HomePageViewModelTests.cs

@@ -228,6 +228,7 @@ public void UpdateView_ENStatus_Unconfirmed()
  Assert.False(homePageViewModel.IsVisibleENStatusActiveLayout);
  Assert.True(homePageViewModel.IsVisibleENStatusUnconfirmedLayout);
  Assert.False(homePageViewModel.IsVisibleENStatusStoppedLayout);
+ Assert.False(homePageViewModel.IsVisibleLocalNotificationOffWarningLayout);
  Assert.Equal(AppResources.HomePageENStatusUnconfirmedDescription1, homePageViewModel.EnStatusUnconfirmedDescription1);
  Assert.Equal(AppResources.HomePageENStatusUnconfirmedDescription2, homePageViewModel.EnStatusUnconfirmedDescription2);
  Assert.True(homePageViewModel.IsVisibleUnconfirmedTroubleshootingButton);
@@ -254,6 +255,7 @@ public void UpdateView_ENStatus_Unconfirmed_Exposure_Detection_API_Limit_Reached
  Assert.False(homePageViewModel.IsVisibleENStatusActiveLayout);
  Assert.True(homePageViewModel.IsVisibleENStatusUnconfirmedLayout);
  Assert.False(homePageViewModel.IsVisibleENStatusStoppedLayout);
+ Assert.False(homePageViewModel.IsVisibleLocalNotificationOffWarningLayout);
  Assert.Equal(AppResources.HomePageExposureDetectionAPILimitReachedDescription1, homePageViewModel.EnStatusUnconfirmedDescription1);
  Assert.Equal(AppResources.HomePageExposureDetectionAPILimitReachedDescription2, homePageViewModel.EnStatusUnconfirmedDescription2);
  Assert.False(homePageViewModel.IsVisibleUnconfirmedTroubleshootingButton);
@@ -277,6 +279,7 @@ public void UpdateView_ENStatus_Stopped()
  Assert.False(homePageViewModel.IsVisibleENStatusActiveLayout);
  Assert.False(homePageViewModel.IsVisibleENStatusUnconfirmedLayout);
  Assert.True(homePageViewModel.IsVisibleENStatusStoppedLayout);
+ Assert.False(homePageViewModel.IsVisibleLocalNotificationOffWarningLayout);
  }
 
  [Fact]
@@ -328,13 +331,16 @@ public void UpdateView_ENStatus_Active()
  }
 
  [Fact]
- public void UpdateView_LocalNotificationOffWarning_Hidden()
+ public void UpdateView_ENStatus_Active_LocalNotificationOffWarning_Hidden()
  {
  var homePageViewModel = CreateViewModel();
 
  mockExposureNotificationApiService
  .Setup(x => x.GetStatusCodesAsync())
  .Returns(Task.FromResult(new List<int>() { ExposureNotificationStatus.Code_Android.ACTIVATED } as IList<int>));
+ mockPreferenceService
+ .Setup(x => x.GetBoolValue("CanConfirmExposure", true))
+ .Returns(true);
  mockLocalNotificationService
  .Setup(x => x.IsWarnedLocalNotificationOffAsync())
  .ReturnsAsync(false);
@@ -345,13 +351,16 @@ public void UpdateView_LocalNotificationOffWarning_Hidden()
  }
 
  [Fact]
- public void UpdateView_LocalNotificationOffWarning_Shown()
+ public void UpdateView_ENStatus_Active_LocalNotificationOffWarning_Shown()
  {
  var homePageViewModel = CreateViewModel();
 
  mockExposureNotificationApiService
  .Setup(x => x.GetStatusCodesAsync())
  .Returns(Task.FromResult(new List<int>() { ExposureNotificationStatus.Code_Android.ACTIVATED } as IList<int>));
+ mockPreferenceService
+ .Setup(x => x.GetBoolValue("CanConfirmExposure", true))
+ .Returns(true);
  mockLocalNotificationService
  .Setup(x => x.IsWarnedLocalNotificationOffAsync())
  .ReturnsAsync(true);