[DO NOT MERGE] v2.0.0-closed beta

Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj

@@ -281,14 +281,6 @@
  <SubType></SubType>
  <Generator></Generator>
  </AndroidResource>
- <AndroidResource Include="Resources\drawable-zh-xhdpi\Nocontact10.png">
- <SubType></SubType>
- <Generator></Generator>
- </AndroidResource>
- <AndroidResource Include="Resources\drawable-zh-xxhdpi\Nocontact10.png">
- <SubType></SubType>
- <Generator></Generator>
- </AndroidResource>
  <AndroidResource Include="Resources\drawable\ic_notification.xml">
  <SubType></SubType>
  <Generator></Generator>
@@ -389,6 +381,10 @@
  <SubType></SubType>
  <Generator></Generator>
  </AndroidResource>
+ <AndroidResource Include="Resources\drawable-xxhdpi\exposure_check_page_head.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
  </ItemGroup>
  <ItemGroup>
  <None Include="Properties\AndroidManifest.xml" />
@@ -553,15 +549,9 @@
  <ItemGroup>
  <AndroidResource Include="Resources\drawable-ja-xhdpi\HelpPage22.png" />
  </ItemGroup>
- <ItemGroup>
- <AndroidResource Include="Resources\drawable-ja-xhdpi\Nocontact10.png" />
- </ItemGroup>
  <ItemGroup>
  <AndroidResource Include="Resources\drawable-ja-xxhdpi\HelpPage22.png" />
  </ItemGroup>
- <ItemGroup>
- <AndroidResource Include="Resources\drawable-ja-xxhdpi\Nocontact10.png" />
- </ItemGroup>
  <ItemGroup>
  <AndroidResource Include="Resources\drawable-xhdpi\HeaderLogo.png" />
  </ItemGroup>
@@ -571,9 +561,6 @@
  <ItemGroup>
  <AndroidResource Include="Resources\drawable-xhdpi\InfoMark.png" />
  </ItemGroup>
- <ItemGroup>
- <AndroidResource Include="Resources\drawable-xhdpi\Nocontact10.png" />
- </ItemGroup>
  <ItemGroup>
  <AndroidResource Include="Resources\drawable-xxhdpi\HeaderLogo.png" />
  </ItemGroup>
@@ -583,9 +570,6 @@
  <ItemGroup>
  <AndroidResource Include="Resources\drawable-xxhdpi\InfoMark.png" />
  </ItemGroup>
- <ItemGroup>
- <AndroidResource Include="Resources\drawable-xxhdpi\Nocontact10.png" />
- </ItemGroup>
  <ItemGroup>
  <AndroidResource Include="Resources\drawable-xhdpi\SplashImg.png" />
  </ItemGroup>

Covid19Radar/Covid19Radar.Android/Properties/AndroidManifest.xml

@@ -29,5 +29,13 @@
  <action android:name="android.intent.action.SEND" />
  <data android:scheme="mailto" />
  </intent>
+ <intent>
+ <action android:name="android.intent.action.VIEW"/>
+ <category android:name="android.intent.category.BROWSABLE"/>
+ <data android:scheme="https"
+ android:host="github.com"
+ android:path="cocoa-mhlw/cocoa/"
+ />
+ </intent>
  </queries>
-</manifest>
+</manifest>

Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs

@@ -14,7 +14,7 @@ public class DeviceCheckService : IDeviceVerifier
  {
  public Task<string> VerifyAsync(DiagnosisSubmissionParameter submission)
  {
- var nonce = DeviceVerifierUtils.CreateAndroidNonceV3(submission);
+ var nonce = DeviceVerifierUtils.CreateAndroidNonceV2(submission);
  return GetSafetyNetAttestationAsync(nonce);
  }
 

Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj

@@ -303,8 +303,6 @@
  <BundleResource Include="Resources\Base.lproj\privacypolicy_img01%402x.png" />
  <BundleResource Include="Resources\Base.lproj\arrow_icon%403x.png" />
  <BundleResource Include="Resources\Base.lproj\arrow_icon%402x.png" />
- <BundleResource Include="Resources\Base.lproj\Nocontact10%402x.png" />
- <BundleResource Include="Resources\Base.lproj\Nocontact10%403x.png" />
  <BundleResource Include="Resources\Base.lproj\HelpPage20%402x.png" />
  <BundleResource Include="Resources\Base.lproj\HelpPage20%403x.png" />
  <BundleResource Include="Resources\Base.lproj\HelpPage21%402x.png" />
@@ -329,8 +327,6 @@
  <BundleResource Include="Resources\zh-Hans.lproj\HelpPage31%403x.png" />
  <BundleResource Include="Resources\zh-Hans.lproj\HelpPage32%402x.png" />
  <BundleResource Include="Resources\zh-Hans.lproj\HelpPage32%403x.png" />
- <BundleResource Include="Resources\zh-Hans.lproj\Nocontact10%402x.png" />
- <BundleResource Include="Resources\zh-Hans.lproj\Nocontact10%403x.png" />
  <BundleResource Include="Resources\license.html" />
  <BundleResource Include="Resources\Base.lproj\app_share_icon%402x.png" />
  <BundleResource Include="Resources\Base.lproj\app_share_icon%403x.png" />
@@ -362,6 +358,7 @@
  <BundleResource Include="Resources\zh-Hans.lproj\icon_menu%403x.png" />
  <BundleResource Include="Resources\Base.lproj\icon_arrow%402x.png" />
  <BundleResource Include="Resources\Base.lproj\icon_arrow%403x.png" />
+ <BundleResource Include="Resources\Base.lproj\exposure_check_page_head.png" />
  </ItemGroup>
  <ItemGroup>
  <Reference Include="System" />
@@ -514,12 +511,6 @@
  <ItemGroup>
  <BundleResource Include="Resources\ja.lproj\HelpPage32%403x.png" />
  </ItemGroup>
- <ItemGroup>
- <BundleResource Include="Resources\ja.lproj\Nocontact10%402x.png" />
- </ItemGroup>
- <ItemGroup>
- <BundleResource Include="Resources\ja.lproj\Nocontact10%403x.png" />
- </ItemGroup>
  <ItemGroup>
  <BundleResource Include="Resources\ja.lproj\HelpPage22%402x.png" />
  </ItemGroup>

Covid19Radar/Covid19Radar/App.xaml

@@ -206,7 +206,7 @@
  <Setter Property="BorderWidth" Value="4" />
  <Setter Property="TextColor" Value="{StaticResource ButtonText}" />
  <Setter Property="FontSize" Value="Medium" />
- <Setter Property="Padding" Value="0,0,0,0" />
+ <Setter Property="Padding" Value="10" />
  <Setter Property="Margin" Value="0,10,0,5" />
  <Setter Property="HorizontalOptions" Value="Center" />
  <Setter Property="WidthRequest" Value="{x:OnPlatform Android=300, iOS=310}" />
@@ -273,13 +273,16 @@
  </Style>
 
  <Style x:Key="FrameCardViewStyle" TargetType="Frame">
- <Setter Property="CornerRadius" Value="5" />
+ <Setter Property="CornerRadius" Value="6" />
  <Setter Property="Margin" Value="5" />
  <Setter Property="Padding" Value="10" />
  <Setter Property="HorizontalOptions" Value="FillAndExpand" />
  <Setter Property="OutlineColor" Value="LightGray" />
  <Setter Property="BorderColor" Value="LightGray" />
- <Setter Property="HasShadow" Value="True" />
+ </Style>
+
+ <Style x:Key="FrameCardViewStyle_Diabled" TargetType="Frame" BasedOn="{StaticResource FrameCardViewStyle}">
+ <Setter Property="Opacity" Value="0.5" />
  </Style>
 
  <Style x:Key="LinkLabelStyleLarge" TargetType="Label">

Covid19Radar/Covid19Radar/App.xaml.cs

@@ -162,7 +162,6 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
  containerRegistry.RegisterForNavigation<PrivacyPolicyPage2>();
  containerRegistry.RegisterForNavigation<InqueryPage>();
  containerRegistry.RegisterForNavigation<TermsofservicePage>();
- containerRegistry.RegisterForNavigation<ThankYouNotifyOtherPage>();
  containerRegistry.RegisterForNavigation<NotifyOtherPage>();
  containerRegistry.RegisterForNavigation<ExposureCheckPage>();
  containerRegistry.RegisterForNavigation<ContactedNotifyPage>();
@@ -183,7 +182,6 @@ private static void RegisterCommonTypes(IContainer container)
  container.Register<ILoggerService, LoggerService>(Reuse.Singleton);
  container.Register<ILogFileService, LogFileService>(Reuse.Singleton);
  container.Register<ILogPathService, LogPathService>(Reuse.Singleton);
- container.Register<ILogUploadService, LogUploadService>(Reuse.Singleton);
  container.Register<IEssentialsService, EssentialsService>(Reuse.Singleton);
  container.Register<IUserDataService, UserDataService>(Reuse.Singleton);
  container.Register<ITermsUpdateService, TermsUpdateService>(Reuse.Singleton);
@@ -217,11 +215,12 @@ private static void RegisterCommonTypes(IContainer container)
  container.Register<IExposureConfigurationRepository, ExposureConfigurationRepository>(Reuse.Singleton);
  container.Register<IExposureRiskCalculationConfigurationRepository, ExposureRiskCalculationConfigurationRepository>(Reuse.Singleton);
 
-#if EVENT_LOG_ENABLED
- container.Register<IEventLogService, EventLogService>(Reuse.Singleton);
-#else
+ // Privacy
  container.Register<IEventLogService, EventLogServiceNop>(Reuse.Singleton);
-#endif
+
+ // Beta
+ container.Register<ILogUploadService, LogUploadServiceNop>(Reuse.Singleton);
+ container.Register<ICheckVersionService, CheckVersionServiceNop>(Reuse.Singleton);
 
  // Utilities
  container.Register<IDateTimeUtility, DateTimeUtility>(Reuse.Singleton);

Covid19Radar/Covid19Radar/Common/AppConstants.cs

@@ -14,7 +14,7 @@ public static class AppConstants
  /// <summary>
  /// Number of days covered from the date of diagnosis or onset
  /// </summary>
- public const int DaysToSendTek = -15;
+ public const int DaysToSendTek = -3;
 
  /// <summary>
  /// Max Error Count
@@ -47,7 +47,7 @@ public static class AppConstants
  /// DiagnosisApi version.
  /// (e.g. v2, v3)
  /// </summary>
- public const string DiagnosisApiVersionCode = "v3";
+ public const string DiagnosisApiVersionCode = "v2";
 
  /// <summary>
  /// Number of day(s) that ExposureConfiguration file downloaded cache.

Covid19Radar/Covid19Radar/Common/AppUtils.cs

@@ -2,13 +2,6 @@
  * 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/. */
 
-using Acr.UserDialogs;
-using Covid19Radar.Resources;
-using Covid19Radar.Services.Logs;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Diagnostics;
-using System.Net.Http;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 
@@ -36,45 +29,5 @@ await Share.RequestAsync(new ShareTextRequest
  }
 
  }
-
- public static async void CheckVersion(ILoggerService loggerService)
- {
- loggerService.StartMethod();
-
- var uri = AppResources.UrlVersion;
- using (var client = new HttpClient())
- {
- try
- {
- var json = await client.GetStringAsync(uri);
- var versionString = JObject.Parse(json).Value<string>("version");
-
- if (new Version(versionString).CompareTo(new Version(AppInfo.VersionString)) > 0)
- {
- await UserDialogs.Instance.AlertAsync(AppResources.AppUtilsGetNewVersionDescription, AppResources.AppUtilsGetNewVersionTitle, Resources.AppResources.ButtonOk);
-
- if (Device.RuntimePlatform == Device.iOS)
- {
- await Browser.OpenAsync(AppSettings.Instance.AppStoreUrl, BrowserLaunchMode.External);
- }
- else if (Device.RuntimePlatform == Device.Android)
- {
- await Browser.OpenAsync(AppSettings.Instance.GooglePlayUrl, BrowserLaunchMode.External);
- }
-
- }
-
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex.ToString());
- loggerService.Exception("Failed to check version.", ex);
- }
- finally
- {
- loggerService.EndMethod();
- }
- }
- }
  }
 }

Covid19Radar/Covid19Radar/Covid19Radar.csproj

@@ -23,7 +23,6 @@
  <Compile Remove="Controls\**" />
  <EmbeddedResource Remove="Controls\**" />
  <None Remove="Controls\**" />
- <None Remove="Views\ExposureCheck\" />
  <None Remove="ViewModels\ExposureCheckPage\" />
  </ItemGroup>
 
@@ -87,9 +86,6 @@
  <Compile Update="Views\HomePage\PrivacyPolicyPage2.xaml.cs">
  <DependentUpon>PrivacyPolicyPage2.xaml</DependentUpon>
  </Compile>
- <Compile Update="Views\HomePage\ThankYouNotifyOtherPage.xaml.cs">
- <DependentUpon>ThankYouNotifyOtherPage.xaml</DependentUpon>
- </Compile>
  <Compile Update="Views\Settings\LicenseAgreementPage.xaml.cs">
  <DependentUpon>LicenseAgreementPage.xaml</DependentUpon>
  </Compile>
@@ -149,8 +145,6 @@
  <Folder Include="Controls\" />
  <Folder Include="Services\Migration\" />
  <Folder Include="Repository\" />
- <Folder Include="Views\ExposureCheck\" />
- <Folder Include="ViewModels\ExposureCheck\" />
  </ItemGroup>
  <ItemGroup Condition="'$(Configuration)'=='Release'">
  <Compile Remove="ViewModels/Settings/DebugPageViewModel.cs" />

Covid19Radar/Covid19Radar/Model/DiagnosisSubmissionParameter.cs

@@ -8,7 +8,8 @@ namespace Covid19Radar.Model
 {
  public class DiagnosisSubmissionParameter
  {
- [JsonProperty("symptomOnsetDate")]
+ //[JsonProperty("symptomOnsetDate")]
+ [JsonIgnore]
  public string SymptomOnsetDate { get; set; }
 
  [JsonProperty("keys")]
@@ -25,7 +26,8 @@ public class DiagnosisSubmissionParameter
  [JsonProperty("verificationPayload")]
  public string VerificationPayload { get; set; }
 
- [JsonProperty("idempotency_key")]
+ //[JsonProperty("idempotency_key")]
+ [JsonIgnore]
  public string IdempotencyKey { get; set; }
 
  // Random data to obscure the size of the request network packet sniffers.
@@ -40,7 +42,9 @@ public class Key
  public uint RollingStartNumber { get; set; }
  [JsonProperty("rollingPeriod")]
  public uint RollingPeriod { get; set; }
- [JsonProperty("reportType")]
+
+ //[JsonProperty("reportType")]
+ [JsonIgnore]
  public uint ReportType { get; set; }
  }
  }

Covid19Radar/Covid19Radar/Repository/ExposureRiskCalculationConfigurationRepository.cs

@@ -185,7 +185,7 @@ await SaveAsync(
  }
  }
 
- private static V1ExposureRiskCalculationConfiguration CreateDefaultConfiguration()
+ public static V1ExposureRiskCalculationConfiguration CreateDefaultConfiguration()
  {
  return new V1ExposureRiskCalculationConfiguration()
  {

Covid19Radar/Covid19Radar/Repository/IExposureDataRepository.cs

@@ -2,10 +2,13 @@
 // 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/.
 
+using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading.Tasks;
 using Chino;
 using Covid19Radar.Model;
+using Covid19Radar.Resources;
 
 namespace Covid19Radar.Repository
 {
@@ -38,5 +41,36 @@ int minimumRiskScore
 
  void RemoveExposureInformation();
  void RemoveOutOfDateExposureInformation(int offsetDays);
+
+ public static string ConvertToDate(DateTime utcDatetime)
+ => utcDatetime.Date
+ .ToLocalTime()
+ .ToString("D", CultureInfo.CurrentCulture);
+
+ public static string ConvertToTerm(DateTime utcDatetime)
+ {
+ var from = utcDatetime.Date.ToLocalTime();
+ var to = from.AddDays(1).ToLocalTime();
+
+ bool changeMonth = from.Month != to.Month;
+ bool changeYear = from.Year != to.Year;
+
+ string fromFormat = AppResources.ExposureDateFormatMonth;
+ string toFormat = AppResources.ExposureDateFormatDate;
+ if (changeMonth)
+ {
+ toFormat = AppResources.ExposureDateFormatMonth;
+ }
+ if (changeYear)
+ {
+ fromFormat = AppResources.ExposureDateFormatYear;
+ toFormat = AppResources.ExposureDateFormatYear;
+ }
+
+ string fromStr = from.ToString(fromFormat, CultureInfo.CurrentCulture);
+ string toStr = to.ToString(toFormat, CultureInfo.CurrentCulture);
+
+ return string.Format("{0}{1} {2} {3}", AppResources.ExposuresPageFrom, fromStr, AppResources.ExposuresPageTo, toStr);
+ }
  }
 }