release: v0.1.4 — onglet Journal (diagnostic VPN), limitation des applications (plages horaires, temps d'écran)

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

app/src/main/java/com/jttools/datacontrol/data/AppSettings.kt

@@ -27,7 +27,9 @@ data class AppSettings(
     val familyId: String? = null,
     val deviceId: String? = null,
     /** Horodatage (ms) de la dernière configuration distante appliquée. */
-    val remoteConfigVersion: Long = 0L
+    val remoteConfigVersion: Long = 0L,
+    /** Règles d'usage (plages horaires, limites de temps, applications interdites), au format JSON. */
+    val rulesJson: String? = null
 ) {
     val isPaired: Boolean get() = !familyId.isNullOrEmpty() && !deviceId.isNullOrEmpty()
 

app/src/main/java/com/jttools/datacontrol/data/SettingsRepository.kt

@@ -45,6 +45,9 @@ class SettingsRepository @Inject constructor(
         val FAMILY_ID = stringPreferencesKey("family_id")
         val DEVICE_ID = stringPreferencesKey("device_id")
         val REMOTE_CONFIG_VERSION = longPreferencesKey("remote_config_version")
+        val RULES_JSON = stringPreferencesKey("rules_json")
+        val USAGE_DAY = stringPreferencesKey("usage_day")
+        val USAGE_JSON = stringPreferencesKey("usage_json")
         val TRAFFIC_DAY = stringPreferencesKey("traffic_day")
         val TRAFFIC_MOBILE_ACC = longPreferencesKey("traffic_mobile_acc")
         val TRAFFIC_WIFI_ACC = longPreferencesKey("traffic_wifi_acc")
@@ -74,7 +77,8 @@ class SettingsRepository @Inject constructor(
             cutoffPulseStartMillis = prefs[Keys.CUTOFF_PULSE_START_MILLIS] ?: defaults.cutoffPulseStartMillis,
             familyId = prefs[Keys.FAMILY_ID],
             deviceId = prefs[Keys.DEVICE_ID],
-            remoteConfigVersion = prefs[Keys.REMOTE_CONFIG_VERSION] ?: defaults.remoteConfigVersion
+            remoteConfigVersion = prefs[Keys.REMOTE_CONFIG_VERSION] ?: defaults.remoteConfigVersion,
+            rulesJson = prefs[Keys.RULES_JSON]
         )
     }
 
@@ -205,6 +209,7 @@ class SettingsRepository @Inject constructor(
                 it.remove(Keys.FAMILY_ID)
                 it.remove(Keys.DEVICE_ID)
                 it.remove(Keys.REMOTE_CONFIG_VERSION)
+                it.remove(Keys.RULES_JSON)
             } else {
                 it[Keys.FAMILY_ID] = familyId
                 it[Keys.DEVICE_ID] = deviceId
@@ -225,10 +230,12 @@ class SettingsRepository @Inject constructor(
         whitelistedPackagesWifi: Set<String>?,
         wifiFilterEnabled: Boolean?,
         planLimitMo: Long?,
-        cutoffIntervalMinutes: Int?
+        cutoffIntervalMinutes: Int?,
+        rulesJson: String?
     ) {
         context.dataStore.edit { prefs ->
             if ((prefs[Keys.REMOTE_CONFIG_VERSION] ?: 0L) >= version) return@edit
+            rulesJson?.let { prefs[Keys.RULES_JSON] = it }
             prefs[Keys.REMOTE_CONFIG_VERSION] = version
             controlEnabled?.let { prefs[Keys.CONTROL_ENABLED] = it }
             whitelistedPackages?.let { prefs[Keys.WHITELISTED_PACKAGES] = it }
@@ -265,4 +272,18 @@ class SettingsRepository @Inject constructor(
         }
         return result
     }
+
+    suspend fun loadUsage(): Pair<String, String>? {
+        val prefs = context.dataStore.data.first()
+        val day = prefs[Keys.USAGE_DAY] ?: return null
+        val json = prefs[Keys.USAGE_JSON] ?: return null
+        return day to json
+    }
+
+    suspend fun saveUsage(day: String, json: String) {
+        context.dataStore.edit {
+            it[Keys.USAGE_DAY] = day
+            it[Keys.USAGE_JSON] = json
+        }
+    }
 }