Idx -> Index

appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt

@@ -91,8 +91,8 @@ class RootFlowNode @AssistedInject constructor(
         authenticationService.isLoggedIn()
             .distinctUntilChanged()
             .combine(
-                authenticationService.cacheIdx().onEach {
+                authenticationService.cacheIndex().onEach {
-                    Timber.v("cacheIdx=$it")
+                    Timber.v("cacheIndex=$it")
                     matrixClientsHolder.removeAll()
                 }
             ) { isLoggedIn, cacheIdx -> isLoggedIn to cacheIdx }
@@ -243,9 +243,9 @@ class RootFlowNode @AssistedInject constructor(
     }
 
     private suspend fun attachSession(sessionId: SessionId): LoggedInFlowNode {
-        val cacheIdx = authenticationService.cacheIdx().first()
+        val cacheIndex = authenticationService.cacheIndex().first()
         return attachChild {
-            backstack.newRoot(NavTarget.LoggedInFlow(sessionId, cacheIdx))
+            backstack.newRoot(NavTarget.LoggedInFlow(sessionId, cacheIndex))
         }
     }
 }

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt

@@ -57,6 +57,6 @@ class DefaultClearCacheUseCase @Inject constructor(
         // Clear app cache
         context.cacheDir.deleteRecursively()
         // Ensure the app is restarted
-        authenticationService.incrementCacheIdx()
+        authenticationService.incrementCacheIndex()
     }
 }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/MatrixAuthenticationService.kt

@@ -33,8 +33,8 @@ interface MatrixAuthenticationService {
      * Cache index
      */
 
-    fun cacheIdx(): Flow<Int>
+    fun cacheIndex(): Flow<Int>
-    fun incrementCacheIdx()
+    fun incrementCacheIndex()
 
     /*
      * OIDC part.

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt

@@ -58,7 +58,7 @@ class RustMatrixAuthenticationService @Inject constructor(
     private val clock: SystemClock,
 ) : MatrixAuthenticationService {
 
-    private val cacheIdxState = MutableStateFlow(0)
+    private val cacheIndexState = MutableStateFlow(0)
 
     private val authService: RustAuthenticationService = RustAuthenticationService(
         basePath = baseDirectory.absolutePath,
@@ -73,12 +73,12 @@ class RustMatrixAuthenticationService @Inject constructor(
         return sessionStore.isLoggedIn()
     }
 
-    override fun incrementCacheIdx() {
+    override fun incrementCacheIndex() {
-        cacheIdxState.value++
+        cacheIndexState.value++
     }
 
-    override fun cacheIdx(): Flow<Int> {
+    override fun cacheIndex(): Flow<Int> {
-        return cacheIdxState
+        return cacheIndexState
     }
 
     override suspend fun getLatestSessionId(): SessionId? = withContext(coroutineDispatchers.io) {

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt

@@ -65,14 +65,14 @@ class FakeAuthenticationService : MatrixAuthenticationService {
         loginError?.let { Result.failure(it) } ?: Result.success(A_USER_ID)
     }
 
-    private val cacheIdxFlow = MutableStateFlow(0)
+    private val cacheIndexFlow = MutableStateFlow(0)
 
-    override fun cacheIdx(): Flow<Int> {
+    override fun cacheIndex(): Flow<Int> {
-        return cacheIdxFlow
+        return cacheIndexFlow
     }
 
-    override fun incrementCacheIdx() {
+    override fun incrementCacheIndex() {
-        cacheIdxFlow.value++
+        cacheIndexFlow.value++
     }
 
     override suspend fun getOidcUrl(): Result<OidcDetails> = simulateLongTask {