wip

app/src/main/java/ru/risdeveau/pixeldragon/api/Server.kt

@@ -5,6 +5,7 @@
 
 package ru.risdeveau.pixeldragon.api
 
+import android.util.Log
 import io.ktor.client.request.get
 import io.ktor.client.statement.bodyAsText
 import org.json.JSONException
@@ -14,10 +15,16 @@ import ru.risdeveau.pixeldragon.webClient
 
 suspend fun getHomeserver(url: String): String? {
     val r = try { webClient.get("https://$url/.well-known/matrix/client") }
-    catch (_: Exception) { return null }
+    catch (e: Exception) {
+        Log.w("getHomeserver", "Fail sending the request", e)
+        return null
+    }
 
     val json = try { JSONObject(r.bodyAsText()) }
-    catch (_: JSONException) { return null }
+    catch (e: JSONException) {
+        Log.w("getHomeserver", "Fail parsing the JSON", e)
+        return null
+    }
 
     if (!json.has("m.homeserver")) return null
 

app/src/main/java/ru/risdeveau/pixeldragon/api/User.kt

@@ -6,10 +6,14 @@
 package ru.risdeveau.pixeldragon.api
 
 import android.util.Log
+import de.connect2x.trixnity.client.CryptoDriverModule
 import io.ktor.http.Url
-import net.folivo.trixnity.client.MatrixClient
-import net.folivo.trixnity.client.login
-import net.folivo.trixnity.clientserverapi.model.authentication.IdentifierType
+import de.connect2x.trixnity.client.MatrixClient
+import de.connect2x.trixnity.client.create
+import de.connect2x.trixnity.client.cryptodriver.vodozemac.vodozemac
+import de.connect2x.trixnity.clientserverapi.client.MatrixClientAuthProviderData
+import de.connect2x.trixnity.clientserverapi.client.classicLogin
+import de.connect2x.trixnity.clientserverapi.model.authentication.IdentifierType
 import ru.risdeveau.pixeldragon.client
 import ru.risdeveau.pixeldragon.util.getMediaStore
 import ru.risdeveau.pixeldragon.util.getRoomStore
@@ -24,13 +28,16 @@ suspend fun login(server: String, login: String, pass: String): Boolean {
     val pinfo = appCtx.packageManager.getPackageInfo(appCtx.packageName, 0)
 
     try {
-        client = MatrixClient.login(
-            baseUrl = hs,
-            identifier = IdentifierType.User(login),
-            password = pass,
-            initialDeviceDisplayName = "PixelDragon Android v${pinfo.versionName}",
+        client = MatrixClient.create(
             repositoriesModule = getRoomStore(appCtx),
-            mediaStore = getMediaStore()
+            mediaStoreModule = getMediaStore(),
+            cryptoDriverModule = CryptoDriverModule.vodozemac(),
+            authProviderData = MatrixClientAuthProviderData.classicLogin(
+                baseUrl = hs,
+                identifier = IdentifierType.User(login),
+                password = pass,
+                initialDeviceDisplayName = "PixelDragon Android v${pinfo.versionName}",
+            ).getOrThrow()
         ).getOrThrow()
 
         return true