Remove unused slidingSyncProxy from DB.

libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/SessionDataMapper.kt

@@ -21,7 +21,6 @@ internal fun SessionData.toDbModel(): DbSessionData {
         refreshToken = refreshToken,
         homeserverUrl = homeserverUrl,
         oidcData = oidcData,
-        slidingSyncProxy = slidingSyncProxy,
         loginTimestamp = loginTimestamp?.time,
         isTokenValid = if (isTokenValid) 1L else 0L,
         loginType = loginType.name,
@@ -43,7 +42,6 @@ internal fun DbSessionData.toApiModel(): SessionData {
         refreshToken = refreshToken,
         homeserverUrl = homeserverUrl,
         oidcData = oidcData,
-        slidingSyncProxy = slidingSyncProxy,
         loginTimestamp = loginTimestamp?.let { Date(it) },
         isTokenValid = isTokenValid == 1L,
         loginType = LoginType.fromName(loginType ?: LoginType.UNKNOWN.name),

libraries/session-storage/impl/src/main/sqldelight/io/element/android/libraries/matrix/session/SessionData.sq

@@ -14,7 +14,6 @@ CREATE TABLE SessionData (
     accessToken TEXT NOT NULL,
     refreshToken TEXT,
     homeserverUrl TEXT NOT NULL,
-    slidingSyncProxy TEXT,
     -- added in version 2
     loginTimestamp INTEGER,
     -- added in version 3

libraries/session-storage/impl/src/main/sqldelight/migrations/10.sqm

@@ -0,0 +1,43 @@
+-- Migrate DB from version 10
+-- Remove field slidingSyncProxy
+
+-- Equivalent to (DROP not supported by sqldelight):
+-- ALTER TABLE SessionData DROP slidingSyncProxy;
+
+CREATE TABLE SessionData_bak (
+    userId TEXT NOT NULL PRIMARY KEY,
+    deviceId TEXT NOT NULL,
+    accessToken TEXT NOT NULL,
+    refreshToken TEXT,
+    homeserverUrl TEXT NOT NULL,
+    loginTimestamp INTEGER,
+    oidcData TEXT,
+    isTokenValid INTEGER NOT NULL DEFAULT 1,
+    loginType TEXT,
+    passphrase TEXT,
+    sessionPath TEXT NOT NULL DEFAULT "",
+    cachePath TEXT NOT NULL DEFAULT "",
+    position INTEGER NOT NULL DEFAULT 0,
+    lastUsageIndex INTEGER NOT NULL DEFAULT 0,
+    userDisplayName TEXT,
+    userAvatarUrl TEXT
+);
+INSERT INTO SessionData_bak SELECT
+    userId,
+    deviceId,
+    accessToken,
+    refreshToken,
+    homeserverUrl,
+    loginTimestamp,
+    oidcData,
+    isTokenValid,
+    loginType,
+    passphrase,
+    sessionPath,
+    cachePath,
+    position,
+    lastUsageIndex,
+    userDisplayName,
+    userAvatarUrl FROM SessionData;
+DROP TABLE SessionData;
+ALTER TABLE SessionData_bak RENAME TO SessionData;

libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseSessionStoreTest.kt

@@ -220,7 +220,6 @@ class DatabaseSessionStoreTest {
             accessToken = "accessToken",
             refreshToken = "refreshToken",
             homeserverUrl = "homeserverUrl",
-            slidingSyncProxy = "slidingSyncProxy",
             loginTimestamp = 1,
             oidcData = "aOidcData",
             isTokenValid = 1,
@@ -239,7 +238,6 @@ class DatabaseSessionStoreTest {
             accessToken = "accessTokenAltered",
             refreshToken = "refreshTokenAltered",
             homeserverUrl = "homeserverUrlAltered",
-            slidingSyncProxy = "slidingSyncProxyAltered",
             loginTimestamp = 2,
             oidcData = "aOidcDataAltered",
             isTokenValid = 1,
@@ -266,7 +264,6 @@ class DatabaseSessionStoreTest {
         assertThat(alteredSession.accessToken).isEqualTo(secondSessionData.accessToken)
         assertThat(alteredSession.refreshToken).isEqualTo(secondSessionData.refreshToken)
         assertThat(alteredSession.homeserverUrl).isEqualTo(secondSessionData.homeserverUrl)
-        assertThat(alteredSession.slidingSyncProxy).isEqualTo(secondSessionData.slidingSyncProxy)
         // Check that alteredSession.loginTimestamp is not altered, so equal to firstSessionData.loginTimestamp
         assertThat(alteredSession.loginTimestamp).isEqualTo(firstSessionData.loginTimestamp)
         assertThat(alteredSession.oidcData).isEqualTo(secondSessionData.oidcData)
@@ -286,7 +283,6 @@ class DatabaseSessionStoreTest {
             accessToken = "accessToken",
             refreshToken = "refreshToken",
             homeserverUrl = "homeserverUrl",
-            slidingSyncProxy = "slidingSyncProxy",
             loginTimestamp = 1,
             oidcData = "aOidcData",
             isTokenValid = 1,
@@ -305,7 +301,6 @@ class DatabaseSessionStoreTest {
             accessToken = "accessTokenAltered",
             refreshToken = "refreshTokenAltered",
             homeserverUrl = "homeserverUrlAltered",
-            slidingSyncProxy = "slidingSyncProxyAltered",
             loginTimestamp = 2,
             oidcData = "aOidcDataAltered",
             isTokenValid = 1,

libraries/session-storage/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/Fixtures.kt

@@ -19,7 +19,6 @@ internal fun aDbSessionData(
     accessToken = "accessToken",
     refreshToken = "refreshToken",
     homeserverUrl = "homeserverUrl",
-    slidingSyncProxy = null,
     loginTimestamp = null,
     oidcData = "aOidcData",
     isTokenValid = 1,