From cf2adeef7a59610abd8b6b1fa466c1ccb8b1678c Mon Sep 17 00:00:00 2001
From: Atridad Lahiji <me@atri.dad>
Date: Fri, 22 Aug 2025 23:22:23 -0600
Subject: [PATCH] 1.1.2 - More fixes for notification reliability

---
 .idea/deploymentTargetSelector.xml            |  8 ++++++++
 app/build.gradle.kts                          |  4 ++--
 .../openclimb/ui/screens/AddEditScreens.kt    | 19 ++++++++++---------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef3..493f22e 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-08-23T05:20:48.817593Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=18171FDF6007NW" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6562bf0..d2b2187 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,8 +14,8 @@ android {
         applicationId = "com.atridad.openclimb"
         minSdk = 33
         targetSdk = 36
-        versionCode = 16
-        versionName = "1.1.1"
+        versionCode = 17
+        versionName = "1.1.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/atridad/openclimb/ui/screens/AddEditScreens.kt b/app/src/main/java/com/atridad/openclimb/ui/screens/AddEditScreens.kt
index 3bbfa92..cc720cf 100644
--- a/app/src/main/java/com/atridad/openclimb/ui/screens/AddEditScreens.kt
+++ b/app/src/main/java/com/atridad/openclimb/ui/screens/AddEditScreens.kt
@@ -16,6 +16,7 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.platform.LocalContext
 import com.atridad.openclimb.data.model.*
 import com.atridad.openclimb.ui.components.ImagePicker
 import com.atridad.openclimb.ui.viewmodel.ClimbViewModel
@@ -80,7 +81,7 @@ fun AddEditGymScreen(
                             val gym = Gym.create(name, location, selectedClimbTypes.toList(), selectedDifficultySystems.toList(), notes = notes)
                             
                             if (isEditing) {
-                                viewModel.updateGym(gym.copy(id = gymId))
+                                viewModel.updateGym(gym.copy(id = gymId!!))
                             } else {
                                 viewModel.addGym(gym)
                             }
@@ -348,7 +349,7 @@ fun AddEditProblemScreen(
                                 )
                                 
                                 if (isEditing) {
-                                    viewModel.updateProblem(problem.copy(id = problemId))
+                                    viewModel.updateProblem(problem.copy(id = problemId!!))
                                 } else {
                                     viewModel.addProblem(problem)
                                 }
@@ -688,6 +689,7 @@ fun AddEditSessionScreen(
 ) {
     val isEditing = sessionId != null
     val gyms by viewModel.gyms.collectAsState()
+    val context = LocalContext.current
 
     // Session form state
     var selectedGym by remember { mutableStateOf<Gym?>(gymId?.let { id -> gyms.find { it.id == id } }) }
@@ -727,15 +729,14 @@ fun AddEditSessionScreen(
                     TextButton(
                         onClick = {
                             selectedGym?.let { gym ->
-                                val session = ClimbSession.create(
-                                    gymId = gym.id,
-                                    notes = sessionNotes.ifBlank { null }
-                                )
-                                
                                 if (isEditing) {
-                                    viewModel.updateSession(session.copy(id = sessionId))
+                                    val session = ClimbSession.create(
+                                        gymId = gym.id,
+                                        notes = sessionNotes.ifBlank { null }
+                                    )
+                                    viewModel.updateSession(session.copy(id = sessionId!!))
                                 } else {
-                                    viewModel.addSession(session)
+                                    viewModel.startSession(context, gym.id, sessionNotes.ifBlank { null })
                                 }
                                 onNavigateBack()
                             }