OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 06:25:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

bug fixes

Browse source
This commit is contained in:
DrKLO 2017-12-09 03:45:38 +03:00
parent 5630ad8623
commit e9e40cb13e
7 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TMessagesProj/build.gradle
View file

@ -91,7 +91,7 @@ android {
} }
} }
defaultConfig.versionCode = 1154 defaultConfig.versionCode = 1155
sourceSets.debug { sourceSets.debug {
manifest.srcFile 'config/debug/AndroidManifest.xml' manifest.srcFile 'config/debug/AndroidManifest.xml'

2
TMessagesProj/jni/tgnet/ConnectionsManager.cpp
View file

@ -1289,12 +1289,12 @@ void ConnectionsManager::processServerResponse(TLObject *message, int64_t messag
networkMessage->message->bytes = request->getObjectSize(); networkMessage->message->bytes = request->getObjectSize();
networkMessage->message->body = std::unique_ptr<TLObject>(request); networkMessage->message->body = std::unique_ptr<TLObject>(request);
networkMessage->message->seqno = connection->generateMessageSeqNo(false); networkMessage->message->seqno = connection->generateMessageSeqNo(false);
resendRequests[networkMessage->message->msg_id] = response->answer_msg_id;
std::vector<std::unique_ptr<NetworkMessage>> array; std::vector<std::unique_ptr<NetworkMessage>> array;
array.push_back(std::unique_ptr<NetworkMessage>(networkMessage)); array.push_back(std::unique_ptr<NetworkMessage>(networkMessage));
sendMessagesToConnection(array, connection, false); sendMessagesToConnection(array, connection, false);
resendRequests[networkMessage->message->msg_id] = response->answer_msg_id;
} else if (confirm) { } else if (confirm) {
connection->addMessageToConfirm(response->answer_msg_id); connection->addMessageToConfirm(response->answer_msg_id);
} }

6
TMessagesProj/jni/tgnet/NativeByteBuffer.cpp
View file

@ -476,7 +476,7 @@ int32_t NativeByteBuffer::readBigInt32(bool *error) {
} }
int64_t NativeByteBuffer::readInt64(bool *error) { int64_t NativeByteBuffer::readInt64(bool *error) {
if (_position + 4 > _limit) { if (_position + 8 > _limit) {
if (error != nullptr) { if (error != nullptr) {
*error = true; *error = true;
} }
@ -521,7 +521,7 @@ bool NativeByteBuffer::readBool(bool *error) {
} }
void NativeByteBuffer::readBytes(uint8_t *b, uint32_t length, bool *error) { void NativeByteBuffer::readBytes(uint8_t *b, uint32_t length, bool *error) {
if (_position + length > _limit) { if (length > _limit - _position) {
if (error != nullptr) { if (error != nullptr) {
*error = true; *error = true;
} }
@ -533,7 +533,7 @@ void NativeByteBuffer::readBytes(uint8_t *b, uint32_t length, bool *error) {
} }
ByteArray *NativeByteBuffer::readBytes(uint32_t length, bool *error) { ByteArray *NativeByteBuffer::readBytes(uint32_t length, bool *error) {
if (_position + length > _limit) { if (length > _limit - _position) {
if (error != nullptr) { if (error != nullptr) {
*error = true; *error = true;
} }

2
TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
View file

@ -11,7 +11,7 @@ package org.telegram.messenger;
public class BuildVars { public class BuildVars {
public static boolean DEBUG_VERSION = false; public static boolean DEBUG_VERSION = false;
public static boolean DEBUG_PRIVATE_VERSION = false; public static boolean DEBUG_PRIVATE_VERSION = false;
public static int BUILD_VERSION = 1154; public static int BUILD_VERSION = 1155;
public static String BUILD_VERSION_STRING = "4.6"; public static String BUILD_VERSION_STRING = "4.6";
public static int APP_ID = 0; //obtain your own APP_ID at https://core.telegram.org/api/obtaining_api_id public static int APP_ID = 0; //obtain your own APP_ID at https://core.telegram.org/api/obtaining_api_id
public static String APP_HASH = ""; //obtain your own APP_HASH at https://core.telegram.org/api/obtaining_api_id public static String APP_HASH = ""; //obtain your own APP_HASH at https://core.telegram.org/api/obtaining_api_id

19
TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
View file

@ -808,18 +808,23 @@ public class FileLoader {
} }
public static String getDocumentFileName(TLRPC.Document document) { public static String getDocumentFileName(TLRPC.Document document) {
String fileName = null;
if (document != null) { if (document != null) {
if (document.file_name != null) { if (document.file_name != null) {
return document.file_name; fileName = document.file_name;
} } else {
for (int a = 0; a < document.attributes.size(); a++) { for (int a = 0; a < document.attributes.size(); a++) {
TLRPC.DocumentAttribute documentAttribute = document.attributes.get(a); TLRPC.DocumentAttribute documentAttribute = document.attributes.get(a);
if (documentAttribute instanceof TLRPC.TL_documentAttributeFilename) { if (documentAttribute instanceof TLRPC.TL_documentAttributeFilename) {
return documentAttribute.file_name; fileName = documentAttribute.file_name;
}
} }
} }
} }
return ""; if (fileName != null) {
fileName = fileName.replaceAll("[\u0001-\u001f<>:\"/\\\\|?*\u007f]+", "").trim();
}
return fileName != null ? fileName : "";
} }
public static String getExtensionByMime(String mime) { public static String getExtensionByMime(String mime) {

2
TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
View file

@ -4863,7 +4863,7 @@ public class MessagesStorage {
mentionsIdsMap.put(messageId, message.dialog_id); mentionsIdsMap.put(messageId, message.dialog_id);
} }
if (!MessageObject.isOut(message) && (message.id > 0 || MessageObject.isUnread(message))) { if (!(message.action instanceof TLRPC.TL_messageActionHistoryClear) && !MessageObject.isOut(message) && (message.id > 0 || MessageObject.isUnread(message))) {
Integer currentMaxId = dialogsReadMax.get(message.dialog_id); Integer currentMaxId = dialogsReadMax.get(message.dialog_id);
if (currentMaxId == null) { if (currentMaxId == null) {
SQLiteCursor cursor = database.queryFinalized("SELECT inbox_max FROM dialogs WHERE did = " + message.dialog_id); SQLiteCursor cursor = database.queryFinalized("SELECT inbox_max FROM dialogs WHERE did = " + message.dialog_id);

12
TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java
View file

@ -193,17 +193,17 @@ public class MusicPlayerService extends Service implements NotificationCenter.No
if (MediaController.getInstance().isDownloadingCurrentMessage()) { if (MediaController.getInstance().isDownloadingCurrentMessage()) {
playbackState.setState(PlaybackState.STATE_BUFFERING, 0, 1).setActions(0); playbackState.setState(PlaybackState.STATE_BUFFERING, 0, 1).setActions(0);
bldr.addAction(new Notification.Action.Builder(R.drawable.ic_action_previous, null, pendingPrev).build()) bldr.addAction(new Notification.Action.Builder(R.drawable.ic_action_previous, "", pendingPrev).build())
.addAction(new Notification.Action.Builder(R.drawable.loading_animation2, null, null).build()) .addAction(new Notification.Action.Builder(R.drawable.loading_animation2, "", null).build())
.addAction(new Notification.Action.Builder(R.drawable.ic_action_next, null, pendingNext).build()); .addAction(new Notification.Action.Builder(R.drawable.ic_action_next, "", pendingNext).build());
} else { } else {
playbackState.setState(isPlaying ? PlaybackState.STATE_PLAYING : PlaybackState.STATE_PAUSED, playbackState.setState(isPlaying ? PlaybackState.STATE_PLAYING : PlaybackState.STATE_PAUSED,
MediaController.getInstance().getPlayingMessageObject().audioProgressSec * 1000L, MediaController.getInstance().getPlayingMessageObject().audioProgressSec * 1000L,
isPlaying ? 1 : 0) isPlaying ? 1 : 0)
.setActions(PlaybackState.ACTION_PLAY_PAUSE | PlaybackState.ACTION_PLAY | PlaybackState.ACTION_PAUSE | PlaybackState.ACTION_SKIP_TO_PREVIOUS | PlaybackState.ACTION_SKIP_TO_NEXT); .setActions(PlaybackState.ACTION_PLAY_PAUSE | PlaybackState.ACTION_PLAY | PlaybackState.ACTION_PAUSE | PlaybackState.ACTION_SKIP_TO_PREVIOUS | PlaybackState.ACTION_SKIP_TO_NEXT);
bldr.addAction(new Notification.Action.Builder(R.drawable.ic_action_previous, null, pendingPrev).build()) bldr.addAction(new Notification.Action.Builder(R.drawable.ic_action_previous, "", pendingPrev).build())
.addAction(new Notification.Action.Builder(isPlaying ? R.drawable.ic_action_pause : R.drawable.ic_action_play, null, pendingPlaypause).build()) .addAction(new Notification.Action.Builder(isPlaying ? R.drawable.ic_action_pause : R.drawable.ic_action_play, "", pendingPlaypause).build())
.addAction(new Notification.Action.Builder(R.drawable.ic_action_next, null, pendingNext).build()); .addAction(new Notification.Action.Builder(R.drawable.ic_action_next, "", pendingNext).build());
} }
mediaSession.setPlaybackState(playbackState.build()); mediaSession.setPlaybackState(playbackState.build());