From e8a4ad5c98d11c56c339942455170476e47ee90f Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Sun, 7 Feb 2021 23:55:01 +0300 Subject: [PATCH] Anonymous schedule export is temporarly disabled --- GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs | 8 ++++---- .../GUTSchedule.Droid/Activities/StartActivity.cs | 2 +- GUT.Schedule/GUTSchedule.Droid/Resources/layout/Main.xml | 1 + GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml | 2 +- GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml.cs | 6 +++--- changelogs/android/en-IN/changelogs/android-changelog.txt | 2 +- changelogs/android/ru-RU/changelogs/android-changelog.txt | 2 +- changelogs/github.md | 4 ++-- changelogs/windows/en/baseListing/releaseNotes.txt | 2 +- changelogs/windows/ru/baseListing/releaseNotes.txt | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs b/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs index e4dcbc3..a2d409c 100644 --- a/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs +++ b/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs @@ -61,7 +61,7 @@ namespace GUTSchedule.Droid.Activities AssignVariables(); - faculty.SetList(this, Faculties.Select(i => i.name)); + /*faculty.SetList(this, Faculties.Select(i => i.name)); int s = Faculties.FindIndex(i => i.id == prefs.GetString("Faculty", "-123")); faculty.SetSelection(s == -1 ? 0 : s); @@ -70,7 +70,7 @@ namespace GUTSchedule.Droid.Activities // P.S. Fuck Android await Task.Delay(100); - UpdateGroupsList(); + UpdateGroupsList(); */ // TODO: Temp AddEvents(); @@ -85,14 +85,14 @@ namespace GUTSchedule.Droid.Activities reminder.SetSelection(prefs.GetInt("Reminder", 0)); calendar.SetList(this, Calendar.Calendars.Select(i => i.Name)); - s = Calendar.Calendars.FindIndex(i => i.Id == prefs.GetString("Calendar", "-123")); + int s = Calendar.Calendars.FindIndex(i => i.Id == prefs.GetString("Calendar", "-123")); calendar.SetSelection(s == -1 ? 0 : s); end.Text = endDate.ToShortDateString(); start.Text = startDate.ToShortDateString(); groupTitle.Checked = prefs.GetBoolean("AddGroupToHeader", false); - authorize.Checked = prefs.GetBoolean("Authorize", true); + authorize.Checked = true;// prefs.GetBoolean("Authorize", true); // TODO: Temp email.Text = prefs.GetString("email", ""); password.Text = prefs.GetString("password", ""); diff --git a/GUT.Schedule/GUTSchedule.Droid/Activities/StartActivity.cs b/GUT.Schedule/GUTSchedule.Droid/Activities/StartActivity.cs index a3f9d22..fde0d79 100644 --- a/GUT.Schedule/GUTSchedule.Droid/Activities/StartActivity.cs +++ b/GUT.Schedule/GUTSchedule.Droid/Activities/StartActivity.cs @@ -59,7 +59,7 @@ namespace GUT.Schedule.Droid.Activities } status.Text = Resources.GetText(Resource.String.facultiesLoadingStatus); - MainActivity.Faculties = await Parser.GetFaculties(); + //MainActivity.Faculties = await Parser.GetFaculties(); // TODO: Temp } catch (HttpRequestException e) { diff --git a/GUT.Schedule/GUTSchedule.Droid/Resources/layout/Main.xml b/GUT.Schedule/GUTSchedule.Droid/Resources/layout/Main.xml index f7c9630..1285c02 100644 --- a/GUT.Schedule/GUTSchedule.Droid/Resources/layout/Main.xml +++ b/GUT.Schedule/GUTSchedule.Droid/Resources/layout/Main.xml @@ -32,6 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:checked="true" + android:enabled="false" android:text="@string/authorizeCheckbox"/> - + diff --git a/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml.cs b/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml.cs index 0c93398..ad57083 100644 --- a/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml.cs +++ b/GUT.Schedule/GUTSchedule.UWP/Pages/MainPage.xaml.cs @@ -45,7 +45,7 @@ namespace GUTSchedule.UWP.Pages PackageVersion ver = Package.Current.Id.Version; version.Text = $"v{ver.Major}.{ver.Minor}.{ver.Build}.{ver.Revision}"; - authorize.IsChecked = (bool?)settings.Values["Authorize"] ?? true; + authorize.IsChecked = true;//(bool?)settings.Values["Authorize"] ?? true; // TODO: Temp if (vault.RetrieveAll() is IReadOnlyList credentials && credentials.Count > 0) { email.Text = credentials.First().UserName; @@ -54,7 +54,7 @@ namespace GUTSchedule.UWP.Pages } rememberCredential.IsChecked = (bool?)settings.Values["RememberCredential"] ?? true; - faculty.ItemsSource = (await Parser.GetFaculties()).Select(i => new ComboBoxItem + /*faculty.ItemsSource = (await Parser.GetFaculties()).Select(i => new ComboBoxItem // TODO: Temp { Content = i.name, Tag = i.id, @@ -63,7 +63,7 @@ namespace GUTSchedule.UWP.Pages faculty.SelectedIndex = (faculty.ItemsSource as List).FindIndex(i => i.IsSelected); if (faculty.SelectedIndex < 0) faculty.SelectedIndex = 0; - course.SelectedIndex = (int?)settings.Values["Course"] ?? 0; + course.SelectedIndex = (int?)settings.Values["Course"] ?? 0;*/ startDate.Date = DateTime.Today; endDate.Date = startDate.Date.Value.AddDays(6); diff --git a/changelogs/android/en-IN/changelogs/android-changelog.txt b/changelogs/android/en-IN/changelogs/android-changelog.txt index cd03071..18c47fd 100644 --- a/changelogs/android/en-IN/changelogs/android-changelog.txt +++ b/changelogs/android/en-IN/changelogs/android-changelog.txt @@ -1 +1 @@ -- Fixed application crashes when there is no public schedule available \ No newline at end of file +- Anonymous schedule export is temporarly disabled \ No newline at end of file diff --git a/changelogs/android/ru-RU/changelogs/android-changelog.txt b/changelogs/android/ru-RU/changelogs/android-changelog.txt index 0d54a6b..6ce5084 100644 --- a/changelogs/android/ru-RU/changelogs/android-changelog.txt +++ b/changelogs/android/ru-RU/changelogs/android-changelog.txt @@ -1 +1 @@ -- Исправлены вылеты, когда нет публичного расписания \ No newline at end of file +- Анонимный экспорт расписания временно отключен \ No newline at end of file diff --git a/changelogs/github.md b/changelogs/github.md index 09caba4..16a568a 100644 --- a/changelogs/github.md +++ b/changelogs/github.md @@ -1,2 +1,2 @@ -## Android -- Fixed application crashes when there is no public schedule available \ No newline at end of file +## Core +- Anonymous schedule export is temporarly disabled \ No newline at end of file diff --git a/changelogs/windows/en/baseListing/releaseNotes.txt b/changelogs/windows/en/baseListing/releaseNotes.txt index 0106204..18c47fd 100644 --- a/changelogs/windows/en/baseListing/releaseNotes.txt +++ b/changelogs/windows/en/baseListing/releaseNotes.txt @@ -1 +1 @@ -- Updated schedule parser \ No newline at end of file +- Anonymous schedule export is temporarly disabled \ No newline at end of file diff --git a/changelogs/windows/ru/baseListing/releaseNotes.txt b/changelogs/windows/ru/baseListing/releaseNotes.txt index 12b873e..6ce5084 100644 --- a/changelogs/windows/ru/baseListing/releaseNotes.txt +++ b/changelogs/windows/ru/baseListing/releaseNotes.txt @@ -1 +1 @@ -- Обновлен парсер расписания \ No newline at end of file +- Анонимный экспорт расписания временно отключен \ No newline at end of file