Authentication-Results: mail-b.sr.ht; dkim=pass header.d=fedora.email header.i=@fedora.email Received: from fedora.email (fedora.email [205.185.120.125]) by mail-b.sr.ht (Postfix) with ESMTPS id 8056E11EFFE for <~captainepoch/husky-devel@lists.sr.ht>; Thu, 6 Jan 2022 01:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fedora.email; q=dns/txt; s=aug2020; bh=KnnGz/+PXdVMhUGABEiWrXEpUX46PmO3dfU2SHIrsco=; h=from:subject:date:message-id:to:cc:mime-version:content-transfer-encoding; b=nK2xkeTf34hQYKDKynhSt5Gd++aB2XyCEmwYQdiK/kvXHA/OOcTGdtJ8hQ/WOxbnZ3aevygZ1 tReqc/YNu6N8VoKvzbBNs0VT9nSY5BUPA+02II7FZ8PrsSEUdYG9l8GF8EddP5d6CyCmlRRx783 471/NZyqgMOaDQsWgDNrY5A= Received: from localhost.localdomain ([189.171.101.149] dsl-189-171-101-149-dyn.prod-infinitum.com.mx) (Authenticated sender: sneeden[sneeden@fedora.email]) by fedora.email (ZoneMTA) with ESMTPSA id 17e2cf4701700047ca.001 for <~captainepoch/husky-devel@lists.sr.ht> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Thu, 06 Jan 2022 01:15:24 +0000 X-Zone-Loop: d540be93cd5930024e0fcf4644bf7c98a23192e8ce81 X-Originating-IP: [189.171.101.149] From: Edward Sneed To: ~captainepoch/husky-devel@lists.sr.ht Cc: Edward Sneed Subject: [PATCH husky] Fix missing chats in app Date: Wed, 5 Jan 2022 19:14:51 -0600 Message-Id: <20220106011451.4363-1-sneeden@fedora.email> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit --- This patch fixes the missing chats in its corresponding tab. It is copied from an unmaintained fork found at https://github.com/SamTherapy/Husky and was originally made by @sam@froth.zone (fediverse) .../tusky/network/MastodonApi.kt | 2 +- .../tusky/repository/ChatRepository.kt | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/husky/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt index dda8201..b1a794a 100644 --- a/husky/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt +++ b/husky/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt @@ -631,7 +631,7 @@ interface MastodonApi { @Path("message_id") messageId: String ): Single - @GET("api/v1/pleroma/chats") + @GET("api/v2/pleroma/chats") fun getChats( @Query("max_id") maxId: String?, @Query("min_id") minId: String?, diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/repository/ChatRepository.kt b/husky/app/src/main/java/com/keylesspalace/tusky/repository/ChatRepository.kt index d96df4c..6fa19c3 100644 --- a/husky/app/src/main/java/com/keylesspalace/tusky/repository/ChatRepository.kt +++ b/husky/app/src/main/java/com/keylesspalace/tusky/repository/ChatRepository.kt @@ -59,24 +59,24 @@ class ChatRepositoryImpl( getChatMessagesFromNetwork(chatId, maxId, sinceId, sincedIdMinusOne, limit, accountId, requestMode) }*/ - return getChatMessagesFromNetwork(chatId, maxId, sinceId, sincedIdMinusOne, limit, accountId, requestMode) + return getChatMessagesFromNetwork(chatId, maxId, null, null, limit, accountId, requestMode) } private fun getChatsFromNetwork(maxId: String?, sinceId: String?, sinceIdMinusOne: String?, limit: Int, accountId: Long, requestMode: TimelineRequestMode ): Single> { - return mastodonApi.getChats(maxId, null, sinceIdMinusOne, 0, limit + 1) - .map { chats -> - this.saveChatsToDb(accountId, chats, maxId, sinceId) - } - .flatMap { chats -> - this.addFromDbIfNeeded(accountId, chats, maxId, sinceId, limit, requestMode) - } - .onErrorResumeNext { error -> - if (error is IOException && requestMode != NETWORK) { - this.getChatsFromDb(accountId, maxId, sinceId, limit) - } else { + return mastodonApi.getChats(null, null, sinceIdMinusOne, 0, limit + 1) + .map { chats -> + this.saveChatsToDb(accountId, chats, maxId, sinceId) + } + .flatMap { chats -> + this.addFromDbIfNeeded(accountId, chats, maxId, sinceId, limit, requestMode) + } + .onErrorResumeNext { error -> + if (error is IOException && requestMode != NETWORK) { + this.getChatsFromDb(accountId, maxId, sinceId, limit) + } else { Single.error(error) } } -- 2.25.1