ref: models.kt

app/src/main/java/ru/sweetbread/unn/core/CredentialsStore.kt

@@ -7,6 +7,7 @@ import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import android.util.Base64
 import androidx.core.content.edit
+import java.security.GeneralSecurityException
 import java.security.KeyStore
 import javax.crypto.Cipher
 import javax.crypto.KeyGenerator
@@ -97,6 +98,7 @@ class CredentialsStore(
     }
 
     fun get(): Credentials? {
+        return try {
             val encryptedString =
                 prefs.getString("data", null)
                     ?: return null
@@ -130,12 +132,18 @@ class CredentialsStore(
             val parts = plainText.split('\u0000', limit = 2)
 
             if (parts.size != 2)
-            return null
+                null
-
+            else Credentials(
-        return Credentials(
                 login = parts[0],
                 password = parts[1]
             )
+        } catch (_: GeneralSecurityException) {
+            clear()
+            null
+        } catch (_: IllegalArgumentException) {
+            clear()
+            null
+        }
     }
 
     fun clear() {

app/src/main/java/ru/sweetbread/unn/core/db/entity/Auditorium.kt

@@ -6,8 +6,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import androidx.room.withTransaction
-import ru.sweetbread.unn.api.Auditorium
 import ru.sweetbread.unn.core.db.AppDatabase
+import ru.sweetbread.unn.model.Auditorium
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 

app/src/main/java/ru/sweetbread/unn/core/db/entity/Building.kt

@@ -5,7 +5,7 @@ package ru.sweetbread.unn.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import ru.sweetbread.unn.api.Building
+import ru.sweetbread.unn.model.Building
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 

app/src/main/java/ru/sweetbread/unn/core/db/entity/Discipline.kt

@@ -5,7 +5,7 @@ package ru.sweetbread.unn.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import ru.sweetbread.unn.api.Discipline
+import ru.sweetbread.unn.model.Discipline
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 

app/src/main/java/ru/sweetbread/unn/core/db/entity/KindOfWork.kt

@@ -5,7 +5,7 @@ package ru.sweetbread.unn.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import ru.sweetbread.unn.api.KindOfWork
+import ru.sweetbread.unn.model.KindOfWork
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 

app/src/main/java/ru/sweetbread/unn/core/db/entity/Lecturer.kt

@@ -5,8 +5,8 @@ package ru.sweetbread.unn.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import ru.sweetbread.unn.api.Lecturer
+import ru.sweetbread.unn.model.Lecturer
-import ru.sweetbread.unn.api.LecturerRank
+import ru.sweetbread.unn.model.LecturerRank
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 

app/src/main/java/ru/sweetbread/unn/core/db/entity/ScheduleUnit.kt

@@ -6,8 +6,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import androidx.room.withTransaction
-import ru.sweetbread.unn.api.ScheduleUnit
 import ru.sweetbread.unn.core.db.AppDatabase
+import ru.sweetbread.unn.model.ScheduleUnit
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime

app/src/main/java/ru/sweetbread/unn/core/db/entity/User.kt

@@ -6,7 +6,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import io.ktor.util.reflect.instanceOf
-import ru.sweetbread.unn.api.AvatarSet
+import ru.sweetbread.unn.model.AvatarSet
 import ru.sweetbread.unn.model.Student
 import ru.sweetbread.unn.model.Type
 import ru.sweetbread.unn.model.User

app/src/main/java/ru/sweetbread/unn/core/network/endpoints.kt

@@ -11,15 +11,15 @@ import io.ktor.client.statement.bodyAsText
 import io.ktor.http.parameters
 import org.json.JSONArray
 import org.json.JSONObject
-import ru.sweetbread.unn.api.Auditorium
-import ru.sweetbread.unn.api.Building
-import ru.sweetbread.unn.api.Discipline
-import ru.sweetbread.unn.api.KindOfWork
-import ru.sweetbread.unn.api.Lecturer
-import ru.sweetbread.unn.api.LecturerRank
-import ru.sweetbread.unn.api.ScheduleUnit
 import ru.sweetbread.unn.core.SessionManager
+import ru.sweetbread.unn.model.Auditorium
+import ru.sweetbread.unn.model.Building
+import ru.sweetbread.unn.model.Discipline
+import ru.sweetbread.unn.model.KindOfWork
+import ru.sweetbread.unn.model.Lecturer
+import ru.sweetbread.unn.model.LecturerRank
 import ru.sweetbread.unn.model.NewsDto
+import ru.sweetbread.unn.model.ScheduleUnit
 import ru.sweetbread.unn.model.User
 import java.time.LocalDate
 import java.time.LocalDateTime

app/src/main/java/ru/sweetbread/unn/feature/schedule/Schedule.kt

@@ -44,15 +44,15 @@ import androidx.compose.ui.zIndex
 import androidx.lifecycle.viewmodel.compose.viewModel
 import kotlinx.coroutines.delay
 import ru.sweetbread.unn.R
-import ru.sweetbread.unn.api.Auditorium
-import ru.sweetbread.unn.api.Building
-import ru.sweetbread.unn.api.Discipline
-import ru.sweetbread.unn.api.KindOfWork
-import ru.sweetbread.unn.api.Lecturer
-import ru.sweetbread.unn.api.LecturerRank
-import ru.sweetbread.unn.api.ScheduleUnit
 import ru.sweetbread.unn.feature.schedule.components.BoundedWeekPicker
 import ru.sweetbread.unn.feature.schedule.components.GroupsNameText
+import ru.sweetbread.unn.model.Auditorium
+import ru.sweetbread.unn.model.Building
+import ru.sweetbread.unn.model.Discipline
+import ru.sweetbread.unn.model.KindOfWork
+import ru.sweetbread.unn.model.Lecturer
+import ru.sweetbread.unn.model.LecturerRank
+import ru.sweetbread.unn.model.ScheduleUnit
 import ru.sweetbread.unn.ui.theme.UNNTheme
 import splitties.resources.appStr
 import java.time.LocalDate

app/src/main/java/ru/sweetbread/unn/feature/schedule/ScheduleRepository.kt

@@ -5,12 +5,11 @@ package ru.sweetbread.unn.feature.schedule
 import androidx.room.withTransaction
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import ru.sweetbread.unn.api.ScheduleUnit
-import ru.sweetbread.unn.core.SessionManager
 import ru.sweetbread.unn.core.db.AppDatabase
 import ru.sweetbread.unn.core.db.entity.cacheSchedule
 import ru.sweetbread.unn.core.db.entity.toModel
 import ru.sweetbread.unn.core.network.PortalApi
+import ru.sweetbread.unn.model.ScheduleUnit
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter

app/src/main/java/ru/sweetbread/unn/feature/schedule/ScheduleViewModel.kt

@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import ru.sweetbread.unn.app.UNNApp
-import ru.sweetbread.unn.api.ScheduleUnit
+import ru.sweetbread.unn.model.ScheduleUnit
 import java.time.LocalDate
 
 data class ScheduleUiState(

app/src/main/java/ru/sweetbread/unn/model/Schedule.kt

@@ -1,19 +1,12 @@
 // Copyright (c) 2026 Gleb Zaharov. License: GPLv3 (see LICENSE).
 
-package ru.sweetbread.unn.api
+package ru.sweetbread.unn.model
 
 import ru.sweetbread.unn.R
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
 
-enum class LecturerRank(val id: Int) {
-    Assistant(R.string.assistant),
-    Lecturer(R.string.lecturer),
-    SLecturer(R.string.slecturer),
-    AProfessor(R.string.aprofessor)
-}
-
 class ScheduleUnit(
     val oid: Int,
     val auditorium: Auditorium,
@@ -27,6 +20,13 @@ class ScheduleUnit(
     val lastUpdated: LocalDateTime,
 )
 
+enum class LecturerRank(val id: Int) {
+    Assistant(R.string.assistant),
+    Lecturer(R.string.lecturer),
+    SLecturer(R.string.slecturer),
+    AProfessor(R.string.aprofessor)
+}
+
 class Auditorium(
     val name: String,
     val oid: Int,
@@ -60,18 +60,3 @@ class Lecturer(
     val unnId: Int,
     val uid: String
 )
-
-class Post(
-    val id: Int,
-    val authorId: Int,
-    val enableComments: Boolean,
-    val numComments: Int,
-    val date: LocalDateTime,
-    val content: String
-)
-
-class AvatarSet(
-    val original: String,
-    val thumbnail: String,
-    val small: String
-)

app/src/main/java/ru/sweetbread/unn/model/User.kt

@@ -4,15 +4,12 @@ package ru.sweetbread.unn.model
 
 import org.json.JSONObject
 import ru.sweetbread.unn.R
-import ru.sweetbread.unn.api.AvatarSet
 import splitties.resources.appStr
 
 enum class Type(val s: String) {
-    student(appStr(R.string.student)),
+    Student(appStr(R.string.student)),
-    // group("group"),
+    Lecturer(appStr(R.string.lecturer)),
-    lecturer(appStr(R.string.lecturer)),
+    Employee(appStr(R.string.employee))
-    // auditorium("auditorium"),
-    employee(appStr(R.string.employee))
 }
 
 open class User(
@@ -32,8 +29,8 @@ open class User(
                 .getJSONObject(0)
                 .getString("type")
         ) {
-            "student" -> Type.student
+            "student" -> Type.Student
-            else -> Type.employee
+            else -> Type.Employee
         },
         json.getString("email"),
         json.getString("fullname"),
@@ -53,8 +50,8 @@ open class User(
             return User(
                 user.getInt("id"),
                 when (json.getString("type")) {
-                    "student" -> Type.student
+                    "student" -> Type.Student
-                    else -> Type.employee
+                    else -> Type.Employee
                 },
                 user.getString("email"),
                 user.getString("fullname"),
@@ -71,7 +68,7 @@ open class User(
 
         fun getPlaceholder() = User(
             0,
-            Type.employee,
+            Type.Employee,
             "",
             "Удалённый пользователь",
             "Deleted user",
@@ -108,3 +105,9 @@ class Student(
         group
     )
 }
+
+class AvatarSet(
+    val original: String,
+    val thumbnail: String,
+    val small: String
+)