ref: models.kt

2026-09-17 13:01:54 +03:00
parent e9151f281b
commit d66ffaae7b
14 changed files with 93 additions and 98 deletions
@@ -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,48 +98,55 @@ class CredentialsStore(
    }

    fun get(): Credentials? {
-        val encryptedString =
-            prefs.getString("data", null)
-                ?: return null
+        return try {
+            val encryptedString =
+                prefs.getString("data", null)
+                    ?: return null

-        val ivString =
-            prefs.getString("iv", null)
-                ?: return null
+            val ivString =
+                prefs.getString("iv", null)
+                    ?: return null

-        val encrypted = Base64.decode(
-            encryptedString,
-            Base64.NO_WRAP
-        )
+            val encrypted = Base64.decode(
+                encryptedString,
+                Base64.NO_WRAP
+            )

-        val iv = Base64.decode(
-            ivString,
-            Base64.NO_WRAP
-        )
+            val iv = Base64.decode(
+                ivString,
+                Base64.NO_WRAP
+            )

-        val cipher = Cipher.getInstance("AES/GCM/NoPadding")
+            val cipher = Cipher.getInstance("AES/GCM/NoPadding")

-        cipher.init(
-            Cipher.DECRYPT_MODE,
-            key,
-            GCMParameterSpec(128, iv)
-        )
+            cipher.init(
+                Cipher.DECRYPT_MODE,
+                key,
+                GCMParameterSpec(128, iv)
+            )

-        val plainText = cipher
-            .doFinal(encrypted)
-            .decodeToString()
+            val plainText = cipher
+                .doFinal(encrypted)
+                .decodeToString()

-        val parts = plainText.split('\u0000', limit = 2)
+            val parts = plainText.split('\u0000', limit = 2)

-        if (parts.size != 2)
-            return null
-
-        return Credentials(
-            login = parts[0],
-            password = parts[1]
-        )
+            if (parts.size != 2)
+                null
+            else Credentials(
+                login = parts[0],
+                password = parts[1]
+            )
+        } catch (_: GeneralSecurityException) {
+            clear()
+            null
+        } catch (_: IllegalArgumentException) {
+            clear()
+            null
+        }
    }

    fun clear() {
        prefs.edit { clear() }
    }
-}
+}
@@ -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

@@ -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

@@ -18,4 +18,4 @@ data class BuildingDB(
 )

 fun BuildingDB.toModel() = Building(name, gid, oid)
-fun Building.toEntity() = BuildingDB(oid, name, gid, LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
+fun Building.toEntity() = BuildingDB(oid, name, gid, LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
@@ -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

@@ -19,4 +19,4 @@ data class DisciplineDB(

 fun DisciplineDB.toModel() = Discipline(name, oid, type)
 fun Discipline.toEntity() = DisciplineDB(oid, name, type, LocalDateTime.now().format(
-    DateTimeFormatter.ISO_DATE_TIME))
+    DateTimeFormatter.ISO_DATE_TIME))
@@ -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

@@ -25,4 +25,4 @@ fun KindOfWork.toEntity() = KindOfWorkDB(
    uid,
    complexity,
    LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME)
-)
+)
@@ -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.api.LecturerRank
+import ru.sweetbread.unn.model.Lecturer
+import ru.sweetbread.unn.model.LecturerRank
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter

@@ -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
@@ -67,4 +67,4 @@ suspend fun cacheSchedule(db: AppDatabase, units: List<ScheduleUnit>) {
        db.lecturerDao().insert(units.flatMap { it.lecturers }.map { it.toEntity() })
        db.scheduleDao().insert(units.map { it.toEntity() })
    }
-}
+}
@@ -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
@@ -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
@@ -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
@@ -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
@@ -43,4 +42,4 @@ class ScheduleRepository (
            }
        }
    }
-}
+}
@@ -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(
@@ -88,4 +88,4 @@ class ScheduleViewModel(
            }
        }
    }
-}
+}
@@ -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,
@@ -59,19 +59,4 @@ class Lecturer(
    val email: String,
    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
 )
@@ -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)),
-    // group("group"),
-    lecturer(appStr(R.string.lecturer)),
-    // auditorium("auditorium"),
-    employee(appStr(R.string.employee))
+    Student(appStr(R.string.student)),
+    Lecturer(appStr(R.string.lecturer)),
+    Employee(appStr(R.string.employee))
 }

 open class User(
@@ -32,8 +29,8 @@ open class User(
                .getJSONObject(0)
                .getString("type")
        ) {
-            "student" -> Type.student
-            else -> Type.employee
+            "student" -> Type.Student
+            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
-                    else -> Type.employee
+                    "student" -> Type.Student
+                    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",
@@ -107,4 +104,10 @@ class Student(
        user.avatar,
        group
    )
-}
+}
+
+class AvatarSet(
+    val original: String,
+    val thumbnail: String,
+    val small: String
+)