bump to 1.2

app/build.gradle.kts

@@ -3,6 +3,8 @@
  * Copyright (c) 2025. All rights reserved.
  */
 
+import java.util.Properties
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -15,12 +17,22 @@ android {
 
     defaultConfig {
         applicationId = "ru.risdeveau.geotracker"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 35
-        versionCode = 2
-        versionName = "1.1"
+        versionCode = 3
+        versionName = "1.2"
+        setProperty("archivesBaseName", "$applicationId-v$versionCode($versionName)")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        val secretProperties = Properties().apply {
+            val secretFile = rootProject.file("secrets.properties")
+            if (secretFile.exists())
+                secretFile.inputStream().use { load(it) }
+            else
+                println("Warning: secrets.properties not found!")
+        }
+        manifestPlaceholders["sentry_url"] = secretProperties.getProperty("SENTRY_URL")!!
     }
 
     buildTypes {
@@ -30,6 +42,10 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            manifestPlaceholders["sentry_env"] = "production"
+        }
+        debug {
+            manifestPlaceholders["sentry_env"] = "develop"
         }
     }
     compileOptions {
@@ -71,4 +87,5 @@ dependencies {
     implementation(libs.logback.classic)
 
     implementation(libs.splitties.base)
+    implementation(libs.sentry)
 }

app/src/main/AndroidManifest.xml

@@ -26,6 +26,35 @@
         android:theme="@style/Theme.GeoTracker"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+
+        <meta-data
+            android:name="io.sentry.dsn"
+            android:value="${sentry_url}" />
+        <meta-data
+            android:name="io.sentry.environment"
+            android:value="${sentry_env}" />
+        <meta-data
+            android:name="io.sentry.send-default-pii"
+            android:value="true" />
+        <meta-data
+            android:name="io.sentry.traces.sample-rate"
+            android:value="1.0" />
+        <meta-data
+            android:name="io.sentry.traces.user-interaction.enable"
+            android:value="true" />
+        <meta-data
+            android:name="io.sentry.attach-screenshot"
+            android:value="true" />
+        <meta-data
+            android:name="io.sentry.attach-view-hierarchy"
+            android:value="true" />
+        <meta-data
+            android:name="io.sentry.session-replay.on-error-sample-rate"
+            android:value="1.0" />
+        <meta-data
+            android:name="io.sentry.session-replay.session-sample-rate"
+            android:value="0.1" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"

app/src/main/java/ru/risdeveau/geotracker/Data.kt

@@ -11,4 +11,10 @@ object SettingsPreferences : Preferences("settings") {
     var username by stringPref("username", "")
     var url by stringPref("url", "https://geo.tmp.codrs.ru")
     val interval by IntPref("interval", 15)
+}
+
+object StatisticsPreferences : Preferences("statistics") {
+    var totalSent by IntPref("total_sent", 0)
+    var sessionSent by IntPref("session_sent", 0)
+    var lastSent by LongPref("last_sent", 0)
 }

app/src/main/java/ru/risdeveau/geotracker/LocationForegroundService.kt

@@ -16,6 +16,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import java.time.Instant
 
 
 class LocationForegroundService : Service() {
@@ -36,6 +37,12 @@ class LocationForegroundService : Service() {
                     )
                 )
             }
+
+            StatisticsPreferences.apply {
+                totalSent++
+                sessionSent++
+                lastSent = Instant.now().epochSecond
+            }
         }
     }
 
@@ -70,15 +77,13 @@ class LocationForegroundService : Service() {
 
     private fun createNotificationChannel() {
         Log.d("Service", "createNotificationChannel")
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                "location_channel",
-                "Отправка Местоположения",
-                NotificationManager.IMPORTANCE_HIGH
-            )
-            val manager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
-            manager.createNotificationChannel(channel)
-        }
+        val channel = NotificationChannel(
+            "location_channel",
+            "Отправка Местоположения",
+            NotificationManager.IMPORTANCE_HIGH
+        )
+        val manager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        manager.createNotificationChannel(channel)
     }
 
     private fun createNotification(): Notification {

app/src/main/java/ru/risdeveau/geotracker/MainActivity.kt

@@ -50,6 +50,7 @@ import ru.risdeveau.geotracker.ui.theme.GeoTrackerTheme
 import splitties.experimental.ExperimentalSplittiesApi
 import splitties.init.appCtx
 import splitties.resources.appStr
+import java.time.Instant
 
 class MainActivity : ComponentActivity() {
 
@@ -68,13 +69,29 @@ class MainActivity : ComponentActivity() {
 
                         when (screen) {
                             Screen.Main -> {
+                                var totalSent by remember { mutableIntStateOf(0) }
+                                var sessionSent by remember { mutableIntStateOf(0) }
+                                var lastSent by remember { mutableIntStateOf(0) }
+
                                 LaunchedEffect(Unit) {
                                     Log.d("Thread", "Starting...")
                                     startLocationService()
+                                    StatisticsPreferences.sessionSent = 0
                                     Log.d("Thread", "Started")
+
+                                    while (true) {
+                                        totalSent = StatisticsPreferences.totalSent
+                                        sessionSent = StatisticsPreferences.sessionSent
+                                        lastSent = (Instant.now().epochSecond - StatisticsPreferences.lastSent).toInt()
+                                        delay(1000)
+                                    }
                                 }
 
-                                Text("Hello world")
+                                Column(Modifier.align(Alignment.Center)) {
+                                    Text("Всего отправлено: $totalSent")
+                                    Text("Отправлено за эту сессию: $sessionSent")
+                                    Text("В последний раз было отпавлено $lastSent секунд назад")
+                                }
                             }
 
                             Screen.Settings -> {

gradle/libs.versions.toml

@@ -11,6 +11,7 @@ lifecycleRuntimeKtx = "2.8.7"
 activityCompose = "1.10.1"
 composeBom = "2024.04.01"
 logbackClassic = "1.2.11"
+sentry = "8.12.0"
 splittiesFunPackAndroidBase = "3.0.0"
 
 [libraries]
@@ -35,6 +36,7 @@ ktor-client-json = { module = "io.ktor:ktor-client-json", version.ref = "ktor" }
 ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logbackClassic" }
+sentry = { module = "io.sentry:sentry-android", version.ref = "sentry" }
 splitties-base = { module = "com.louiscad.splitties:splitties-fun-pack-android-base", version.ref = "splittiesFunPackAndroidBase" }
 
 [plugins]