Add Reset Logic

* Reset language to default
* Reset country code to default
* Forgot all APs configuration

Change-Id: I89cba2384722b7a4ef0a5bc7a0f81bb75f628c55

diff --git a/Oobe/Oobe.Language/LanguageStep.cs b/Oobe/Oobe.Language/LanguageStep.cs
index cd00a9cbc712e1ce905459879821e2553c6cf74d..f3a7480f90323f6221007b1d3f74d4e8fc5208c9 100644 (file)
--- a/Oobe/Oobe.Language/LanguageStep.cs
+++ b/Oobe/Oobe.Language/LanguageStep.cs
@@ -91,5 +91,10 @@ namespace Oobe.Language
 
             return container;
         }
+
+        public override void OnReset()
+        {
+            manager.Reset();
+        }
     }
 }

diff --git a/Oobe/Oobe.Language/Model/LanguageInfo.cs b/Oobe/Oobe.Language/Model/LanguageInfo.cs
index 5008e692f07dc03863a6e63d2c799daaaf4b4a18..a21792ddc11ae6d9e7f792dd2c1649421c0ac4cb 100644 (file)
--- a/Oobe/Oobe.Language/Model/LanguageInfo.cs
+++ b/Oobe/Oobe.Language/Model/LanguageInfo.cs
@@ -25,5 +25,8 @@ namespace Oobe.Language.Model
 
         [XmlAttribute("name_local")]
         public string LocalName { get; set; }
+
+        [XmlAttribute("default")]
+        public bool Default { get; set; }
     }
 }

diff --git a/Oobe/Oobe.Language/Model/LanguageManger.cs b/Oobe/Oobe.Language/Model/LanguageManger.cs
index 8b13e78d76e5163eb2ee36ebd8ddb002726b3242..0a1bcdb92d76ce32fa45006fe3c3a2954b7da486 100644 (file)
--- a/Oobe/Oobe.Language/Model/LanguageManger.cs
+++ b/Oobe/Oobe.Language/Model/LanguageManger.cs
@@ -42,7 +42,7 @@ namespace Oobe.Language.Model
         {
             get
             {
-                return Languages.FirstOrDefault(s => s.Code == Settings.Language) ?? Languages.FirstOrDefault();
+                return Languages.FirstOrDefault(s => s.Code == Settings.Language) ?? Languages.FirstOrDefault(s => s.Default == true);
             }
 
             set
@@ -53,5 +53,10 @@ namespace Oobe.Language.Model
                 }
             }
         }
+
+        public void Reset()
+        {
+            CurrentLanguage = Languages.FirstOrDefault(s => s.Default == true);
+        }
     }
 }

diff --git a/Oobe/Oobe.Language/res/languages_OOBE.xml b/Oobe/Oobe.Language/res/languages_OOBE.xml
index 38740fed66c401e8eb323a1e142d2e59c28fde6f..33d9db5f1c8254c925b03af7a399e1aca84a4f9d 100644 (file)
--- a/Oobe/Oobe.Language/res/languages_OOBE.xml
+++ b/Oobe/Oobe.Language/res/languages_OOBE.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <languages>
   <language code="ko_KR" name_local="한국어" />
-  <language code="en_US" name_local="English" />
+  <language code="en_US" name_local="English" default="true" />
 </languages>

diff --git a/Oobe/Oobe.Region/Model/RegionInfo.cs b/Oobe/Oobe.Region/Model/RegionInfo.cs
index 7308b0de216e263b5a7f0089264e90c15df43b4d..bcb73e155334a9c3e3662a4397ed60604d17c858 100644 (file)
--- a/Oobe/Oobe.Region/Model/RegionInfo.cs
+++ b/Oobe/Oobe.Region/Model/RegionInfo.cs
@@ -25,5 +25,8 @@ namespace Oobe.Region.Model
 
         [XmlAttribute("name_en")]
         public string Name { get; set; }
+
+        [XmlAttribute("default")]
+        public bool Default { get; set; }
     }
 }

diff --git a/Oobe/Oobe.Region/Model/RegionManager.cs b/Oobe/Oobe.Region/Model/RegionManager.cs
index c74fd2a7faffb5cb81db21a18540f065c31791a8..cf372a3f3116d31e28f1ac226b454735c295ebc4 100644 (file)
--- a/Oobe/Oobe.Region/Model/RegionManager.cs
+++ b/Oobe/Oobe.Region/Model/RegionManager.cs
@@ -43,7 +43,7 @@ namespace Oobe.Region.Model
         {
             get
             {
-                return Regions.FirstOrDefault(s => s.CountryCode == Settings.Country) ?? Regions.FirstOrDefault();
+                return Regions.FirstOrDefault(s => s.CountryCode == Settings.Country) ?? Regions.FirstOrDefault(s => s.Default == true);
             }
 
             set
@@ -54,5 +54,10 @@ namespace Oobe.Region.Model
                 }
             }
         }
+
+        public void Reset()
+        {
+            CurrentRegion = Regions.FirstOrDefault(s => s.Default == true);
+        }
     }
 }

diff --git a/Oobe/Oobe.Region/RegionStep.cs b/Oobe/Oobe.Region/RegionStep.cs
index f6195321825ca9f2e73b8652158f4c3979c242f7..48d8719514d49a6b8f777bd06f7122efb115776a 100644 (file)
--- a/Oobe/Oobe.Region/RegionStep.cs
+++ b/Oobe/Oobe.Region/RegionStep.cs
@@ -75,5 +75,10 @@ namespace Oobe.Region
 
             return container;
         }
+
+        public override void OnReset()
+        {
+            manager.Reset();
+        }
     }
 }

diff --git a/Oobe/Oobe.Region/res/regions_OOBE.xml b/Oobe/Oobe.Region/res/regions_OOBE.xml
index 3003dd7e6d99c990519573e7702f94aa58f1c4a0..5bdffcae2d1fa6ea144bbfa4e666151b72a0d749 100644 (file)
--- a/Oobe/Oobe.Region/res/regions_OOBE.xml
+++ b/Oobe/Oobe.Region/res/regions_OOBE.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <regions>
-  <region code="GB" name_en="UNITED_KINGDOM" />
+  <region code="GB" name_en="UNITED_KINGDOM" default="true" />
   <region code="KR" name_en="SOUTH_KOREA" />
 </regions>

diff --git a/Oobe/Oobe.Wifi/WifiStep.cs b/Oobe/Oobe.Wifi/WifiStep.cs
index 9a187ff252b58d35e2f2879f90c60c1978cf2db6..96a17d5f58c52d47bc8a07fcae5ad72e52a7d3d2 100644 (file)
--- a/Oobe/Oobe.Wifi/WifiStep.cs
+++ b/Oobe/Oobe.Wifi/WifiStep.cs
@@ -65,6 +65,14 @@ namespace Oobe.Wifi
             DisposeView();
         }
 
+        public override void OnReset()
+        {
+            foreach (var ap in WiFiManager.GetFoundAPs())
+            {
+                ap.ForgetAP();
+            }
+        }
+
         private void DisposeView()
         {
             wifiView?.Dispose();

diff --git a/Oobe/Oobe/Managers/ProcessManager.cs b/Oobe/Oobe/Managers/ProcessManager.cs
index de53e60aa2a1468fe5f66e2a7e7b7335d2998ab3..5a8f0e12004eb109e423bb1aa1731faa4a468b53 100644 (file)
--- a/Oobe/Oobe/Managers/ProcessManager.cs
+++ b/Oobe/Oobe/Managers/ProcessManager.cs
@@ -148,6 +148,7 @@ namespace Oobe
             ui?.Dispose();
             foreach (var step in steps)
             {
+                step.Value.Initialize();
                 step.Value.Reset();
             }