Merge pull request #376 from cocoa-mhlw/release_1_2_6

Release 1.2.6
cocoa-mhlw · Sep 8, 2021 · 3e7fdeb · 3e7fdeb
2 parents 343886e + cf71fd6
commit 3e7fdeb
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 342 deletions.
diff --git a/Covid19Radar/Covid19Radar.Android/Assets/license.html b/Covid19Radar/Covid19Radar.Android/Assets/license.html
@@ -4,7 +4,6 @@
 }
 
 body {
- width: 980px;
  margin-right: auto;
  margin-left: auto;
  color:#333;

diff --git a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
@@ -46,6 +46,7 @@
  <CodesignKey>Apple Development: Kazumi Hirose (WG99EL99X6)</CodesignKey>
  <CodesignProvision>VS: net.kzmx.Covid19Radar Development</CodesignProvision>
  <LangVersion>latest</LangVersion>
+ <MtouchUseLlvm>true</MtouchUseLlvm>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
  <DebugSymbols>true</DebugSymbols>
@@ -106,6 +107,7 @@
  <BuildIpa>false</BuildIpa>
  <MtouchEnableSGenConc>true</MtouchEnableSGenConc>
  <OptimizePNGs>true</OptimizePNGs>
+ <MtouchUseLlvm>true</MtouchUseLlvm>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
  <DebugType>none</DebugType>
@@ -163,6 +165,7 @@
  <MtouchFloat32>true</MtouchFloat32>
  <MtouchI18n>cjk</MtouchI18n>
  <DefineConstants>DEBUG;__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
+ <MtouchUseLlvm>true</MtouchUseLlvm>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
  <AppExtensionDebugBundleId />
@@ -198,6 +201,7 @@
  <ErrorReport>prompt</ErrorReport>
  <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
  <MtouchArch>ARM64</MtouchArch>
+ <MtouchUseLlvm>true</MtouchUseLlvm>
  </PropertyGroup>
  <ItemGroup>
  <Compile Include="Main.cs" />

diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/license.html b/Covid19Radar/Covid19Radar.iOS/Resources/license.html
@@ -4,7 +4,6 @@
 }
 
 body {
- width: 980px;
  margin-right: auto;
  margin-left: auto;
  color:#333;

diff --git a/Covid19Radar/Covid19Radar.iOS/appcenter-pre-build.sh b/Covid19Radar/Covid19Radar.iOS/appcenter-pre-build.sh
@@ -35,11 +35,3 @@ sed -i '' "s/LOG_STORAGE_ACCOUNT_NAME/$LOG_STORAGE_ACCOUNT_NAME/g" $APP_CONSTANT
 # Print out file for reference
 cat $APP_CONSTANT_FILE
 echo "Updated id!"
-
-# Download Runtime
-curl -L -O https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/d16-6/29c4ea73109b377a71866c53a6d43033d5c5e90b/49/package/notarized/xamarin.ios-13.18.2.1.pkg
-curl -L -O https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/d16-6/29c4ea73109b377a71866c53a6d43033d5c5e90b/49/package/notarized/xamarin.mac-6.18.2.1.pkg
-
-# Install Runtime
-sudo installer -store -pkg "xamarin.ios-13.18.2.1.pkg" -target /
-sudo installer -store -pkg "xamarin.mac-6.18.2.1.pkg" -target /
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.en.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.en.resx
@@ -973,6 +973,18 @@ Storage :</value>
  <data name="HowToReceiveProcessingNumberPageDescription4" xml:space="preserve">
  <value>If you have received a usage guide for My HER-SYS from the health center, please apply to use the Contact Confirmation Application from there.</value>
  <comment>保健所からMy HER-SYSの利用案内を受けている場合は、そちらから接触確認アプリの利用を申し出てください。</comment>
+ </data>
+ <data name="AndroidNotificationChannelName" xml:space="preserve">
+ <value>Exposure notification</value>
+ <comment>接触を通知</comment>
+ </data>
+ <data name="LocalExposureNotificationTitle" xml:space="preserve">
+ <value>Important Notice</value>
+ <comment>重要なお知らせ</comment>
+ </data>
+ <data name="LocalExposureNotificationContent" xml:space="preserve">
+ <value>It is possible you have been in close proximity to a user who tested positive for COVID-19. Tap for more details.</value>
+ <comment>新型コロナウイルス感染症の陽性登録者と接触した可能性があります。タップして詳細を確認してください。</comment>
  </data>
  <data name="NoteSymbol" xml:space="preserve">
  <value>* </value>

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.resx
@@ -1088,8 +1088,8 @@ Storage :</value>
  <comment>重要なお知らせ</comment>
  </data>
  <data name="LocalExposureNotificationContent" xml:space="preserve">
- <value>It is possible you have been in close proximity to a user who tested positive for COVID-19. Tap for more details</value>
- <comment>新型コロナウイルス感染症の陽性登録者と接触した可能性があります。タップして詳細を確認してください</comment>
+ <value>It is possible you have been in close proximity to a user who tested positive for COVID-19. Tap for more details.</value>
+ <comment>新型コロナウイルス感染症の陽性登録者と接触した可能性があります。タップして詳細を確認してください。</comment>
  </data>
  <data name="NoteSymbol" xml:space="preserve">
  <value>* </value>

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
@@ -976,6 +976,18 @@
  <data name="HowToReceiveProcessingNumberPageDescription4" xml:space="preserve">
  <value>如果您从保健中心收到了My HER-SYS的使用指南，请从那里申请使用接触确认应用。</value>
  <comment>保健所からMy HER-SYSの利用案内を受けている場合は、そちらから接触確認アプリの利用を申し出てください。</comment>
+ </data>
+ <data name="AndroidNotificationChannelName" xml:space="preserve">
+ <value>接触通知</value>
+ <comment>接触を通知</comment>
+ </data>
+ <data name="LocalExposureNotificationTitle" xml:space="preserve">
+ <value>重要通知</value>
+ <comment>重要なお知らせ</comment>
+ </data>
+ <data name="LocalExposureNotificationContent" xml:space="preserve">
+ <value>您可能接触过感染新型冠状病毒的阳性登记者。点击查看详细信息。</value>
+ <comment>新型コロナウイルス感染症の陽性登録者と接触した可能性があります。タップして詳細を確認してください。</comment>
  </data>
  <data name="NoteSymbol" xml:space="preserve">
  <value>*</value>

diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
@@ -52,6 +52,8 @@ ILocalNotificationService localNotificationService
 
  public override async void Initialize(INavigationParameters parameters)
  {
+ base.Initialize(parameters);
+
  loggerService.StartMethod();
 
  // It seems the life cycle methods are not called after background fetch in iOS.
@@ -69,27 +71,30 @@ public override async void Initialize(INavigationParameters parameters)
 
  // Check Version
  AppUtils.CheckVersion(loggerService);
+
  try
  {
  await exposureNotificationService.StartExposureNotification();
  await exposureNotificationService.FetchExposureKeyAsync();
+ }
+ catch (Exception ex)
+ {
+ loggerService.Exception("Failed to fetch exposure key.", ex);
+ }
 
+ try
+ {
  var statusMessage = await exposureNotificationService.UpdateStatusMessageAsync();
  loggerService.Info($"Exposure notification status: {statusMessage}");
-
- base.Initialize(parameters);
-
- loggerService.EndMethod();
  }
  catch (Exception ex)
  {
- Debug.WriteLine(ex.ToString());
-
  loggerService.Exception("Failed to exposure notification status.", ex);
- loggerService.EndMethod();
  }
 
  await localNotificationService.PrepareAsync();
+
+ loggerService.EndMethod();
  }
 
  public Command OnClickExposures => new Command(async () =>

diff --git a/Covid19Radar/Covid19Radar/Views/NavigatePopoverWebView.cs b/Covid19Radar/Covid19Radar/Views/NavigatePopoverWebView.cs
@@ -4,6 +4,7 @@
 
 using Xamarin.Forms;
 using Xamarin.Essentials;
+using System;
 
 namespace Covid19Radar.Views
 {
@@ -14,7 +15,12 @@ public NavigatePopoverWebView() : base()
  {
  Navigating += async (_, e) =>
  {
- if (firstNavigateUrl != null && firstNavigateUrl != e.Url)
+ if (e.Url.StartsWith("mailto"))
+ {
+ e.Cancel = true;
+ await Launcher.OpenAsync(e.Url);
+ }
+ else if (firstNavigateUrl != null && firstNavigateUrl != e.Url)
  {
  e.Cancel = true;
  await Browser.OpenAsync(e.Url);

diff --git a/src/Covid19Radar.Api.Common/Services/IValidationUserService.cs b/src/Covid19Radar.Api.Common/Services/IValidationUserService.cs
diff --git a/src/Covid19Radar.Api.Common/Services/ValidationUserService.cs b/src/Covid19Radar.Api.Common/Services/ValidationUserService.cs