Wydaj aplikację kierowcy 1.0.73 (126)

.gitignore

@@ -1,4 +1,5 @@
 .gradle/
+.kotlin/
 build/
 local.properties
 app/google-services.json

app/build.gradle.kts

@@ -22,7 +22,7 @@ val keystoreProperties = Properties().apply {
 
 android {
     namespace = "pl.firmatpp.kierowca"
-    compileSdk = 35
+    compileSdk = 36
 
     fun configValue(name: String, default: String): String =
         providers.gradleProperty(name)
@@ -33,9 +33,9 @@ android {
     defaultConfig {
         applicationId = "pl.firmatpp.kierowca"
         minSdk = 26
-        targetSdk = 35
-        versionCode = 117
-        versionName = "1.0.64"
+        targetSdk = 36
+        versionCode = 126
+        versionName = "1.0.73"
         setProperty("archivesBaseName", "pl.firmatpp.kierowca")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/AndroidManifest.xml

@@ -2,12 +2,23 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <queries>
+        <intent>
+            <action android:name="android.speech.RecognitionService" />
+        </intent>
+    </queries>
+
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"

app/src/main/java/pl/firmatpp/kierowca/data/AppPreferencesStore.kt

@@ -20,6 +20,7 @@ class AppPreferencesStore(
 
     private val themeModeKey = stringPreferencesKey("theme_mode")
     private val routeProgressNotificationEnabledKey = booleanPreferencesKey("route_progress_notification_enabled")
+    private val routeLocationEnabledKey = booleanPreferencesKey("route_location_enabled")
 
     val themeMode: Flow<AppThemeMode> = dataStore.data
         .map { preferences -> AppThemeMode.fromStoredValue(preferences[themeModeKey]) }
@@ -27,6 +28,9 @@ class AppPreferencesStore(
     val routeProgressNotificationEnabled: Flow<Boolean> = dataStore.data
         .map { preferences -> preferences[routeProgressNotificationEnabledKey] ?: true }
 
+    val routeLocationEnabled: Flow<Boolean> = dataStore.data
+        .map { preferences -> preferences[routeLocationEnabledKey] ?: false }
+
     suspend fun setThemeMode(themeMode: AppThemeMode) {
         dataStore.edit { preferences ->
             preferences[themeModeKey] = themeMode.storedValue
@@ -38,4 +42,10 @@ class AppPreferencesStore(
             preferences[routeProgressNotificationEnabledKey] = enabled
         }
     }
+
+    suspend fun setRouteLocationEnabled(enabled: Boolean) {
+        dataStore.edit { preferences ->
+            preferences[routeLocationEnabledKey] = enabled
+        }
+    }
 }

app/src/main/java/pl/firmatpp/kierowca/data/DeviceInfoProvider.kt

@@ -22,17 +22,6 @@ class DeviceInfoProvider(
             androidVersion = Build.VERSION.RELEASE,
             sdkInt = Build.VERSION.SDK_INT,
             appVersion = BuildConfig.VERSION_NAME,
-            serialNumber = readSerialNumber(),
+            serialNumber = null,
         )
-
-    private fun readSerialNumber(): String? =
-        runCatching {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                Build.getSerial()
-            } else {
-                @Suppress("DEPRECATION")
-                Build.SERIAL
-            }
-        }.getOrNull()
-            ?.takeUnless { it.isBlank() || it.equals(Build.UNKNOWN, ignoreCase = true) }
 }

app/src/main/java/pl/firmatpp/kierowca/data/DriverRepository.kt

@@ -2,6 +2,7 @@ package pl.firmatpp.kierowca.data
 
 import android.content.Context
 import android.net.Uri
+import android.provider.OpenableColumns
 import java.io.File
 import java.security.MessageDigest
 import java.util.UUID
@@ -12,6 +13,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import pl.firmatpp.kierowca.data.api.ApiFactory
 import pl.firmatpp.kierowca.data.api.MobileDriverApi
 import pl.firmatpp.kierowca.data.model.BootstrapResponse
+import pl.firmatpp.kierowca.data.model.AcknowledgeTachographReminderBody
 import pl.firmatpp.kierowca.data.model.BroadcastAuthBody
 import pl.firmatpp.kierowca.data.model.BroadcastAuthResponse
 import pl.firmatpp.kierowca.data.model.CancelLeaveRequestBody
@@ -19,8 +21,12 @@ import pl.firmatpp.kierowca.data.model.DispatchSheetUploadResponse
 import pl.firmatpp.kierowca.data.model.CreateLeaveRequestBody
 import pl.firmatpp.kierowca.data.model.DriverDto
 import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveDocumentDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveForecastDto
 import pl.firmatpp.kierowca.data.model.DriverLeaveRequestDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveSummaryDto
 import pl.firmatpp.kierowca.data.model.FinishRouteBody
+import pl.firmatpp.kierowca.data.model.LeaveForecastBody
 import pl.firmatpp.kierowca.data.model.NotificationPreferencesBody
 import pl.firmatpp.kierowca.data.model.NotificationPreferencesDto
 import pl.firmatpp.kierowca.data.model.OtpResponse
@@ -33,6 +39,7 @@ import pl.firmatpp.kierowca.data.model.RoutePointsResponse
 import pl.firmatpp.kierowca.data.model.RouteResponse
 import pl.firmatpp.kierowca.data.model.StartRouteBody
 import pl.firmatpp.kierowca.data.model.SyncStateResponse
+import pl.firmatpp.kierowca.data.model.TachographReminderDto
 import pl.firmatpp.kierowca.data.model.VerifyOtpBody
 import pl.firmatpp.kierowca.data.upload.DispatchSheetUploadEntity
 import pl.firmatpp.kierowca.data.upload.PhotoUploadEntity
@@ -56,24 +63,104 @@ class DriverRepository(
     suspend fun bootstrap(date: String? = null): BootstrapResponse =
         api.bootstrap(authHeader(requireToken()), date)
 
+    suspend fun acknowledgeTachographReminder(taskIds: List<String>): TachographReminderDto =
+        api.acknowledgeTachographReminder(
+            authHeader(requireToken()),
+            AcknowledgeTachographReminderBody(taskIds),
+        ).tachographReminder
+
     suspend fun route(routeId: String): RouteResponse =
         api.route(authHeader(requireToken()), routeId)
 
     suspend fun leaveRequests(): List<DriverLeaveRequestDto> =
         api.leaveRequests(authHeader(requireToken())).data
 
+    suspend fun leaveSummary(): DriverLeaveSummaryDto =
+        api.leaveSummary(authHeader(requireToken())).data
+
+    suspend fun leaveForecast(
+        dateFrom: String,
+        dateTo: String,
+        type: String,
+        requestMode: String,
+        requestedQuantity: Int?,
+    ): DriverLeaveForecastDto =
+        api.leaveForecast(
+            authHeader(requireToken()),
+            LeaveForecastBody(type, dateFrom, dateTo, requestMode, requestedQuantity),
+        ).data
+
     suspend fun leaveCalendar(from: String, to: String): List<DriverLeaveCalendarEntryDto> =
         api.leaveCalendar(authHeader(requireToken()), from, to).data
 
     suspend fun leaveRequest(id: String): DriverLeaveRequestDto =
         api.leaveRequest(authHeader(requireToken()), id).data
 
-    suspend fun createLeaveRequest(dateFrom: String, dateTo: String, type: String, note: String?): DriverLeaveRequestDto =
-        api.createLeaveRequest(authHeader(requireToken()), CreateLeaveRequestBody(dateFrom, dateTo, type, note)).data
+    suspend fun createLeaveRequest(
+        dateFrom: String,
+        dateTo: String,
+        type: String,
+        requestMode: String,
+        requestedQuantity: Int?,
+        details: Map<String, String>,
+        idempotencyKey: String,
+        note: String?,
+    ): DriverLeaveRequestDto =
+        api.createLeaveRequest(
+            authHeader(requireToken()),
+            CreateLeaveRequestBody(
+                dateFrom = dateFrom,
+                dateTo = dateTo,
+                type = type,
+                requestMode = requestMode,
+                requestedQuantity = requestedQuantity,
+                details = details,
+                idempotencyKey = idempotencyKey,
+                note = note,
+            ),
+        ).data
 
     suspend fun cancelLeaveRequest(id: String, expectedVersion: Long, comment: String? = null): DriverLeaveRequestDto =
         api.cancelLeaveRequest(authHeader(requireToken()), id, CancelLeaveRequestBody(comment, expectedVersion)).data
 
+    suspend fun leaveDocuments(id: String): List<DriverLeaveDocumentDto> =
+        api.leaveDocuments(authHeader(requireToken()), id).data
+
+    suspend fun uploadLeaveDocument(id: String, documentType: String, uri: Uri): DriverLeaveDocumentDto {
+        val resolver = context.contentResolver
+        val mimeType = resolver.getType(uri) ?: "application/octet-stream"
+        val fileMetadata = resolver.query(
+            uri,
+            arrayOf(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE),
+            null,
+            null,
+            null,
+        )?.use { cursor ->
+            if (!cursor.moveToFirst()) {
+                null
+            } else {
+                cursor.getString(0) to cursor.getLong(1)
+            }
+        }
+        if ((fileMetadata?.second ?: 0L) > 20L * 1024L * 1024L) {
+            error("Dokument jest za duży. Maksymalny rozmiar pliku to 20 MB.")
+        }
+        val bytes = resolver.openInputStream(uri)?.use { it.readBytes() }
+            ?: error("Nie można odczytać wybranego dokumentu.")
+        val originalName = fileMetadata?.first
+            ?.takeIf { it.isNotBlank() }
+            ?: "dokument"
+        val body = bytes.toRequestBody(mimeType.toMediaTypeOrNull())
+        val file = MultipartBody.Part.createFormData("file", originalName, body)
+
+        return api.uploadLeaveDocument(
+            authHeader(requireToken()),
+            id,
+            file,
+            documentType.toPlainTextBody(),
+        ).data
+    }
+
     suspend fun completeRoute(routeId: String) =
         api.completeRoute(authHeader(requireToken()), routeId)
 

app/src/main/java/pl/firmatpp/kierowca/data/api/ApiFactory.kt

@@ -1,11 +1,19 @@
 package pl.firmatpp.kierowca.data.api
 
 import okhttp3.OkHttpClient
+import okhttp3.Request
 import okhttp3.logging.HttpLoggingInterceptor
 import pl.firmatpp.kierowca.BuildConfig
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
+internal const val DRIVER_APP_VERSION_HEADER = "X-Driver-App-Version"
+
+internal fun Request.withDriverAppVersion(appVersion: String): Request =
+    newBuilder()
+        .header(DRIVER_APP_VERSION_HEADER, appVersion)
+        .build()
+
 object ApiFactory {
     fun mobileDriverApi(): MobileDriverApi {
         val logging = HttpLoggingInterceptor().apply {
@@ -13,6 +21,9 @@ object ApiFactory {
         }
 
         val client = OkHttpClient.Builder()
+            .addInterceptor { chain ->
+                chain.proceed(chain.request().withDriverAppVersion(BuildConfig.VERSION_NAME))
+            }
             .addInterceptor(logging)
             .build()
 

app/src/main/java/pl/firmatpp/kierowca/data/api/MobileDriverApi.kt

@@ -3,6 +3,8 @@ package pl.firmatpp.kierowca.data.api
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import pl.firmatpp.kierowca.data.model.BootstrapResponse
+import pl.firmatpp.kierowca.data.model.AcknowledgeTachographReminderBody
+import pl.firmatpp.kierowca.data.model.AcknowledgeTachographReminderResponse
 import pl.firmatpp.kierowca.data.model.BroadcastAuthBody
 import pl.firmatpp.kierowca.data.model.BroadcastAuthResponse
 import pl.firmatpp.kierowca.data.model.CancelLeaveRequestBody
@@ -11,9 +13,14 @@ import pl.firmatpp.kierowca.data.model.CreateLeaveRequestBody
 import pl.firmatpp.kierowca.data.model.DispatchSheetUploadResponse
 import pl.firmatpp.kierowca.data.model.FinishRouteBody
 import pl.firmatpp.kierowca.data.model.LeaveCalendarResponse
+import pl.firmatpp.kierowca.data.model.LeaveDocumentListResponse
+import pl.firmatpp.kierowca.data.model.LeaveDocumentResponse
+import pl.firmatpp.kierowca.data.model.LeaveForecastBody
+import pl.firmatpp.kierowca.data.model.LeaveForecastResponse
 import pl.firmatpp.kierowca.data.model.LeaveRequestListResponse
 import pl.firmatpp.kierowca.data.model.LeaveRequestResponse
 import pl.firmatpp.kierowca.data.model.LeaveRequestTypesResponse
+import pl.firmatpp.kierowca.data.model.LeaveSummaryResponse
 import pl.firmatpp.kierowca.data.model.OtpResponse
 import pl.firmatpp.kierowca.data.model.NotificationPreferencesBody
 import pl.firmatpp.kierowca.data.model.NotificationPreferencesDto
@@ -67,11 +74,28 @@ interface MobileDriverApi {
         @Query("date") date: String?,
     ): BootstrapResponse
 
+    @POST("mobile/driver/tachograph-reminder/acknowledge")
+    suspend fun acknowledgeTachographReminder(
+        @Header("Authorization") authorization: String,
+        @Body body: AcknowledgeTachographReminderBody,
+    ): AcknowledgeTachographReminderResponse
+
     @GET("mobile/driver/leave-request-types")
     suspend fun leaveRequestTypes(
         @Header("Authorization") authorization: String,
     ): LeaveRequestTypesResponse
 
+    @GET("mobile/driver/leave-summary")
+    suspend fun leaveSummary(
+        @Header("Authorization") authorization: String,
+    ): LeaveSummaryResponse
+
+    @POST("mobile/driver/leave-forecast")
+    suspend fun leaveForecast(
+        @Header("Authorization") authorization: String,
+        @Body body: LeaveForecastBody,
+    ): LeaveForecastResponse
+
     @GET("mobile/driver/leave-requests")
     suspend fun leaveRequests(
         @Header("Authorization") authorization: String,
@@ -96,6 +120,21 @@ interface MobileDriverApi {
         @Path("id") id: String,
     ): LeaveRequestResponse
 
+    @GET("mobile/driver/leave-requests/{id}/documents")
+    suspend fun leaveDocuments(
+        @Header("Authorization") authorization: String,
+        @Path("id") id: String,
+    ): LeaveDocumentListResponse
+
+    @Multipart
+    @POST("mobile/driver/leave-requests/{id}/documents")
+    suspend fun uploadLeaveDocument(
+        @Header("Authorization") authorization: String,
+        @Path("id") id: String,
+        @Part file: MultipartBody.Part,
+        @Part("documentType") documentType: RequestBody,
+    ): LeaveDocumentResponse
+
     @POST("mobile/driver/leave-requests/{id}/cancel")
     suspend fun cancelLeaveRequest(
         @Header("Authorization") authorization: String,

app/src/main/java/pl/firmatpp/kierowca/data/model/DriverModels.kt

@@ -47,6 +47,7 @@ data class BootstrapResponse(
     val routes: RoutesBucketDto,
     val driverAppSettings: DriverAppSettingsDto?,
     val dispatchSheetReminder: DispatchSheetReminderDto? = null,
+    val tachographReminder: TachographReminderDto? = null,
     val notificationPreferences: NotificationPreferencesDto? = null,
     val realtime: RealtimeConfigDto? = null,
     val syncState: SyncStateResponse? = null,
@@ -72,6 +73,7 @@ data class DriverAppSettingsDto(
     val allowGalleryUploads: Boolean?,
     val allowRouteCompletion: Boolean?,
     val requirePreciseLocationForPhotos: Boolean?,
+    val routeLocationMode: String? = null,
     val loadingPhotoRequirement: String? = null,
     val loadingWeightRequirement: String? = null,
     val unloadingPhotoRequirement: String? = null,
@@ -79,6 +81,7 @@ data class DriverAppSettingsDto(
     val dispatchSheetRemindersEnabled: Boolean? = null,
     val dispatchSheetOnFridays: Boolean? = null,
     val dispatchSheetOnLastWorkingDay: Boolean? = null,
+    val tachographRemindersEnabled: Boolean? = null,
     val leaveRequests: LeaveRequestsConfigDto? = null,
 )
 
@@ -98,6 +101,30 @@ data class DispatchSheetReminderDto(
     val canUpload: Boolean = false,
 )
 
+data class TachographReminderDto(
+    val enabled: Boolean = false,
+    val visible: Boolean = false,
+    val title: String? = null,
+    val message: String? = null,
+    val confirmationLabel: String? = null,
+    val tasks: List<TachographReminderTaskDto>? = null,
+)
+
+data class TachographReminderTaskDto(
+    val id: String,
+    val type: String,
+    val label: String,
+)
+
+data class AcknowledgeTachographReminderBody(
+    val taskIds: List<String>,
+)
+
+data class AcknowledgeTachographReminderResponse(
+    val ok: Boolean,
+    val tachographReminder: TachographReminderDto,
+)
+
 data class DispatchSheetPhotoDto(
     val id: String,
     val driverId: String,
@@ -196,13 +223,94 @@ data class LeaveRequestTypesResponse(
 
 data class LeaveRequestTypeDto(
     val value: String,
+    val code: String? = null,
+    val ruleCode: String? = null,
     val label: String,
+    val category: String? = null,
+    val unit: String? = null,
+    val poolCode: String? = null,
+    val requestModes: List<String> = listOf("days"),
+    val requiredFields: List<String> = emptyList(),
+    val requiredDocuments: List<String> = emptyList(),
+    val fieldOptions: Map<String, Map<String, String>> = emptyMap(),
+    val description: String? = null,
+    val decisionMode: String? = null,
+    val payrollMode: String? = null,
+    val legalBasis: String? = null,
+)
+
+data class LeaveSummaryResponse(
+    val data: DriverLeaveSummaryDto,
+)
+
+data class DriverLeaveSummaryDto(
+    val pools: List<DriverLeavePoolDto> = emptyList(),
+    val dailyNormMinutes: Int = 480,
+    val balanceConfigured: Boolean = false,
+    val overdueQuantity: Int = 0,
+    val availableTypes: List<LeaveRequestTypeDto> = emptyList(),
+    val reminders: List<DriverLeaveReminderDto> = emptyList(),
+)
+
+data class DriverLeavePoolDto(
+    val id: Int,
+    val poolCode: String,
+    val year: Int,
+    val unit: String,
+    val calculatedQuantity: Int = 0,
+    val confirmedQuantity: Int? = null,
+    val availableQuantity: Int = 0,
+    val reservedQuantity: Int = 0,
+    val usedQuantity: Int = 0,
+    val grantedQuantity: Int = 0,
+    val overdue: Boolean = false,
+    val status: String,
+)
+
+data class DriverLeaveReminderDto(
+    val code: String,
+    val message: String,
+    val poolId: Int? = null,
+)
+
+data class LeaveForecastBody(
+    val type: String,
+    val dateFrom: String,
+    val dateTo: String,
+    val requestMode: String,
+    val requestedQuantity: Int? = null,
+)
+
+data class LeaveForecastResponse(
+    val data: DriverLeaveForecastDto,
+)
+
+data class DriverLeaveForecastDto(
+    val ruleCode: String,
+    val quantityUnit: String,
+    val days: List<DriverLeaveForecastDayDto> = emptyList(),
+    val workingDaysCount: Int = 0,
+    val requestedQuantity: Int = 0,
+    val availableQuantity: Int = 0,
+    val balanceConfigured: Boolean = false,
+    val sufficientBalance: Boolean = true,
+    val pools: List<DriverLeavePoolDto> = emptyList(),
+)
+
+data class DriverLeaveForecastDayDto(
+    val date: String,
+    val quantity: Int,
+    val source: String? = null,
 )
 
 data class CreateLeaveRequestBody(
     val dateFrom: String,
     val dateTo: String,
     val type: String,
+    val requestMode: String = "days",
+    val requestedQuantity: Int? = null,
+    val details: Map<String, String> = emptyMap(),
+    val idempotencyKey: String? = null,
     val note: String?,
 )
 
@@ -217,7 +325,12 @@ data class DriverLeaveRequestDto(
     val dateFrom: String?,
     val dateTo: String?,
     val type: String,
+    val ruleCode: String? = null,
     val typeLabel: String? = null,
+    val requestMode: String = "days",
+    val requestedQuantity: Int? = null,
+    val rule: DriverLeaveRuleSnapshotDto? = null,
+    val details: Map<String, String> = emptyMap(),
     val note: String? = null,
     val status: String,
     val version: Long = 1,
@@ -228,6 +341,54 @@ data class DriverLeaveRequestDto(
     val decidedAt: String? = null,
     val decisionComment: String? = null,
     val events: List<DriverLeaveRequestEventDto> = emptyList(),
+    val allocations: List<DriverLeaveAllocationDto> = emptyList(),
+    val balanceConfigurationRequired: Boolean = false,
+    val missingDocumentTypes: List<String> = emptyList(),
+)
+
+data class DriverLeaveRuleSnapshotDto(
+    val code: String? = null,
+    val label: String? = null,
+    val unit: String? = null,
+    val decisionMode: String? = null,
+    val payrollMode: String? = null,
+    val poolCode: String? = null,
+    val rule: DriverLeaveRuleRequirementsDto? = null,
+    val legalBasis: String? = null,
+)
+
+data class DriverLeaveRuleRequirementsDto(
+    val requestModes: List<String> = listOf("days"),
+    val requiredFields: List<String> = emptyList(),
+    val requiredDocuments: List<String> = emptyList(),
+    val fieldOptions: Map<String, Map<String, String>> = emptyMap(),
+    val description: String? = null,
+)
+
+data class DriverLeaveAllocationDto(
+    val id: Int,
+    val date: String?,
+    val quantity: Int,
+    val status: String,
+    val poolId: Int? = null,
+    val sourceYear: Int? = null,
+)
+
+data class LeaveDocumentListResponse(
+    val data: List<DriverLeaveDocumentDto> = emptyList(),
+)
+
+data class LeaveDocumentResponse(
+    val data: DriverLeaveDocumentDto,
+)
+
+data class DriverLeaveDocumentDto(
+    val id: Int,
+    val documentType: String,
+    val originalName: String,
+    val mimeType: String? = null,
+    val sizeBytes: Long = 0,
+    val uploadedAt: String? = null,
 )
 
 data class DriverLeaveCalendarEntryDto(
@@ -278,7 +439,9 @@ data class DriverRouteDto(
     val driverStatus: String? = null,
     val operationalStatus: String? = null,
     val loadingWeight: Double? = null,
+    val loadingNotes: String? = null,
     val unloadingWeight: Double? = null,
+    val unloadingNotes: String? = null,
     val trackingStatus: String? = null,
     val arrivedAt: String? = null,
     val distanceKm: Double?,
@@ -352,6 +515,7 @@ data class StartRouteBody(
     val loadingWeight: Double?,
     val occurredAt: String,
     val photoClientRequestIds: List<String>,
+    val loadingNotes: String? = null,
 )
 
 data class FinishRouteBody(
@@ -359,6 +523,7 @@ data class FinishRouteBody(
     val unloadingWeight: Double?,
     val occurredAt: String,
     val photoClientRequestIds: List<String>,
+    val unloadingNotes: String? = null,
 )
 
 data class RouteActionResponse(

app/src/main/java/pl/firmatpp/kierowca/data/sync/DriverSyncRepository.kt

@@ -5,6 +5,7 @@ import com.google.gson.Gson
 import java.io.IOException
 import java.time.LocalDate
 import pl.firmatpp.kierowca.data.DriverRepository
+import pl.firmatpp.kierowca.data.rethrowIfCancellation
 import pl.firmatpp.kierowca.data.model.BootstrapResponse
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
 import pl.firmatpp.kierowca.data.model.RouteResponse
@@ -38,6 +39,7 @@ class DriverSyncRepository(
             saveSyncStates(response.syncState)
             CachedValue(response, stale = false, syncedAtEpochMillis = System.currentTimeMillis())
         }.getOrElse { throwable ->
+            throwable.rethrowIfCancellation()
             cachedBootstrap(requestedDate, throwable)
         }
     }
@@ -58,6 +60,7 @@ class DriverSyncRepository(
             saveSyncStates(response.syncState)
             CachedValue(response, stale = false, syncedAtEpochMillis = System.currentTimeMillis())
         }.getOrElse { throwable ->
+            throwable.rethrowIfCancellation()
             cachedRoute(routeId, throwable)
         }
 

app/src/main/java/pl/firmatpp/kierowca/data/upload/DriverDatabase.kt

@@ -21,7 +21,7 @@ import pl.firmatpp.kierowca.data.sync.DriverSyncStateEntity
         DriverRouteCacheEntity::class,
         DriverSyncStateEntity::class,
     ],
-    version = 6,
+    version = 7,
     exportSchema = false,
 )
 abstract class DriverDatabase : RoomDatabase() {
@@ -202,13 +202,26 @@ abstract class DriverDatabase : RoomDatabase() {
             }
         }
 
+        private val migration6To7 = object : Migration(6, 7) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE route_actions ADD COLUMN notes TEXT")
+            }
+        }
+
         fun get(context: Context): DriverDatabase =
             instance ?: synchronized(this) {
                 instance ?: Room.databaseBuilder(
                     context.applicationContext,
                     DriverDatabase::class.java,
                     "driver-local-outbox.db",
-                ).addMigrations(migration1To2, migration2To3, migration3To4, migration4To5, migration5To6).build().also { instance = it }
+                ).addMigrations(
+                    migration1To2,
+                    migration2To3,
+                    migration3To4,
+                    migration4To5,
+                    migration5To6,
+                    migration6To7,
+                ).build().also { instance = it }
             }
     }
 }

app/src/main/java/pl/firmatpp/kierowca/data/upload/RouteActionDao.kt

@@ -14,6 +14,61 @@ interface RouteActionDao {
     @Query("SELECT * FROM route_actions WHERE clientActionId = :clientActionId LIMIT 1")
     suspend fun find(clientActionId: String): RouteActionEntity?
 
+    @Query(
+        """
+        SELECT * FROM route_actions
+        WHERE routeId = :routeId
+        AND action = 'start'
+        AND createdAtEpochMillis < :beforeEpochMillis
+        ORDER BY createdAtEpochMillis DESC
+        LIMIT 1
+        """,
+    )
+    suspend fun latestStartBefore(routeId: String, beforeEpochMillis: Long): RouteActionEntity?
+
+    @Query(
+        """
+        SELECT * FROM route_actions
+        WHERE routeId = :routeId
+        AND action = 'finish'
+        AND createdAtEpochMillis > :afterEpochMillis
+        AND status != 'CONFIRMED'
+        ORDER BY createdAtEpochMillis ASC
+        """,
+    )
+    suspend fun unconfirmedFinishesAfter(routeId: String, afterEpochMillis: Long): List<RouteActionEntity>
+
+    @Query(
+        """
+        SELECT EXISTS(
+            SELECT 1 FROM route_actions
+            WHERE routeId = :routeId
+            AND action = 'finish'
+            AND status = 'CONFIRMED'
+            AND createdAtEpochMillis > :afterEpochMillis
+        )
+        """,
+    )
+    suspend fun hasConfirmedFinishAfter(routeId: String, afterEpochMillis: Long): Boolean
+
+    @Query(
+        """
+        UPDATE route_actions
+        SET status = 'CONFIRMED',
+            lastError = NULL,
+            updatedAtEpochMillis = :updatedAt
+        WHERE routeId = :routeId
+        AND action = 'finish'
+        AND createdAtEpochMillis < :beforeEpochMillis
+        AND status != 'CONFIRMED'
+        """,
+    )
+    suspend fun confirmSupersededFinishes(
+        routeId: String,
+        beforeEpochMillis: Long,
+        updatedAt: Long = System.currentTimeMillis(),
+    )
+
     @Query("SELECT * FROM route_actions WHERE status != 'CONFIRMED'")
     suspend fun allUnsent(): List<RouteActionEntity>
 

app/src/main/java/pl/firmatpp/kierowca/data/upload/RouteActionEntity.kt

@@ -38,4 +38,5 @@ data class RouteActionEntity(
     val lastError: String? = null,
     val createdAtEpochMillis: Long = System.currentTimeMillis(),
     val updatedAtEpochMillis: Long = System.currentTimeMillis(),
+    val notes: String? = null,
 )

app/src/main/java/pl/firmatpp/kierowca/data/upload/RouteActionOutbox.kt

@@ -43,17 +43,28 @@ class RouteActionOutbox(
         enqueueWorker(clientActionId)
     }
 
-    suspend fun enqueueStart(routeId: String, loadingWeight: Double?, photoClientRequestIds: List<String>): RouteActionEntity =
-        enqueue(RouteActionType.Start, routeId, loadingWeight, photoClientRequestIds)
+    suspend fun enqueueStart(
+        routeId: String,
+        loadingWeight: Double?,
+        photoClientRequestIds: List<String>,
+        notes: String? = null,
+    ): RouteActionEntity =
+        enqueue(RouteActionType.Start, routeId, loadingWeight, photoClientRequestIds, notes)
 
-    suspend fun enqueueFinish(routeId: String, unloadingWeight: Double?, photoClientRequestIds: List<String>): RouteActionEntity =
-        enqueue(RouteActionType.Finish, routeId, unloadingWeight, photoClientRequestIds)
+    suspend fun enqueueFinish(
+        routeId: String,
+        unloadingWeight: Double?,
+        photoClientRequestIds: List<String>,
+        notes: String? = null,
+    ): RouteActionEntity =
+        enqueue(RouteActionType.Finish, routeId, unloadingWeight, photoClientRequestIds, notes)
 
     private suspend fun enqueue(
         action: String,
         routeId: String,
         weight: Double?,
         photoClientRequestIds: List<String>,
+        notes: String?,
     ): RouteActionEntity {
         dao.pruneConfirmed(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(7))
         val entity = RouteActionEntity(
@@ -63,6 +74,7 @@ class RouteActionOutbox(
             weight = weight,
             occurredAt = Instant.now().toString(),
             photoClientRequestIdsJson = gson.toJson(photoClientRequestIds.distinct()),
+            notes = notes?.trim()?.takeIf { it.isNotEmpty() },
         )
 
         dao.upsert(entity)

app/src/main/java/pl/firmatpp/kierowca/data/upload/RouteActionWorker.kt

@@ -8,9 +8,11 @@ import pl.firmatpp.kierowca.data.ApiErrorKind
 import pl.firmatpp.kierowca.data.ApiErrorMapper
 import pl.firmatpp.kierowca.data.DriverRepository
 import pl.firmatpp.kierowca.data.rethrowIfCancellation
+import pl.firmatpp.kierowca.data.model.DriverRouteDto
 import pl.firmatpp.kierowca.data.model.FinishRouteBody
 import pl.firmatpp.kierowca.data.model.RouteActionResponse
 import pl.firmatpp.kierowca.data.model.StartRouteBody
+import pl.firmatpp.kierowca.data.model.driverLifecycleStatus
 import pl.firmatpp.kierowca.data.sync.DriverSyncRepository
 import pl.firmatpp.kierowca.data.sync.NetworkMonitor
 import pl.firmatpp.kierowca.diagnostics.AppDiagnostics
@@ -31,6 +33,33 @@ class RouteActionWorker(
         if (!NetworkMonitor(applicationContext).isCurrentlyValidated()) return Result.retry()
         val clientActionId = inputData.getString(KEY_CLIENT_ACTION_ID) ?: return Result.failure()
         val action = dao.find(clientActionId) ?: return Result.failure()
+        if (action.status == RouteActionStatus.Confirmed) return Result.success()
+        val startPrerequisite = if (action.action == RouteActionType.Finish) {
+            dao.latestStartBefore(action.routeId, action.createdAtEpochMillis)
+        } else {
+            null
+        }
+        when (routeActionPrerequisiteState(action, startPrerequisite)) {
+            RouteActionPrerequisiteState.Waiting -> {
+                dao.updateStatus(
+                    clientActionId = clientActionId,
+                    status = RouteActionStatus.Pending,
+                    lastError = "Czekam na potwierdzenie rozpoczęcia kursu.",
+                    attemptIncrement = 0,
+                )
+                return Result.retry()
+            }
+            RouteActionPrerequisiteState.Failed -> {
+                dao.updateStatus(
+                    clientActionId = clientActionId,
+                    status = RouteActionStatus.FailedConflict,
+                    lastError = "Najpierw trzeba potwierdzić rozpoczęcie kursu.",
+                    attemptIncrement = 0,
+                )
+                return Result.failure()
+            }
+            RouteActionPrerequisiteState.Ready -> Unit
+        }
         val photoClientRequestIds = photoClientRequestIds(action)
 
         val photoDependencies = photoClientRequestIds.mapNotNull { photoDao.find(it) }
@@ -72,12 +101,25 @@ class RouteActionWorker(
                 lastError = null,
                 attemptIncrement = 0,
             )
+            if (action.action == RouteActionType.Finish) {
+                dao.confirmSupersededFinishes(action.routeId, action.createdAtEpochMillis)
+            }
             syncRepository.cacheConfirmedRoute(response.route, response.route.routeDate)
             DriverSyncWorker.enqueue(applicationContext, response.route.routeDate, response.route.id)
+            if (action.action == RouteActionType.Start) {
+                val outbox = RouteActionOutbox(applicationContext)
+                dao.unconfirmedFinishesAfter(action.routeId, action.createdAtEpochMillis)
+                    .forEach { outbox.enqueueWorker(it.clientActionId) }
+            }
             Result.success()
         }.getOrElse { throwable ->
             throwable.rethrowIfCancellation()
             val error = ApiErrorMapper.map(throwable)
+            val serverRoute = if (error.kind == ApiErrorKind.Conflict) {
+                runCatching { repository.route(action.routeId).route }.getOrNull()
+            } else {
+                null
+            }
             AppDiagnostics.reportNonFatal(
                 throwable = throwable,
                 operation = "route_action_worker",
@@ -89,8 +131,30 @@ class RouteActionWorker(
                     "api_error_code" to error.code,
                     "api_status_code" to error.statusCode,
                     "retryable" to error.retryable,
+                    "server_route_status" to serverRoute?.driverLifecycleStatus(),
                 ),
             )
+            val supersededByConfirmedFinish = action.action == RouteActionType.Finish &&
+                dao.hasConfirmedFinishAfter(action.routeId, action.createdAtEpochMillis)
+            if (serverRoute != null &&
+                (
+                    routeActionMatchesServer(action, photoClientRequestIds, serverRoute) ||
+                        routeActionWasSuperseded(action, supersededByConfirmedFinish, serverRoute)
+                    )
+            ) {
+                dao.updateStatus(
+                    clientActionId = clientActionId,
+                    status = RouteActionStatus.Confirmed,
+                    lastError = null,
+                    attemptIncrement = 0,
+                )
+                if (action.action == RouteActionType.Finish) {
+                    dao.confirmSupersededFinishes(action.routeId, action.createdAtEpochMillis)
+                }
+                syncRepository.cacheConfirmedRoute(serverRoute, serverRoute.routeDate)
+                DriverSyncWorker.enqueue(applicationContext, serverRoute.routeDate, serverRoute.id)
+                return@getOrElse Result.success()
+            }
             val status = when {
                 error.kind == ApiErrorKind.Conflict -> RouteActionStatus.FailedConflict
                 error.retryable -> RouteActionStatus.FailedRetryable
@@ -99,7 +163,7 @@ class RouteActionWorker(
             dao.updateStatus(
                 clientActionId = clientActionId,
                 status = status,
-                lastError = error.message,
+                lastError = routeActionConflictMessage(error.message, serverRoute),
                 attemptIncrement = 0,
             )
 
@@ -116,6 +180,7 @@ class RouteActionWorker(
                     loadingWeight = action.weight,
                     occurredAt = action.occurredAt,
                     photoClientRequestIds = photoClientRequestIds,
+                    loadingNotes = action.notes,
                 ),
             )
             RouteActionType.Finish -> repository.finishRoute(
@@ -125,6 +190,7 @@ class RouteActionWorker(
                     unloadingWeight = action.weight,
                     occurredAt = action.occurredAt,
                     photoClientRequestIds = photoClientRequestIds,
+                    unloadingNotes = action.notes,
                 ),
             )
             else -> error("Nieznana akcja kursu: ${action.action}")
@@ -144,3 +210,84 @@ class RouteActionWorker(
         fun uniqueWorkName(clientActionId: String): String = "route-action-$clientActionId"
     }
 }
+
+internal fun routeActionMatchesServer(
+    action: RouteActionEntity,
+    photoClientRequestIds: List<String>,
+    serverRoute: DriverRouteDto,
+): Boolean {
+    val lifecycleMatches = when (action.action) {
+        RouteActionType.Start -> serverRoute.driverLifecycleStatus() in setOf("W TRAKCIE", "ZAKOŃCZONA")
+        RouteActionType.Finish -> serverRoute.driverLifecycleStatus() == "ZAKOŃCZONA"
+        else -> false
+    }
+    if (!lifecycleMatches) return false
+
+    val serverWeight = when (action.action) {
+        RouteActionType.Start -> serverRoute.loadingWeight
+        RouteActionType.Finish -> serverRoute.unloadingWeight
+        else -> null
+    }
+    val serverNotes = when (action.action) {
+        RouteActionType.Start -> serverRoute.loadingNotes
+        RouteActionType.Finish -> serverRoute.unloadingNotes
+        else -> null
+    }
+    val weightMatches = when {
+        action.weight == null && serverWeight == null -> true
+        action.weight == null || serverWeight == null -> false
+        else -> kotlin.math.abs(action.weight - serverWeight) < 0.0005
+    }
+    val notesMatch = action.notes.normalizedRouteActionNotes() == serverNotes.normalizedRouteActionNotes()
+    val serverPhotoRequestIds = serverRoute.photos
+        .mapNotNull { it.clientRequestId?.trim()?.takeIf(String::isNotBlank) }
+        .toSet()
+    val photosMatch = photoClientRequestIds.all(serverPhotoRequestIds::contains)
+
+    return weightMatches && notesMatch && photosMatch
+}
+
+internal fun routeActionWasSuperseded(
+    action: RouteActionEntity,
+    hasConfirmedFinishAfter: Boolean,
+    serverRoute: DriverRouteDto,
+): Boolean =
+    action.action == RouteActionType.Finish &&
+        hasConfirmedFinishAfter &&
+        serverRoute.driverLifecycleStatus() == "ZAKOŃCZONA"
+
+internal fun routeActionConflictMessage(message: String, serverRoute: DriverRouteDto?): String {
+    val serverStatus = serverRoute?.driverLifecycleStatus() ?: return message
+    val operationalStatus = serverRoute.operationalStatus
+        ?.takeIf(String::isNotBlank)
+        ?.let { ", status operacyjny: $it" }
+        .orEmpty()
+
+    return "$message Status kursu na serwerze: $serverStatus$operationalStatus. Dane w telefonie pozostają zachowane."
+}
+
+private fun String?.normalizedRouteActionNotes(): String? =
+    this?.trim()?.takeIf(String::isNotEmpty)
+
+internal enum class RouteActionPrerequisiteState {
+    Ready,
+    Waiting,
+    Failed,
+}
+
+internal fun routeActionPrerequisiteState(
+    action: RouteActionEntity,
+    precedingStart: RouteActionEntity?,
+): RouteActionPrerequisiteState {
+    if (action.action != RouteActionType.Finish || precedingStart == null) {
+        return RouteActionPrerequisiteState.Ready
+    }
+
+    return when (precedingStart.status) {
+        RouteActionStatus.Confirmed -> RouteActionPrerequisiteState.Ready
+        RouteActionStatus.FailedConflict,
+        RouteActionStatus.FailedPermanent,
+        -> RouteActionPrerequisiteState.Failed
+        else -> RouteActionPrerequisiteState.Waiting
+    }
+}

app/src/main/java/pl/firmatpp/kierowca/diagnostics/DiagnosticSnapshotProvider.kt

@@ -229,18 +229,28 @@ class DiagnosticSnapshotProvider(private val context: Context) {
         val validated = capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
             capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
         val links = activeNetwork?.let(manager::getLinkProperties)
+        val roaming = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            yesNo(!capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING))
+        } else {
+            "niedostępne"
+        }
+        val mtu = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            links?.mtu?.toString() ?: "brak"
+        } else {
+            "niedostępne"
+        }
         return listOf(
             DiagnosticEntry("Transport", transports.joinToString()),
             DiagnosticEntry("Internet zweryfikowany", yesNo(validated), if (validated) DiagnosticSeverity.Good else DiagnosticSeverity.Error),
             DiagnosticEntry("NET_CAPABILITY_INTERNET", yesNo(capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET))),
             DiagnosticEntry("NET_CAPABILITY_VALIDATED", yesNo(capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED))),
             DiagnosticEntry("Sieć mierzona", yesNo(!capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED))),
-            DiagnosticEntry("Roaming", yesNo(!capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING))),
+            DiagnosticEntry("Roaming", roaming),
             DiagnosticEntry("Pasmo downstream / upstream", "${capabilities.linkDownstreamBandwidthKbps} / ${capabilities.linkUpstreamBandwidthKbps} kb/s"),
             DiagnosticEntry("Interfejs", links?.interfaceName ?: "brak"),
             DiagnosticEntry("Adresy IP", links?.linkAddresses?.joinToString { it.toString() }?.ifBlank { "brak" } ?: "brak"),
             DiagnosticEntry("DNS", links?.dnsServers?.joinToString { it.hostAddress ?: it.toString() }?.ifBlank { "brak" } ?: "brak"),
-            DiagnosticEntry("MTU", links?.mtu?.toString() ?: "brak"),
+            DiagnosticEntry("MTU", mtu),
             DiagnosticEntry("Proxy", links?.httpProxy?.toString() ?: "brak"),
         )
     }

app/src/main/java/pl/firmatpp/kierowca/sync/LeaveRequestDecisionNotificationWorker.kt

@@ -57,7 +57,11 @@ class LeaveRequestDecisionNotificationWorker(
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .build()
 
-        NotificationManagerCompat.from(applicationContext).notify(leaveRequestId.hashCode(), notification)
+        try {
+            NotificationManagerCompat.from(applicationContext).notify(leaveRequestId.hashCode(), notification)
+        } catch (_: SecurityException) {
+            return Result.success()
+        }
         return Result.success()
     }
 

app/src/main/java/pl/firmatpp/kierowca/sync/NewRouteNotificationWorker.kt

@@ -73,7 +73,11 @@ class NewRouteNotificationWorker(
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
                 .build()
 
-            NotificationManagerCompat.from(applicationContext).notify(route.id.hashCode(), notification)
+            try {
+                NotificationManagerCompat.from(applicationContext).notify(route.id.hashCode(), notification)
+            } catch (_: SecurityException) {
+                return@runCatching Result.success()
+            }
             Result.success()
         }.getOrElse { throwable ->
             throwable.rethrowIfCancellation()

app/src/main/java/pl/firmatpp/kierowca/tracking/ActiveRouteTrackingService.kt

@@ -1,6 +1,7 @@
 package pl.firmatpp.kierowca.tracking
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -54,6 +55,11 @@ class ActiveRouteTrackingService : Service(), LocationListener {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (intent?.action != ACTION_STOP && !hasLocationPermission()) {
+            stopSelf()
+            return START_NOT_STICKY
+        }
+
         when (intent?.action) {
             ACTION_STOP -> {
                 val requestedRouteId = intent.getStringExtra(EXTRA_ROUTE_ID)
@@ -69,7 +75,9 @@ class ActiveRouteTrackingService : Service(), LocationListener {
                     routeId = id
                     arrived = true
                     runCatching { locationManager.removeUpdates(this) }
-                    startForegroundCompat(buildNotification())
+                    if (!startForegroundCompat(buildNotification())) {
+                        return START_NOT_STICKY
+                    }
                 }
                 return START_NOT_STICKY
             }
@@ -97,7 +105,9 @@ class ActiveRouteTrackingService : Service(), LocationListener {
                     ?: totalDistanceMeters
                 progressEnabled = intent?.getBooleanExtra(EXTRA_PROGRESS_ENABLED, true) ?: progressEnabled
                 if (routeChanged) arrived = false
-                startForegroundCompat(buildNotification())
+                if (!startForegroundCompat(buildNotification())) {
+                    return START_NOT_STICKY
+                }
                 if (!arrived) requestLocationUpdates()
                 return START_NOT_STICKY
             }
@@ -113,9 +123,9 @@ class ActiveRouteTrackingService : Service(), LocationListener {
         if (!arrived && remaining != null && remaining <= arrivalRadiusMeters(location)) {
             arrived = true
             runCatching { locationManager.removeUpdates(this) }
-            startForegroundCompat(buildNotification())
+            if (!startForegroundCompat(buildNotification())) return
         } else {
-            startForegroundCompat(buildNotification())
+            if (!startForegroundCompat(buildNotification())) return
         }
 
         val (battery, charging) = batterySnapshot()
@@ -151,6 +161,7 @@ class ActiveRouteTrackingService : Service(), LocationListener {
         super.onDestroy()
     }
 
+    @SuppressLint("MissingPermission")
     private fun requestLocationUpdates() {
         if (!hasLocationPermission() || routeId.isNullOrBlank() || driverId.isNullOrBlank()) {
             return
@@ -204,11 +215,25 @@ class ActiveRouteTrackingService : Service(), LocationListener {
         return builder.build()
     }
 
-    private fun startForegroundCompat(notification: Notification) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && hasLocationPermission()) {
-            startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION)
-        } else {
-            startForeground(NOTIFICATION_ID, notification)
+    private fun startForegroundCompat(notification: Notification): Boolean {
+        if (!hasLocationPermission()) {
+            stopSelf()
+            return false
+        }
+
+        return try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION)
+            } else {
+                startForeground(NOTIFICATION_ID, notification)
+            }
+            true
+        } catch (_: SecurityException) {
+            stopSelf()
+            false
+        } catch (_: IllegalStateException) {
+            stopSelf()
+            false
         }
     }
 
@@ -220,7 +245,7 @@ class ActiveRouteTrackingService : Service(), LocationListener {
             "Aktywny kurs",
             NotificationManager.IMPORTANCE_LOW,
         ).apply {
-            description = "Postęp aktywnego kursu i lokalizacja w tle"
+            description = "Informacje o aktywnym kursie"
         }
         manager.createNotificationChannel(channel)
     }
@@ -299,6 +324,8 @@ class ActiveRouteTrackingService : Service(), LocationListener {
         private const val ACTIVE_ROUTE_ID = "active_route_id"
 
         fun start(context: Context, route: DriverRouteDto, driver: DriverDto, progressEnabled: Boolean = true) {
+            if (!hasLocationPermission(context)) return
+
             val intent = Intent(context, ActiveRouteTrackingService::class.java).apply {
                 action = ACTION_START
                 putExtra(EXTRA_ROUTE_ID, route.id)
@@ -309,7 +336,7 @@ class ActiveRouteTrackingService : Service(), LocationListener {
                 route.destinationNavigation?.longitude?.let { putExtra(EXTRA_DESTINATION_LON, it) }
                 route.distanceKm?.takeIf { it > 0.0 }?.let { putExtra(EXTRA_TOTAL_DISTANCE_METERS, it * 1000.0) }
             }
-            ContextCompat.startForegroundService(context, intent)
+            runCatching { ContextCompat.startForegroundService(context, intent) }
         }
 
         fun stop(context: Context, routeId: String? = null) {
@@ -325,11 +352,20 @@ class ActiveRouteTrackingService : Service(), LocationListener {
         }
 
         fun markArrived(context: Context, routeId: String) {
+            if (!hasLocationPermission(context)) return
+            val activeRouteId = context.getSharedPreferences(TRACKING_PREFERENCES, Context.MODE_PRIVATE)
+                .getString(ACTIVE_ROUTE_ID, null)
+            if (activeRouteId != routeId) return
+
             val intent = Intent(context, ActiveRouteTrackingService::class.java).apply {
                 action = ACTION_MARK_ARRIVED
                 putExtra(EXTRA_ROUTE_ID, routeId)
             }
-            ContextCompat.startForegroundService(context, intent)
+            runCatching { ContextCompat.startForegroundService(context, intent) }
         }
+
+        private fun hasLocationPermission(context: Context): Boolean =
+            ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
+                ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
     }
 }

app/src/main/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRules.kt

@@ -2,24 +2,36 @@ package pl.firmatpp.kierowca.ui
 
 import java.time.LocalDate
 import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto
+import pl.firmatpp.kierowca.data.model.DriverLeavePoolDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveRequestDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveSummaryDto
+import pl.firmatpp.kierowca.data.model.LeaveRequestTypeDto
 
 data class LeaveRequestsConfig(
     val enabled: Boolean = false,
     val types: List<String> = listOf("URLOP"),
 )
 
+data class AnnualLeaveTotals(
+    val availableMinutes: Int,
+    val reservedMinutes: Int,
+    val usedMinutes: Int,
+    val grantedMinutes: Int,
+    val overdueMinutes: Int,
+)
+
 object DriverLeaveRequestUiRules {
     fun isFeatureVisible(config: LeaveRequestsConfig?): Boolean =
         config?.enabled == true && config.types.isNotEmpty()
 
     fun statusLabel(status: String): String =
         when (status) {
-            "pending" -> "Oczekuje"
-            "approved" -> "Zatwierdzony"
+            "pending" -> "Czeka na decyzję"
+            "approved" -> "Zaakceptowany"
             "rejected" -> "Odrzucony"
-            "cancel_requested" -> "Anulowanie do decyzji"
+            "cancel_requested" -> "Czeka na anulowanie"
             "cancelled" -> "Anulowany"
-            "revoked" -> "Cofnięto decyzję"
+            "revoked" -> "Akceptacja cofnięta"
             else -> "Nieznany status"
         }
 
@@ -33,19 +45,160 @@ object DriverLeaveRequestUiRules {
             "cancellation_requested" -> "Kierowca poprosił o anulowanie"
             "cancellation_approved" -> "Anulowanie zatwierdzone"
             "cancellation_rejected" -> "Anulowanie odrzucone"
+            "period_amended" -> "Zmieniono termin wniosku"
+            "interrupted" -> "Nieobecność została przerwana"
             else -> "Aktualizacja wniosku"
         }
 
     fun typeLabel(type: String): String =
         when (type) {
-            "URLOP" -> "Urlop"
-            "CHOROBOWE" -> "Chorobowe"
-            "SZKOLENIE" -> "Szkolenie"
+            "URLOP", "ANNUAL" -> "Urlop wypoczynkowy"
+            "ANNUAL_ON_DEMAND" -> "Urlop na żądanie"
+            "ANNUAL_DISABILITY" -> "Dodatkowy urlop"
+            "CHOROBOWE", "SICKNESS" -> "Niezdolność do pracy"
+            "SZKOLENIE", "TRAINING" -> "Urlop szkoleniowy"
             "WOLNE" -> "Dzień wolny"
-            "INNE" -> "Inne"
+            "INNE", "OTHER_OPERATIONAL" -> "Inna nieobecność"
+            "FORCE_MAJEURE" -> "Siła wyższa"
+            "CHILD_CARE_14" -> "Opieka nad dzieckiem do 14 lat"
+            "CARE_LEAVE" -> "Urlop opiekuńczy"
+            "MATERNITY" -> "Urlop macierzyński"
+            "MATERNITY_EQUIVALENT" -> "Urlop na warunkach macierzyńskiego"
+            "MATERNITY_SUPPLEMENTARY" -> "Uzupełniający urlop macierzyński"
+            "PARENTAL" -> "Urlop rodzicielski"
+            "PATERNITY" -> "Urlop ojcowski"
+            "CHILDCARE_UNPAID" -> "Urlop wychowawczy"
+            "OCCASIONAL" -> "Zwolnienie okolicznościowe"
+            "REHABILITATION" -> "Turnus rehabilitacyjny"
+            "UNPAID" -> "Urlop bezpłatny"
+            "PREGNANCY_EXAMS" -> "Badania w ciąży"
+            "OCCUPATIONAL_EXAMS" -> "Badania pracownicze"
+            "BLOOD_DONATION" -> "Zwolnienie krwiodawcy"
+            "AUTHORITY_SUMMONS" -> "Wezwanie urzędowe"
+            "RESCUE_DUTIES" -> "Obowiązki ratownicze"
+            "MILITARY_DUTIES" -> "Obowiązki wojskowe"
             else -> type
         }
 
+    fun requestType(request: DriverLeaveRequestDto): String =
+        request.typeLabel?.takeIf { it.isNotBlank() }
+            ?: request.rule?.label?.takeIf { it.isNotBlank() }
+            ?: typeLabel(request.ruleCode ?: request.type)
+
+    fun annualTotals(summary: DriverLeaveSummaryDto?): AnnualLeaveTotals {
+        val annualPools = summary?.pools.orEmpty().filter {
+            it.poolCode == "ANNUAL" && it.unit == "minutes" && it.status == "active"
+        }
+        return AnnualLeaveTotals(
+            availableMinutes = annualPools.sumOf { it.availableQuantity },
+            reservedMinutes = annualPools.sumOf { it.reservedQuantity },
+            usedMinutes = annualPools.sumOf { it.usedQuantity },
+            grantedMinutes = annualPools.sumOf { it.grantedQuantity },
+            overdueMinutes = annualPools.filter { it.year < LocalDate.now().year }.sumOf { it.availableQuantity },
+        )
+    }
+
+    fun annualPools(summary: DriverLeaveSummaryDto?): List<DriverLeavePoolDto> =
+        summary?.pools.orEmpty()
+            .filter { it.poolCode == "ANNUAL" && it.status == "active" }
+            .sortedByDescending { it.year }
+
+    fun formatQuantity(quantity: Int, unit: String, dailyNormMinutes: Int = 480): String {
+        if (unit == "days") return dayCountLabel(quantity)
+
+        val safeNorm = dailyNormMinutes.coerceAtLeast(1)
+        val fullDays = quantity / safeNorm
+        val remainingMinutes = quantity % safeNorm
+        val hours = quantity / 60
+        val minutes = quantity % 60
+        val dayPart = when {
+            fullDays == 0 && remainingMinutes == 0 -> "0 dni"
+            remainingMinutes == 0 -> dayCountLabel(fullDays)
+            fullDays == 0 -> "mniej niż 1 dzień"
+            else -> "${dayCountLabel(fullDays)} + ${formatHours(remainingMinutes)}"
+        }
+
+        return "$dayPart · ${hours} godz.${if (minutes > 0) " ${minutes} min" else ""}"
+    }
+
+    fun formatHours(minutes: Int): String {
+        val hours = minutes / 60
+        val remainder = minutes % 60
+        return when {
+            hours == 0 -> "$remainder min"
+            remainder == 0 -> "$hours godz."
+            else -> "$hours godz. $remainder min"
+        }
+    }
+
+    fun dayCountLabel(days: Int): String {
+        val suffix = when {
+            days == 1 -> "dzień"
+            days % 10 in 2..4 && days % 100 !in 12..14 -> "dni"
+            else -> "dni"
+        }
+        return "$days $suffix"
+    }
+
+    fun modeLabel(mode: String): String = if (mode == "hours") "Kilka godzin" else "Całe dni"
+
+    fun decisionExplanation(type: LeaveRequestTypeDto): String =
+        when (type.decisionMode) {
+            "mandatory_registration" -> "Po spełnieniu wymaganych warunków wniosek jest rejestrowany zgodnie z przepisami."
+            "external_event" -> "Nieobecność wymaga potwierdzenia odpowiednim dokumentem."
+            else -> "Wniosek zostanie przekazany do osoby, która podejmie decyzję."
+        }
+
+    fun fieldLabel(field: String): String =
+        when (field) {
+            "childBirthDate" -> "Data urodzenia dziecka"
+            "settlementMode" -> "Sposób wykorzystania w tym roku"
+            "careRecipientName" -> "Imię i nazwisko osoby wymagającej opieki"
+            "careRecipientRelationship" -> "Kim jest dla Ciebie ta osoba"
+            "careReason" -> "Dlaczego potrzebna jest opieka"
+            "careRecipientAddress" -> "Adres osoby wymagającej opieki"
+            "childrenBornCount" -> "Liczba dzieci urodzonych przy jednym porodzie"
+            "entitlementEventKey" -> "Opis zdarzenia"
+            "partNumber" -> "Która to część urlopu"
+            "childIdentityKey" -> "Imię dziecka"
+            "occasionType" -> "Rodzaj zdarzenia rodzinnego"
+            "examType" -> "Rodzaj egzaminu lub nauki"
+            "educationProgramKey" -> "Nazwa szkoły lub programu"
+            "classification" -> "Czego dotyczy nieobecność"
+            else -> "Dodatkowa informacja"
+        }
+
+    fun fieldHint(field: String): String? =
+        when (field) {
+            "childBirthDate" -> "Wpisz datę w formacie RRRR-MM-DD, np. 2020-05-12"
+            "entitlementEventKey" -> "Np. poród z 15.06.2026"
+            "partNumber" -> "Np. 1"
+            "childIdentityKey" -> "Wystarczy imię i rok urodzenia"
+            "educationProgramKey" -> "Np. Technikum Transportowe w Poznaniu"
+            "classification" -> "Krótko opisz powód, aby kadry mogły go prawidłowo zakwalifikować"
+            else -> null
+        }
+
+    fun documentLabel(type: String): String =
+        when (type) {
+            "disability_certificate" -> "Orzeczenie o niepełnosprawności"
+            "parent_declaration" -> "Oświadczenie rodzica"
+            "birth_document", "birth_or_adoption_document" -> "Dokument potwierdzający urodzenie lub przysposobienie"
+            "adoption_or_care_document" -> "Dokument przysposobienia lub przyjęcia na wychowanie"
+            "hospitalization_certificate" -> "Zaświadczenie o hospitalizacji"
+            "parental_leave_declaration", "childcare_leave_declaration" -> "Oświadczenie dotyczące urlopu rodzicielskiego"
+            "event_document" -> "Dokument potwierdzający zdarzenie"
+            "training_confirmation" -> "Potwierdzenie nauki lub egzaminu"
+            "rehabilitation_referral" -> "Skierowanie na turnus rehabilitacyjny"
+            "medical_referral", "medical_referral_or_confirmation" -> "Skierowanie lub potwierdzenie badania"
+            "blood_donation_certificate" -> "Zaświadczenie o oddaniu krwi"
+            "authority_summons" -> "Wezwanie urzędowe"
+            "rescue_service_confirmation" -> "Potwierdzenie służby ratowniczej"
+            "military_document" -> "Dokument wojskowy"
+            "external_sickness_confirmation" -> "Potwierdzenie niezdolności do pracy"
+            else -> "Wymagany dokument"
+        }
+
     fun canCancel(status: String, dateFrom: String, today: LocalDate = LocalDate.now()): Boolean {
         if (status == "pending") return true
         if (status != "approved") return false

app/src/main/java/pl/firmatpp/kierowca/ui/DriverRouteProjection.kt

@@ -22,13 +22,20 @@ internal val routeActionVisibleStatuses = setOf(
     RouteActionStatus.FailedPermanent,
 )
 
-private val routeActionProjectionStatuses = routeActionVisibleStatuses + RouteActionStatus.Confirmed
+private val routeActionDataProjectionStatuses = routeActionVisibleStatuses + RouteActionStatus.Confirmed
+private val routeActionLifecycleProjectionStatuses = setOf(
+    RouteActionStatus.Pending,
+    RouteActionStatus.WaitingForPhotos,
+    RouteActionStatus.Syncing,
+    RouteActionStatus.FailedRetryable,
+    RouteActionStatus.Confirmed,
+)
 
 fun projectDriverRoute(route: DriverRouteDto, actions: List<RouteActionEntity>): ProjectedDriverRoute {
     val visible = actions
         .filter { it.routeId == route.id && it.status in routeActionVisibleStatuses }
     val projectable = actions
-        .filter { it.routeId == route.id && it.status in routeActionProjectionStatuses }
+        .filter { it.routeId == route.id && it.status in routeActionDataProjectionStatuses }
     var projectedRoute = route
     var loadingWeightPending = false
     var unloadingWeightPending = false
@@ -39,23 +46,33 @@ fun projectDriverRoute(route: DriverRouteDto, actions: List<RouteActionEntity>):
             when (action.action) {
                 RouteActionType.Start -> {
                     projectedRoute = projectedRoute.copy(
-                        status = "W TRAKCIE",
-                        driverStatus = "W TRAKCIE",
                         loadingWeight = action.weight,
-                        trackingStatus = "active",
+                        loadingNotes = action.notes,
                         photos = projectedRoute.safePhotos(),
                     )
+                    if (action.status in routeActionLifecycleProjectionStatuses) {
+                        projectedRoute = projectedRoute.copy(
+                            status = "W TRAKCIE",
+                            driverStatus = "W TRAKCIE",
+                            trackingStatus = "active",
+                        )
+                    }
                     loadingWeightPending = action.status != RouteActionStatus.Confirmed
                 }
                 RouteActionType.Finish -> {
                     projectedRoute = projectedRoute.copy(
-                        status = "ZAKOŃCZONA",
-                        driverStatus = "ZAKOŃCZONA",
                         unloadingWeight = action.weight,
-                        trackingStatus = "finished",
-                        completedAt = action.occurredAt,
+                        unloadingNotes = action.notes,
                         photos = projectedRoute.safePhotos(),
                     )
+                    if (action.status in routeActionLifecycleProjectionStatuses) {
+                        projectedRoute = projectedRoute.copy(
+                            status = "ZAKOŃCZONA",
+                            driverStatus = "ZAKOŃCZONA",
+                            trackingStatus = "finished",
+                            completedAt = action.occurredAt,
+                        )
+                    }
                     unloadingWeightPending = action.status != RouteActionStatus.Confirmed
                 }
             }

app/src/main/java/pl/firmatpp/kierowca/ui/DriverUiRules.kt

@@ -14,6 +14,8 @@ import kotlin.math.abs
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
 import pl.firmatpp.kierowca.data.model.DispatchSheetReminderDto
 import pl.firmatpp.kierowca.data.model.RoutePhotoDto
+import pl.firmatpp.kierowca.data.model.TachographReminderDto
+import pl.firmatpp.kierowca.data.model.TachographReminderTaskDto
 import pl.firmatpp.kierowca.data.model.driverLifecycleStatus
 import pl.firmatpp.kierowca.data.upload.PhotoUploadEntity
 import pl.firmatpp.kierowca.data.upload.PhotoUploadStatus
@@ -25,6 +27,7 @@ import pl.firmatpp.kierowca.data.upload.RouteActionType
 private val shortDateFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("dd.MM")
 private val routeWeightKilogramInputThreshold = BigDecimal("1000")
 private const val routeWeightMaxTons = 999.999
+const val routeStageNotesMaxLength = 2000
 private const val googleMapsPackage = "com.google.android.apps.maps"
 
 data class NavigationIntentCandidate(
@@ -39,6 +42,42 @@ data class AppUpdateBannerUi(
     val downloaded: Boolean,
 )
 
+object RouteLocationMode {
+    const val Disabled = "disabled"
+    const val Optional = "optional"
+    const val Required = "required"
+}
+
+fun normalizeRouteLocationMode(value: String?): String = when (value) {
+    RouteLocationMode.Disabled,
+    RouteLocationMode.Required,
+    -> value
+    else -> RouteLocationMode.Optional
+}
+
+fun shouldTrackRouteLocation(
+    mode: String,
+    optionalLocationEnabled: Boolean,
+    hasLocationPermission: Boolean,
+): Boolean = hasLocationPermission && when (normalizeRouteLocationMode(mode)) {
+    RouteLocationMode.Disabled -> false
+    RouteLocationMode.Required -> true
+    else -> optionalLocationEnabled
+}
+
+fun routeStartRequiresLocationPermission(
+    mode: String,
+    hasLocationPermission: Boolean,
+): Boolean = normalizeRouteLocationMode(mode) == RouteLocationMode.Required && !hasLocationPermission
+
+fun shouldWarnAboutRequiredRouteLocation(
+    mode: String,
+    hasActiveRoute: Boolean,
+    hasLocationPermission: Boolean,
+): Boolean = normalizeRouteLocationMode(mode) == RouteLocationMode.Required &&
+    hasActiveRoute &&
+    !hasLocationPermission
+
 fun appUpdateBannerUi(
     currentVersionCode: Int,
     latestVersionCode: Int?,
@@ -239,6 +278,8 @@ fun routeStageRequirementIsVisible(requirement: String): Boolean =
 fun routeStageRequirementIsRequired(requirement: String): Boolean =
     normalizeRouteStageRequirement(requirement) == RouteStageRequirement.Required
 
+fun normalizeRouteStageNotes(value: String): String = value.take(routeStageNotesMaxLength)
+
 fun parseRouteWeightTons(weightText: String): Double? {
     val enteredWeight = weightText.trim().replace(',', '.').toBigDecimalOrNull() ?: return null
     val tons = if (enteredWeight.abs() >= routeWeightKilogramInputThreshold) {
@@ -632,6 +673,16 @@ fun canLaunchCameraWithLocationPolicy(requirePreciseLocation: Boolean, hasFineLo
 fun shouldShowDispatchSheetReminderCard(reminder: DispatchSheetReminderDto?): Boolean =
     reminder?.dueToday == true && reminder.status in setOf("missing", "uploaded")
 
+fun shouldShowTachographReminderCard(reminder: TachographReminderDto?): Boolean =
+    reminder?.enabled == true &&
+        reminder.visible &&
+        !reminder.title.isNullOrBlank() &&
+        !reminder.message.isNullOrBlank() &&
+        !reminder.tasks.isNullOrEmpty()
+
+fun defaultTachographConfirmationSelection(tasks: List<TachographReminderTaskDto>): Set<String> =
+    if (tasks.size == 1) setOf(tasks.single().id) else emptySet()
+
 fun dispatchSheetPrimaryActionLabel(reminder: DispatchSheetReminderDto?, hasQueuedUpload: Boolean): String =
     when {
         hasQueuedUpload -> "Wysyłam zdjęcie..."

app/src/main/java/pl/firmatpp/kierowca/ui/DriverViewModel.kt

@@ -1,11 +1,16 @@
 package pl.firmatpp.kierowca.ui
 
+import android.Manifest
 import android.app.Application
+import android.content.pm.PackageManager
 import android.net.Uri
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.google.firebase.messaging.FirebaseMessaging
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
@@ -15,11 +20,13 @@ import kotlinx.coroutines.sync.withLock
 import java.time.LocalDate
 import java.time.Instant
 import java.io.IOException
+import java.util.UUID
 import pl.firmatpp.kierowca.data.AppPreferencesStore
 import pl.firmatpp.kierowca.data.ApiErrorMapper
 import pl.firmatpp.kierowca.data.ApiErrorKind
 import pl.firmatpp.kierowca.data.DriverRepository
 import pl.firmatpp.kierowca.data.PhotoUploadMetadata
+import pl.firmatpp.kierowca.data.rethrowIfCancellation
 import pl.firmatpp.kierowca.data.sync.DriverSyncRepository
 import pl.firmatpp.kierowca.data.sync.NetworkMonitor
 import pl.firmatpp.kierowca.data.sync.StartupOfflineFallbackLoader
@@ -27,9 +34,13 @@ import pl.firmatpp.kierowca.data.model.DispatchSheetReminderDto
 import pl.firmatpp.kierowca.data.model.AppUpdateDto
 import pl.firmatpp.kierowca.data.model.DriverDto
 import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveDocumentDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveForecastDto
 import pl.firmatpp.kierowca.data.model.DriverLeaveRequestDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveSummaryDto
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
 import pl.firmatpp.kierowca.data.model.RoutePhotoDto
+import pl.firmatpp.kierowca.data.model.TachographReminderDto
 import pl.firmatpp.kierowca.data.model.driverLifecycleStatus
 import pl.firmatpp.kierowca.data.upload.DispatchSheetUploadEntity
 import pl.firmatpp.kierowca.data.upload.DispatchSheetUploadOutbox
@@ -81,6 +92,8 @@ data class DriverUiState(
     val allowGalleryUploads: Boolean = true,
     val allowRouteCompletion: Boolean = false,
     val requirePreciseLocationForPhotos: Boolean = false,
+    val routeLocationMode: String = RouteLocationMode.Optional,
+    val routeLocationEnabled: Boolean = false,
     val loadingPhotoRequirement: String = RouteStageRequirement.Required,
     val loadingWeightRequirement: String = RouteStageRequirement.Required,
     val unloadingPhotoRequirement: String = RouteStageRequirement.Required,
@@ -91,20 +104,32 @@ data class DriverUiState(
     val selectedRoute: DriverRouteDto? = null,
     val selectedPhoto: RoutePhotoDto? = null,
     val routeStageWeightText: String = "",
+    val routeStageNotesText: String = "",
     val routeActions: List<RouteActionEntity> = emptyList(),
     val visibleRouteActions: List<RouteActionEntity> = emptyList(),
     val photoUploads: List<PhotoUploadEntity> = emptyList(),
     val queuedPhotoUploads: List<PhotoUploadEntity> = emptyList(),
     val dispatchSheetReminder: DispatchSheetReminderDto? = null,
+    val tachographReminder: TachographReminderDto? = null,
+    val tachographReminderSubmitting: Boolean = false,
     val appUpdate: AppUpdateDto? = null,
     val dispatchSheetUploads: List<DispatchSheetUploadEntity> = emptyList(),
     val leaveRequestsConfig: LeaveRequestsConfig? = null,
+    val leaveSummary: DriverLeaveSummaryDto? = null,
     val leaveRequests: List<DriverLeaveRequestDto> = emptyList(),
     val selectedLeaveRequest: DriverLeaveRequestDto? = null,
     val leaveRequestDateFrom: String = LocalDate.now().toString(),
     val leaveRequestDateTo: String = LocalDate.now().toString(),
     val leaveRequestType: String = "URLOP",
+    val leaveRequestMode: String = "days",
+    val leaveRequestHoursText: String = "",
+    val leaveRequestDetails: Map<String, String> = emptyMap(),
+    val leaveRequestIdempotencyKey: String = "",
     val leaveRequestNote: String = "",
+    val leaveForecast: DriverLeaveForecastDto? = null,
+    val leaveForecastLoading: Boolean = false,
+    val leaveDocuments: List<DriverLeaveDocumentDto> = emptyList(),
+    val leaveDocumentUploading: Boolean = false,
     val leaveCalendarEntries: List<DriverLeaveCalendarEntryDto> = emptyList(),
     val leaveCalendarLoading: Boolean = false,
     val leaveCalendarLoadedUntil: String? = null,
@@ -193,6 +218,31 @@ internal fun DriverUiState.withLoadedLeaveRequests(
     )
 }
 
+internal fun shouldStartRoutesLoad(
+    screen: DriverScreen,
+    navigateToRoutes: Boolean,
+    startupOfflineOnly: Boolean,
+    startupLoadInProgress: Boolean = false,
+): Boolean =
+    (!startupLoadInProgress || navigateToRoutes || startupOfflineOnly) &&
+        (screen != DriverScreen.Initializing || navigateToRoutes || startupOfflineOnly)
+
+internal fun screenAfterBootstrap(
+    currentScreen: DriverScreen,
+    navigateToRoutes: Boolean,
+    leaveRequestsEnabled: Boolean,
+): DriverScreen = when {
+    currentScreen == DriverScreen.Initializing -> DriverScreen.Routes
+    !leaveRequestsEnabled && currentScreen in setOf(
+        DriverScreen.LeaveRequests,
+        DriverScreen.LeaveRequestDetail,
+        DriverScreen.LeaveCalendar,
+        DriverScreen.AddLeaveRequest,
+    ) -> DriverScreen.Routes
+    navigateToRoutes -> DriverScreen.Routes
+    else -> currentScreen
+}
+
 class DriverViewModel(application: Application) : AndroidViewModel(application) {
     private val appPreferencesStore = AppPreferencesStore(application)
     private val repository = DriverRepository(application)
@@ -227,6 +277,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
     private var routesRequestGeneration: Long = 0
     private var routeDetailRequestGeneration: Long = 0
     private var routesLoadJob: Job? = null
+    private var startupLoadInProgress: Boolean = false
     val state: StateFlow<DriverUiState> = _state
 
     init {
@@ -240,6 +291,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                 _state.update { it.copy(routeProgressNotificationEnabled = enabled) }
             }
         }
+        viewModelScope.launch {
+            appPreferencesStore.routeLocationEnabled.collect { enabled ->
+                _state.update { it.copy(routeLocationEnabled = enabled) }
+                reconcileTrackingServiceFromState()
+            }
+        }
         viewModelScope.launch {
             photoUploadOutbox.observeQueuedUploads().collect { uploads ->
                 _state.update { it.copy(queuedPhotoUploads = uploads) }
@@ -458,6 +515,39 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         loadRoutes(date = date, showLoading = true, navigateToRoutes = true)
     }
 
+    fun acknowledgeTachographReminder(taskIds: List<String>) {
+        val snapshot = _state.value
+        if (taskIds.isEmpty() || snapshot.tachographReminderSubmitting) return
+        if (!snapshot.isOnline) {
+            _state.update { it.copy(error = "Potwierdzenie odczytu wymaga połączenia z internetem.") }
+            return
+        }
+
+        viewModelScope.launch {
+            _state.update {
+                it.copy(
+                    tachographReminderSubmitting = true,
+                    error = null,
+                    feedback = null,
+                )
+            }
+            runCatching { repository.acknowledgeTachographReminder(taskIds) }
+                .onSuccess { reminder ->
+                    _state.update {
+                        it.copy(
+                            tachographReminder = reminder,
+                            feedback = "Zapisano potwierdzenie odczytu.",
+                            error = null,
+                        )
+                    }
+                }
+                .onFailure { throwable ->
+                    _state.update { it.withApiError(throwable) }
+                }
+            _state.update { it.copy(tachographReminderSubmitting = false) }
+        }
+    }
+
     fun dismissRouteDayLiveUpdate() {
         _state.update { it.copy(routeDayLiveUpdateMessage = null) }
     }
@@ -468,24 +558,35 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         navigateToRoutes: Boolean,
         startupOfflineOnly: Boolean = false,
     ) {
+        val requestSnapshot = _state.value
+        if (!shouldStartRoutesLoad(
+                screen = requestSnapshot.screen,
+                navigateToRoutes = navigateToRoutes,
+                startupOfflineOnly = startupOfflineOnly,
+                startupLoadInProgress = startupLoadInProgress,
+            )
+        ) {
+            return
+        }
+        val isStartup = requestSnapshot.screen == DriverScreen.Initializing
+        if (isStartup) startupLoadInProgress = true
         val generation = ++routesRequestGeneration
         routesLoadJob?.cancel()
-        routesLoadJob = viewModelScope.launch {
-            val isStartup = _state.value.screen == DriverScreen.Initializing
+        val loadJob = viewModelScope.launch {
             _state.update { it.copy(loading = showLoading, refreshing = !showLoading, feedback = null, error = null) }
 
             runCatching {
                 val cached = when {
                     startupOfflineOnly -> syncRepository.bootstrapFromCache(date)
                         ?: throw IOException("Brak zapisanych danych dla wybranego dnia.")
-                    !_state.value.isOnline -> syncRepository.bootstrapFromCache(date)
-                        ?: throw IOException("Brak zapisanych danych dla wybranego dnia.")
                     isStartup -> {
                         startupOfflineFallbackLoader.load(
                             onlineLoad = { syncRepository.bootstrap(date) },
                             offlineLoad = { syncRepository.bootstrapFromCache(date) },
                         )
                     }
+                    !_state.value.isOnline -> syncRepository.bootstrapFromCache(date)
+                        ?: throw IOException("Brak zapisanych danych dla wybranego dnia.")
                     else -> syncRepository.bootstrap(date)
                 }
                 val response = cached.value
@@ -497,6 +598,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                         driver = response.session.driver,
                         routes = response.routes.today,
                         dispatchSheetReminder = response.dispatchSheetReminder,
+                        tachographReminder = response.tachographReminder,
                         appUpdate = response.appUpdate ?: it.appUpdate,
                         selectedDate = settings?.selectedDate ?: date ?: it.selectedDate,
                         minRouteDate = settings?.minDate ?: it.minRouteDate,
@@ -506,6 +608,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                         allowRouteCompletion = settings?.allowRouteCompletion ?: it.allowRouteCompletion,
                         requirePreciseLocationForPhotos = settings?.requirePreciseLocationForPhotos
                             ?: it.requirePreciseLocationForPhotos,
+                        routeLocationMode = normalizeRouteLocationMode(settings?.routeLocationMode),
                         loadingPhotoRequirement = normalizeRouteStageRequirement(settings?.loadingPhotoRequirement),
                         loadingWeightRequirement = normalizeRouteStageRequirement(settings?.loadingWeightRequirement),
                         unloadingPhotoRequirement = normalizeRouteStageRequirement(settings?.unloadingPhotoRequirement),
@@ -513,10 +616,11 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                         leaveRequestsConfig = settings?.leaveRequests?.let { config ->
                             LeaveRequestsConfig(enabled = config.enabled, types = config.types)
                         },
-                        screen = if (
-                            settings?.leaveRequests?.enabled != true &&
-                            it.screen in setOf(DriverScreen.LeaveRequests, DriverScreen.LeaveRequestDetail, DriverScreen.AddLeaveRequest)
-                        ) DriverScreen.Routes else if (navigateToRoutes) DriverScreen.Routes else it.screen,
+                        screen = screenAfterBootstrap(
+                            currentScreen = it.screen,
+                            navigateToRoutes = navigateToRoutes,
+                            leaveRequestsEnabled = settings?.leaveRequests?.enabled == true,
+                        ),
                         notifyNewRoutes = response.notificationPreferences?.notifyNewRoutes ?: it.notifyNewRoutes,
                         imageAuthHeader = repository.imageAuthHeader(),
                         isStale = cached.stale || !it.isOnline,
@@ -530,10 +634,20 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                     if (_state.value.isOnline && !cached.stale) registerPushTokenIfAvailable(driverId)
                 }
                 observeDispatchSheetUploads(response.dispatchSheetReminder?.workDate)
-                if (_state.value.isOnline && !cached.stale && settings?.selectedDate == settings?.today) {
+                val trackingSnapshot = _state.value
+                if (
+                    !shouldTrackRouteLocation(
+                        trackingSnapshot.routeLocationMode,
+                        trackingSnapshot.routeLocationEnabled,
+                        hasLocationPermission(),
+                    )
+                ) {
+                    ActiveRouteTrackingService.stop(getApplication())
+                } else if (trackingSnapshot.isOnline && !cached.stale && settings?.selectedDate == settings?.today) {
                     reconcileTrackingService(response.routes.today, response.session.driver)
                 }
             }.onFailure { throwable ->
+                throwable.rethrowIfCancellation()
                 if (generation != routesRequestGeneration) return@onFailure
                 reportHandledException("load_routes", throwable, mapOf("date" to date))
                 if (ApiErrorMapper.map(throwable).kind == ApiErrorKind.Auth) {
@@ -551,6 +665,14 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                 it.copy(loading = false, refreshing = false)
             }
         }
+        routesLoadJob = loadJob
+        if (isStartup) {
+            loadJob.invokeOnCompletion {
+                if (generation == routesRequestGeneration) {
+                    startupLoadInProgress = false
+                }
+            }
+        }
     }
 
     fun openRoute(routeId: String) = openRouteWithTarget(routeId, DriverScreen.Detail)
@@ -575,6 +697,11 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                     DriverScreen.FinishRoute -> response.route.unloadingWeight?.toString().orEmpty()
                     else -> it.routeStageWeightText
                 },
+                routeStageNotesText = when (targetScreen) {
+                    DriverScreen.LoadingWeight -> response.route.loadingNotes.orEmpty()
+                    DriverScreen.FinishRoute -> response.route.unloadingNotes.orEmpty()
+                    else -> it.routeStageNotesText
+                },
                 feedback = null,
                 isStale = cached.stale || !it.isOnline,
                 lastServerSyncAtEpochMillis = cached.syncedAtEpochMillis ?: it.lastServerSyncAtEpochMillis,
@@ -634,6 +761,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
 
     fun openProfile() {
         _state.update { it.copy(screen = DriverScreen.Profile, error = null) }
+        if (
+            DriverLeaveRequestUiRules.isFeatureVisible(_state.value.leaveRequestsConfig) &&
+            _state.value.isOnline
+        ) {
+            viewModelScope.launch { loadLeaveOverview(showLoading = false, navigateToList = false) }
+        }
     }
 
     fun openDiagnostics() {
@@ -694,6 +827,8 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                         DiagnosticEntry("Galeria", if (runtime.allowGalleryUploads) "włączona" else "wyłączona"),
                         DiagnosticEntry("Kończenie kursu", if (runtime.allowRouteCompletion) "włączone" else "wyłączone"),
                         DiagnosticEntry("Dokładna lokalizacja zdjęć", if (runtime.requirePreciseLocationForPhotos) "wymagana" else "niewymagana"),
+                        DiagnosticEntry("Lokalizacja kursu", runtime.routeLocationMode),
+                        DiagnosticEntry("Wybór kierowcy", if (runtime.routeLocationEnabled) "włączony" else "wyłączony"),
                         DiagnosticEntry("Załadunek, zdjęcie", runtime.loadingPhotoRequirement),
                         DiagnosticEntry("Załadunek, tonaż", runtime.loadingWeightRequirement),
                         DiagnosticEntry("Rozładunek, zdjęcie", runtime.unloadingPhotoRequirement),
@@ -790,6 +925,36 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         }
     }
 
+    fun setRouteLocationEnabled(enabled: Boolean) {
+        if (_state.value.routeLocationMode != RouteLocationMode.Optional) return
+
+        _state.update { it.copy(routeLocationEnabled = enabled, error = null) }
+        reconcileTrackingServiceFromState()
+        viewModelScope.launch {
+            runCatching { appPreferencesStore.setRouteLocationEnabled(enabled) }
+                .onFailure { throwable -> _state.update { it.withApiError(throwable) } }
+        }
+    }
+
+    fun onLocationPermissionGranted() {
+        val snapshot = _state.value
+        val driver = snapshot.driver ?: return
+        if (!shouldTrackRouteLocation(snapshot.routeLocationMode, snapshot.routeLocationEnabled, hasLocationPermission())) {
+            return
+        }
+        val activeRoute = snapshot.displaySelectedRoute
+            ?.takeIf { it.driverLifecycleStatus() == "W TRAKCIE" }
+            ?: snapshot.displayRoutes.firstOrNull { it.driverLifecycleStatus() == "W TRAKCIE" }
+            ?: return
+
+        ActiveRouteTrackingService.start(
+            context = getApplication(),
+            route = activeRoute,
+            driver = driver,
+            progressEnabled = snapshot.routeProgressNotificationEnabled,
+        )
+    }
+
     fun openPhotoQueue() {
         _state.update { it.copy(screen = DriverScreen.PhotoQueue, error = null) }
     }
@@ -818,13 +983,34 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
     }
 
     private suspend fun loadLeaveRequests(showLoading: Boolean, navigateToList: Boolean): Boolean {
+        return loadLeaveOverview(showLoading, navigateToList)
+    }
+
+    private suspend fun loadLeaveOverview(showLoading: Boolean, navigateToList: Boolean): Boolean {
         _state.update { it.copy(loading = showLoading, refreshing = !showLoading, error = null, feedback = null) }
-        val result = runCatching { repository.leaveRequests() }
-        result.onSuccess { requests ->
+        val (requestsResult, summaryResult) = coroutineScope {
+            val requests = async { runCatching { repository.leaveRequests() } }
+            val summary = async { runCatching { repository.leaveSummary() } }
+            requests.await() to summary.await()
+        }
+        requestsResult.onSuccess { requests ->
             _state.update { it.withLoadedLeaveRequests(requests, navigateToList) }
         }.onFailure { throwable -> _state.update { it.withApiError(throwable) } }
+        summaryResult.onSuccess { summary ->
+            _state.update {
+                it.copy(
+                    leaveSummary = summary,
+                    leaveForecast = if (it.screen == DriverScreen.AddLeaveRequest) null else it.leaveForecast,
+                )
+            }
+        }.onFailure { throwable ->
+            if (requestsResult.isSuccess) {
+                val message = ApiErrorMapper.map(throwable).message
+                _state.update { it.copy(error = "Nie udało się odświeżyć salda urlopu. $message") }
+            }
+        }
         _state.update { it.copy(loading = false, refreshing = false) }
-        return result.isSuccess
+        return requestsResult.isSuccess
     }
 
     fun openLeaveRequest(id: String) {
@@ -842,9 +1028,23 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         }
         viewModelScope.launch {
             _state.update { it.copy(loading = true, error = null, feedback = null) }
-            runCatching { repository.leaveRequest(id) }
-                .onSuccess { request ->
-                    _state.update { it.copy(screen = DriverScreen.LeaveRequestDetail, selectedLeaveRequest = request, error = null) }
+            val (requestResult, documentsResult) = coroutineScope {
+                val leaveRequest = async { runCatching { repository.leaveRequest(id) } }
+                val documents = async { runCatching { repository.leaveDocuments(id) } }
+                leaveRequest.await() to documents.await()
+            }
+            requestResult
+                .onSuccess { leaveRequest ->
+                    _state.update {
+                        it.copy(
+                            screen = DriverScreen.LeaveRequestDetail,
+                            selectedLeaveRequest = leaveRequest,
+                            leaveDocuments = documentsResult.getOrDefault(emptyList()),
+                            error = documentsResult.exceptionOrNull()?.let { error ->
+                                "Nie udało się pobrać listy dokumentów. ${ApiErrorMapper.map(error).message}"
+                            },
+                        )
+                    }
                 }
                 .onFailure { throwable -> _state.update { it.withApiError(throwable) } }
             _state.update { it.copy(loading = false) }
@@ -858,14 +1058,44 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             _state.update { it.copy(error = "Złożenie wniosku urlopowego wymaga połączenia z internetem.") }
             return
         }
+        if (_state.value.leaveSummary?.availableTypes.isNullOrEmpty()) {
+            viewModelScope.launch {
+                _state.update { it.copy(loading = true, error = null) }
+                runCatching { repository.leaveSummary() }
+                    .onSuccess { summary ->
+                        _state.update { it.copy(leaveSummary = summary, loading = false) }
+                        beginLeaveRequestDraft(config)
+                    }
+                    .onFailure { throwable ->
+                        _state.update { it.withApiError(throwable).copy(loading = false) }
+                    }
+            }
+            return
+        }
+        beginLeaveRequestDraft(config)
+    }
+
+    private fun beginLeaveRequestDraft(config: LeaveRequestsConfig?) {
         val today = LocalDate.now().toString()
+        val defaultType = _state.value.leaveSummary?.availableTypes?.firstOrNull()
+        val type = defaultType?.value ?: config?.types?.firstOrNull() ?: "URLOP"
+        val mode = defaultType?.requestModes?.firstOrNull() ?: "days"
         _state.update {
             it.copy(
-                screen = DriverScreen.LeaveCalendar,
+                screen = DriverScreen.AddLeaveRequest,
                 leaveRequestDateFrom = today,
                 leaveRequestDateTo = today,
-                leaveRequestType = config?.types?.firstOrNull() ?: "URLOP",
+                leaveRequestType = type,
+                leaveRequestMode = mode,
+                leaveRequestHoursText = "",
+                leaveRequestDetails = if ("settlementMode" in defaultType?.requiredFields.orEmpty()) {
+                    mapOf("settlementMode" to mode)
+                } else {
+                    emptyMap()
+                },
+                leaveRequestIdempotencyKey = UUID.randomUUID().toString(),
                 leaveRequestNote = "",
+                leaveForecast = null,
                 leaveCalendarEntries = emptyList(),
                 leaveCalendarLoadedUntil = null,
                 leaveCalendarHasSelection = false,
@@ -874,22 +1104,64 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                 feedback = null,
             )
         }
-        loadMoreLeaveCalendarMonths(reset = true)
     }
 
-    fun updateLeaveRequestDraft(dateFrom: String? = null, dateTo: String? = null, type: String? = null, note: String? = null) {
+    fun updateLeaveRequestType(type: String) {
+        val metadata = _state.value.leaveSummary?.availableTypes?.firstOrNull { it.value == type }
         _state.update {
-            val nextFrom = dateFrom ?: it.leaveRequestDateFrom
-            val nextTo = dateTo ?: it.leaveRequestDateTo
             it.copy(
-                leaveRequestDateFrom = nextFrom,
-                leaveRequestDateTo = if (nextTo < nextFrom) nextFrom else nextTo,
-                leaveRequestType = type ?: it.leaveRequestType,
-                leaveRequestNote = note ?: it.leaveRequestNote,
+                leaveRequestType = type,
+                leaveRequestMode = metadata?.requestModes?.firstOrNull() ?: "days",
+                leaveRequestHoursText = "",
+                leaveRequestDetails = if ("settlementMode" in metadata?.requiredFields.orEmpty()) {
+                    mapOf("settlementMode" to (metadata?.requestModes?.firstOrNull() ?: "days"))
+                } else {
+                    emptyMap()
+                },
+                leaveForecast = null,
+                error = null,
             )
         }
     }
 
+    fun updateLeaveRequestMode(mode: String) {
+        val metadata = selectedLeaveRequestType() ?: return
+        if (mode !in metadata.requestModes) return
+        _state.update {
+            it.copy(
+                leaveRequestMode = mode,
+                leaveRequestDateTo = if (mode == "hours") it.leaveRequestDateFrom else it.leaveRequestDateTo,
+                leaveRequestHoursText = if (mode == "hours") it.leaveRequestHoursText else "",
+                leaveRequestDetails = if ("settlementMode" in metadata.requiredFields) {
+                    it.leaveRequestDetails + ("settlementMode" to mode)
+                } else {
+                    it.leaveRequestDetails
+                },
+                leaveForecast = null,
+                error = null,
+            )
+        }
+    }
+
+    fun updateLeaveRequestHours(value: String) {
+        val normalized = value.filter { it.isDigit() || it == ',' || it == '.' }.take(5)
+        _state.update { it.copy(leaveRequestHoursText = normalized, leaveForecast = null, error = null) }
+    }
+
+    fun updateLeaveRequestDetail(field: String, value: String) {
+        _state.update {
+            it.copy(
+                leaveRequestDetails = it.leaveRequestDetails + (field to value),
+                leaveForecast = null,
+                error = null,
+            )
+        }
+    }
+
+    fun updateLeaveRequestNote(value: String) {
+        _state.update { it.copy(leaveRequestNote = value, error = null) }
+    }
+
     fun selectLeaveCalendarDate(date: String) {
         val selected = runCatching { LocalDate.parse(date) }.getOrNull() ?: return
         if (selected.isBefore(LocalDate.now())) return
@@ -925,7 +1197,15 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             return
         }
 
-        _state.update { it.copy(screen = DriverScreen.AddLeaveRequest, error = null, feedback = null) }
+        _state.update {
+            it.copy(
+                screen = DriverScreen.AddLeaveRequest,
+                leaveRequestDateTo = if (it.leaveRequestMode == "hours") it.leaveRequestDateFrom else it.leaveRequestDateTo,
+                leaveForecast = null,
+                error = null,
+                feedback = null,
+            )
+        }
     }
 
     fun reopenLeaveCalendarFromDraft() {
@@ -943,6 +1223,52 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         }
     }
 
+    fun refreshLeaveForecast() {
+        val snapshot = _state.value
+        if (!snapshot.isOnline || snapshot.leaveForecastLoading) return
+        if (!snapshot.leaveCalendarHasSelection) {
+            _state.update { it.copy(error = "Najpierw wybierz termin nieobecności.") }
+            return
+        }
+        val type = selectedLeaveRequestType()
+        if (type == null) {
+            _state.update { it.copy(error = "Wybierz rodzaj nieobecności.") }
+            return
+        }
+        val missingField = type.requiredFields
+            .filterNot { it == "settlementMode" }
+            .firstOrNull { snapshot.leaveRequestDetails[it].isNullOrBlank() }
+        if (missingField != null) {
+            _state.update {
+                it.copy(error = "Uzupełnij pole „${DriverLeaveRequestUiRules.fieldLabel(missingField)}”.")
+            }
+            return
+        }
+        val requestedMinutes = requestedLeaveMinutes(snapshot)
+        if (snapshot.leaveRequestMode == "hours" && requestedMinutes == null) {
+            _state.update { it.copy(error = "Wpisz liczbę godzin, o które chcesz wnioskować.") }
+            return
+        }
+
+        viewModelScope.launch {
+            _state.update { it.copy(leaveForecastLoading = true, leaveForecast = null, error = null) }
+            runCatching {
+                repository.leaveForecast(
+                    dateFrom = snapshot.leaveRequestDateFrom,
+                    dateTo = snapshot.leaveRequestDateTo,
+                    type = snapshot.leaveRequestType,
+                    requestMode = snapshot.leaveRequestMode,
+                    requestedQuantity = requestedMinutes,
+                )
+            }.onSuccess { forecast ->
+                _state.update { it.copy(leaveForecast = forecast, error = null) }
+            }.onFailure { throwable ->
+                _state.update { it.withApiError(throwable) }
+            }
+            _state.update { it.copy(leaveForecastLoading = false) }
+        }
+    }
+
     fun loadMoreLeaveCalendarMonths(reset: Boolean = false) {
         val snapshot = _state.value
         if (!DriverLeaveRequestUiRules.isFeatureVisible(snapshot.leaveRequestsConfig) || snapshot.leaveCalendarLoading) return
@@ -997,6 +1323,14 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             _state.update { it.copy(error = "Wysłanie wniosku wymaga połączenia z internetem.") }
             return
         }
+        if (snapshot.leaveForecast == null) {
+            _state.update { it.copy(error = "Najpierw wybierz „Sprawdź wniosek”, aby zobaczyć jego podsumowanie.") }
+            return
+        }
+        if (!snapshot.leaveForecast.sufficientBalance) {
+            _state.update { it.copy(error = "Nie możesz wysłać tego wniosku, ponieważ dostępne saldo jest za małe.") }
+            return
+        }
         if (!leaveMutationMutex.tryLock()) return
         if (snapshot.leaveRequestDateFrom < LocalDate.now().toString()) {
             _state.update { it.copy(error = "Data od nie może być z przeszłości.") }
@@ -1012,16 +1346,30 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                     dateFrom = snapshot.leaveRequestDateFrom,
                     dateTo = snapshot.leaveRequestDateTo,
                     type = snapshot.leaveRequestType,
+                    requestMode = snapshot.leaveRequestMode,
+                    requestedQuantity = requestedLeaveMinutes(snapshot),
+                    details = snapshot.leaveRequestDetails,
+                    idempotencyKey = snapshot.leaveRequestIdempotencyKey.ifBlank { UUID.randomUUID().toString() },
                     note = snapshot.leaveRequestNote.takeIf { it.isNotBlank() },
                 )
             }.onSuccess { created ->
-                val requests = runCatching { repository.leaveRequests() }.getOrElse { listOf(created) }
+                val (requests, summary) = coroutineScope {
+                    val refreshedRequests = async { runCatching { repository.leaveRequests() }.getOrElse { listOf(created) } }
+                    val refreshedSummary = async { runCatching { repository.leaveSummary() }.getOrNull() }
+                    refreshedRequests.await() to refreshedSummary.await()
+                }
                 _state.update {
                     it.copy(
                         screen = DriverScreen.LeaveRequestDetail,
                         selectedLeaveRequest = created,
+                        leaveDocuments = emptyList(),
                         leaveRequests = requests,
-                        feedback = "Wniosek został wysłany do decyzji.",
+                        leaveSummary = summary ?: it.leaveSummary,
+                        feedback = if (created.balanceConfigurationRequired) {
+                            "Wniosek zapisano. Kadry muszą jeszcze potwierdzić saldo, zanim będzie można go zaakceptować."
+                        } else {
+                            "Gotowe. Wniosek został wysłany i odpowiednia część salda jest już zarezerwowana."
+                        },
                         error = null,
                     )
                 }
@@ -1036,6 +1384,51 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         }
     }
 
+    fun uploadSelectedLeaveDocument(documentType: String, uri: Uri) {
+        val request = _state.value.selectedLeaveRequest ?: return
+        if (!_state.value.isOnline || _state.value.leaveDocumentUploading) {
+            if (!_state.value.isOnline) {
+                _state.update { it.copy(error = "Dodanie dokumentu wymaga połączenia z internetem.") }
+            }
+            return
+        }
+
+        viewModelScope.launch {
+            _state.update { it.copy(leaveDocumentUploading = true, error = null, feedback = null) }
+            runCatching { repository.uploadLeaveDocument(request.id, documentType, uri) }
+                .onSuccess { document ->
+                    _state.update {
+                        val updatedRequest = it.selectedLeaveRequest?.copy(
+                            missingDocumentTypes = it.selectedLeaveRequest.missingDocumentTypes - documentType,
+                        )
+                        it.copy(
+                            selectedLeaveRequest = updatedRequest,
+                            leaveRequests = it.leaveRequests.map { leaveRequest ->
+                                if (leaveRequest.id == updatedRequest?.id) updatedRequest else leaveRequest
+                            },
+                            leaveDocuments = (it.leaveDocuments.filterNot { existing ->
+                                existing.documentType == document.documentType
+                            } + document).sortedBy { item -> item.documentType },
+                            feedback = "Dokument został bezpiecznie dołączony do wniosku.",
+                            error = null,
+                        )
+                    }
+                }
+                .onFailure { throwable -> _state.update { it.withApiError(throwable) } }
+            _state.update { it.copy(leaveDocumentUploading = false) }
+        }
+    }
+
+    private fun selectedLeaveRequestType() =
+        _state.value.leaveSummary?.availableTypes?.firstOrNull { it.value == _state.value.leaveRequestType }
+
+    private fun requestedLeaveMinutes(state: DriverUiState): Int? {
+        if (state.leaveRequestMode != "hours") return null
+        val hours = state.leaveRequestHoursText.replace(',', '.').toDoubleOrNull() ?: return null
+        val minutes = (hours * 60).toInt()
+        return minutes.takeIf { it > 0 }
+    }
+
     fun cancelSelectedLeaveRequest() {
         val request = _state.value.selectedLeaveRequest ?: return
         if (!_state.value.isOnline) {
@@ -1050,10 +1443,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             try {
             runCatching { repository.cancelLeaveRequest(request.id, request.version) }
                 .onSuccess { updated ->
+                    val refreshedSummary = runCatching { repository.leaveSummary() }.getOrNull()
                     _state.update {
                         it.copy(
                             selectedLeaveRequest = updated,
                             leaveRequests = it.leaveRequests.map { existing -> if (existing.id == updated.id) updated else existing },
+                            leaveSummary = refreshedSummary ?: it.leaveSummary,
                             feedback = if (updated.status == "cancel_requested") "Anulowanie wysłane do decyzji." else "Wniosek został anulowany.",
                             error = null,
                         )
@@ -1101,6 +1496,10 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
     fun openStartRoute() {
         val snapshot = _state.value
         val route = snapshot.selectedRoute ?: return
+        if (routeStartRequiresLocationPermission(snapshot.routeLocationMode, hasLocationPermission())) {
+            _state.update { it.copy(error = "Lokalizacja jest wymagana, aby rozpocząć kurs.") }
+            return
+        }
         if (!canStartRouteFromDriverApp(route, snapshot.selectedDate)) {
             _state.update { it.copy(error = "Załadunek nie jest dostępny poza zaplanowanym zakresem kursu.") }
             return
@@ -1113,6 +1512,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             it.copy(
                 screen = targetScreen,
                 routeStageWeightText = "",
+                routeStageNotesText = route.loadingNotes.orEmpty(),
                 feedback = null,
                 error = null,
             )
@@ -1157,6 +1557,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             it.copy(
                 screen = DriverScreen.FinishRoute,
                 routeStageWeightText = route.unloadingWeight?.toString().orEmpty(),
+                routeStageNotesText = route.unloadingNotes.orEmpty(),
                 feedback = null,
                 error = null,
             )
@@ -1168,6 +1569,10 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         _state.update { it.copy(routeStageWeightText = normalized) }
     }
 
+    fun updateRouteStageNotes(value: String) {
+        _state.update { it.copy(routeStageNotesText = normalizeRouteStageNotes(value)) }
+    }
+
     fun correctFailedRouteAction() {
         val snapshot = _state.value
         val action = (snapshot.visibleRouteActions + snapshot.routeActions)
@@ -1199,6 +1604,30 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         }
     }
 
+    fun retryConflictedRouteAction() {
+        val snapshot = _state.value
+        val action = (snapshot.visibleRouteActions + snapshot.routeActions)
+            .distinctBy { it.clientActionId }
+            .filter { it.status == RouteActionStatus.FailedConflict }
+            .maxByOrNull { it.createdAtEpochMillis }
+            ?: return
+
+        viewModelScope.launch {
+            runCatching {
+                routeActionOutbox.retry(action.clientActionId)
+            }
+                .onSuccess {
+                    _state.update {
+                        it.copy(
+                            feedback = "Ponawiam wysyłanie zapisanych danych.",
+                            error = null,
+                        )
+                    }
+                }
+                .onFailure { throwable -> _state.update { it.withApiError(throwable) } }
+        }
+    }
+
     fun submitStartRoute() {
         submitRouteStage(stage = "loading")
     }
@@ -1210,6 +1639,10 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
     private fun submitRouteStage(stage: String) {
         val snapshot = _state.value
         val route = snapshot.selectedRoute ?: return
+        if (stage == "loading" && routeStartRequiresLocationPermission(snapshot.routeLocationMode, hasLocationPermission())) {
+            _state.update { it.copy(error = "Lokalizacja jest wymagana, aby rozpocząć kurs.") }
+            return
+        }
         val canSubmitStage = if (stage == "loading") {
             canStartRouteFromDriverApp(route, snapshot.selectedDate)
         } else {
@@ -1233,6 +1666,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         } else {
             null
         }
+        val notes = normalizeRouteStageNotes(snapshot.routeStageNotesText).trim().takeIf { it.isNotBlank() }
         val stagePhotos = routePhotosForStage(route.photos, stage)
         val stageUploads = routeStageUsableUploads(
             snapshot.photoUploads.filter { normalizedRoutePhotoStage(it.stage) == stage },
@@ -1279,21 +1713,23 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             runCatching {
                 val updatedRoute = when (stage) {
                     "loading" -> {
-                        routeActionOutbox.enqueueStart(route.id, weight, photoClientRequestIds)
+                        routeActionOutbox.enqueueStart(route.id, weight, photoClientRequestIds, notes)
                         route.copy(
                             status = "W TRAKCIE",
                             driverStatus = "W TRAKCIE",
                             loadingWeight = weight,
+                            loadingNotes = notes,
                             trackingStatus = "active",
                             photos = route.safePhotos(),
                         )
                     }
                     "unloading" -> {
-                        routeActionOutbox.enqueueFinish(route.id, weight, photoClientRequestIds)
+                        routeActionOutbox.enqueueFinish(route.id, weight, photoClientRequestIds, notes)
                         route.copy(
                             status = "ZAKOŃCZONA",
                             driverStatus = "ZAKOŃCZONA",
                             unloadingWeight = weight,
+                            unloadingNotes = notes,
                             trackingStatus = "finished",
                             completedAt = Instant.now().toString(),
                             photos = route.safePhotos(),
@@ -1308,6 +1744,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                         selectedRoute = updatedRoute,
                         routes = it.routes.map { item -> if (item.id == route.id) updatedRoute else item },
                         routeStageWeightText = "",
+                        routeStageNotesText = "",
                         feedback = if (stage == "loading") {
                             if (snapshot.isOnline) "Potwierdzam załadunek z serwerem." else "Załadunek zapisano w telefonie. Wyślemy go po odzyskaniu internetu."
                         } else {
@@ -1317,7 +1754,15 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                     )
                 }
 
-                if (stage == "loading" && driver != null) {
+                if (
+                    stage == "loading" &&
+                    driver != null &&
+                    shouldTrackRouteLocation(
+                        snapshot.routeLocationMode,
+                        snapshot.routeLocationEnabled,
+                        hasLocationPermission(),
+                    )
+                ) {
                     ActiveRouteTrackingService.start(
                         context = getApplication(),
                         route = updatedRoute,
@@ -1486,12 +1931,25 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             when (it.screen) {
                 DriverScreen.Photo -> it.copy(screen = DriverScreen.Detail, selectedPhoto = null)
                 DriverScreen.PhotoQueue -> it.copy(screen = DriverScreen.Routes)
-                DriverScreen.StartRoute -> it.copy(screen = DriverScreen.Detail, routeStageWeightText = "", feedback = null)
+                DriverScreen.StartRoute -> it.copy(
+                    screen = DriverScreen.Detail,
+                    routeStageWeightText = "",
+                    routeStageNotesText = "",
+                    feedback = null,
+                )
                 DriverScreen.LoadingWeight -> it.copy(screen = DriverScreen.StartRoute, feedback = null)
-                DriverScreen.FinishRoute -> it.copy(screen = DriverScreen.Detail, routeStageWeightText = "", feedback = null)
+                DriverScreen.FinishRoute -> it.copy(
+                    screen = DriverScreen.Detail,
+                    routeStageWeightText = "",
+                    routeStageNotesText = "",
+                    feedback = null,
+                )
                 DriverScreen.LeaveRequests -> it.copy(screen = DriverScreen.Routes)
                 DriverScreen.LeaveRequestDetail -> it.copy(screen = DriverScreen.LeaveRequests, selectedLeaveRequest = null, feedback = null)
-                DriverScreen.LeaveCalendar -> it.copy(screen = DriverScreen.LeaveRequests, feedback = null)
+                DriverScreen.LeaveCalendar -> it.copy(
+                    screen = if (it.leaveRequestIdempotencyKey.isNotBlank()) DriverScreen.AddLeaveRequest else DriverScreen.LeaveRequests,
+                    feedback = null,
+                )
                 DriverScreen.AddLeaveRequest -> it.copy(screen = DriverScreen.LeaveRequests, feedback = null)
                 DriverScreen.Detail -> {
                     photoUploadsJob?.cancel()
@@ -1571,8 +2029,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
     }
 
     private fun reconcileTrackingService(routes: List<DriverRouteDto>, driver: DriverDto) {
+        val snapshot = _state.value
         val activeRoute = routes.firstOrNull { it.driverLifecycleStatus() == "W TRAKCIE" }
-        if (activeRoute == null) {
+        if (
+            activeRoute == null ||
+            !shouldTrackRouteLocation(snapshot.routeLocationMode, snapshot.routeLocationEnabled, hasLocationPermission())
+        ) {
             ActiveRouteTrackingService.stop(getApplication())
         } else {
             ActiveRouteTrackingService.start(
@@ -1585,7 +2047,11 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
     }
 
     private fun reconcileTrackingServiceForRoute(route: DriverRouteDto, driver: DriverDto?) {
-        if (route.driverLifecycleStatus() == "W TRAKCIE") {
+        val snapshot = _state.value
+        if (
+            route.driverLifecycleStatus() == "W TRAKCIE" &&
+            shouldTrackRouteLocation(snapshot.routeLocationMode, snapshot.routeLocationEnabled, hasLocationPermission())
+        ) {
             if (driver != null) {
                 ActiveRouteTrackingService.start(
                     context = getApplication(),
@@ -1599,6 +2065,20 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         }
     }
 
+    private fun reconcileTrackingServiceFromState() {
+        val snapshot = _state.value
+        val driver = snapshot.driver
+        if (driver == null) {
+            ActiveRouteTrackingService.stop(getApplication())
+            return
+        }
+        reconcileTrackingService(snapshot.displayRoutes, driver)
+    }
+
+    private fun hasLocationPermission(): Boolean =
+        ContextCompat.checkSelfPermission(getApplication(), Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
+            ContextCompat.checkSelfPermission(getApplication(), Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
+
     private fun observeRouteActions(routeId: String) {
         routeActionsJob?.cancel()
         routeActionsJob = viewModelScope.launch {
@@ -1632,7 +2112,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
     }
 
     private suspend fun checkRemoteSyncState() {
-        if (!_state.value.isOnline) return
+        val initialSnapshot = _state.value
+        if (
+            !initialSnapshot.isOnline ||
+            initialSnapshot.screen == DriverScreen.Initializing ||
+            initialSnapshot.driver == null
+        ) return
         syncCheckMutex.withLock {
             syncHintMutex.withLock { highestHintVersions.clear() }
             val snapshot = _state.value
@@ -1679,6 +2164,8 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
     }
 
     private suspend fun handleSyncHint(hint: DriverSyncHint) {
+        val initialSnapshot = _state.value
+        if (initialSnapshot.screen == DriverScreen.Initializing || initialSnapshot.driver == null) return
         syncHintMutex.withLock {
         val hintKey = listOf(hint.scope, hint.date ?: "-", hint.routeId ?: "-").joinToString(":")
         val previousVersion = highestHintVersions[hintKey]
@@ -1715,7 +2202,13 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                     if (pending == null || hint.version > pending.version) pendingLeaveHint = hint
                     return
                 }
-                if (snapshot.screen == DriverScreen.LeaveRequests || snapshot.screen == DriverScreen.LeaveRequestDetail) {
+                if (snapshot.screen in setOf(
+                        DriverScreen.Profile,
+                        DriverScreen.LeaveRequests,
+                        DriverScreen.LeaveRequestDetail,
+                        DriverScreen.AddLeaveRequest,
+                    )
+                ) {
                     if (loadLeaveRequests(showLoading = false, navigateToList = false)) {
                         syncRepository.saveSyncScope(hint.asScope())
                     }

app/src/main/java/pl/firmatpp/kierowca/ui/LiveVoiceDictation.kt

@@ -0,0 +1,337 @@
+package pl.firmatpp.kierowca.ui
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.speech.RecognitionListener
+import android.speech.RecognizerIntent
+import android.speech.SpeechRecognizer
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Mic
+import androidx.compose.material.icons.outlined.StopCircle
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import pl.firmatpp.kierowca.ui.theme.TppTheme
+
+internal data class VoiceDictationUiState(
+    val isListening: Boolean = false,
+    val message: String = "Możesz wpisać uwagę albo podyktować ją po polsku.",
+    val isError: Boolean = false,
+)
+
+internal fun mergeDictationText(existingText: String, recognizedText: String): String {
+    val existing = existingText.trimEnd()
+    val recognized = recognizedText.trim()
+    if (recognized.isBlank()) return normalizeRouteStageNotes(existingText)
+
+    return normalizeRouteStageNotes(
+        if (existing.isBlank()) recognized else "$existing $recognized",
+    )
+}
+
+@Composable
+internal fun VoiceNotesField(
+    value: String,
+    onValueChange: (String) -> Unit,
+    stageLabel: String,
+    enabled: Boolean,
+    onListeningChanged: (Boolean) -> Unit = {},
+    modifier: Modifier = Modifier,
+) {
+    val context = LocalContext.current
+    var dictationState by remember { mutableStateOf(VoiceDictationUiState()) }
+    val currentValue by rememberUpdatedState(value)
+    val currentOnValueChange by rememberUpdatedState(onValueChange)
+    val controller = remember(context) { AndroidLiveVoiceDictation(context.applicationContext) }
+
+    val startDictation = {
+        controller.start(
+            existingText = currentValue,
+            onText = currentOnValueChange,
+            onState = { dictationState = it },
+        )
+    }
+    val microphonePermissionLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestPermission(),
+    ) { granted ->
+        if (granted) {
+            startDictation()
+        } else {
+            dictationState = VoiceDictationUiState(
+                message = "Brak dostępu do mikrofonu. Możesz nadal wpisać uwagę ręcznie.",
+                isError = true,
+            )
+        }
+    }
+
+    LaunchedEffect(dictationState.isListening) {
+        onListeningChanged(dictationState.isListening)
+    }
+
+    DisposableEffect(controller) {
+        onDispose {
+            onListeningChanged(false)
+            controller.destroy()
+        }
+    }
+
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(10.dp),
+    ) {
+        OutlinedTextField(
+            value = value,
+            onValueChange = { currentOnValueChange(normalizeRouteStageNotes(it)) },
+            label = { Text("Uwagi do $stageLabel (opcjonalnie)") },
+            placeholder = { Text("Np. oczekiwanie, uszkodzenie, problem z dokumentami…") },
+            supportingText = {
+                Row(
+                    Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                ) {
+                    Text("Zapisujemy tylko tekst uwagi.")
+                    Text("${value.length}/$routeStageNotesMaxLength")
+                }
+            },
+            readOnly = dictationState.isListening,
+            enabled = enabled,
+            minLines = 3,
+            maxLines = 6,
+            modifier = Modifier.fillMaxWidth(),
+        )
+
+        OutlinedButton(
+            onClick = {
+                if (dictationState.isListening) {
+                    controller.stop()
+                } else if (
+                    ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) ==
+                    PackageManager.PERMISSION_GRANTED
+                ) {
+                    startDictation()
+                } else {
+                    microphonePermissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
+                }
+            },
+            enabled = enabled,
+            modifier = Modifier.fillMaxWidth().heightIn(min = 52.dp),
+        ) {
+            Icon(
+                imageVector = if (dictationState.isListening) Icons.Outlined.StopCircle else Icons.Outlined.Mic,
+                contentDescription = null,
+            )
+            Text(
+                text = if (dictationState.isListening) "Zakończ dyktowanie" else "Dyktuj uwagę",
+                modifier = Modifier.padding(start = 10.dp),
+                fontWeight = FontWeight.Bold,
+            )
+        }
+
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(10.dp),
+        ) {
+            if (dictationState.isListening) {
+                CircularProgressIndicator(
+                    modifier = Modifier.size(18.dp),
+                    strokeWidth = 2.dp,
+                    color = TppTheme.colors.forest,
+                )
+            }
+            Text(
+                text = dictationState.message,
+                color = if (dictationState.isError) Color(0xFFB42318) else TppTheme.colors.muted,
+            )
+        }
+    }
+}
+
+private class AndroidLiveVoiceDictation(
+    private val context: Context,
+) : RecognitionListener {
+    private var recognizer: SpeechRecognizer? = null
+    private var prefix: String = ""
+    private var onText: ((String) -> Unit)? = null
+    private var onState: ((VoiceDictationUiState) -> Unit)? = null
+    private var listening = false
+
+    fun start(
+        existingText: String,
+        onText: (String) -> Unit,
+        onState: (VoiceDictationUiState) -> Unit,
+    ) {
+        if (! SpeechRecognizer.isRecognitionAvailable(context)) {
+            onState(
+                VoiceDictationUiState(
+                    message = "Na tym telefonie nie ma usługi rozpoznawania mowy. Wpisz uwagę ręcznie.",
+                    isError = true,
+                ),
+            )
+            return
+        }
+
+        this.prefix = existingText
+        this.onText = onText
+        this.onState = onState
+
+        if (recognizer == null) {
+            recognizer = SpeechRecognizer.createSpeechRecognizer(context).also {
+                it.setRecognitionListener(this)
+            }
+        }
+
+        listening = true
+        emitState("Uruchamiam mikrofon…")
+        runCatching {
+            recognizer?.startListening(recognitionIntent())
+        }.onFailure {
+            listening = false
+            emitState("Nie udało się uruchomić dyktowania. Spróbuj ponownie.", isError = true)
+        }
+    }
+
+    fun stop() {
+        if (! listening) return
+        emitState("Kończę i sprawdzam rozpoznany tekst…")
+        recognizer?.stopListening()
+    }
+
+    fun destroy() {
+        listening = false
+        onText = null
+        onState = null
+        recognizer?.cancel()
+        recognizer?.destroy()
+        recognizer = null
+    }
+
+    override fun onReadyForSpeech(params: Bundle?) {
+        emitState("Słucham… Mów normalnie. Rozpoznany tekst pojawia się wyżej na żywo.")
+    }
+
+    override fun onBeginningOfSpeech() {
+        emitState("Rozpoznaję mowę na żywo…")
+    }
+
+    override fun onRmsChanged(rmsdB: Float) = Unit
+
+    override fun onBufferReceived(buffer: ByteArray?) = Unit
+
+    override fun onEndOfSpeech() {
+        emitState("Sprawdzam rozpoznany tekst…")
+    }
+
+    override fun onError(error: Int) {
+        listening = false
+        emitState(speechRecognitionErrorMessage(error), isError = true)
+    }
+
+    override fun onResults(results: Bundle?) {
+        val recognized = bestRecognitionResult(results)
+        if (recognized.isNotBlank()) {
+            onText?.invoke(mergeDictationText(prefix, recognized))
+        }
+        listening = false
+        emitState(
+            if (recognized.isBlank()) {
+                "Nie wykryto tekstu. Naciśnij „Dyktuj uwagę” i spróbuj ponownie."
+            } else {
+                "Rozpoznano: „${recognized.take(160)}”. Możesz teraz poprawić tekst."
+            },
+            isError = recognized.isBlank(),
+        )
+    }
+
+    override fun onPartialResults(partialResults: Bundle?) {
+        val recognized = bestRecognitionResult(partialResults)
+        if (recognized.isBlank()) return
+
+        onText?.invoke(mergeDictationText(prefix, recognized))
+        emitState("Na żywo: „${recognized.take(160)}”")
+    }
+
+    override fun onEvent(eventType: Int, params: Bundle?) = Unit
+
+    private fun recognitionIntent(): Intent =
+        Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
+            putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+            putExtra(RecognizerIntent.EXTRA_LANGUAGE, "pl-PL")
+            putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, true)
+            putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 3)
+            putExtra(RecognizerIntent.EXTRA_PREFER_OFFLINE, false)
+            putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, context.packageName)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                putExtra(
+                    RecognizerIntent.EXTRA_ENABLE_FORMATTING,
+                    RecognizerIntent.FORMATTING_OPTIMIZE_LATENCY,
+                )
+                putExtra(RecognizerIntent.EXTRA_HIDE_PARTIAL_TRAILING_PUNCTUATION, true)
+            }
+        }
+
+    private fun bestRecognitionResult(bundle: Bundle?): String =
+        bundle
+            ?.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)
+            ?.firstOrNull()
+            .orEmpty()
+            .trim()
+
+    private fun emitState(message: String, isError: Boolean = false) {
+        onState?.invoke(
+            VoiceDictationUiState(
+                isListening = listening,
+                message = message,
+                isError = isError,
+            ),
+        )
+    }
+}
+
+internal fun speechRecognitionErrorMessage(error: Int): String = when (error) {
+    SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS ->
+        "Brak dostępu do mikrofonu. Możesz wpisać uwagę ręcznie."
+    SpeechRecognizer.ERROR_SPEECH_TIMEOUT ->
+        "Nie usłyszałem mowy. Naciśnij „Dyktuj uwagę” i spróbuj ponownie."
+    SpeechRecognizer.ERROR_NO_MATCH ->
+        "Nie rozpoznano słów. Mów wyraźnie i spróbuj ponownie."
+    SpeechRecognizer.ERROR_NETWORK,
+    SpeechRecognizer.ERROR_NETWORK_TIMEOUT ->
+        "Rozpoznawanie mowy nie ma teraz połączenia. Spróbuj ponownie lub wpisz uwagę."
+    SpeechRecognizer.ERROR_RECOGNIZER_BUSY ->
+        "Mikrofon jest teraz zajęty. Odczekaj chwilę i spróbuj ponownie."
+    SpeechRecognizer.ERROR_LANGUAGE_NOT_SUPPORTED,
+    SpeechRecognizer.ERROR_LANGUAGE_UNAVAILABLE ->
+        "Polskie rozpoznawanie mowy nie jest dostępne na tym telefonie."
+    else ->
+        "Nie udało się rozpoznać mowy. Spróbuj ponownie lub wpisz uwagę ręcznie."
+}

app/src/main/java/pl/firmatpp/kierowca/ui/PhotoLocationProvider.kt

@@ -0,0 +1,97 @@
+package pl.firmatpp.kierowca.ui
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.pm.PackageManager
+import android.location.Location
+import android.location.LocationListener
+import android.location.LocationManager
+import android.os.Build
+import android.os.CancellationSignal
+import android.os.Looper
+import androidx.core.content.ContextCompat
+import kotlin.coroutines.resume
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withTimeoutOrNull
+
+private const val PHOTO_LOCATION_PROVIDER_TIMEOUT_MILLIS = 5_000L
+
+internal suspend fun currentPhotoLocation(context: Context): Location? {
+    if (!hasAnyLocationPermission(context)) return null
+
+    val manager = context.getSystemService(Context.LOCATION_SERVICE) as? LocationManager ?: return null
+    val hasFineLocation = ContextCompat.checkSelfPermission(
+        context,
+        Manifest.permission.ACCESS_FINE_LOCATION,
+    ) == PackageManager.PERMISSION_GRANTED
+    val providers = buildList {
+        if (hasFineLocation) add(LocationManager.GPS_PROVIDER)
+        add(LocationManager.NETWORK_PROVIDER)
+    }.filter { provider -> runCatching { manager.isProviderEnabled(provider) }.getOrDefault(false) }
+
+    for (provider in providers) {
+        val location = withTimeoutOrNull(PHOTO_LOCATION_PROVIDER_TIMEOUT_MILLIS) {
+            manager.awaitSingleLocation(context, provider)
+        }
+        if (location != null) return location
+    }
+
+    return bestLastKnownLocation(manager)
+}
+
+@SuppressLint("MissingPermission")
+private suspend fun LocationManager.awaitSingleLocation(
+    context: Context,
+    provider: String,
+): Location? = suspendCancellableCoroutine { continuation ->
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        val cancellationSignal = CancellationSignal()
+        continuation.invokeOnCancellation { cancellationSignal.cancel() }
+        runCatching {
+            getCurrentLocation(provider, cancellationSignal, context.mainExecutor) { location ->
+                if (continuation.isActive) continuation.resume(location)
+            }
+        }.onFailure {
+            if (continuation.isActive) continuation.resume(null)
+        }
+        return@suspendCancellableCoroutine
+    }
+
+    val listener = object : LocationListener {
+        override fun onLocationChanged(location: Location) {
+            removeUpdates(this)
+            if (continuation.isActive) continuation.resume(location)
+        }
+    }
+    continuation.invokeOnCancellation { runCatching { removeUpdates(listener) } }
+    runCatching {
+        @Suppress("DEPRECATION")
+        requestSingleUpdate(provider, listener, Looper.getMainLooper())
+    }.onFailure {
+        if (continuation.isActive) continuation.resume(null)
+    }
+}
+
+private fun hasAnyLocationPermission(context: Context): Boolean =
+    ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
+        ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
+
+@SuppressLint("MissingPermission")
+private fun bestLastKnownLocation(manager: LocationManager): Location? {
+    val providers = listOf(
+        LocationManager.GPS_PROVIDER,
+        LocationManager.NETWORK_PROVIDER,
+        LocationManager.PASSIVE_PROVIDER,
+    )
+
+    return providers.mapNotNull { provider ->
+        runCatching {
+            if (manager.isProviderEnabled(provider) || provider == LocationManager.PASSIVE_PROVIDER) {
+                manager.getLastKnownLocation(provider)
+            } else {
+                null
+            }
+        }.getOrNull()
+    }.maxByOrNull { it.time }
+}

app/src/test/java/pl/firmatpp/kierowca/data/DriverLeaveApiContractTest.kt

@@ -0,0 +1,83 @@
+package pl.firmatpp.kierowca.data
+
+import com.google.gson.Gson
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import pl.firmatpp.kierowca.data.model.DriverLeaveRequestDto
+import pl.firmatpp.kierowca.data.model.LeaveSummaryResponse
+
+class DriverLeaveApiContractTest {
+    private val gson = Gson()
+
+    @Test
+    fun parsesNewLeaveSummaryWithoutTechnicalFallbacks() {
+        val response = gson.fromJson(
+            """
+            {
+              "data": {
+                "dailyNormMinutes": 480,
+                "balanceConfigured": true,
+                "overdueQuantity": 480,
+                "pools": [{
+                  "id": 7,
+                  "poolCode": "ANNUAL",
+                  "year": 2026,
+                  "unit": "minutes",
+                  "availableQuantity": 7680,
+                  "reservedQuantity": 960,
+                  "usedQuantity": 960,
+                  "grantedQuantity": 9600,
+                  "status": "active"
+                }],
+                "availableTypes": [{
+                  "value": "URLOP",
+                  "code": "ANNUAL",
+                  "label": "Urlop wypoczynkowy",
+                  "requestModes": ["days", "hours"],
+                  "requiredFields": [],
+                  "requiredDocuments": [],
+                  "fieldOptions": {},
+                  "description": "Urlop rozliczany według grafiku."
+                }]
+              }
+            }
+            """.trimIndent(),
+            LeaveSummaryResponse::class.java,
+        )
+
+        assertEquals(480, response.data.dailyNormMinutes)
+        assertEquals(7680, response.data.pools.single().availableQuantity)
+        assertEquals("URLOP", response.data.availableTypes.single().value)
+        assertEquals("ANNUAL", response.data.availableTypes.single().code)
+        assertTrue("hours" in response.data.availableTypes.single().requestModes)
+    }
+
+    @Test
+    fun parsesSensitiveOwnRequestDetailsAsFormValues() {
+        val request = gson.fromJson(
+            """
+            {
+              "id": "12",
+              "dateFrom": "2026-08-03",
+              "dateTo": "2026-08-03",
+              "type": "WOLNE",
+              "ruleCode": "CHILD_CARE_14",
+              "requestMode": "days",
+              "requestedQuantity": 480,
+              "details": {
+                "childrenBornCount": 1,
+                "childBirthDate": "2020-05-12"
+              },
+              "status": "pending",
+              "missingDocumentTypes": ["parent_declaration"]
+            }
+            """.trimIndent(),
+            DriverLeaveRequestDto::class.java,
+        )
+
+        assertEquals("1", request.details["childrenBornCount"])
+        assertEquals("2020-05-12", request.details["childBirthDate"])
+        assertEquals(listOf("parent_declaration"), request.missingDocumentTypes)
+    }
+}

app/src/test/java/pl/firmatpp/kierowca/data/api/ApiFactoryTest.kt

@@ -0,0 +1,19 @@
+package pl.firmatpp.kierowca.data.api
+
+import okhttp3.Request
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class ApiFactoryTest {
+    @Test
+    fun `request contains current driver app version header`() {
+        val request = Request.Builder()
+            .url("https://api.example.test/mobile/driver/bootstrap")
+            .header(DRIVER_APP_VERSION_HEADER, "old-version")
+            .build()
+
+        val updated = request.withDriverAppVersion("1.0.65")
+
+        assertEquals("1.0.65", updated.header(DRIVER_APP_VERSION_HEADER))
+    }
+}

app/src/test/java/pl/firmatpp/kierowca/data/upload/RouteActionPrerequisiteTest.kt

@@ -0,0 +1,61 @@
+package pl.firmatpp.kierowca.data.upload
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class RouteActionPrerequisiteTest {
+    @Test
+    fun finishWaitsUntilEarlierStartIsConfirmed() {
+        val finish = action(RouteActionType.Finish, RouteActionStatus.Pending, createdAt = 2_000)
+        val pendingStart = action(RouteActionType.Start, RouteActionStatus.Syncing, createdAt = 1_000)
+
+        assertEquals(
+            RouteActionPrerequisiteState.Waiting,
+            routeActionPrerequisiteState(finish, pendingStart),
+        )
+    }
+
+    @Test
+    fun finishRunsAfterEarlierStartIsConfirmed() {
+        val finish = action(RouteActionType.Finish, RouteActionStatus.Pending, createdAt = 2_000)
+        val confirmedStart = action(RouteActionType.Start, RouteActionStatus.Confirmed, createdAt = 1_000)
+
+        assertEquals(
+            RouteActionPrerequisiteState.Ready,
+            routeActionPrerequisiteState(finish, confirmedStart),
+        )
+    }
+
+    @Test
+    fun failedStartBlocksFinishInsteadOfSendingItOutOfOrder() {
+        val finish = action(RouteActionType.Finish, RouteActionStatus.Pending, createdAt = 2_000)
+        val failedStart = action(RouteActionType.Start, RouteActionStatus.FailedConflict, createdAt = 1_000)
+
+        assertEquals(
+            RouteActionPrerequisiteState.Failed,
+            routeActionPrerequisiteState(finish, failedStart),
+        )
+    }
+
+    @Test
+    fun finishWithoutLocalStartCanUseServerLifecycleState() {
+        val finish = action(RouteActionType.Finish, RouteActionStatus.Pending, createdAt = 2_000)
+
+        assertEquals(
+            RouteActionPrerequisiteState.Ready,
+            routeActionPrerequisiteState(finish, null),
+        )
+    }
+
+    private fun action(type: String, status: String, createdAt: Long): RouteActionEntity =
+        RouteActionEntity(
+            clientActionId = "$type-$createdAt",
+            routeId = "route-1",
+            action = type,
+            weight = 12.5,
+            occurredAt = "2026-07-23T10:00:00Z",
+            photoClientRequestIdsJson = "[]",
+            status = status,
+            createdAtEpochMillis = createdAt,
+        )
+}

app/src/test/java/pl/firmatpp/kierowca/data/upload/RouteActionServerReconciliationTest.kt

@@ -0,0 +1,135 @@
+package pl.firmatpp.kierowca.data.upload
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import pl.firmatpp.kierowca.data.model.DriverRouteDto
+import pl.firmatpp.kierowca.data.model.RoutePhotoDto
+
+class RouteActionServerReconciliationTest {
+    @Test
+    fun matchingFinishedRouteConfirmsDuplicateFinishSafely() {
+        assertTrue(
+            routeActionMatchesServer(
+                action = finish(weight = 11.8, notes = "Uszkodzona plomba."),
+                photoClientRequestIds = listOf("photo-1"),
+                serverRoute = route(
+                    status = "ZAKOŃCZONA",
+                    weight = 11.8,
+                    notes = "Uszkodzona plomba.",
+                    photoClientRequestIds = listOf("photo-1"),
+                ),
+            ),
+        )
+    }
+
+    @Test
+    fun differingNotesKeepConflictVisibleAndPreserveLocalData() {
+        assertFalse(
+            routeActionMatchesServer(
+                action = finish(weight = 11.8, notes = "Uwagi z telefonu"),
+                photoClientRequestIds = listOf("photo-1"),
+                serverRoute = route(
+                    status = "ZAKOŃCZONA",
+                    weight = 11.8,
+                    notes = "Inna uwaga na serwerze",
+                    photoClientRequestIds = listOf("photo-1"),
+                ),
+            ),
+        )
+    }
+
+    @Test
+    fun missingServerPhotoDoesNotDiscardLocalFinish() {
+        assertFalse(
+            routeActionMatchesServer(
+                action = finish(weight = null, notes = null),
+                photoClientRequestIds = listOf("photo-1"),
+                serverRoute = route(status = "ZAKOŃCZONA", weight = null, notes = null),
+            ),
+        )
+    }
+
+    @Test
+    fun laterConfirmedFinishSupersedesAnOlderConflictingFinish() {
+        assertTrue(
+            routeActionWasSuperseded(
+                action = finish(weight = 11.8, notes = "Starsza uwaga"),
+                hasConfirmedFinishAfter = true,
+                serverRoute = route(
+                    status = "ZAKOŃCZONA",
+                    weight = null,
+                    notes = null,
+                ),
+            ),
+        )
+    }
+
+    @Test
+    fun completedServerRouteAloneDoesNotDiscardConflictingLocalData() {
+        assertFalse(
+            routeActionWasSuperseded(
+                action = finish(weight = 11.8, notes = "Nadal ważna uwaga"),
+                hasConfirmedFinishAfter = false,
+                serverRoute = route(
+                    status = "ZAKOŃCZONA",
+                    weight = null,
+                    notes = null,
+                ),
+            ),
+        )
+    }
+
+    private fun finish(weight: Double?, notes: String?): RouteActionEntity =
+        RouteActionEntity(
+            clientActionId = "finish-1",
+            routeId = "route-1",
+            action = RouteActionType.Finish,
+            weight = weight,
+            occurredAt = "2026-07-23T10:00:00Z",
+            photoClientRequestIdsJson = """["photo-1"]""",
+            notes = notes,
+        )
+
+    private fun route(
+        status: String,
+        weight: Double?,
+        notes: String?,
+        photoClientRequestIds: List<String> = emptyList(),
+    ): DriverRouteDto =
+        DriverRouteDto(
+            id = "route-1",
+            routeDate = "2026-07-23",
+            startsAt = "",
+            originName = "Baza",
+            destinationName = "Cel",
+            contractorName = "TPP",
+            contractName = "Kontrakt",
+            contractCode = "TPP-1",
+            relationLabel = "Baza → Cel",
+            status = status,
+            driverStatus = status,
+            unloadingWeight = weight,
+            unloadingNotes = notes,
+            distanceKm = 1.0,
+            notes = null,
+            truck = null,
+            photos = photoClientRequestIds.mapIndexed { index, requestId ->
+                RoutePhotoDto(
+                    id = "photo-$index",
+                    routeId = "route-1",
+                    clientRequestId = requestId,
+                    source = "camera",
+                    stage = "unloading",
+                    mimeType = "image/jpeg",
+                    size = 1,
+                    url = "https://example.test/photo-$index",
+                    takenAt = null,
+                    latitude = null,
+                    longitude = null,
+                    locationAccuracyMeters = null,
+                    createdAt = null,
+                )
+            },
+        )
+}

app/src/test/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRulesTest.kt

@@ -7,6 +7,8 @@ import org.junit.Assert.assertTrue
 import org.junit.Test
 import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarDriverDto
 import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto
+import pl.firmatpp.kierowca.data.model.DriverLeavePoolDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveSummaryDto
 
 class DriverLeaveRequestUiRulesTest {
     @Test
@@ -18,15 +20,35 @@ class DriverLeaveRequestUiRulesTest {
 
     @Test
     fun exposesPolishStatusLabels() {
-        assertEquals("Oczekuje", DriverLeaveRequestUiRules.statusLabel("pending"))
-        assertEquals("Zatwierdzony", DriverLeaveRequestUiRules.statusLabel("approved"))
+        assertEquals("Czeka na decyzję", DriverLeaveRequestUiRules.statusLabel("pending"))
+        assertEquals("Zaakceptowany", DriverLeaveRequestUiRules.statusLabel("approved"))
         assertEquals("Odrzucony", DriverLeaveRequestUiRules.statusLabel("rejected"))
-        assertEquals("Anulowanie do decyzji", DriverLeaveRequestUiRules.statusLabel("cancel_requested"))
+        assertEquals("Czeka na anulowanie", DriverLeaveRequestUiRules.statusLabel("cancel_requested"))
         assertEquals("Anulowany", DriverLeaveRequestUiRules.statusLabel("cancelled"))
-        assertEquals("Cofnięto decyzję", DriverLeaveRequestUiRules.statusLabel("revoked"))
+        assertEquals("Akceptacja cofnięta", DriverLeaveRequestUiRules.statusLabel("revoked"))
         assertEquals("Nieznany status", DriverLeaveRequestUiRules.statusLabel("some_raw_status"))
     }
 
+    @Test
+    fun explainsAnnualBalanceInDaysAndHours() {
+        val summary = DriverLeaveSummaryDto(
+            dailyNormMinutes = 480,
+            balanceConfigured = true,
+            pools = listOf(
+                annualPool(year = 2025, available = 480, reserved = 0, used = 480, granted = 960),
+                annualPool(year = 2026, available = 3_840, reserved = 960, used = 960, granted = 5_760),
+            ),
+        )
+
+        val totals = DriverLeaveRequestUiRules.annualTotals(summary)
+
+        assertEquals(4_320, totals.availableMinutes)
+        assertEquals(960, totals.reservedMinutes)
+        assertEquals(1_440, totals.usedMinutes)
+        assertEquals("9 dni · 72 godz.", DriverLeaveRequestUiRules.formatQuantity(totals.availableMinutes, "minutes", 480))
+        assertEquals("2 dni + 2 godz. · 18 godz.", DriverLeaveRequestUiRules.formatQuantity(1_080, "minutes", 480))
+    }
+
     @Test
     fun exposesPolishEventActionLabels() {
         assertEquals("Wniosek złożony", DriverLeaveRequestUiRules.eventActionLabel("submitted"))
@@ -105,4 +127,23 @@ class DriverLeaveRequestUiRulesTest {
                 phoneNumber = "+48 600 700 800",
             ),
         )
+
+    private fun annualPool(
+        year: Int,
+        available: Int,
+        reserved: Int,
+        used: Int,
+        granted: Int,
+    ): DriverLeavePoolDto =
+        DriverLeavePoolDto(
+            id = year,
+            poolCode = "ANNUAL",
+            year = year,
+            unit = "minutes",
+            availableQuantity = available,
+            reservedQuantity = reserved,
+            usedQuantity = used,
+            grantedQuantity = granted,
+            status = "active",
+        )
 }

app/src/test/java/pl/firmatpp/kierowca/ui/DriverRouteProjectionTest.kt

@@ -17,11 +17,19 @@ class DriverRouteProjectionTest {
     fun pendingStartProjectsPlannedRouteAsActiveWithLoadingWeight() {
         val projection = projectDriverRoute(
             route = route(status = "ZAPLANOWANA"),
-            actions = listOf(action(RouteActionType.Start, RouteActionStatus.Pending, weight = 12.5)),
+            actions = listOf(
+                action(
+                    RouteActionType.Start,
+                    RouteActionStatus.Pending,
+                    weight = 12.5,
+                    notes = "Oczekiwanie na dokument WZ.",
+                ),
+            ),
         )
 
         assertEquals("W TRAKCIE", projection.route.status)
         assertEquals(12.5, projection.route.loadingWeight)
+        assertEquals("Oczekiwanie na dokument WZ.", projection.route.loadingNotes)
         assertEquals("active", projection.route.trackingStatus)
         assertTrue(projection.loadingWeightPending)
         assertFalse(projection.unloadingWeightPending)
@@ -32,11 +40,20 @@ class DriverRouteProjectionTest {
     fun pendingFinishProjectsActiveRouteAsFinishedWithUnloadingWeight() {
         val projection = projectDriverRoute(
             route = route(status = "W TRAKCIE", loadingWeight = 12.5),
-            actions = listOf(action(RouteActionType.Finish, RouteActionStatus.Syncing, weight = 11.8, occurredAt = "2026-06-30T09:10:00Z")),
+            actions = listOf(
+                action(
+                    RouteActionType.Finish,
+                    RouteActionStatus.Syncing,
+                    weight = 11.8,
+                    notes = "Uszkodzona plomba.",
+                    occurredAt = "2026-06-30T09:10:00Z",
+                ),
+            ),
         )
 
         assertEquals("ZAKOŃCZONA", projection.route.status)
         assertEquals(11.8, projection.route.unloadingWeight)
+        assertEquals("Uszkodzona plomba.", projection.route.unloadingNotes)
         assertEquals("finished", projection.route.trackingStatus)
         assertEquals("2026-06-30T09:10:00Z", projection.route.completedAt)
         assertTrue(projection.unloadingWeightPending)
@@ -108,16 +125,25 @@ class DriverRouteProjectionTest {
     }
 
     @Test
-    fun conflictKeepsLocalRouteValuesAndMarksStageAsAttention() {
+    fun conflictKeepsLocalRouteValuesButPreservesServerLifecycleStatus() {
         val projection = projectDriverRoute(
             route = route(status = "W TRAKCIE", loadingWeight = 12.5),
-            actions = listOf(action(RouteActionType.Finish, RouteActionStatus.FailedConflict, weight = 11.8)),
+            actions = listOf(
+                action(
+                    RouteActionType.Finish,
+                    RouteActionStatus.FailedConflict,
+                    weight = 11.8,
+                    notes = "Uszkodzona plomba.",
+                ),
+            ),
         )
         val steps = routeFlowSteps(projection.route, projection.visibleActions)
         val callout = routeSyncCallout(projection.visibleActions)
 
-        assertEquals("ZAKOŃCZONA", projection.route.status)
+        assertEquals("W TRAKCIE", projection.route.status)
         assertEquals(11.8, projection.route.unloadingWeight)
+        assertEquals("Uszkodzona plomba.", projection.route.unloadingNotes)
+        assertTrue(projection.unloadingWeightPending)
         assertEquals(RouteFlowStepState.NeedsAttention, steps[3].state)
         assertEquals("Kurs wymaga obsługi. Dane wpisane w telefonie zostały zachowane.", callout?.text)
         assertTrue(callout?.isConflict ?: false)
@@ -131,8 +157,9 @@ class DriverRouteProjectionTest {
         )
         val steps = routeFlowSteps(projection.route, projection.visibleActions)
 
-        assertEquals("W TRAKCIE", projection.route.status)
+        assertEquals("ZAPLANOWANA", projection.route.status)
         assertEquals(12.5, projection.route.loadingWeight)
+        assertTrue(projection.loadingWeightPending)
         assertEquals(RouteFlowStepState.NeedsAttention, steps[1].state)
     }
 
@@ -174,6 +201,7 @@ class DriverRouteProjectionTest {
         type: String,
         status: String,
         weight: Double,
+        notes: String? = null,
         occurredAt: String = "2026-06-30T07:40:00Z",
         createdAt: Long = 1000,
     ): RouteActionEntity =
@@ -186,6 +214,7 @@ class DriverRouteProjectionTest {
             photoClientRequestIdsJson = "[]",
             status = status,
             createdAtEpochMillis = createdAt,
+            notes = notes,
         )
 
     private companion object {

app/src/test/java/pl/firmatpp/kierowca/ui/DriverUiRulesTest.kt

@@ -8,6 +8,8 @@ import org.junit.Test
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
 import pl.firmatpp.kierowca.data.model.DispatchSheetReminderDto
 import pl.firmatpp.kierowca.data.model.RoutePhotoDto
+import pl.firmatpp.kierowca.data.model.TachographReminderDto
+import pl.firmatpp.kierowca.data.model.TachographReminderTaskDto
 import pl.firmatpp.kierowca.data.upload.PhotoUploadEntity
 import pl.firmatpp.kierowca.data.upload.RouteActionEntity
 import pl.firmatpp.kierowca.data.upload.RouteActionStatus
@@ -16,6 +18,29 @@ import pl.firmatpp.kierowca.data.upload.RouteActionType
 class DriverUiRulesTest {
     private val today = LocalDate.parse("2026-06-30")
 
+    @Test
+    fun disabledRouteLocationNeverStartsTracking() {
+        assertFalse(shouldTrackRouteLocation(RouteLocationMode.Disabled, optionalLocationEnabled = true, hasLocationPermission = true))
+        assertFalse(shouldTrackRouteLocation(RouteLocationMode.Disabled, optionalLocationEnabled = false, hasLocationPermission = true))
+    }
+
+    @Test
+    fun optionalRouteLocationFollowsDriverChoiceAndPermission() {
+        assertTrue(shouldTrackRouteLocation(RouteLocationMode.Optional, optionalLocationEnabled = true, hasLocationPermission = true))
+        assertFalse(shouldTrackRouteLocation(RouteLocationMode.Optional, optionalLocationEnabled = false, hasLocationPermission = true))
+        assertFalse(shouldTrackRouteLocation(RouteLocationMode.Optional, optionalLocationEnabled = true, hasLocationPermission = false))
+    }
+
+    @Test
+    fun requiredRouteLocationBlocksStartAndWarnsOnlyWhenNeeded() {
+        assertTrue(routeStartRequiresLocationPermission(RouteLocationMode.Required, hasLocationPermission = false))
+        assertFalse(routeStartRequiresLocationPermission(RouteLocationMode.Required, hasLocationPermission = true))
+        assertFalse(routeStartRequiresLocationPermission(RouteLocationMode.Optional, hasLocationPermission = false))
+        assertTrue(shouldWarnAboutRequiredRouteLocation(RouteLocationMode.Required, hasActiveRoute = true, hasLocationPermission = false))
+        assertFalse(shouldWarnAboutRequiredRouteLocation(RouteLocationMode.Required, hasActiveRoute = false, hasLocationPermission = false))
+        assertFalse(shouldWarnAboutRequiredRouteLocation(RouteLocationMode.Optional, hasActiveRoute = true, hasLocationPermission = false))
+    }
+
     @Test
     fun allowsPhotoActionsOnlyForTodayRouteDate() {
         assertTrue(canManageRoutePhotos("2026-06-30", today))
@@ -387,6 +412,57 @@ class DriverUiRulesTest {
         assertFalse(shouldShowDispatchSheetReminderCard(null))
     }
 
+    @Test
+    fun showsTachographCardOnlyForCompleteReminderEnabledByBackend() {
+        assertTrue(
+            shouldShowTachographReminderCard(
+                TachographReminderDto(
+                    enabled = true,
+                    visible = true,
+                    title = "Odczyt tachografu",
+                    message = "Pamiętaj o odczycie.",
+                    tasks = listOf(tachographTask()),
+                ),
+            ),
+        )
+        assertFalse(
+            shouldShowTachographReminderCard(
+                TachographReminderDto(
+                    enabled = false,
+                    visible = true,
+                    title = "Odczyt tachografu",
+                    message = "Pamiętaj o odczycie.",
+                    tasks = listOf(tachographTask()),
+                ),
+            ),
+        )
+        assertFalse(
+            shouldShowTachographReminderCard(
+                TachographReminderDto(
+                    enabled = true,
+                    visible = false,
+                    title = "Odczyt tachografu",
+                    message = "Pamiętaj o odczycie.",
+                    tasks = listOf(tachographTask()),
+                ),
+            ),
+        )
+        assertFalse(shouldShowTachographReminderCard(null))
+    }
+
+    @Test
+    fun preselectsOnlySingleTachographConfirmationTask() {
+        val driverCard = tachographTask()
+        val vehicle = TachographReminderTaskDto(
+            id = "vehicle:12:2026-07-31",
+            type = "vehicle_tachograph",
+            label = "Tachograf pojazdu",
+        )
+
+        assertEquals(setOf(driverCard.id), defaultTachographConfirmationSelection(listOf(driverCard)))
+        assertEquals(emptySet<String>(), defaultTachographConfirmationSelection(listOf(driverCard, vehicle)))
+    }
+
     @Test
     fun explainsOfflineStateWithoutCachedSync() {
         assertEquals(
@@ -794,4 +870,11 @@ class DriverUiRulesTest {
             photo = null,
             canUpload = dueToday,
         )
+
+    private fun tachographTask(): TachographReminderTaskDto =
+        TachographReminderTaskDto(
+            id = "driver-card:1:2026-07-31",
+            type = "driver_card",
+            label = "Karta kierowcy",
+        )
 }

app/src/test/java/pl/firmatpp/kierowca/ui/DriverUiStateTest.kt

@@ -43,6 +43,55 @@ class DriverUiStateTest {
         assertEquals(ServerConnectionState.Degraded, failed.serverConnectionState)
     }
 
+    @Test
+    fun silentRefreshCannotReplaceActiveStartupLoad() {
+        assertFalse(
+            shouldStartRoutesLoad(
+                screen = DriverScreen.Initializing,
+                navigateToRoutes = false,
+                startupOfflineOnly = false,
+            ),
+        )
+        assertFalse(
+            shouldStartRoutesLoad(
+                screen = DriverScreen.Routes,
+                navigateToRoutes = false,
+                startupOfflineOnly = false,
+                startupLoadInProgress = true,
+            ),
+        )
+    }
+
+    @Test
+    fun startupAndManualOfflineLoadsRemainAvailable() {
+        assertTrue(
+            shouldStartRoutesLoad(
+                screen = DriverScreen.Initializing,
+                navigateToRoutes = true,
+                startupOfflineOnly = false,
+            ),
+        )
+        assertTrue(
+            shouldStartRoutesLoad(
+                screen = DriverScreen.Initializing,
+                navigateToRoutes = false,
+                startupOfflineOnly = true,
+            ),
+        )
+    }
+
+    @Test
+    fun successfulBootstrapAlwaysLeavesInitializingScreen() {
+        assertEquals(
+            DriverScreen.Routes,
+            screenAfterBootstrap(
+                currentScreen = DriverScreen.Initializing,
+                navigateToRoutes = false,
+                leaveRequestsEnabled = true,
+            ),
+        )
+    }
+
     @Test
     fun refreshingLeaveRequestsKeepsDetailScreenOpenAndUpdatesSelectedRequest() {
         val state = DriverUiState(

app/src/test/java/pl/firmatpp/kierowca/ui/LiveVoiceDictationTest.kt

@@ -0,0 +1,30 @@
+package pl.firmatpp.kierowca.ui
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class LiveVoiceDictationTest {
+    @Test
+    fun recognizedTextIsAppendedToExistingTypedNote() {
+        assertEquals(
+            "Oczekiwanie na dokumenty kierowca odebrał WZ",
+            mergeDictationText("Oczekiwanie na dokumenty ", " kierowca odebrał WZ "),
+        )
+    }
+
+    @Test
+    fun recognizedTextCanStartAnEmptyNote() {
+        assertEquals(
+            "Uszkodzona plomba",
+            mergeDictationText("", " Uszkodzona plomba "),
+        )
+    }
+
+    @Test
+    fun routeNotesAreLimitedToApiMaximum() {
+        assertEquals(
+            routeStageNotesMaxLength,
+            normalizeRouteStageNotes("a".repeat(routeStageNotesMaxLength + 20)).length,
+        )
+    }
+}

app/src/test/java/pl/firmatpp/kierowca/ui/RouteDatePickerBoundsTest.kt

@@ -0,0 +1,43 @@
+package pl.firmatpp.kierowca.ui
+
+import java.time.LocalDate
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class RouteDatePickerBoundsTest {
+    @Test
+    fun usesTheSameMinAndMaxDatesAsTheRouteSelector() {
+        val bounds = routeDatePickerBounds(
+            selectedDate = "2026-07-24",
+            minDate = "2026-07-17",
+            maxDate = "2026-07-26",
+        )
+
+        assertEquals(LocalDate.parse("2026-07-24"), bounds.selectedDate)
+        assertEquals(LocalDate.parse("2026-07-17"), bounds.minDate)
+        assertEquals(LocalDate.parse("2026-07-26"), bounds.maxDate)
+    }
+
+    @Test
+    fun clampsSelectedDateToAllowedRange() {
+        val bounds = routeDatePickerBounds(
+            selectedDate = "2026-07-30",
+            minDate = "2026-07-17",
+            maxDate = "2026-07-26",
+        )
+
+        assertEquals(LocalDate.parse("2026-07-26"), bounds.selectedDate)
+    }
+
+    @Test
+    fun normalizesAccidentallyReversedServerBounds() {
+        val bounds = routeDatePickerBounds(
+            selectedDate = "2026-07-24",
+            minDate = "2026-07-26",
+            maxDate = "2026-07-17",
+        )
+
+        assertEquals(LocalDate.parse("2026-07-17"), bounds.minDate)
+        assertEquals(LocalDate.parse("2026-07-26"), bounds.maxDate)
+    }
+}

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.7.3"
+agp = "8.10.1"
 kotlin = "2.1.10"
 composeBom = "2026.03.00"
 activityCompose = "1.9.3"

scripts/release-android.sh

@@ -138,6 +138,14 @@ if [[ "$sanitized_remote" =~ ^(https?)://([^/]+)/(.+)$ ]]; then
     detected_protocol="${BASH_REMATCH[1]}"
     detected_host="${BASH_REMATCH[2]}"
     detected_repository="${BASH_REMATCH[3]%.git}"
+elif [[ "$remote_url" =~ ^ssh://([^/@]+@)?([^/:]+)(:[0-9]+)?/(.+)$ ]]; then
+    detected_protocol="https"
+    detected_host="${BASH_REMATCH[2]}"
+    detected_repository="${BASH_REMATCH[4]%.git}"
+elif [[ "$remote_url" =~ ^([^/@:]+@)?([^/:]+):(.+)$ ]]; then
+    detected_protocol="https"
+    detected_host="${BASH_REMATCH[2]}"
+    detected_repository="${BASH_REMATCH[3]%.git}"
 else
     detected_protocol="https"
     detected_host=""
@@ -147,14 +155,20 @@ fi
 gitea_base_url="${GITEA_BASE_URL:-${detected_protocol}://${detected_host}}"
 gitea_repository="${GITEA_REPOSITORY:-$detected_repository}"
 gitea_base_url="${gitea_base_url%/}"
-[[ "$gitea_base_url" =~ ^https?://[^/]+$ ]] || { echo "Ustaw poprawne GITEA_BASE_URL." >&2; exit 1; }
+if [[ "$gitea_base_url" =~ ^(https?)://([^/]+)$ ]]; then
+    gitea_api_protocol="${BASH_REMATCH[1]}"
+    gitea_api_host="${BASH_REMATCH[2]}"
+else
+    echo "Ustaw poprawne GITEA_BASE_URL." >&2
+    exit 1
+fi
 [[ "$gitea_repository" =~ ^[^/]+/[^/]+$ ]] || { echo "Ustaw poprawne GITEA_REPOSITORY=owner/repository." >&2; exit 1; }
 
 auth_args=()
 if [[ -n "${GITEA_TOKEN:-}" ]]; then
     auth_args=(-H "Authorization: token $GITEA_TOKEN")
 else
-    credential="$(printf 'protocol=%s\nhost=%s\n\n' "$detected_protocol" "$detected_host" | git credential fill)"
+    credential="$(printf 'protocol=%s\nhost=%s\n\n' "$gitea_api_protocol" "$gitea_api_host" | git credential fill)"
     gitea_username="$(printf '%s\n' "$credential" | sed -n 's/^username=//p')"
     gitea_password="$(printf '%s\n' "$credential" | sed -n 's/^password=//p')"
     [[ -n "$gitea_username" && -n "$gitea_password" ]] || {