Automatyzuj logowanie po wpisaniu OTP

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "pl.firmatpp.kierowca"
         minSdk = 26
         targetSdk = 35
-        versionCode = 10
+        versionCode = 12
-        versionName = "1.0.9"
+        versionName = "1.0.11"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("String", "API_BASE_URL", "\"https://api-intranet.firmatpp.pl/api/\"")
@@ -45,6 +45,10 @@ android {
         compose = true
         buildConfig = true
     }
+
+    lint {
+        disable += "NullSafeMutableLiveData"
+    }
 }
 
 dependencies {

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

@@ -0,0 +1,38 @@
+package pl.firmatpp.kierowca.data
+
+import android.content.Context
+import android.os.Build
+import android.provider.Settings
+import pl.firmatpp.kierowca.BuildConfig
+import pl.firmatpp.kierowca.data.model.DriverDeviceInfo
+
+class DeviceInfoProvider(
+    private val context: Context,
+    private val tokenStore: TokenStore,
+) {
+    suspend fun currentDeviceInfo(): DriverDeviceInfo =
+        DriverDeviceInfo(
+            deviceId = tokenStore.deviceId(),
+            androidId = Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID),
+            brand = Build.BRAND,
+            manufacturer = Build.MANUFACTURER,
+            model = Build.MODEL,
+            device = Build.DEVICE,
+            product = Build.PRODUCT,
+            androidVersion = Build.VERSION.RELEASE,
+            sdkInt = Build.VERSION.SDK_INT,
+            appVersion = BuildConfig.VERSION_NAME,
+            serialNumber = readSerialNumber(),
+        )
+
+    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

@@ -19,12 +19,13 @@ class DriverRepository(
     private val context: Context,
     private val api: MobileDriverApi = ApiFactory.mobileDriverApi(),
     private val tokenStore: TokenStore = TokenStore(context),
+    private val deviceInfoProvider: DeviceInfoProvider = DeviceInfoProvider(context, tokenStore),
 ) {
     suspend fun requestOtp(phoneNumber: String): OtpResponse =
         api.requestOtp(RequestOtpBody(phoneNumber))
 
     suspend fun verifyOtp(phoneNumber: String, code: String, deviceName: String): DriverDto {
-        val response = api.verifyOtp(VerifyOtpBody(phoneNumber, code, deviceName))
+        val response = api.verifyOtp(VerifyOtpBody(phoneNumber, code, deviceName, deviceInfoProvider.currentDeviceInfo()))
         val token = response.accessToken ?: error("Brak tokenu sesji.")
         tokenStore.save(token)
         return response.driver ?: error("Brak danych kierowcy.")
@@ -62,6 +63,10 @@ class DriverRepository(
         )
     }
 
+    suspend fun deletePhoto(photoId: String) {
+        api.deletePhoto(authHeader(requireToken()), photoId)
+    }
+
     suspend fun logout() {
         val token = tokenStore.read()
         if (token != null) {

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

@@ -6,11 +6,13 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import java.util.UUID
 
 private val Context.driverDataStore by preferencesDataStore(name = "driver_session")
 
 class TokenStore(private val context: Context) {
     private val tokenKey = stringPreferencesKey("access_token")
+    private val deviceIdKey = stringPreferencesKey("device_id")
 
     suspend fun save(token: String) {
         context.driverDataStore.edit { preferences ->
@@ -22,6 +24,21 @@ class TokenStore(private val context: Context) {
         .map { it[tokenKey] }
         .first()
 
+    suspend fun deviceId(): String {
+        val existing = context.driverDataStore.data
+            .map { it[deviceIdKey] }
+            .first()
+
+        if (!existing.isNullOrBlank()) return existing
+
+        val generated = UUID.randomUUID().toString()
+        context.driverDataStore.edit { preferences ->
+            preferences[deviceIdKey] = generated
+        }
+
+        return generated
+    }
+
     suspend fun clear() {
         context.driverDataStore.edit { it.remove(tokenKey) }
     }

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

@@ -10,6 +10,7 @@ import pl.firmatpp.kierowca.data.model.RouteResponse
 import pl.firmatpp.kierowca.data.model.VerifyOtpBody
 import pl.firmatpp.kierowca.data.model.VerifyOtpResponse
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.Multipart
@@ -52,4 +53,10 @@ interface MobileDriverApi {
         @Part("longitude") longitude: RequestBody?,
         @Part("locationAccuracyMeters") locationAccuracyMeters: RequestBody?,
     ): PhotoUploadResponse
+
+    @DELETE("mobile/driver/photos/{photoId}")
+    suspend fun deletePhoto(
+        @Header("Authorization") authorization: String,
+        @Path("photoId") photoId: String,
+    ): Map<String, Boolean>
 }

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

@@ -6,6 +6,21 @@ data class VerifyOtpBody(
     val phoneNumber: String,
     val code: String,
     val deviceName: String,
+    val device: DriverDeviceInfo,
+)
+
+data class DriverDeviceInfo(
+    val deviceId: String,
+    val androidId: String?,
+    val brand: String?,
+    val manufacturer: String?,
+    val model: String?,
+    val device: String?,
+    val product: String?,
+    val androidVersion: String?,
+    val sdkInt: Int,
+    val appVersion: String?,
+    val serialNumber: String?,
 )
 
 data class OtpResponse(
@@ -100,6 +115,8 @@ data class RoutePhotoDto(
     val longitude: Double?,
     val locationAccuracyMeters: Double?,
     val createdAt: String?,
+    val canDelete: Boolean = false,
+    val deleteUntil: String? = null,
 )
 
 data class PhotoUploadResponse(

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

@@ -44,6 +44,7 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.AddPhotoAlternate
@@ -51,6 +52,7 @@ import androidx.compose.material.icons.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.CameraAlt
 import androidx.compose.material.icons.outlined.CalendarToday
 import androidx.compose.material.icons.outlined.Factory
+import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.LocationOn
 import androidx.compose.material.icons.outlined.LocalShipping
 import androidx.compose.material.icons.outlined.Navigation
@@ -170,7 +172,7 @@ fun DriverApp(viewModel: DriverViewModel) {
                 onRoute = viewModel::openRoute,
             )
             DriverScreen.Profile -> ProfileScreen(state, viewModel::refreshRoutes, viewModel::openProfile, viewModel::logout)
-            DriverScreen.Detail -> DetailScreen(state, viewModel::back, viewModel::uploadPhoto, viewModel::openPhoto, viewModel::refreshSelectedRoute)
+            DriverScreen.Detail -> DetailScreen(state, viewModel::back, viewModel::uploadPhoto, viewModel::openPhoto, viewModel::deletePhoto, viewModel::refreshSelectedRoute)
             DriverScreen.Photo -> PhotoScreen(state, viewModel::back)
         }
 
@@ -351,8 +353,16 @@ private fun RouteDateSelector(selectedDate: String, minDate: String, maxDate: St
             }.toList()
         }.getOrElse { listOf(LocalDate.parse(selectedDate)) }
     }
+    val listState = rememberLazyListState()
 
-    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+    LaunchedEffect(dates, selectedDate) {
+        val selectedIndex = dates.indexOfFirst { it.toString() == selectedDate }
+        if (selectedIndex >= 0) {
+            listState.scrollToItem(selectedIndex)
+        }
+    }
+
+    LazyRow(state = listState, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
         items(dates, key = { it.toString() }) { date ->
             DateSelectorChip(
                 date = date,
@@ -575,6 +585,7 @@ private fun DetailScreen(
     onBack: () -> Unit,
     onUpload: (Uri, String, PhotoUploadMetadata) -> Unit,
     onPhoto: (RoutePhotoDto) -> Unit,
+    onDeletePhoto: (RoutePhotoDto) -> Unit,
     onRefresh: () -> Unit,
 ) {
     val context = LocalContext.current
@@ -594,6 +605,7 @@ private fun DetailScreen(
         if (uri != null) onUpload(uri, "gallery", PhotoUploadMetadata())
     }
     val route = state.selectedRoute
+    val canManagePhotos = canManageRoutePhotos(state.selectedDate)
 
     Scaffold(
         topBar = {
@@ -614,7 +626,9 @@ private fun DetailScreen(
                         photos = route.photos,
                         imageAuthHeader = state.imageAuthHeader,
                         allowGalleryUploads = state.allowGalleryUploads,
+                        canManagePhotos = canManagePhotos,
                         onPhoto = onPhoto,
+                        onDeletePhoto = onDeletePhoto,
                         onCamera = {
                             val newUri = createCameraUri(context)
                             cameraUri = newUri
@@ -800,7 +814,9 @@ private fun CargoDocumentationSection(
     photos: List<RoutePhotoDto>,
     imageAuthHeader: String?,
     allowGalleryUploads: Boolean,
+    canManagePhotos: Boolean,
     onPhoto: (RoutePhotoDto) -> Unit,
+    onDeletePhoto: (RoutePhotoDto) -> Unit,
     onCamera: () -> Unit,
     onGallery: () -> Unit,
 ) {
@@ -811,12 +827,18 @@ private fun CargoDocumentationSection(
             Box(Modifier.width(116.dp).height(3.dp).background(TppColors.ContainerGreen))
         }
         Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+            if (canManagePhotos) {
                 if (allowGalleryUploads) {
                     CargoActionButton("Dodaj zdjęcie z galerii", Icons.Outlined.AddPhotoAlternate, TppColors.ContainerGreen, onGallery)
                 }
                 CargoActionButton("Zrób nowe zdjęcie", Icons.Outlined.CameraAlt, TppColors.Forest, onCamera)
+            } else {
+                Box(Modifier.fillMaxWidth().background(TppColors.Panel, RoundedCornerShape(4.dp)).padding(14.dp)) {
+                    Text("Zdjęcia można dodawać tylko dla dzisiejszych kursów.", color = TppColors.Muted, fontFamily = FontFamily.Monospace)
                 }
-        PhotoGrid(photos, imageAuthHeader, onPhoto)
+            }
+        }
+        PhotoGrid(photos, imageAuthHeader, onPhoto, onDeletePhoto)
     }
 }
 
@@ -839,6 +861,7 @@ private fun PhotoGrid(
     photos: List<RoutePhotoDto>,
     imageAuthHeader: String?,
     onPhoto: (RoutePhotoDto) -> Unit,
+    onDeletePhoto: (RoutePhotoDto) -> Unit,
 ) {
     val rows = ceil((photos.size.coerceAtLeast(1) / 2f).toDouble()).toInt()
     val gridHeight = (rows * 172).coerceIn(172, 520).dp
@@ -865,12 +888,31 @@ private fun PhotoGrid(
                     horizontalArrangement = Arrangement.spacedBy(12.dp),
                 ) {
                     items(photos, key = { it.id }) { photo ->
+                        Box(Modifier.aspectRatio(1f)) {
                             AsyncImage(
                                 model = imageRequest(photo.url, imageAuthHeader),
                                 contentDescription = "Zdjecie ladunku",
                                 contentScale = ContentScale.Crop,
-                            modifier = Modifier.aspectRatio(1f).clickable { onPhoto(photo) },
+                                modifier = Modifier.fillMaxSize().clickable { onPhoto(photo) },
                             )
+                            if (photo.canDelete) {
+                                IconButton(
+                                    onClick = { onDeletePhoto(photo) },
+                                    modifier = Modifier
+                                        .align(Alignment.TopEnd)
+                                        .padding(6.dp)
+                                        .size(34.dp)
+                                        .background(TppColors.Error, RoundedCornerShape(17.dp)),
+                                ) {
+                                    Icon(
+                                        Icons.Outlined.Delete,
+                                        contentDescription = "Usuń zdjęcie",
+                                        tint = Color.White,
+                                        modifier = Modifier.size(18.dp),
+                                    )
+                                }
+                            }
+                        }
                     }
                 }
             }

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

@@ -0,0 +1,6 @@
+package pl.firmatpp.kierowca.ui
+
+import java.time.LocalDate
+
+fun canManageRoutePhotos(selectedDate: String, today: LocalDate = LocalDate.now()): Boolean =
+    runCatching { LocalDate.parse(selectedDate).isEqual(today) }.getOrDefault(false)

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

@@ -40,6 +40,7 @@ data class DriverUiState(
 class DriverViewModel(application: Application) : AndroidViewModel(application) {
     private val repository = DriverRepository(application)
     private val _state = MutableStateFlow(DriverUiState(loading = true))
+    private val otpAutoSubmitPolicy = OtpAutoSubmitPolicy()
     val state: StateFlow<DriverUiState> = _state
 
     init {
@@ -50,6 +51,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
 
     fun requestOtp(phone: String) = runLoading {
         val response = repository.requestOtp(phone)
+        otpAutoSubmitPolicy.reset()
         _state.update {
             it.copy(
                 screen = DriverScreen.Otp,
@@ -68,7 +70,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
     }
 
     fun updateOtpCode(code: String) {
-        _state.update { it.copy(otpCode = code.filter(Char::isDigit).take(10)) }
+        val sanitized = code.filter(Char::isDigit).take(6)
+        _state.update { it.copy(otpCode = sanitized) }
+
+        if (otpAutoSubmitPolicy.shouldSubmit(sanitized, _state.value.loading)) {
+            verifyOtp(sanitized)
+        }
     }
 
     fun refreshRoutes() = loadRoutes(date = _state.value.selectedDate, showLoading = true, navigateToRoutes = true)
@@ -147,6 +154,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         openRoute(route.id)
     }
 
+    fun deletePhoto(photo: RoutePhotoDto) = runLoading {
+        val route = _state.value.selectedRoute ?: return@runLoading
+        repository.deletePhoto(photo.id)
+        openRoute(route.id)
+    }
+
     fun openPhoto(photo: RoutePhotoDto) {
         _state.update { it.copy(screen = DriverScreen.Photo, selectedPhoto = photo) }
     }

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

@@ -0,0 +1,27 @@
+package pl.firmatpp.kierowca.ui
+
+class OtpAutoSubmitPolicy {
+    private var lastSubmittedCode: String? = null
+
+    fun shouldSubmit(code: String, loading: Boolean): Boolean {
+        if (code.length < OTP_LENGTH) {
+            lastSubmittedCode = null
+            return false
+        }
+
+        if (loading || code.length != OTP_LENGTH || code == lastSubmittedCode) {
+            return false
+        }
+
+        lastSubmittedCode = code
+        return true
+    }
+
+    fun reset() {
+        lastSubmittedCode = null
+    }
+
+    private companion object {
+        const val OTP_LENGTH = 6
+    }
+}

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

@@ -0,0 +1,23 @@
+package pl.firmatpp.kierowca.ui
+
+import java.time.LocalDate
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class DriverUiRulesTest {
+    private val today = LocalDate.parse("2026-06-30")
+
+    @Test
+    fun allowsPhotoActionsOnlyForTodayRouteDate() {
+        assertTrue(canManageRoutePhotos("2026-06-30", today))
+        assertFalse(canManageRoutePhotos("2026-06-29", today))
+        assertFalse(canManageRoutePhotos("2026-07-01", today))
+    }
+
+    @Test
+    fun blocksPhotoActionsWhenDateIsInvalid() {
+        assertFalse(canManageRoutePhotos("", today))
+        assertFalse(canManageRoutePhotos("not-a-date", today))
+    }
+}

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

@@ -0,0 +1,41 @@
+package pl.firmatpp.kierowca.ui
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class OtpAutoSubmitPolicyTest {
+    @Test
+    fun submitsWhenSixthDigitIsEntered() {
+        val policy = OtpAutoSubmitPolicy()
+
+        assertFalse(policy.shouldSubmit("12345", loading = false))
+        assertTrue(policy.shouldSubmit("123456", loading = false))
+    }
+
+    @Test
+    fun submitsSmsRetrieverCodeOnlyOnceWhileItStaysTheSame() {
+        val policy = OtpAutoSubmitPolicy()
+
+        assertTrue(policy.shouldSubmit("987654", loading = false))
+        assertFalse(policy.shouldSubmit("987654", loading = false))
+    }
+
+    @Test
+    fun allowsRetryAfterCodeIsEditedBelowSixDigits() {
+        val policy = OtpAutoSubmitPolicy()
+
+        assertTrue(policy.shouldSubmit("111111", loading = false))
+        assertFalse(policy.shouldSubmit("111111", loading = false))
+        assertFalse(policy.shouldSubmit("11111", loading = false))
+        assertTrue(policy.shouldSubmit("111111", loading = false))
+    }
+
+    @Test
+    fun doesNotSubmitWhileLoadingOrForLongerCodes() {
+        val policy = OtpAutoSubmitPolicy()
+
+        assertFalse(policy.shouldSubmit("123456", loading = true))
+        assertFalse(policy.shouldSubmit("1234567", loading = false))
+    }
+}

tests/device-metadata.test.mjs

@@ -0,0 +1,27 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const root = resolve(__dirname, '..');
+
+function readSource(path) {
+  return readFileSync(resolve(root, path), 'utf8');
+}
+
+test('driver app sends Android device metadata during OTP verification', () => {
+  const models = readSource('app/src/main/java/pl/firmatpp/kierowca/data/model/DriverModels.kt');
+  const repository = readSource('app/src/main/java/pl/firmatpp/kierowca/data/DriverRepository.kt');
+  const deviceInfo = readSource('app/src/main/java/pl/firmatpp/kierowca/data/DeviceInfoProvider.kt');
+
+  assert.match(models, /data class DriverDeviceInfo/);
+  assert.match(models, /val device: DriverDeviceInfo/);
+  assert.match(repository, /DeviceInfoProvider/);
+  assert.match(repository, /deviceInfoProvider\.currentDeviceInfo/);
+  assert.match(deviceInfo, /Settings\.Secure\.ANDROID_ID/);
+  assert.match(deviceInfo, /Build\.MANUFACTURER/);
+  assert.match(deviceInfo, /Build\.MODEL/);
+  assert.match(deviceInfo, /BuildConfig\.VERSION_NAME/);
+});