Merge pull request #681 from Covid-19Radar/master

Delete notification settings
Covid-19Radar · Jun 26, 2020 · 5ad9768 · 5ad9768
2 parents 98b0180 + 7bb6f1c
commit 5ad9768
Show file tree

Hide file tree

Showing 237 changed files with 49,837 additions and 594 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -73,6 +73,7 @@
 - Satoshi Iguchi
 - Kimihiro Shirase
 - Tassana Thaveeteeratham (Thai Translation)
+- Kotaro Sakamoto
 
 # Original Covid19Radar Beta Testers
 - Nagahata Kenji

diff --git a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
@@ -130,9 +130,6 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.3</Version>
     </PackageReference>
-    <PackageReference Include="Plugin.LocalNotification">
-      <Version>5.0.4</Version>
-    </PackageReference>
     <PackageReference Include="Prism.Core">
       <Version>7.2.0.1422</Version>
     </PackageReference>

diff --git a/Covid19Radar/Covid19Radar.Android/MainActivity.cs b/Covid19Radar/Covid19Radar.Android/MainActivity.cs
@@ -16,7 +16,7 @@
 using Xamarin.Forms;
 using Acr.UserDialogs;
 using Covid19Radar.Renderers;
-using Plugin.LocalNotification;
+//using Plugin.LocalNotification;
 
 namespace Covid19Radar.Droid
 {
@@ -41,9 +41,9 @@ protected override void OnCreate(Bundle savedInstanceState)
 
             UserDialogs.Init(this);
 
-            NotificationCenter.CreateNotificationChannel();
+            //NotificationCenter.CreateNotificationChannel();
             LoadApplication(new App(new AndroidInitializer()));
-            NotificationCenter.NotifyNotificationTapped(base.Intent);
+            //NotificationCenter.NotifyNotificationTapped(base.Intent);
         }
 
 
@@ -84,12 +84,12 @@ protected override void OnActivityResult(int requestCode, Result resultCode, Int
             Xamarin.ExposureNotifications.ExposureNotification.OnActivityResult(requestCode, resultCode, data);
         }
 
-        protected override void OnNewIntent(Intent intent)
-        {
-            NotificationCenter.NotifyNotificationTapped(intent);
+        //protected override void OnNewIntent(Intent intent)
+        //{
+        //    NotificationCenter.NotifyNotificationTapped(intent);
 
-            base.OnNewIntent(intent);
-        }
+        //    base.OnNewIntent(intent);
+        //}
 
     }
 }

diff --git a/Covid19Radar/Covid19Radar.Android/Resources/Resource.designer.cs b/Covid19Radar/Covid19Radar.Android/Resources/Resource.designer.cs
diff --git a/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs b/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs
@@ -42,10 +42,10 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
             return base.FinishedLaunching(app, options);
         }
 
-        public override void WillEnterForeground(UIApplication uiApplication)
-        {
-            Plugin.LocalNotification.NotificationCenter.ResetApplicationIconBadgeNumber(uiApplication);
-        }
+        //public override void WillEnterForeground(UIApplication uiApplication)
+        //{
+        //    Plugin.LocalNotification.NotificationCenter.ResetApplicationIconBadgeNumber(uiApplication);
+        //}
     }
 
     public class iOSInitializer : IPlatformInitializer

diff --git a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
@@ -474,9 +474,6 @@
     <PackageReference Include="Google.Protobuf">
       <Version>3.12.3</Version>
     </PackageReference>
-    <PackageReference Include="Plugin.LocalNotification">
-      <Version>5.0.4</Version>
-    </PackageReference>
     <PackageReference Include="Prism.Autofac.Forms">
       <Version>7.1.0.431</Version>
     </PackageReference>

diff --git a/Covid19Radar/Covid19Radar/App.xaml.cs b/Covid19Radar/Covid19Radar/App.xaml.cs
@@ -22,7 +22,7 @@
 using FFImageLoading.Helpers;
 using FFImageLoading;
 using Xamarin.ExposureNotifications;
-using Plugin.LocalNotification;
+//using Plugin.LocalNotification;
 
 /*
  * Our mission...is
@@ -57,7 +57,7 @@ protected override async void OnInitialized()
             Xamarin.ExposureNotifications.ExposureNotification.Init();
 
             // Local Notification tap event listener
-            NotificationCenter.Current.NotificationTapped += OnNotificationTapped;
+            //NotificationCenter.Current.NotificationTapped += OnNotificationTapped;
             LogUnobservedTaskExceptions();
 
             INavigationResult result;
@@ -95,10 +95,10 @@ protected override async void OnInitialized()
 
         }
 
-        protected void OnNotificationTapped(NotificationTappedEventArgs e)
-        {
-            NavigationService.NavigateAsync(nameof(MenuPage) + "/" + nameof(NavigationPage) + "/" + nameof(HomePage));
-        }
+        //protected void OnNotificationTapped(NotificationTappedEventArgs e)
+        //{
+        //    NavigationService.NavigateAsync(nameof(MenuPage) + "/" + nameof(NavigationPage) + "/" + nameof(HomePage));
+        //}
 
         protected override void RegisterTypes(IContainerRegistry containerRegistry)
         {

diff --git a/Covid19Radar/Covid19Radar/Covid19Radar.csproj b/Covid19Radar/Covid19Radar/Covid19Radar.csproj
@@ -106,7 +106,6 @@
   <ItemGroup>
     <PackageReference Include="Acr.UserDialogs" Version="7.1.0.442" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Plugin.LocalNotification" Version="5.0.4" />
     <PackageReference Include="Prism.DryIoc.Forms" Version="7.2.0.1422" />
     <PackageReference Include="Prism.Forms" Version="7.2.0.1422" />
     <PackageReference Include="Prism.Plugin.Logging.AppCenter" Version="7.2.0.1114" />

diff --git a/Covid19Radar/Covid19Radar/Model/UserDataModel.cs b/Covid19Radar/Covid19Radar/Model/UserDataModel.cs
@@ -45,8 +45,8 @@ public bool Equals(UserDataModel other)
         {
             return UserUuid == other?.UserUuid
                 && LastNotificationTime == other?.LastNotificationTime
-                && IsExposureNotificationEnabled == other.IsExposureNotificationEnabled
-                && IsNotificationEnabled == other.IsNotificationEnabled;
+                && IsExposureNotificationEnabled == other.IsExposureNotificationEnabled;
+                //&& IsNotificationEnabled == other.IsNotificationEnabled;
         }
 
         /// <summary>

diff --git a/Covid19Radar/Covid19Radar/MultilingualResources/Covid19Radar.af.xlf b/Covid19Radar/Covid19Radar/MultilingualResources/Covid19Radar.af.xlf
@@ -242,9 +242,10 @@
           <note from="MultilingualBuild" annotates="source" priority="2">アプリの設定へ</note>
         </trans-unit>
         <trans-unit id="HelpPage4Description" translate="yes" xml:space="preserve">
-          <source>From app settings, you can enable/disable Bluetooth and notifications, stop using the app and delete close contact history.</source>
+          <source>From app settings, you can stop using the app and delete user data.</source>
           <target state="needs-review-translation" state-qualifier="mt-suggestion">Van toepassing-instellings kan jy Bluetooth en kennisgewings aktiveer/deaktiveer, ophou om die toepassing te gebruik en noue kontakgeskiedenis te skrap.</target>
-          <note from="MultilingualBuild" annotates="source" priority="2">アプリの設定から、Bluetoothの有効／無効、通知の有効／無効、アプリの使用中止と履歴の削除を行うことができます。</note>
+          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <note from="MultilingualBuild" annotates="source" priority="2">アプリの設定からアプリの使用中止とユーザー情報の削除を行うことができます。</note>
         </trans-unit>
         <trans-unit id="HelpPage2Description1" translate="yes" xml:space="preserve">
           <source>The app will notify you, if you were in close contact with COVID-19 positive user.</source>