Merge pull request #94 from CrisisCleanup/update-incidents

Update incidents
CrisisCleanup · Sep 26, 2023 · a049ad1 · a049ad1
2 parents 02f1fe4 + f85010c
commit a049ad1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
 
 android {
     defaultConfig {
-        val buildVersion = 157
+        val buildVersion = 166
         applicationId = "com.crisiscleanup"
         versionCode = buildVersion
         versionName = "0.8.${buildVersion - 155}"

diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/SyncAttempt.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/SyncAttempt.kt
@@ -21,8 +21,12 @@ data class SyncAttempt(
             return false
         }
 
-        val intervalSeconds = backoffIntervalSeconds.coerceAtLeast(1)
         val deltaSeconds = (nowSeconds - attemptedSeconds).coerceAtLeast(1)
+        if (deltaSeconds > 3600) {
+            return false
+        }
+
+        val intervalSeconds = backoffIntervalSeconds.coerceAtLeast(1)
         // now < attempted + interval * 2^(tries-1)
         val lhs = ln(deltaSeconds / intervalSeconds.toFloat())
         val rhs = (attemptedCounter - 1) * ln(2f)

diff --git a/core/model/src/test/java/com/crisiscleanup/core/model/data/SyncAttemptTest.kt b/core/model/src/test/java/com/crisiscleanup/core/model/data/SyncAttemptTest.kt
@@ -57,6 +57,14 @@ class SyncAttemptTest {
         assertFalse(syncAttempt.isBackingOff(0, 108))
     }
 
+    @Test
+    fun backoffIntervalMaximum() {
+        val syncAttempt = SyncAttempt(10, 100, 11)
+
+        assertTrue(syncAttempt.isBackingOff(15, 100 + 3600))
+        assertFalse(syncAttempt.isBackingOff(15, 100 + 3601))
+    }
+
     @Test
     fun shouldSyncPassively() {
         // Not recent, not backing off

diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/DataApiClient.kt b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/DataApiClient.kt
@@ -32,7 +32,7 @@ private interface DataSourceApi {
         fields: String,
         @Query("limit")
         limit: Int,
-        @Query("ordering")
+        @Query("sort")
         ordering: String,
         @Query("start_at__gt")
         after: Instant?,

diff --git a/...aseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditExistingCaseScreen.kt b/...aseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditExistingCaseScreen.kt
@@ -50,6 +50,7 @@ import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -447,6 +448,16 @@ private fun ColumnScope.ExistingCaseContent(
         }
         BusyIndicatorFloatingTopCenter(isLoading)
     }
+
+    val closeKeyboard = rememberCloseKeyboard(pagerState)
+    val pagerPage by remember(pagerState) {
+        derivedStateOf {
+            pagerState.currentPage
+        }
+    }
+    LaunchedEffect(pagerPage) {
+        closeKeyboard()
+    }
 }
 
 @Composable
@@ -1106,7 +1117,7 @@ internal fun EditExistingCaseNotesView(
                     }
                 },
                 modifier = Modifier.testTag("viewCaseAddNoteAction"),
-                enabled = isEditable && isScrolledDown,
+                enabled = isScrolledDown,
             ) {
                 Icon(
                     imageVector = CrisisCleanupIcons.CaretUp,