Merge pull request #13 from whatrushki/develop

🚀 release: promote develop to main for v1.0.5

Author: topanim

.gitignore

@@ -8,7 +8,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 .DS_Store
-/build
+build
 /captures
 .externalNativeBuild
 .cxx

app/build.gradle.kts

@@ -29,7 +29,7 @@ android {
         minSdk = 26
         targetSdk = 36
         versionCode = generateVersionCode()
-        versionName = "1.0.4-beta.1"
+        versionName = "1.0.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/app/what/schedule/CrashActivity.kt

@@ -35,20 +35,20 @@ import java.io.File
 class CrashActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        
         Auditor.critic("app.crash", intent.getStringExtra("CRASH_REPORT") ?: "")
-
+        
         enableEdgeToEdge()
         setContent {
             // НЕ ПЕРЕМЕЩАТЬ!!
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 window.setNavigationBarContrastEnforced(false)
             }
-
+            
             AppTheme(koinInject<AppValues>()) {
                 ProvideGlobalDialog {
                     val dialog = rememberDialogController()
-
+                    
                     Box {
                         FloatingActionButton(
                             modifier = Modifier
@@ -62,7 +62,7 @@ class CrashActivity : ComponentActivity() {
                         ) {
                             WHATIcons.FrameBug.Show(color = colorScheme.onSecondaryContainer)
                         }
-
+                        
                         CrashScreen(
                             crashReport = intent.getStringExtra("CRASH_REPORT") ?: "",
                             onRestart = { restartApp() },
@@ -73,7 +73,7 @@ class CrashActivity : ComponentActivity() {
             }
         }
     }
-
+    
     private fun restartApp() {
         val intent = packageManager.getLaunchIntentForPackage(packageName)?.apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
@@ -82,21 +82,21 @@ class CrashActivity : ComponentActivity() {
         finish()
         Process.killProcess(Process.myPid())
     }
-
+    
     private fun shareCrashReport() {
         val crashReport = intent.getStringExtra("CRASH_REPORT") ?: return
-
+        
         try {
             val file = File(cacheDir, "crash_report.txt")
             file.writeText(crashReport)
-
+            
             val uris = listOf(
                 getFileUri(file),
             ).let {
                 if (Auditor.logFile.exists()) it + getFileUri(Auditor.logFile)
                 else it
             }
-
+            
             ShareUtils.shareUris(
                 this@CrashActivity,
                 ArrayList(uris)
@@ -105,7 +105,7 @@ class CrashActivity : ComponentActivity() {
             Toast.makeText(this, "Error sharing report", Toast.LENGTH_SHORT).show()
         }
     }
-
+    
     private fun getFileUri(file: File) =
         FileProvider.getUriForFile(this, "${packageName}.fileprovider", file)
 }

app/src/main/java/app/what/schedule/MainActivity.kt

@@ -28,22 +28,22 @@ import org.koin.compose.koinInject
 
 class MainActivity : ComponentActivity() {
     private val crashlytics = FirebaseCrashlytics.getInstance()
-
+    
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        
         val uiTag = buildTag(LogScope.UI, LogCat.INIT)
         Auditor.info(uiTag, "MainActivity создана")
-
+        
         enableEdgeToEdge()
         setContent {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 window.setNavigationBarContrastEnforced(false)
             }
-
+            
             val navigator = rememberHostNavigator()
             val settings = koinInject<AppValues>()
-
+            
             LaunchedEffect(Unit) {
                 navigator.c.addOnDestinationChangedListener { _, destination, _ ->
                     val navTag = buildTag(LogScope.CORE, LogCat.NAV)
@@ -52,7 +52,7 @@ class MainActivity : ComponentActivity() {
                     crashlytics.setCustomKey("current_screen", destination.route ?: "unknown")
                 }
             }
-
+            
             ProvideGLobalAppValues(settings) {
                 AppTheme {
                     ProvideGlobalDialog {

app/src/main/java/app/what/schedule/ScheduleApp.kt

@@ -43,6 +43,7 @@ import com.google.firebase.analytics.analytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.cio.CIO
+import io.ktor.client.plugins.HttpRequestRetry
 import io.ktor.client.plugins.HttpTimeout
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.plugins.logging.Logger
@@ -65,29 +66,29 @@ import javax.net.ssl.X509TrustManager
 class ScheduleApp : Application() {
     override fun onCreate() {
         super.onCreate()
-
+        
         if (FirebaseApp.getApps(this).isEmpty()) {
             FirebaseApp.initializeApp(this)
         }
-
+        
         val crashlytics = FirebaseCrashlytics.getInstance()
         crashlytics.setCustomKey("app_version", BuildConfig.VERSION_NAME)
         crashlytics.setCustomKey("app_version_code", BuildConfig.VERSION_CODE)
-
+        
         AppLogger.initialize(applicationContext)
         CrashHandler.initialize(applicationContext, CrashActivity::class.java)
             .setSideEffect(crashlytics::recordException)
-
+        
         val initTag = buildTag(LogScope.CORE, LogCat.INIT)
         Auditor.info(initTag, "Приложение запущено")
-
+        
         startKoin {
             androidContext(this@ScheduleApp)
             modules(generalModule, controllers)
         }
-
+        
         val koin = getKoin()
-
+        
         val appValues = koin.get<AppValues>()
         if (appValues.userId.get() == null) {
             val userId = UUID.randomUUID().toString()
@@ -98,7 +99,7 @@ class ScheduleApp : Application() {
         } else {
             Auditor.debug(initTag, "Пользователь уже существует: ${appValues.userId.get()}")
         }
-
+        
         SingletonImageLoader.setSafe {
             ImageLoader.Builder(this)
                 .crossfade(true)
@@ -107,9 +108,9 @@ class ScheduleApp : Application() {
                 }
                 .build()
         }
-
+        
         val source = getInstallSource(this)
-
+        
         when (source) {
             InstallSource.APK -> Auditor.debug("d", "install source Apk")
             InstallSource.RuStore -> Auditor.debug("d", "install source RuStore")
@@ -129,24 +130,24 @@ val controllers = module {
 
 val generalModule = module {
     single<CoroutineScope> { CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) }
-
+    
     singleOf(::AppValues) bind PreferenceStorage::class
     singleOf(::AppUtils)
     singleOf(::GoogleDriveParser)
     singleOf(::FileManager)
-
+    
     singleOf(::DGTUAccountService)
-
+    
     singleOf(::InstitutionManager)
     singleOf(::ScheduleRepository)
     singleOf(::NewsRepository)
-
+    
     single<AppUpdateManager> {
         val context = androidContext()
         val source = getInstallSource(context)
-
+        
         when (source) {
-
+            
             InstallSource.RuStore -> RuStoreUpdateManager(context, get())
             InstallSource.APK -> GitHubUpdateManager(
                 GitHubUpdateService(get()),
@@ -160,7 +161,7 @@ val generalModule = module {
             )
         }
     }
-
+    
     single {
         Room.databaseBuilder(
             androidContext(),
@@ -170,19 +171,36 @@ val generalModule = module {
             .fallbackToDestructiveMigration(true)
             .build()
     }
-
+    
     single {
         HttpClient(CIO) {
+            install(HttpRequestRetry) {
+                maxRetries = 4
+                
+                retryOnExceptionIf { _, cause ->
+                    cause is java.net.UnknownHostException ||
+                            cause is java.net.ConnectException ||
+                            cause is java.net.SocketTimeoutException
+                }
+                
+                retryOnServerErrors(maxRetries = 3)
+                
+                exponentialDelay(
+                    baseDelayMs = 300L,
+                    maxDelayMs = 5000L
+                )
+            }
+            
             install(NetworkMonitorPlugin)
-
+            
             install(Logging) {
                 logger = object : Logger {
                     override fun log(message: String) {
                         Auditor.debug(buildTag(LogScope.NETWORK, LogCat.NET), message)
                     }
                 }
             }
-
+            
             install(ContentNegotiation) {
                 json(Json {
                     classDiscriminator = "type"
@@ -192,12 +210,12 @@ val generalModule = module {
                     explicitNulls = false
                 })
             }
-
+            
             install(HttpTimeout) {
                 this@HttpClient.expectSuccess = false
                 requestTimeoutMillis = 60 * 1000
             }
-
+            
             engine {
                 https {
                     trustManager = object : X509TrustManager {
@@ -206,13 +224,13 @@ val generalModule = module {
                             authType: String
                         ) {
                         }
-
+                        
                         override fun checkServerTrusted(
                             chain: Array<X509Certificate>,
                             authType: String
                         ) {
                         }
-
+                        
                         override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
                     }
                 }

app/src/main/java/app/what/schedule/data/local/database/Converters.kt

@@ -10,44 +10,44 @@ import java.time.format.DateTimeFormatterBuilder
 class Converters {
     private val dateFormatter = DateTimeFormatter.ISO_LOCAL_DATE
     private val timeFormatter = DateTimeFormatter.ISO_LOCAL_TIME
-
+    
     // Существует два основных подхода для LocalDateTime:
-
+    
     // Подход 1: Использовать ISO_LOCAL_DATE_TIME (рекомендуется)
     private val dateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME
-
+    
     // Подход 2: Разделить дату и время компонентами (альтернативный вариант)
     private val customDateTimeFormatter = DateTimeFormatterBuilder()
         .append(DateTimeFormatter.ISO_LOCAL_DATE)
         .appendLiteral(' ')
         .append(DateTimeFormatter.ISO_LOCAL_TIME)
         .toFormatter()
-
+    
     @TypeConverter
     fun fromLocalDate(date: LocalDate?): String? {
         return date?.format(dateFormatter)
     }
-
+    
     @TypeConverter
     fun toLocalDate(dateString: String?): LocalDate? {
         return dateString?.let { LocalDate.parse(it, dateFormatter) }
     }
-
+    
     @TypeConverter
     fun fromLocalTime(time: LocalTime?): String? {
         return time?.format(timeFormatter)
     }
-
+    
     @TypeConverter
     fun toLocalTime(timeString: String?): LocalTime? {
         return timeString?.let { LocalTime.parse(it, timeFormatter) }
     }
-
+    
     @TypeConverter
     fun fromLocalDateTime(dateTime: LocalDateTime?): String? {
         return dateTime?.format(dateTimeFormatter)
     }
-
+    
     @TypeConverter
     fun toLocalDateTime(dateTimeString: String?): LocalDateTime? {
         return dateTimeString?.let { LocalDateTime.parse(it, dateTimeFormatter) }