From d1d665bbdffb27be240a3e1383095485a0623891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 2 Oct 2023 12:20:34 +0200
Subject: [PATCH] Fix student auto selection if there is already active some
 students logged (#2314)

---
 .github/workflows/deploy-store.yml                     |  4 ++--
 .github/workflows/deploy-test.yml                      |  4 ++--
 .github/workflows/test.yml                             |  6 +++---
 .../login/studentselect/LoginStudentSelectPresenter.kt | 10 ++++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml
index e8a220ddf..e8237a381 100644
--- a/.github/workflows/deploy-store.yml
+++ b/.github/workflows/deploy-store.yml
@@ -13,7 +13,7 @@ jobs:
     environment: google-play
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: 17
@@ -49,7 +49,7 @@ jobs:
     environment: app-gallery
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: 17
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
index f2e9f016f..c4f55e6af 100644
--- a/.github/workflows/deploy-test.yml
+++ b/.github/workflows/deploy-test.yml
@@ -19,7 +19,7 @@ jobs:
     environment: app-center
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: 17
@@ -89,7 +89,7 @@ jobs:
     if: github.event_name != 'pull_request_target'
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: 17
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bc4b36470..6d50c45d5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
         - uses: fkirc/skip-duplicate-actions@master
         - uses: actions/checkout@v3
         - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v2
+        - uses: actions/setup-java@v3
           with:
             distribution: 'zulu'
             java-version: 17
@@ -45,7 +45,7 @@ jobs:
         - uses: fkirc/skip-duplicate-actions@master
         - uses: actions/checkout@v3
         - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v2
+        - uses: actions/setup-java@v3
           with:
             distribution: 'zulu'
             java-version: 17
@@ -71,7 +71,7 @@ jobs:
         - uses: fkirc/skip-duplicate-actions@master
         - uses: actions/checkout@v3
         - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v2
+        - uses: actions/setup-java@v3
           with:
             distribution: 'zulu'
             java-version: 17
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
index cc9e422ed..6cbdfbb85 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@@ -98,11 +98,13 @@ class LoginStudentSelectPresenter @Inject constructor(
                 }
             }
         }
-        return students.filter { student ->
-            student.student.semesters.any { semester ->
-                semester.isCurrent()
+        return students
+            .filter { it.isEnabled }
+            .filter { student ->
+                student.student.semesters.any { semester ->
+                    semester.isCurrent()
+                }
             }
-        }
     }
 
     private fun createItems(): List<LoginStudentSelectItem> = buildList {