Merge pull request #3056 from nightscout/prepare3.2.0.2

3.2.0.2

Author: MilosKozak

.gitignore

@@ -3,6 +3,7 @@
 /local.properties
 .DS_Store
 */jacoco.exec
+*/output-metadata.json
 /build
 /captures
 *.apk
@@ -19,6 +20,9 @@ app/.classpath
 app/.settings/org.eclipse.buildship.core.prefs
 wear/.classpath
 wear/.settings/org.eclipse.buildship.core.prefs
-app/nsclient/*
-app/nsclient2/*
+app/aapsclient/*
+app/aapsclient2/*
 app/pumpcontrol/*
+wear/aapsclient/*
+wear/aapsclient2/*
+wear/pumpcontrol/*

app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt

@@ -190,7 +190,7 @@ class UiInteractionImpl @Inject constructor(
         rxBus.send(EventNewNotification(Notification(id, System.currentTimeMillis(), text, level, validTo)))
     }
 
-    override fun addNotificationWithAction(injector: HasAndroidInjector, nsAlarm: NSAlarm) {
+    override fun addNotificationWithAction(nsAlarm: NSAlarm) {
         rxBus.send(EventNewNotification(NotificationWithAction(injector, nsAlarm)))
     }
 

app/src/main/kotlin/app/aaps/receivers/DataReceiver.kt

@@ -32,7 +32,7 @@ open class DataReceiver : DaggerBroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         super.onReceive(context, intent)
         val bundle = intent.extras ?: return
-        aapsLogger.debug(LTag.DATABASE, "onReceive ${intent.action} ${BundleLogger.log(bundle)}")
+        aapsLogger.debug(LTag.CORE, "onReceive ${intent.action} ${BundleLogger.log(bundle)}")
 
         when (intent.action) {
             Intents.ACTION_NEW_BG_ESTIMATE            ->

app/src/main/res/values-lt-rLT/strings.xml

@@ -17,8 +17,8 @@
     <string name="nav_about">Apie</string>
     <string name="smscommunicator_missingphonestatepermission">Trūksta telefono būsenos leidimo</string>
     <string name="ns_alarm_options">Aliarmų nustatymai</string>
-    <string name="ns_alarms">Sukurti pranešimus iš NS aliarmų</string>
-    <string name="ns_announcements">Sukurkite pranešimus iš NS perspėjimų</string>
+    <string name="ns_alarms">Kurti pranešimus iš NS aliarmų</string>
+    <string name="ns_announcements">Kurti pranešimus iš NS perspėjimų</string>
     <string name="ns_alarm_stale_data_value_label">Seni duomenys, riba [min]</string>
     <string name="ns_alarm_urgent_stale_data_value_label">Kritiškai seni duomenys, riba [min]</string>
     <string name="sensitivity_warning">Įjungę Autosens funkciją nepamirškite įvedinėti visus valgomus angliavandenius. To nedarant, angliavandenių sukeliami glikemijos svyravimai bus klaidingai identifikuojami kaip jautrumo pasikeitimai!</string>
@@ -48,7 +48,7 @@
     <string name="clear_filter">Valyti filtrą</string>
     <string name="cannula">Kaniulė</string>
     <string name="email_address">El. pašto adresas</string>
-    <string name="remove_bg_readings">Pašalinti KG duomenis</string>
+    <string name="remove_bg_readings">Pašalinti glikemijos duomenis</string>
     <string name="identification_not_set">Kūrėjo režime tapatybė nenustatyta</string>
     <string name="a11y_dialog">dialogas</string>
     <!-- WEAR OS-->

build.gradle.kts

@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.1.2")
+        classpath("com.android.tools.build:gradle:8.1.3")
         classpath("com.google.gms:google-services:4.4.0")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
 

buildSrc/build.gradle.kts

@@ -1,6 +1,6 @@
 object KtsBuildVersions {
 
-    const val gradle = "8.1.2"
+    const val gradle = "8.1.3"
     const val kotlin = "1.9.0"
 }
 

buildSrc/src/main/kotlin/Versions.kt

@@ -2,7 +2,7 @@ import org.gradle.api.JavaVersion
 
 object Versions {
 
-    const val appVersion = "3.2.0.1"
+    const val appVersion = "3.2.0.2"
     const val versionCode = 1500
 
     const val ndkVersion = "21.1.6352462"
@@ -15,4 +15,4 @@ object Versions {
 
     val javaVersion = JavaVersion.VERSION_11
     const val jacoco = "0.8.11"
-}
+}

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefFileListProvider.kt

@@ -13,7 +13,7 @@ interface PrefFileListProvider {
     fun newExportFile(): File
     fun newExportCsvFile(): File
     fun newCwfFile(filename: String, withDate: Boolean = true): File
-    fun listPreferenceFiles(loadMetadata: Boolean = false): MutableList<PrefsFile>
+    fun listPreferenceFiles(): MutableList<PrefsFile>
     fun listCustomWatchfaceFiles(): MutableList<CwfFile>
     fun checkMetadata(metadata: Map<PrefsMetadataKey, PrefMetadata>): Map<PrefsMetadataKey, PrefMetadata>
     fun formatExportedAgo(utcTime: String): String

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/maintenance/PrefsFile.kt

@@ -10,7 +10,6 @@ data class PrefsFile(
     val name: String,
     val file: File,
     val baseDir: File,
-    val dirKind: PrefsImportDir,
 
     // metadata here is used only for list display
     val metadata: @RawValue Map<PrefsMetadataKey, PrefMetadata>