mirror of
https://github.com/wrwrabbit/Partisan-Telegram-Android.git
synced 2026-05-03 14:30:12 +00:00
Update to 8.0.1 (2428)
This commit is contained in:
xaxtix
parent
368822d20f
commit
42feed0f42
351 changed files with 22083 additions and 13428 deletions
|
|
@ -12,11 +12,11 @@ import android.app.Activity;
|
|||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.text.TextUtils;
|
||||
import android.util.LongSparseArray;
|
||||
import android.util.SparseArray;
|
||||
import android.util.SparseIntArray;
|
||||
|
||||
import org.telegram.SQLite.SQLiteCursor;
|
||||
import org.telegram.messenger.support.LongSparseIntArray;
|
||||
import org.telegram.tgnet.AbstractSerializedData;
|
||||
import org.telegram.tgnet.ConnectionsManager;
|
||||
import org.telegram.tgnet.NativeByteBuffer;
|
||||
|
|
@ -66,7 +66,7 @@ public class SecretChatHelper extends BaseController {
|
|||
}
|
||||
}
|
||||
|
||||
public static final int CURRENT_SECRET_CHAT_LAYER = 101;
|
||||
public static int CURRENT_SECRET_CHAT_LAYER = 101;
|
||||
|
||||
private ArrayList<Integer> sendingNotifyLayer = new ArrayList<>();
|
||||
private SparseArray<ArrayList<TL_decryptedMessageHolder>> secretHolesQueue = new SparseArray<>();
|
||||
|
|
@ -110,7 +110,7 @@ public class SecretChatHelper extends BaseController {
|
|||
|
||||
protected void processPendingEncMessages() {
|
||||
if (!pendingEncMessagesToDelete.isEmpty()) {
|
||||
final ArrayList<Long> pendingEncMessagesToDeleteCopy = new ArrayList<>(pendingEncMessagesToDelete);
|
||||
ArrayList<Long> pendingEncMessagesToDeleteCopy = new ArrayList<>(pendingEncMessagesToDelete);
|
||||
AndroidUtilities.runOnUIThread(() -> {
|
||||
for (int a = 0; a < pendingEncMessagesToDeleteCopy.size(); a++) {
|
||||
MessageObject messageObject = getMessagesController().dialogMessagesByRandomIds.get(pendingEncMessagesToDeleteCopy.get(a));
|
||||
|
|
@ -125,7 +125,7 @@ public class SecretChatHelper extends BaseController {
|
|||
}
|
||||
}
|
||||
|
||||
private TLRPC.TL_messageService createServiceSecretMessage(final TLRPC.EncryptedChat encryptedChat, TLRPC.DecryptedMessageAction decryptedMessage) {
|
||||
private TLRPC.TL_messageService createServiceSecretMessage(TLRPC.EncryptedChat encryptedChat, TLRPC.DecryptedMessageAction decryptedMessage) {
|
||||
TLRPC.TL_messageService newMsg = new TLRPC.TL_messageService();
|
||||
|
||||
newMsg.action = new TLRPC.TL_messageEncryptedAction();
|
||||
|
|
@ -136,7 +136,7 @@ public class SecretChatHelper extends BaseController {
|
|||
newMsg.unread = true;
|
||||
newMsg.out = true;
|
||||
newMsg.flags = TLRPC.MESSAGE_FLAG_HAS_FROM_ID;
|
||||
newMsg.dialog_id = ((long) encryptedChat.id) << 32;
|
||||
newMsg.dialog_id = DialogObject.makeEncryptedDialogId(encryptedChat.id);
|
||||
newMsg.peer_id = new TLRPC.TL_peerUser();
|
||||
newMsg.send_state = MessageObject.MESSAGE_SEND_STATE_SENDING;
|
||||
if (encryptedChat.participant_id == getUserConfig().getClientUserId()) {
|
||||
|
|
@ -179,22 +179,22 @@ public class SecretChatHelper extends BaseController {
|
|||
performSendEncryptedRequest(reqSend, message, encryptedChat, null, null, null);
|
||||
}
|
||||
|
||||
protected void processUpdateEncryption(TLRPC.TL_updateEncryption update, ConcurrentHashMap<Integer, TLRPC.User> usersDict) {
|
||||
final TLRPC.EncryptedChat newChat = update.chat;
|
||||
long dialog_id = ((long) newChat.id) << 32;
|
||||
protected void processUpdateEncryption(TLRPC.TL_updateEncryption update, ConcurrentHashMap<Long, TLRPC.User> usersDict) {
|
||||
TLRPC.EncryptedChat newChat = update.chat;
|
||||
long dialog_id = DialogObject.makeEncryptedDialogId(newChat.id);
|
||||
TLRPC.EncryptedChat existingChat = getMessagesController().getEncryptedChatDB(newChat.id, false);
|
||||
|
||||
if (newChat instanceof TLRPC.TL_encryptedChatRequested && existingChat == null) {
|
||||
int user_id = newChat.participant_id;
|
||||
if (user_id == getUserConfig().getClientUserId()) {
|
||||
user_id = newChat.admin_id;
|
||||
long userId = newChat.participant_id;
|
||||
if (userId == getUserConfig().getClientUserId()) {
|
||||
userId = newChat.admin_id;
|
||||
}
|
||||
TLRPC.User user = getMessagesController().getUser(user_id);
|
||||
TLRPC.User user = getMessagesController().getUser(userId);
|
||||
if (user == null) {
|
||||
user = usersDict.get(user_id);
|
||||
user = usersDict.get(userId);
|
||||
}
|
||||
newChat.user_id = user_id;
|
||||
final TLRPC.Dialog dialog = new TLRPC.TL_dialog();
|
||||
newChat.user_id = userId;
|
||||
TLRPC.Dialog dialog = new TLRPC.TL_dialog();
|
||||
dialog.id = dialog_id;
|
||||
dialog.folder_id = newChat.folder_id;
|
||||
dialog.unread_count = 0;
|
||||
|
|
@ -223,7 +223,7 @@ public class SecretChatHelper extends BaseController {
|
|||
delayedEncryptedChatUpdates.add(update);
|
||||
}
|
||||
} else {
|
||||
final TLRPC.EncryptedChat exist = existingChat;
|
||||
TLRPC.EncryptedChat exist = existingChat;
|
||||
if (exist != null) {
|
||||
newChat.user_id = exist.user_id;
|
||||
newChat.auth_key = exist.auth_key;
|
||||
|
|
@ -288,7 +288,7 @@ public class SecretChatHelper extends BaseController {
|
|||
performSendEncryptedRequest(reqSend, message, encryptedChat, null, null, null);
|
||||
}
|
||||
|
||||
public void sendNotifyLayerMessage(final TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage) {
|
||||
public void sendNotifyLayerMessage(TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage) {
|
||||
if (!(encryptedChat instanceof TLRPC.TL_encryptedChat)) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -312,7 +312,7 @@ public class SecretChatHelper extends BaseController {
|
|||
performSendEncryptedRequest(reqSend, message, encryptedChat, null, null, null);
|
||||
}
|
||||
|
||||
public void sendRequestKeyMessage(final TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage) {
|
||||
public void sendRequestKeyMessage(TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage) {
|
||||
if (!(encryptedChat instanceof TLRPC.TL_encryptedChat)) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -335,7 +335,7 @@ public class SecretChatHelper extends BaseController {
|
|||
performSendEncryptedRequest(reqSend, message, encryptedChat, null, null, null);
|
||||
}
|
||||
|
||||
public void sendAcceptKeyMessage(final TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage) {
|
||||
public void sendAcceptKeyMessage(TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage) {
|
||||
if (!(encryptedChat instanceof TLRPC.TL_encryptedChat)) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -359,7 +359,7 @@ public class SecretChatHelper extends BaseController {
|
|||
performSendEncryptedRequest(reqSend, message, encryptedChat, null, null, null);
|
||||
}
|
||||
|
||||
public void sendCommitKeyMessage(final TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage) {
|
||||
public void sendCommitKeyMessage(TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage) {
|
||||
if (!(encryptedChat instanceof TLRPC.TL_encryptedChat)) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -382,7 +382,7 @@ public class SecretChatHelper extends BaseController {
|
|||
performSendEncryptedRequest(reqSend, message, encryptedChat, null, null, null);
|
||||
}
|
||||
|
||||
public void sendAbortKeyMessage(final TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage, long excange_id) {
|
||||
public void sendAbortKeyMessage(TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage, long excange_id) {
|
||||
if (!(encryptedChat instanceof TLRPC.TL_encryptedChat)) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -404,7 +404,7 @@ public class SecretChatHelper extends BaseController {
|
|||
performSendEncryptedRequest(reqSend, message, encryptedChat, null, null, null);
|
||||
}
|
||||
|
||||
public void sendNoopMessage(final TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage) {
|
||||
public void sendNoopMessage(TLRPC.EncryptedChat encryptedChat, TLRPC.Message resendMessage) {
|
||||
if (!(encryptedChat instanceof TLRPC.TL_encryptedChat)) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -424,7 +424,7 @@ public class SecretChatHelper extends BaseController {
|
|||
performSendEncryptedRequest(reqSend, message, encryptedChat, null, null, null);
|
||||
}
|
||||
|
||||
public void sendResendMessage(final TLRPC.EncryptedChat encryptedChat, int start, int end, TLRPC.Message resendMessage) {
|
||||
public void sendResendMessage(TLRPC.EncryptedChat encryptedChat, int start, int end, TLRPC.Message resendMessage) {
|
||||
if (!(encryptedChat instanceof TLRPC.TL_encryptedChat)) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -581,13 +581,13 @@ public class SecretChatHelper extends BaseController {
|
|||
return message.action instanceof TLRPC.TL_messageEncryptedAction && !(message.action.encryptedAction instanceof TLRPC.TL_decryptedMessageActionScreenshotMessages || message.action.encryptedAction instanceof TLRPC.TL_decryptedMessageActionSetMessageTTL);
|
||||
}
|
||||
|
||||
protected void performSendEncryptedRequest(final TLRPC.TL_messages_sendEncryptedMultiMedia req, final SendMessagesHelper.DelayedMessage message) {
|
||||
protected void performSendEncryptedRequest(TLRPC.TL_messages_sendEncryptedMultiMedia req, SendMessagesHelper.DelayedMessage message) {
|
||||
for (int a = 0; a < req.files.size(); a++) {
|
||||
performSendEncryptedRequest(req.messages.get(a), message.messages.get(a), message.encryptedChat, req.files.get(a), message.originalPaths.get(a), message.messageObjects.get(a));
|
||||
}
|
||||
}
|
||||
|
||||
protected void performSendEncryptedRequest(final TLRPC.DecryptedMessage req, final TLRPC.Message newMsgObj, final TLRPC.EncryptedChat chat, final TLRPC.InputEncryptedFile encryptedFile, final String originalPath, final MessageObject newMsg) {
|
||||
protected void performSendEncryptedRequest(TLRPC.DecryptedMessage req, TLRPC.Message newMsgObj, TLRPC.EncryptedChat chat, TLRPC.InputEncryptedFile encryptedFile, String originalPath, MessageObject newMsg) {
|
||||
if (req == null || chat.auth_key == null || chat instanceof TLRPC.TL_encryptedChatRequested || chat instanceof TLRPC.TL_encryptedChatWaiting) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -627,11 +627,9 @@ public class SecretChatHelper extends BaseController {
|
|||
}
|
||||
|
||||
getMessagesStorage().updateEncryptedChatSeq(chat, false);
|
||||
if (newMsgObj != null) {
|
||||
newMsgObj.seq_in = layer.in_seq_no;
|
||||
newMsgObj.seq_out = layer.out_seq_no;
|
||||
getMessagesStorage().setMessageSeq(newMsgObj.id, newMsgObj.seq_in, newMsgObj.seq_out);
|
||||
}
|
||||
newMsgObj.seq_in = layer.in_seq_no;
|
||||
newMsgObj.seq_out = layer.out_seq_no;
|
||||
getMessagesStorage().setMessageSeq(newMsgObj.id, newMsgObj.seq_in, newMsgObj.seq_out);
|
||||
} else {
|
||||
layer.in_seq_no = newMsgObj.seq_in;
|
||||
layer.out_seq_no = newMsgObj.seq_out;
|
||||
|
|
@ -741,47 +739,45 @@ public class SecretChatHelper extends BaseController {
|
|||
getMessagesStorage().updateEncryptedChatLayer(currentChat);
|
||||
}
|
||||
}
|
||||
if (newMsgObj != null) {
|
||||
if (error == null) {
|
||||
final String attachPath = newMsgObj.attachPath;
|
||||
final TLRPC.messages_SentEncryptedMessage res = (TLRPC.messages_SentEncryptedMessage) response;
|
||||
if (isSecretVisibleMessage(newMsgObj)) {
|
||||
newMsgObj.date = res.date;
|
||||
}
|
||||
int existFlags;
|
||||
if (newMsg != null && res.file instanceof TLRPC.TL_encryptedFile) {
|
||||
updateMediaPaths(newMsg, res.file, req, originalPath);
|
||||
existFlags = newMsg.getMediaExistanceFlags();
|
||||
} else {
|
||||
existFlags = 0;
|
||||
}
|
||||
getMessagesStorage().getStorageQueue().postRunnable(() -> {
|
||||
if (isSecretInvisibleMessage(newMsgObj)) {
|
||||
res.date = 0;
|
||||
}
|
||||
getMessagesStorage().updateMessageStateAndId(newMsgObj.random_id, (long) newMsgObj.id, newMsgObj.id, res.date, false, 0, 0);
|
||||
AndroidUtilities.runOnUIThread(() -> {
|
||||
newMsgObj.send_state = MessageObject.MESSAGE_SEND_STATE_SENT;
|
||||
getNotificationCenter().postNotificationName(NotificationCenter.messageReceivedByServer, newMsgObj.id, newMsgObj.id, newMsgObj, newMsgObj.dialog_id, 0L, existFlags, false);
|
||||
getSendMessagesHelper().processSentMessage(newMsgObj.id);
|
||||
if (MessageObject.isVideoMessage(newMsgObj) || MessageObject.isNewGifMessage(newMsgObj) || MessageObject.isRoundVideoMessage(newMsgObj)) {
|
||||
getSendMessagesHelper().stopVideoService(attachPath);
|
||||
}
|
||||
getSendMessagesHelper().removeFromSendingMessages(newMsgObj.id, false);
|
||||
});
|
||||
});
|
||||
if (error == null) {
|
||||
String attachPath = newMsgObj.attachPath;
|
||||
TLRPC.messages_SentEncryptedMessage res = (TLRPC.messages_SentEncryptedMessage) response;
|
||||
if (isSecretVisibleMessage(newMsgObj)) {
|
||||
newMsgObj.date = res.date;
|
||||
}
|
||||
int existFlags;
|
||||
if (newMsg != null && res.file instanceof TLRPC.TL_encryptedFile) {
|
||||
updateMediaPaths(newMsg, res.file, req, originalPath);
|
||||
existFlags = newMsg.getMediaExistanceFlags();
|
||||
} else {
|
||||
getMessagesStorage().markMessageAsSendError(newMsgObj, false);
|
||||
existFlags = 0;
|
||||
}
|
||||
getMessagesStorage().getStorageQueue().postRunnable(() -> {
|
||||
if (isSecretInvisibleMessage(newMsgObj)) {
|
||||
res.date = 0;
|
||||
}
|
||||
getMessagesStorage().updateMessageStateAndId(newMsgObj.random_id, 0, newMsgObj.id, newMsgObj.id, res.date, false, 0);
|
||||
AndroidUtilities.runOnUIThread(() -> {
|
||||
newMsgObj.send_state = MessageObject.MESSAGE_SEND_STATE_SEND_ERROR;
|
||||
getNotificationCenter().postNotificationName(NotificationCenter.messageSendError, newMsgObj.id);
|
||||
newMsgObj.send_state = MessageObject.MESSAGE_SEND_STATE_SENT;
|
||||
getNotificationCenter().postNotificationName(NotificationCenter.messageReceivedByServer, newMsgObj.id, newMsgObj.id, newMsgObj, newMsgObj.dialog_id, 0L, existFlags, false);
|
||||
getSendMessagesHelper().processSentMessage(newMsgObj.id);
|
||||
if (MessageObject.isVideoMessage(newMsgObj) || MessageObject.isNewGifMessage(newMsgObj) || MessageObject.isRoundVideoMessage(newMsgObj)) {
|
||||
getSendMessagesHelper().stopVideoService(newMsgObj.attachPath);
|
||||
getSendMessagesHelper().stopVideoService(attachPath);
|
||||
}
|
||||
getSendMessagesHelper().removeFromSendingMessages(newMsgObj.id, false);
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
getMessagesStorage().markMessageAsSendError(newMsgObj, false);
|
||||
AndroidUtilities.runOnUIThread(() -> {
|
||||
newMsgObj.send_state = MessageObject.MESSAGE_SEND_STATE_SEND_ERROR;
|
||||
getNotificationCenter().postNotificationName(NotificationCenter.messageSendError, newMsgObj.id);
|
||||
getSendMessagesHelper().processSentMessage(newMsgObj.id);
|
||||
if (MessageObject.isVideoMessage(newMsgObj) || MessageObject.isNewGifMessage(newMsgObj) || MessageObject.isRoundVideoMessage(newMsgObj)) {
|
||||
getSendMessagesHelper().stopVideoService(newMsgObj.attachPath);
|
||||
}
|
||||
getSendMessagesHelper().removeFromSendingMessages(newMsgObj.id, false);
|
||||
});
|
||||
}
|
||||
}, ConnectionsManager.RequestFlagInvokeAfter);
|
||||
} catch (Exception e) {
|
||||
|
|
@ -790,7 +786,7 @@ public class SecretChatHelper extends BaseController {
|
|||
});
|
||||
}
|
||||
|
||||
private void applyPeerLayer(final TLRPC.EncryptedChat chat, int newPeerLayer) {
|
||||
private void applyPeerLayer(TLRPC.EncryptedChat chat, int newPeerLayer) {
|
||||
int currentPeerLayer = AndroidUtilities.getPeerLayerVersion(chat.layer);
|
||||
if (newPeerLayer <= currentPeerLayer) {
|
||||
return;
|
||||
|
|
@ -815,9 +811,9 @@ public class SecretChatHelper extends BaseController {
|
|||
AndroidUtilities.runOnUIThread(() -> getNotificationCenter().postNotificationName(NotificationCenter.encryptedChatUpdated, chat));
|
||||
}
|
||||
|
||||
public TLRPC.Message processDecryptedObject(final TLRPC.EncryptedChat chat, final TLRPC.EncryptedFile file, int date, TLObject object, boolean new_key_used) {
|
||||
public TLRPC.Message processDecryptedObject(TLRPC.EncryptedChat chat, TLRPC.EncryptedFile file, int date, TLObject object, boolean new_key_used) {
|
||||
if (object != null) {
|
||||
int from_id = chat.admin_id;
|
||||
long from_id = chat.admin_id;
|
||||
if (from_id == getUserConfig().getClientUserId()) {
|
||||
from_id = chat.participant_id;
|
||||
}
|
||||
|
|
@ -869,7 +865,7 @@ public class SecretChatHelper extends BaseController {
|
|||
newMessage.grouped_id = decryptedMessage.grouped_id;
|
||||
newMessage.flags |= 131072;
|
||||
}
|
||||
newMessage.dialog_id = ((long) chat.id) << 32;
|
||||
newMessage.dialog_id = DialogObject.makeEncryptedDialogId(chat.id);
|
||||
if (decryptedMessage.reply_to_random_id != 0) {
|
||||
newMessage.reply_to = new TLRPC.TL_messageReplyHeader();
|
||||
newMessage.reply_to.reply_to_random_id = decryptedMessage.reply_to_random_id;
|
||||
|
|
@ -1117,7 +1113,7 @@ public class SecretChatHelper extends BaseController {
|
|||
}
|
||||
return newMessage;
|
||||
} else if (object instanceof TLRPC.TL_decryptedMessageService) {
|
||||
final TLRPC.TL_decryptedMessageService serviceMessage = (TLRPC.TL_decryptedMessageService) object;
|
||||
TLRPC.TL_decryptedMessageService serviceMessage = (TLRPC.TL_decryptedMessageService) object;
|
||||
if (serviceMessage.action instanceof TLRPC.TL_decryptedMessageActionSetMessageTTL || serviceMessage.action instanceof TLRPC.TL_decryptedMessageActionScreenshotMessages) {
|
||||
TLRPC.TL_messageService newMessage = new TLRPC.TL_messageService();
|
||||
if (serviceMessage.action instanceof TLRPC.TL_decryptedMessageActionSetMessageTTL) {
|
||||
|
|
@ -1128,7 +1124,7 @@ public class SecretChatHelper extends BaseController {
|
|||
chat.ttl = serviceMessage.action.ttl_seconds;
|
||||
newMessage.action.encryptedAction = serviceMessage.action;
|
||||
getMessagesStorage().updateEncryptedChatTTL(chat);
|
||||
} else if (serviceMessage.action instanceof TLRPC.TL_decryptedMessageActionScreenshotMessages) {
|
||||
} else {
|
||||
newMessage.action = new TLRPC.TL_messageEncryptedAction();
|
||||
newMessage.action.encryptedAction = serviceMessage.action;
|
||||
}
|
||||
|
|
@ -1141,10 +1137,10 @@ public class SecretChatHelper extends BaseController {
|
|||
newMessage.from_id.user_id = from_id;
|
||||
newMessage.peer_id = new TLRPC.TL_peerUser();
|
||||
newMessage.peer_id.user_id = getUserConfig().getClientUserId();
|
||||
newMessage.dialog_id = ((long) chat.id) << 32;
|
||||
newMessage.dialog_id = DialogObject.makeEncryptedDialogId(chat.id);
|
||||
return newMessage;
|
||||
} else if (serviceMessage.action instanceof TLRPC.TL_decryptedMessageActionFlushHistory) {
|
||||
final long did = ((long) chat.id) << 32;
|
||||
long did = DialogObject.makeEncryptedDialogId(chat.id);
|
||||
AndroidUtilities.runOnUIThread(() -> {
|
||||
TLRPC.Dialog dialog = getMessagesController().dialogs_dict.get(did);
|
||||
if (dialog != null) {
|
||||
|
|
@ -1153,7 +1149,7 @@ public class SecretChatHelper extends BaseController {
|
|||
}
|
||||
getMessagesStorage().getStorageQueue().postRunnable(() -> AndroidUtilities.runOnUIThread(() -> {
|
||||
getNotificationsController().processReadMessages(null, did, 0, Integer.MAX_VALUE, false);
|
||||
LongSparseArray<Integer> dialogsToUpdate = new LongSparseArray<>(1);
|
||||
LongSparseIntArray dialogsToUpdate = new LongSparseIntArray(1);
|
||||
dialogsToUpdate.put(did, 0);
|
||||
getNotificationsController().processDialogsUpdateRead(dialogsToUpdate);
|
||||
}));
|
||||
|
|
@ -1353,7 +1349,7 @@ public class SecretChatHelper extends BaseController {
|
|||
newMsg.unread = true;
|
||||
newMsg.out = true;
|
||||
newMsg.flags = TLRPC.MESSAGE_FLAG_HAS_FROM_ID;
|
||||
newMsg.dialog_id = ((long) encryptedChat.id) << 32;
|
||||
newMsg.dialog_id = DialogObject.makeEncryptedDialogId(encryptedChat.id);
|
||||
newMsg.send_state = MessageObject.MESSAGE_SEND_STATE_SENDING;
|
||||
newMsg.seq_in = seq_in;
|
||||
newMsg.seq_out = seq_out;
|
||||
|
|
@ -1368,7 +1364,7 @@ public class SecretChatHelper extends BaseController {
|
|||
return newMsg;
|
||||
}
|
||||
|
||||
private void resendMessages(final int startSeq, final int endSeq, final TLRPC.EncryptedChat encryptedChat) {
|
||||
private void resendMessages(int startSeq, int endSeq, TLRPC.EncryptedChat encryptedChat) {
|
||||
if (encryptedChat == null || endSeq - startSeq < 0) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -1386,13 +1382,13 @@ public class SecretChatHelper extends BaseController {
|
|||
return;
|
||||
}
|
||||
|
||||
long dialog_id = ((long) encryptedChat.id) << 32;
|
||||
long dialog_id = DialogObject.makeEncryptedDialogId(encryptedChat.id);
|
||||
SparseArray<TLRPC.Message> messagesToResend = new SparseArray<>();
|
||||
final ArrayList<TLRPC.Message> messages = new ArrayList<>();
|
||||
ArrayList<TLRPC.Message> messages = new ArrayList<>();
|
||||
for (int a = sSeq; a <= endSeq; a += 2) {
|
||||
messagesToResend.put(a, null);
|
||||
}
|
||||
cursor = getMessagesStorage().getDatabase().queryFinalized(String.format(Locale.US, "SELECT m.data, r.random_id, s.seq_in, s.seq_out, m.ttl, s.mid FROM messages_seq as s LEFT JOIN randoms as r ON r.mid = s.mid LEFT JOIN messages as m ON m.mid = s.mid WHERE m.uid = %d AND m.out = 1 AND s.seq_out >= %d AND s.seq_out <= %d ORDER BY seq_out ASC", dialog_id, sSeq, endSeq));
|
||||
cursor = getMessagesStorage().getDatabase().queryFinalized(String.format(Locale.US, "SELECT m.data, r.random_id, s.seq_in, s.seq_out, m.ttl, s.mid FROM messages_seq as s LEFT JOIN randoms_v2 as r ON r.mid = s.mid LEFT JOIN messages_v2 as m ON m.mid = s.mid WHERE m.uid = %d AND m.out = 1 AND s.seq_out >= %d AND s.seq_out <= %d ORDER BY seq_out ASC", dialog_id, sSeq, endSeq));
|
||||
while (cursor.next()) {
|
||||
TLRPC.Message message;
|
||||
long random_id = cursor.longValue(1);
|
||||
|
|
@ -1551,7 +1547,7 @@ public class SecretChatHelper extends BaseController {
|
|||
}
|
||||
|
||||
protected ArrayList<TLRPC.Message> decryptMessage(TLRPC.EncryptedMessage message) {
|
||||
final TLRPC.EncryptedChat chat = getMessagesController().getEncryptedChatDB(message.chat_id, true);
|
||||
TLRPC.EncryptedChat chat = getMessagesController().getEncryptedChatDB(message.chat_id, true);
|
||||
if (chat == null || chat instanceof TLRPC.TL_encryptedChatDiscarded) {
|
||||
return null;
|
||||
}
|
||||
|
|
@ -1600,7 +1596,7 @@ public class SecretChatHelper extends BaseController {
|
|||
}
|
||||
} else {
|
||||
decryptedWithVersion = 2;
|
||||
if (!decryptWithMtProtoVersion(is, keyToDecrypt, messageKey, 2, incoming, tryAnotherDecrypt)) {
|
||||
if (!decryptWithMtProtoVersion(is, keyToDecrypt, messageKey, 2, incoming, true)) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1613,7 +1609,7 @@ public class SecretChatHelper extends BaseController {
|
|||
chat.key_use_count_in++;
|
||||
}
|
||||
if (object instanceof TLRPC.TL_decryptedMessageLayer) {
|
||||
final TLRPC.TL_decryptedMessageLayer layer = (TLRPC.TL_decryptedMessageLayer) object;
|
||||
TLRPC.TL_decryptedMessageLayer layer = (TLRPC.TL_decryptedMessageLayer) object;
|
||||
if (chat.seq_in == 0 && chat.seq_out == 0) {
|
||||
if (chat.admin_id == getUserConfig().getClientUserId()) {
|
||||
chat.seq_out = 1;
|
||||
|
|
@ -1650,7 +1646,7 @@ public class SecretChatHelper extends BaseController {
|
|||
}
|
||||
if (arr.size() >= 4) {
|
||||
secretHolesQueue.remove(chat.id);
|
||||
final TLRPC.TL_encryptedChatDiscarded newChat = new TLRPC.TL_encryptedChatDiscarded();
|
||||
TLRPC.TL_encryptedChatDiscarded newChat = new TLRPC.TL_encryptedChatDiscarded();
|
||||
newChat.id = chat.id;
|
||||
newChat.user_id = chat.user_id;
|
||||
newChat.auth_key = chat.auth_key;
|
||||
|
|
@ -1708,8 +1704,8 @@ public class SecretChatHelper extends BaseController {
|
|||
return null;
|
||||
}
|
||||
|
||||
public void requestNewSecretChatKey(final TLRPC.EncryptedChat encryptedChat) {
|
||||
final byte[] salt = new byte[256];
|
||||
public void requestNewSecretChatKey(TLRPC.EncryptedChat encryptedChat) {
|
||||
byte[] salt = new byte[256];
|
||||
Utilities.random.nextBytes(salt);
|
||||
|
||||
BigInteger i_g_a = BigInteger.valueOf(getMessagesStorage().getSecretG());
|
||||
|
|
@ -1730,7 +1726,7 @@ public class SecretChatHelper extends BaseController {
|
|||
sendRequestKeyMessage(encryptedChat, null);
|
||||
}
|
||||
|
||||
public void processAcceptedSecretChat(final TLRPC.EncryptedChat encryptedChat) {
|
||||
public void processAcceptedSecretChat(TLRPC.EncryptedChat encryptedChat) {
|
||||
BigInteger p = new BigInteger(1, getMessagesStorage().getSecretPBytes());
|
||||
BigInteger i_authKey = new BigInteger(1, encryptedChat.g_a_or_b);
|
||||
|
||||
|
|
@ -1775,7 +1771,7 @@ public class SecretChatHelper extends BaseController {
|
|||
sendNotifyLayerMessage(encryptedChat, null);
|
||||
});
|
||||
} else {
|
||||
final TLRPC.TL_encryptedChatDiscarded newChat = new TLRPC.TL_encryptedChatDiscarded();
|
||||
TLRPC.TL_encryptedChatDiscarded newChat = new TLRPC.TL_encryptedChatDiscarded();
|
||||
newChat.id = encryptedChat.id;
|
||||
newChat.user_id = encryptedChat.user_id;
|
||||
newChat.auth_key = encryptedChat.auth_key;
|
||||
|
|
@ -1825,7 +1821,7 @@ public class SecretChatHelper extends BaseController {
|
|||
});
|
||||
}
|
||||
|
||||
public void acceptSecretChat(final TLRPC.EncryptedChat encryptedChat) {
|
||||
public void acceptSecretChat(TLRPC.EncryptedChat encryptedChat) {
|
||||
if (acceptingChats.get(encryptedChat.id) != null) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -1903,7 +1899,7 @@ public class SecretChatHelper extends BaseController {
|
|||
getConnectionsManager().sendRequest(req2, (response1, error1) -> {
|
||||
acceptingChats.remove(encryptedChat.id);
|
||||
if (error1 == null) {
|
||||
final TLRPC.EncryptedChat newChat = (TLRPC.EncryptedChat) response1;
|
||||
TLRPC.EncryptedChat newChat = (TLRPC.EncryptedChat) response1;
|
||||
newChat.auth_key = encryptedChat.auth_key;
|
||||
newChat.user_id = encryptedChat.user_id;
|
||||
newChat.seq_in = encryptedChat.seq_in;
|
||||
|
|
@ -1925,16 +1921,16 @@ public class SecretChatHelper extends BaseController {
|
|||
});
|
||||
}
|
||||
|
||||
public void startSecretChat(final Context context, final TLRPC.User user) {
|
||||
public void startSecretChat(Context context, TLRPC.User user) {
|
||||
if (user == null || context == null) {
|
||||
return;
|
||||
}
|
||||
startingSecretChat = true;
|
||||
final AlertDialog progressDialog = new AlertDialog(context, 3);
|
||||
AlertDialog progressDialog = new AlertDialog(context, 3);
|
||||
TLRPC.TL_messages_getDhConfig req = new TLRPC.TL_messages_getDhConfig();
|
||||
req.random_length = 256;
|
||||
req.version = getMessagesStorage().getLastSecretVersion();
|
||||
final int reqId = getConnectionsManager().sendRequest(req, (response, error) -> {
|
||||
int reqId = getConnectionsManager().sendRequest(req, (response, error) -> {
|
||||
if (error == null) {
|
||||
TLRPC.messages_DhConfig res = (TLRPC.messages_DhConfig) response;
|
||||
if (response instanceof TLRPC.TL_messages_dhConfig) {
|
||||
|
|
@ -1955,7 +1951,7 @@ public class SecretChatHelper extends BaseController {
|
|||
getMessagesStorage().setLastSecretVersion(res.version);
|
||||
getMessagesStorage().saveSecretParams(getMessagesStorage().getLastSecretVersion(), getMessagesStorage().getSecretG(), getMessagesStorage().getSecretPBytes());
|
||||
}
|
||||
final byte[] salt = new byte[256];
|
||||
byte[] salt = new byte[256];
|
||||
for (int a = 0; a < 256; a++) {
|
||||
salt[a] = (byte) ((byte) (Utilities.random.nextDouble() * 256) ^ res.random[a]);
|
||||
}
|
||||
|
|
@ -1991,7 +1987,7 @@ public class SecretChatHelper extends BaseController {
|
|||
chat.a_or_b = salt;
|
||||
getMessagesController().putEncryptedChat(chat, false);
|
||||
TLRPC.Dialog dialog = new TLRPC.TL_dialog();
|
||||
dialog.id = DialogObject.makeSecretDialogId(chat.id);
|
||||
dialog.id = DialogObject.makeEncryptedDialogId(chat.id);
|
||||
dialog.unread_count = 0;
|
||||
dialog.top_message = 0;
|
||||
dialog.last_message_date = getConnectionsManager().getCurrentTime();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue