Skip to content

A
apk
Commit 755446e9 authored by DrKLO's avatar DrKLO
Browse files
Options

Changed broadcast lists ids 

old broadcast lists will be broken
parent 2eb84e23
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 184 deletions
TMessagesProj/build.gradle
View file @ 755446e9
...@@ -83,7 +83,7 @@ android { ...@@ -83,7 +83,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
targetSdkVersion 19 targetSdkVersion 19
versionCode 292 versionCode 293
versionName "1.7.0" versionName "1.7.0"
} }
} }
TMessagesProj/src/main/java/org/telegram/android/AndroidUtilities.java
View file @ 755446e9
...@@ -221,4 +221,8 @@ public class AndroidUtilities { ...@@ -221,4 +221,8 @@ public class AndroidUtilities {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} }
public static long makeBroadcastId(int id) {
return 0x0000000100000000L | ((long)id & 0x00000000FFFFFFFFL);
}
} }
TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java
View file @ 755446e9
...@@ -366,6 +366,17 @@ public class MessagesStorage { ...@@ -366,6 +366,17 @@ public class MessagesStorage {
if (!messagesOnly) { if (!messagesOnly) {
database.executeFast("DELETE FROM dialogs WHERE did = " + did).stepThis().dispose(); database.executeFast("DELETE FROM dialogs WHERE did = " + did).stepThis().dispose();
database.executeFast("DELETE FROM chat_settings WHERE uid = " + did).stepThis().dispose(); database.executeFast("DELETE FROM chat_settings WHERE uid = " + did).stepThis().dispose();
int lower_id = (int)did;
int high_id = (int)(did >> 32);
if (lower_id != 0) {
if (high_id == 1) {
database.executeFast("DELETE FROM chats WHERE uid = " + lower_id).stepThis().dispose();
} else if (lower_id < 0) {
database.executeFast("DELETE FROM chats WHERE uid = " + (-lower_id)).stepThis().dispose();
}
} else {
database.executeFast("DELETE FROM enc_chats WHERE uid = " + high_id).stepThis().dispose();
}
} }
database.executeFast("UPDATE dialogs SET unread_count = 0 WHERE did = " + did).stepThis().dispose(); database.executeFast("UPDATE dialogs SET unread_count = 0 WHERE did = " + did).stepThis().dispose();
database.executeFast("DELETE FROM media_counts WHERE uid = " + did).stepThis().dispose(); database.executeFast("DELETE FROM media_counts WHERE uid = " + did).stepThis().dispose();
...@@ -2429,26 +2440,26 @@ public class MessagesStorage { ...@@ -2429,26 +2440,26 @@ public class MessagesStorage {
buffersStorage.reuseFreeBuffer(data); buffersStorage.reuseFreeBuffer(data);
int lower_id = (int)dialog.id; int lower_id = (int)dialog.id;
int high_id = (int)(dialog.id >> 32);
if (lower_id != 0) { if (lower_id != 0) {
if (lower_id > 0) { if (high_id == 1) {
if (!usersToLoad.contains(lower_id)) { if (!chatsToLoad.contains(lower_id)) {
usersToLoad.add(lower_id); chatsToLoad.add(lower_id);
} }
} else { } else {
if (!chatsToLoad.contains(-lower_id)) { if (lower_id > 0) {
chatsToLoad.add(-lower_id); if (!usersToLoad.contains(lower_id)) {
usersToLoad.add(lower_id);
}
} else {
if (!chatsToLoad.contains(-lower_id)) {
chatsToLoad.add(-lower_id);
}
} }
} }
} else { } else {
int high_id = (int)(dialog.id >> 32); if (!encryptedToLoad.contains(high_id)) {
if (high_id > 0) { encryptedToLoad.add(high_id);
if (!encryptedToLoad.contains(high_id)) {
encryptedToLoad.add(high_id);
}
} else {
if (!chatsToLoad.contains(high_id)) {
chatsToLoad.add(high_id);
}
} }
} }
} }
...@@ -2702,26 +2713,26 @@ public class MessagesStorage { ...@@ -2702,26 +2713,26 @@ public class MessagesStorage {
buffersStorage.reuseFreeBuffer(data); buffersStorage.reuseFreeBuffer(data);
int lower_id = (int)dialog.id; int lower_id = (int)dialog.id;
int high_id = (int)(dialog.id >> 32);
if (lower_id != 0) { if (lower_id != 0) {
if (lower_id > 0) { if (high_id == 1) {
if (!usersToLoad.contains(lower_id)) { if (!chatsToLoad.contains(lower_id)) {
usersToLoad.add(lower_id); chatsToLoad.add(lower_id);
} }
} else { } else {
if (!chatsToLoad.contains(-lower_id)) { if (lower_id > 0) {
chatsToLoad.add(-lower_id); if (!usersToLoad.contains(lower_id)) {
usersToLoad.add(lower_id);
}
} else {
if (!chatsToLoad.contains(-lower_id)) {
chatsToLoad.add(-lower_id);
}
} }
} }
} else { } else {
int high_id = (int)(dialog.id >> 32); if (!encryptedToLoad.contains(high_id)) {
if (high_id > 0) { encryptedToLoad.add(high_id);
if (!encryptedToLoad.contains(high_id)) {
encryptedToLoad.add(high_id);
}
} else {
if (!chatsToLoad.contains(high_id)) {
chatsToLoad.add(high_id);
}
} }
} }
} }
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
View file @ 755446e9
...@@ -225,21 +225,21 @@ public class DialogCell extends BaseCell { ...@@ -225,21 +225,21 @@ public class DialogCell extends BaseCell {
encryptedChat = null; encryptedChat = null;
int lower_id = (int)currentDialog.id; int lower_id = (int)currentDialog.id;
int high_id = (int)(currentDialog.id >> 32);
if (lower_id != 0) { if (lower_id != 0) {
if (lower_id < 0) { if (high_id == 1) {
chat = MessagesController.getInstance().chats.get(-lower_id); chat = MessagesController.getInstance().chats.get(lower_id);
} else { } else {
user = MessagesController.getInstance().users.get(lower_id); if (lower_id < 0) {
chat = MessagesController.getInstance().chats.get(-lower_id);
} else {
user = MessagesController.getInstance().users.get(lower_id);
}
} }
} else { } else {
int high_id = (int)(currentDialog.id >> 32); encryptedChat = MessagesController.getInstance().encryptedChats.get(high_id);
if (high_id > 0) { if (encryptedChat != null) {
encryptedChat = MessagesController.getInstance().encryptedChats.get(high_id); user = MessagesController.getInstance().users.get(encryptedChat.user_id);
if (encryptedChat != null) {
user = MessagesController.getInstance().users.get(encryptedChat.user_id);
}
} else {
chat = MessagesController.getInstance().chats.get(high_id);
} }
} }
......
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file @ 755446e9
...@@ -129,6 +129,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -129,6 +129,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private View pagedownButton; private View pagedownButton;
private TextView topPanelText; private TextView topPanelText;
private long dialog_id; private long dialog_id;
private boolean isBraodcast = false;
private HashMap<Integer, MessageObject> selectedMessagesIds = new HashMap<Integer, MessageObject>(); private HashMap<Integer, MessageObject> selectedMessagesIds = new HashMap<Integer, MessageObject>();
private HashMap<Integer, MessageObject> selectedMessagesCanCopyIds = new HashMap<Integer, MessageObject>(); private HashMap<Integer, MessageObject> selectedMessagesCanCopyIds = new HashMap<Integer, MessageObject>();
...@@ -215,7 +216,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -215,7 +216,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (chatId > 0) { if (chatId > 0) {
dialog_id = -chatId; dialog_id = -chatId;
} else { } else {
dialog_id = ((long)chatId) << 32; isBraodcast = true;
dialog_id = AndroidUtilities.makeBroadcastId(chatId);
} }
} else if (userId != 0) { } else if (userId != 0) {
currentUser = MessagesController.getInstance().users.get(userId); currentUser = MessagesController.getInstance().users.get(userId);
...@@ -1051,8 +1053,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1051,8 +1053,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private int getMessageType(MessageObject messageObject) { private int getMessageType(MessageObject messageObject) {
if (currentEncryptedChat == null) { if (currentEncryptedChat == null) {
boolean isBroadcastError = (int)dialog_id == 0 && messageObject.messageOwner.id <= 0 && messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR; boolean isBroadcastError = isBraodcast && messageObject.messageOwner.id <= 0 && messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR;
if ((int)dialog_id != 0 && messageObject.messageOwner.id <= 0 && messageObject.isOut() || isBroadcastError) { if (!isBraodcast && messageObject.messageOwner.id <= 0 && messageObject.isOut() || isBroadcastError) {
if (messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR) { if (messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR) {
if (!(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) { if (!(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) {
return 0; return 0;
...@@ -1778,7 +1780,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -1778,7 +1780,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (messArr.size() != count) { if (messArr.size() != count) {
if (isCache) { if (isCache) {
cacheEndReaced = true; cacheEndReaced = true;
if ((int)dialog_id == 0) { if (currentEncryptedChat != null || isBraodcast) {
endReached = true; endReached = true;
} }
} else { } else {
...@@ -2932,7 +2934,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ...@@ -2932,7 +2934,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override @Override
public void didSelectDialog(MessagesActivity activity, long did, boolean param) { public void didSelectDialog(MessagesActivity activity, long did, boolean param) {
if (dialog_id != 0 && (forwaringMessage != null || !selectedMessagesIds.isEmpty())) { if (dialog_id != 0 && (forwaringMessage != null || !selectedMessagesIds.isEmpty())) {
if ((int)dialog_id == 0 && currentEncryptedChat == null) { if (isBraodcast) {
param = true; param = true;
} }
if (did != dialog_id) { if (did != dialog_id) {
......
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View file @ 755446e9
...@@ -447,23 +447,23 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen ...@@ -447,23 +447,23 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen
public void didSelectDialog(MessagesActivity messageFragment, long dialog_id, boolean param) { public void didSelectDialog(MessagesActivity messageFragment, long dialog_id, boolean param) {
if (dialog_id != 0) { if (dialog_id != 0) {
int lower_part = (int)dialog_id; int lower_part = (int)dialog_id;
int high_id = (int)(dialog_id >> 32);
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putBoolean("scrollToTopOnResume", true); args.putBoolean("scrollToTopOnResume", true);
NotificationCenter.getInstance().postNotificationName(MessagesController.closeChats); NotificationCenter.getInstance().postNotificationName(MessagesController.closeChats);
if (lower_part != 0) { if (lower_part != 0) {
if (lower_part > 0) { if (high_id == 1) {
args.putInt("user_id", lower_part); args.putInt("chat_id", lower_part);
} else if (lower_part < 0) {
args.putInt("chat_id", -lower_part);
}
} else {
int high_id = (int)(dialog_id >> 32);
if (high_id > 0) {
args.putInt("enc_id", high_id);
} else { } else {
args.putInt("chat_id", high_id); if (lower_part > 0) {
args.putInt("user_id", lower_part);
} else if (lower_part < 0) {
args.putInt("chat_id", -lower_part);
}
} }
} else {
args.putInt("enc_id", high_id);
} }
ChatActivity fragment = new ChatActivity(args); ChatActivity fragment = new ChatActivity(args);
presentFragment(fragment, true); presentFragment(fragment, true);
......
TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java
View file @ 755446e9
...@@ -288,19 +288,19 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -288,19 +288,19 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
} else { } else {
Bundle args = new Bundle(); Bundle args = new Bundle();
int lower_part = (int)dialog_id; int lower_part = (int)dialog_id;
int high_id = (int)(dialog_id >> 32);
if (lower_part != 0) { if (lower_part != 0) {
if (lower_part > 0) { if (high_id == 1) {
args.putInt("user_id", lower_part); args.putInt("chat_id", lower_part);
} else if (lower_part < 0) {
args.putInt("chat_id", -lower_part);
}
} else {
int high_id = (int)(dialog_id >> 32);
if (high_id > 0) {
args.putInt("enc_id", high_id);
} else { } else {
args.putInt("chat_id", high_id); if (lower_part > 0) {
args.putInt("user_id", lower_part);
} else if (lower_part < 0) {
args.putInt("chat_id", -lower_part);
}
} }
} else {
args.putInt("enc_id", high_id);
} }
presentFragment(new ChatActivity(args)); presentFragment(new ChatActivity(args));
} }
...@@ -493,36 +493,36 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -493,36 +493,36 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
builder.setTitle(LocaleController.getString("AppName", R.string.AppName)); builder.setTitle(LocaleController.getString("AppName", R.string.AppName));
int lower_part = (int)dialog_id; int lower_part = (int)dialog_id;
int high_id = (int)(dialog_id >> 32);
if (lower_part != 0) { if (lower_part != 0) {
if (lower_part > 0) { if (high_id == 1) {
TLRPC.User user = MessagesController.getInstance().users.get(lower_part); TLRPC.Chat chat = MessagesController.getInstance().chats.get(lower_part);
if (user == null) {
return;
}
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, Utilities.formatName(user.first_name, user.last_name)));
} else if (lower_part < 0) {
TLRPC.Chat chat = MessagesController.getInstance().chats.get(-lower_part);
if (chat == null) { if (chat == null) {
return; return;
} }
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, chat.title)); builder.setMessage(LocaleController.formatStringSimple(selectAlertString, chat.title));
}
} else {
int high_id = (int)(dialog_id >> 32);
if (high_id > 0) {
TLRPC.EncryptedChat chat = MessagesController.getInstance().encryptedChats.get(high_id);
TLRPC.User user = MessagesController.getInstance().users.get(chat.user_id);
if (user == null) {
return;
}
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, Utilities.formatName(user.first_name, user.last_name)));
} else { } else {
TLRPC.Chat chat = MessagesController.getInstance().chats.get(high_id); if (lower_part > 0) {
if (chat == null) { TLRPC.User user = MessagesController.getInstance().users.get(lower_part);
return; if (user == null) {
return;
}
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, Utilities.formatName(user.first_name, user.last_name)));
} else if (lower_part < 0) {
TLRPC.Chat chat = MessagesController.getInstance().chats.get(-lower_part);
if (chat == null) {
return;
}
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, chat.title));
} }
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, chat.title));
} }
} else {
TLRPC.EncryptedChat chat = MessagesController.getInstance().encryptedChats.get(high_id);
TLRPC.User user = MessagesController.getInstance().users.get(chat.user_id);
if (user == null) {
return;
}
builder.setMessage(LocaleController.formatStringSimple(selectAlertString, Utilities.formatName(user.first_name, user.last_name)));
} }
CheckBox checkBox = null; CheckBox checkBox = null;
/*if (delegate instanceof ChatActivity) { /*if (delegate instanceof ChatActivity) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment