Always require to accept terms on page enter

diff --git a/Oobe/Oobe.Terms/Views/TermsView.cs b/Oobe/Oobe.Terms/Views/TermsView.cs
index 0e439c7d80fa8ec3b0b23bcdcaebe9b609d4ced5..94caaedf6282e772f22128ba21f3e66b4842af9d 100644 (file)
--- a/Oobe/Oobe.Terms/Views/TermsView.cs
+++ b/Oobe/Oobe.Terms/Views/TermsView.cs
@@ -73,6 +73,7 @@ namespace Oobe.Terms.Views
             nextButton.IsEnabled = false;
             nextButton.ClickEvent += (obj, args) =>
             {
+                terms.AcceptTerms();
                 nav.Next();
             };
             nextButton.SetFontStyle(new PropertyMap().AddBoldFontStyle());
@@ -113,16 +114,8 @@ namespace Oobe.Terms.Views
             this.Add(agreeLabel);
             this.Add(guide);
 
-            if (terms.TermsAccepted)
-            {
-                AgreementCheckable = true;
-                NextEnabled = true;
-            }
-            else
-            {
-                AgreementCheckable = false;
-                NextEnabled = false;
-            }
+            AgreementCheckable = false;
+            NextEnabled = false;
 
             // workaround issue with license having only single page
             // currently there is no way for gettings from ScrollableBase
@@ -228,16 +221,7 @@ namespace Oobe.Terms.Views
 
         private void TermsToggle()
         {
-            if (!termsProvider.TermsAccepted)
-            {
-                termsProvider.AcceptTerms();
-                NextEnabled = true;
-            }
-            else
-            {
-                termsProvider.DeclineTerms();
-                NextEnabled = false;
-            }
+            NextEnabled = !NextEnabled;
         }
     }