From 9ff220475da907663693bbb7d399e945a5274e2c Mon Sep 17 00:00:00 2001
From: Erik Kiznov <46452865+k1zn@users.noreply.github.com>
Date: Fri, 26 Aug 2022 18:39:35 +0500
Subject: [PATCH] msg downloader: update
- fix group links
---
.../ru/vtosters/lite/downloaders/MessagesDownloader.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/MessagesDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/MessagesDownloader.java
index 18dde6c15..825033fce 100644
--- a/app/src/main/java/ru/vtosters/lite/downloaders/MessagesDownloader.java
+++ b/app/src/main/java/ru/vtosters/lite/downloaders/MessagesDownloader.java
@@ -110,7 +110,7 @@ public class MessagesDownloader{
if (jsonArray == null) return;
for (int i = 0; i < jsonArray.length(); i++) {
- MiniUser user = new MiniUser(jsonArray.getJSONObject(i));
+ MiniUser user = new MiniUser(jsonArray.getJSONObject(i), groups);
array.put(groups ? -user.id : user.id, user);
}
}
@@ -122,14 +122,16 @@ public class MessagesDownloader{
static class MiniUser{
public String firstName;
public String lastName;
+ public boolean isGroup;
int id;
String photo100;
- public MiniUser(JSONObject obj) throws JSONException {
+ public MiniUser(JSONObject obj, boolean is_group) throws JSONException {
id = obj.getInt("id");
firstName = obj.optString("first_name", obj.optString("name"));
lastName = obj.optString("last_name", "");
photo100 = obj.getString("photo_100");
+ isGroup = is_group;
}
}
@@ -297,9 +299,10 @@ public class MessagesDownloader{
String attaches = (message.attachments.size() > 0) ? "Вложения: " + getHtmlForAttach(message.attachments) + "
" : "";
String reply = (message.reply_message != null) ? provideReply(message.reply_message) : "";
String fwdMessages = (message.fwd_messages.size() > 0) ? provideForwardMessages(message.fwd_messages) : "";
+ String userLink = (user.isGroup ? "club" : "id") + user.id;
return "