Fixed to save isMaxPerDayExposureDetectionAPILimitReached in the app

Covid19Radar/Covid19Radar/Common/PreferenceKey.cs

@@ -16,6 +16,7 @@ public static class PreferenceKey
  public static string PrivacyPolicyLastUpdateDateTimeEpoch = "PrivacyPolicyLastUpdateDateTimeEpoch";
 
  public static string CanConfirmExposure = "CanConfirmExposure";
+ public static string IsMaxPerDayExposureDetectionAPILimitReached = "IsMaxPerDayExposureDetectionAPILimitReached";
  public static string LastConfirmedDateTimeEpoch = "LastConfirmedDateTimeEpoch";
 
  public static string SendEventLogState = "SendEventLogState";

Covid19Radar/Covid19Radar/Repository/UserDataRepository.cs

@@ -32,6 +32,9 @@ public interface IUserDataRepository
  void SetCanConfirmExposure(bool canConfirmExposure);
  bool IsCanConfirmExposure();
 
+ void SetIsMaxPerDayExposureDetectionAPILimitReached(bool isMaxPerDayExposureDetectionAPILimitReached);
+ bool IsMaxPerDayExposureDetectionAPILimitReached();
+
  void SetLastConfirmedDate(DateTime utcNow);
  DateTime? GetLastConfirmedDate();
 
@@ -218,6 +221,22 @@ public bool IsCanConfirmExposure()
  return canConfirmExposure;
  }
 
+ public void SetIsMaxPerDayExposureDetectionAPILimitReached(bool isMaxPerDayExposureDetectionAPILimitReached)
+ {
+ _loggerService.StartMethod();
+ _preferencesService.SetBoolValue(PreferenceKey.IsMaxPerDayExposureDetectionAPILimitReached, isMaxPerDayExposureDetectionAPILimitReached);
+ _loggerService.EndMethod();
+ }
+
+ public bool IsMaxPerDayExposureDetectionAPILimitReached()
+ {
+ _loggerService.StartMethod();
+ var isMaxPerDayExposureDetectionAPILimitReached = _preferencesService.GetBoolValue(PreferenceKey.IsMaxPerDayExposureDetectionAPILimitReached, false);
+ _loggerService.EndMethod();
+
+ return isMaxPerDayExposureDetectionAPILimitReached;
+ }
+
  public void SetLastConfirmedDate(DateTime dateTime)
  {
  _loggerService.StartMethod();

Covid19Radar/Covid19Radar/Services/AbsExposureDetectionBackgroundService.cs

@@ -97,6 +97,7 @@ private async Task InternalExposureDetectionAsync(CancellationTokenSource cancel
  await _serverConfigurationRepository.LoadAsync();
 
  bool canConfirmExposure = true;
+ bool isMaxPerDayExposureDetectionAPILimitReached = false;
 
  foreach (var region in _serverConfigurationRepository.Regions)
  {
@@ -161,10 +162,12 @@ await _exposureNotificationApiService.ProvideDiagnosisKeysAsync(
 
  _userDataRepository.SetLastConfirmedDate(_dateTimeUtility.UtcNow);
  _userDataRepository.SetCanConfirmExposure(true);
+ _userDataRepository.SetIsMaxPerDayExposureDetectionAPILimitReached(isMaxPerDayExposureDetectionAPILimitReached);
  }
  catch (ENException exception)
  {
  canConfirmExposure = false;
+ isMaxPerDayExposureDetectionAPILimitReached = CheckMaxPerDayExposureDetectionAPILimitReached(exception);
  _loggerService.Exception($"ENExcepiton occurred, Code:{exception.Code}, Message:{exception.Message}", exception);
  throw;
  }
@@ -178,6 +181,7 @@ await _exposureNotificationApiService.ProvideDiagnosisKeysAsync(
  {
  RemoveFiles(downloadedFileNameList);
  _userDataRepository.SetCanConfirmExposure(canConfirmExposure);
+ _userDataRepository.SetIsMaxPerDayExposureDetectionAPILimitReached(isMaxPerDayExposureDetectionAPILimitReached);
  }
  }
  }
@@ -236,5 +240,10 @@ private void RemoveFiles(List<string> fileList)
 
  _loggerService.EndMethod();
  }
+
+ private bool CheckMaxPerDayExposureDetectionAPILimitReached(ENException ex)
+ {
+ return ex.Code == ENException.Code_iOS.RateLimited || ex.Code == ENException.Code_Android.FAILED_RATE_LIMITED;
+ }
  }
 }

Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs

@@ -83,8 +83,6 @@ public bool IsVisibleLocalNotificationOffWarningLayout
 
  private bool _isShowTroubleshootingPage = false;
 
- private bool _isMaxPerDayExposureDetectionAPILimitReached = false;
-
  private string _enStatusUnconfirmedDescription1;
  public string EnStatusUnconfirmedDescription1
  {
@@ -220,8 +218,6 @@ private void ExposureDetectionAsync()
  catch (ENException ex)
  {
  loggerService.Exception("Failed to exposure detection.", ex);
- // Check if the exposure detection API limit has been reached
- _isMaxPerDayExposureDetectionAPILimitReached = ex.Code == ENException.Code_iOS.RateLimited || ex.Code == ENException.Code_Android.FAILED_RATE_LIMITED;
  }
  catch (Exception ex)
  {
@@ -431,11 +427,12 @@ private async Task UpdateView()
  IsVisibleENStatusUnconfirmedLayout = true;
  IsVisibleENStatusStoppedLayout = false;
 
- EnStatusUnconfirmedDescription1 = _isMaxPerDayExposureDetectionAPILimitReached
+ var isMaxPerDayExposureDetectionAPILimitReached = _userDataRepository.IsMaxPerDayExposureDetectionAPILimitReached();
+ EnStatusUnconfirmedDescription1 = isMaxPerDayExposureDetectionAPILimitReached
  ? AppResources.HomePageExposureDetectionAPILimitReachedDescription1 : AppResources.HomePageENStatusUnconfirmedDescription1;
- EnStatusUnconfirmedDescription2 = _isMaxPerDayExposureDetectionAPILimitReached
+ EnStatusUnconfirmedDescription2 = isMaxPerDayExposureDetectionAPILimitReached
  ? AppResources.HomePageExposureDetectionAPILimitReachedDescription2 : AppResources.HomePageENStatusUnconfirmedDescription2;
- IsVisibleUnconfirmedTroubleshootingButton = !_isMaxPerDayExposureDetectionAPILimitReached;
+ IsVisibleUnconfirmedTroubleshootingButton = !isMaxPerDayExposureDetectionAPILimitReached;
  }
  else
  {

Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml

@@ -28,8 +28,9 @@
  BackgroundColor="#EEEEEE"
  Spacing="15">
  <xct:SemanticOrderView
- x:Name="activeLayoutOrderView">
- <StackLayout IsVisible="{Binding IsVisibleENStatusActiveLayout}">
+ x:Name="activeLayoutOrderView"
+ IsVisible="{Binding IsVisibleENStatusActiveLayout}">
+ <StackLayout>
  <StackLayout
  Orientation="Horizontal"
  HorizontalOptions="Center"

Covid19Radar/Tests/Covid19Radar.UnitTests/Services/AbsExposureDetectionBackgroundServiceTests.cs

@@ -415,7 +415,8 @@ public async Task ExposureDetectionAsync_ListFileNotFound()
  // Assert
  mockDiagnosisKeyRepository.Verify(x => x.GetDiagnosisKeysListAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
  mockDiagnosisKeyRepository.Verify(x => x.DownloadDiagnosisKeysAsync(It.IsAny<DiagnosisKeyEntry>(), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
- mockUserDataRepository.Verify(x => x.SetCanConfirmExposure(false), Times.Once);
+ mockUserDataRepository.Verify(x => x.SetCanConfirmExposure(false), Times.Once());
+ mockUserDataRepository.Verify(x => x.SetIsMaxPerDayExposureDetectionAPILimitReached(false), Times.Once());
  }
 
  [Fact(Skip = "[Occurs on Windows] System.IO.IOException : The process cannot access the file '1.zip' because it is being used by another process.")]

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

@@ -219,6 +219,9 @@ public void UpdateView_ENStatus_Unconfirmed()
  mockPreferenceService
  .Setup(x => x.GetBoolValue("CanConfirmExposure", true))
  .Returns(false);
+ mockPreferenceService
+ .Setup(x => x.GetBoolValue("IsMaxPerDayExposureDetectionAPILimitReached", false))
+ .Returns(false);
 
  homePageViewModel.OnAppearing();
 
@@ -230,6 +233,32 @@ public void UpdateView_ENStatus_Unconfirmed()
  Assert.True(homePageViewModel.IsVisibleUnconfirmedTroubleshootingButton);
  }
 
+ [Fact]
+ public void UpdateView_ENStatus_Unconfirmed_Exposure_Detection_API_Limit_Reached()
+ {
+ 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(false);
+ mockPreferenceService
+ .Setup(x => x.GetBoolValue("IsMaxPerDayExposureDetectionAPILimitReached", false))
+ .Returns(true);
+
+ homePageViewModel.OnAppearing();
+
+ Assert.False(homePageViewModel.IsVisibleENStatusActiveLayout);
+ Assert.True(homePageViewModel.IsVisibleENStatusUnconfirmedLayout);
+ Assert.False(homePageViewModel.IsVisibleENStatusStoppedLayout);
+ Assert.Equal(AppResources.HomePageExposureDetectionAPILimitReachedDescription1, homePageViewModel.EnStatusUnconfirmedDescription1);
+ Assert.Equal(AppResources.HomePageExposureDetectionAPILimitReachedDescription2, homePageViewModel.EnStatusUnconfirmedDescription2);
+ Assert.False(homePageViewModel.IsVisibleUnconfirmedTroubleshootingButton);
+ }
+
  [Fact]
  public void UpdateView_ENStatus_Stopped()
  {