Skip to content

A
apk
Commit 2b15ac63 authored by DrKLO's avatar DrKLO
Browse files
Options

Continue upload file after app restart, bug fixes

parent 8b73d93d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 256 additions and 206 deletions
TMessagesProj/build.gradle
View file @ 2b15ac63
......@@ -80,7 +80,7 @@ android {
defaultConfig {
minSdkVersion 8
targetSdkVersion 19
versionCode 310
versionCode 311
versionName "1.8.0"
}
}
TMessagesProj/src/main/java/org/telegram/android/GcmBroadcastReceiver.java
View file @ 2b15ac63
......@@ -53,13 +53,6 @@ public class GcmBroadcastReceiver extends BroadcastReceiver {
FileLog.e("tmessages", e);
}
/*SharedPreferences preferences = context.getSharedPreferences("Notifications", Context.MODE_PRIVATE);
boolean globalEnabled = preferences.getBoolean("EnableAll", true);
if (!globalEnabled) {
FileLog.d("tmessages", "GCM disabled");
return;
}*/
ConnectionsManager.getInstance().resumeNetworkMaybe();
}
});
......
TMessagesProj/src/main/java/org/telegram/android/ImageLoader.java
View file @ 2b15ac63
......@@ -628,7 +628,7 @@ public class ImageLoader {
}
}
public BitmapDrawable getImageFromMemory(TLRPC.FileLocation url, String httpUrl, String filter) {
public BitmapDrawable getImageFromMemory(TLRPC.FileLocation url, String httpUrl, String filter, ImageReceiver imageReceiver) {
if (url == null && httpUrl == null) {
return null;
}
......@@ -641,6 +641,15 @@ public class ImageLoader {
if (filter != null) {
key += "@" + filter;
}
if (imageReceiver != null) {
Integer TAG = imageReceiver.getTag();
if (TAG != null) {
CacheImage alreadyLoadingImage = imageLoadingByTag.get(TAG);
if (alreadyLoadingImage != null) {
alreadyLoadingImage.removeImageView(imageReceiver);
}
}
}
return memCache.get(key);
}
......@@ -668,8 +677,8 @@ public class ImageLoader {
String url;
String key;
if (httpUrl != null) {
url = httpUrl;
key = Utilities.MD5(httpUrl);
url = key + ".jpg";
} else {
key = fileLocation.volume_id + "_" + fileLocation.local_id;
url = key + ".jpg";
......
TMessagesProj/src/main/java/org/telegram/android/ImageReceiver.java
View file @ 2b15ac63
......@@ -88,14 +88,14 @@ public class ImageReceiver {
if (currentImage != null) {
return;
} else {
img = ImageLoader.getInstance().getImageFromMemory(fileLocation, httpUrl, filter);
img = ImageLoader.getInstance().getImageFromMemory(fileLocation, httpUrl, filter, this);
}
} else {
img = ImageLoader.getInstance().getImageFromMemory(fileLocation, httpUrl, filter);
img = ImageLoader.getInstance().getImageFromMemory(fileLocation, httpUrl, filter, this);
recycleBitmap(img);
}
}
img = ImageLoader.getInstance().getImageFromMemory(fileLocation, httpUrl, filter);
img = ImageLoader.getInstance().getImageFromMemory(fileLocation, httpUrl, filter, this);
currentPath = key;
last_path = fileLocation;
last_httpUrl = httpUrl;
......
TMessagesProj/src/main/java/org/telegram/android/MessagesController.java
View file @ 2b15ac63
......@@ -963,7 +963,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
NotificationsController.getInstance().processReadMessages(null, did, 0, Integer.MAX_VALUE, false);
HashMap<Long, Integer> dialogsToUpdate = new HashMap<Long, Integer>();
dialogsToUpdate.put(did, 0);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate, true);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
}
});
}
......@@ -1395,7 +1395,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
currentDialog.unread_count = entry.getValue();
}
}
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate, true);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
}
});
......@@ -1491,7 +1491,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
dialogsServerOnly.add(d);
}
}
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate, true);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
}
});
......@@ -1711,12 +1711,12 @@ public class MessagesController implements NotificationCenter.NotificationCenter
NotificationsController.getInstance().processReadMessages(null, dialog_id, 0, max_positive_id, false);
HashMap<Long, Integer> dialogsToUpdate = new HashMap<Long, Integer>();
dialogsToUpdate.put(dialog_id, 0);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate, true);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
} else {
NotificationsController.getInstance().processReadMessages(null, dialog_id, 0, max_positive_id, true);
HashMap<Long, Integer> dialogsToUpdate = new HashMap<Long, Integer>();
dialogsToUpdate.put(dialog_id, 2000001);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate, false);
dialogsToUpdate.put(dialog_id, -1);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
}
}
});
......@@ -1784,7 +1784,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}
HashMap<Long, Integer> dialogsToUpdate = new HashMap<Long, Integer>();
dialogsToUpdate.put(dialog_id, 0);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate, true);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
}
});
}
......@@ -3417,27 +3417,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter
return false;
}
public void dialogsUnreadCountIncr(final HashMap<Long, Integer> values) {
AndroidUtilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
for (HashMap.Entry<Long, Integer> entry : values.entrySet()) {
TLRPC.TL_dialog dialog = dialogs_dict.get(entry.getKey());
if (dialog != null) {
int value = entry.getValue();
if (value < 0) {
dialog.unread_count = -value;
} else {
dialog.unread_count += value;
}
}
}
NotificationsController.getInstance().processDialogsUpdateRead(values, false);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
}
});
}
protected void updateInterfaceWithMessages(long uid, ArrayList<MessageObject> messages) {
updateInterfaceWithMessages(uid, messages, false);
}
......@@ -3718,7 +3697,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
NotificationsController.getInstance().processReadMessages(null, did, 0, Integer.MAX_VALUE, false);
HashMap<Long, Integer> dialogsToUpdate = new HashMap<Long, Integer>();
dialogsToUpdate.put(did, 0);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate, true);
NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
}
});
}
......
TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java
View file @ 2b15ac63
......@@ -133,24 +133,8 @@ public class MessagesStorage {
database.executeFast("CREATE INDEX IF NOT EXISTS send_state_idx_messages ON messages(mid, send_state, date) WHERE mid < 0 AND send_state = 1;").stepThis().dispose();
database.executeFast("PRAGMA user_version = 3").stepThis().dispose();
} else {
int version = database.executeInt("PRAGMA user_version");
if (version < 3) {
SQLiteCursor cursor = database.queryFinalized("SELECT count(*) FROM sqlite_master WHERE type='table' AND name='params'");
boolean create = false;
if (cursor.next()) {
int count = cursor.intValue(0);
if (count == 0) {
create = true;
}
} else {
create = true;
}
cursor.dispose();
if (create) {
database.executeFast("CREATE TABLE params(id INTEGER PRIMARY KEY, seq INTEGER, pts INTEGER, date INTEGER, qts INTEGER, lsv INTEGER, sg INTEGER, pbytes BLOB)").stepThis().dispose();
database.executeFast("INSERT INTO params VALUES(1, 0, 0, 0, 0, 0, 0, NULL)").stepThis().dispose();
} else {
cursor = database.queryFinalized("SELECT seq, pts, date, qts, lsv, sg, pbytes FROM params WHERE id = 1");
try {
SQLiteCursor cursor = database.queryFinalized("SELECT seq, pts, date, qts, lsv, sg, pbytes FROM params WHERE id = 1");
if (cursor.next()) {
lastSeqValue = cursor.intValue(0);
lastPtsValue = cursor.intValue(1);
......@@ -168,7 +152,32 @@ public class MessagesStorage {
}
}
cursor.dispose();
} catch (Exception e) {
FileLog.e("tmessages", e);
try {
database.executeFast("CREATE TABLE IF NOT EXISTS params(id INTEGER PRIMARY KEY, seq INTEGER, pts INTEGER, date INTEGER, qts INTEGER, lsv INTEGER, sg INTEGER, pbytes BLOB)").stepThis().dispose();
database.executeFast("INSERT INTO params VALUES(1, 0, 0, 0, 0, 0, 0, NULL)").stepThis().dispose();
} catch (Exception e2) {
FileLog.e("tmessages", e2);
}
}
int version = database.executeInt("PRAGMA user_version");
if (version < 3) {
updateDbToVersion3();
}
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
loadUnreadMessages(false);
}
public void updateDbToVersion3() {
storageQueue.postRunnable(new Runnable() {
@Override
public void run() {
try {
database.executeFast("CREATE TABLE IF NOT EXISTS user_photos(uid INTEGER, id INTEGER, data BLOB, PRIMARY KEY (uid, id))").stepThis().dispose();
database.executeFast("CREATE INDEX IF NOT EXISTS mid_idx_media ON media(mid);").stepThis().dispose();
......@@ -200,7 +209,12 @@ public class MessagesStorage {
database.executeFast("UPDATE messages SET send_state = 2 WHERE mid < 0 AND send_state = 1").stepThis().dispose();
try {
database.executeFast("ALTER TABLE dialogs ADD COLUMN flags INTEGER NOT NULL default 0;").stepThis().dispose();
} catch (Exception e) {
FileLog.e("tmessages", e);
}
database.executeFast("CREATE INDEX IF NOT EXISTS unread_count_flags_idx_dialogs ON dialogs(unread_count, flags);").stepThis().dispose();
database.executeFast("PRAGMA user_version = 3").stepThis().dispose();
......@@ -230,31 +244,11 @@ public class MessagesStorage {
}
}
});
} else {
SQLiteCursor cursor = database.queryFinalized("SELECT seq, pts, date, qts, lsv, sg, pbytes FROM params WHERE id = 1");
if (cursor.next()) {
lastSeqValue = cursor.intValue(0);
lastPtsValue = cursor.intValue(1);
lastDateValue = cursor.intValue(2);
lastQtsValue = cursor.intValue(3);
lastSecretVersion = cursor.intValue(4);
secretG = cursor.intValue(5);
if (cursor.isNull(6)) {
secretPBytes = null;
} else {
secretPBytes = cursor.byteArrayValue(6);
if (secretPBytes != null && secretPBytes.length == 1) {
secretPBytes = null;
}
}
}
cursor.dispose();
}
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
loadUnreadMessages(false);
}
});
}
public void cleanUp(final boolean isLogin) {
......@@ -2416,14 +2410,7 @@ public class MessagesStorage {
SQLitePreparedStatement state4 = database.executeFast("REPLACE INTO download_queue VALUES(?, ?, ?, ?)");
for (TLRPC.Message message : messages) {
long dialog_id = 0;
if (message.unread && !message.out) {
if (messageIds.length() > 0) {
messageIds += ",";
}
messageIds += message.id;
dialog_id = message.dialog_id;
long dialog_id = message.dialog_id;
if (dialog_id == 0) {
if (message.to_id.chat_id != 0) {
dialog_id = -message.to_id.chat_id;
......@@ -2432,20 +2419,15 @@ public class MessagesStorage {
}
}
if (message.unread && !message.out) {
if (messageIds.length() > 0) {
messageIds += ",";
}
messageIds += message.id;
messagesIdsMap.put(message.id, dialog_id);
}
if (message.media instanceof TLRPC.TL_messageMediaVideo || message.media instanceof TLRPC.TL_messageMediaPhoto) {
if (dialog_id == 0) {
dialog_id = message.dialog_id;
if (dialog_id == 0) {
if (message.to_id.chat_id != 0) {
dialog_id = -message.to_id.chat_id;
} else if (message.to_id.user_id != 0) {
dialog_id = message.to_id.user_id;
}
}
}
if (messageMediaIds.length() > 0) {
messageMediaIds += ",";
}
......@@ -2612,7 +2594,7 @@ public class MessagesStorage {
if (unread_count == null) {
unread_count = 0;
} else {
messagesCounts.put(key, -(unread_count + old_unread_count));
messagesCounts.put(key, unread_count + old_unread_count);
}
int messageId = value.id;
if (value.local_id != 0) {
......@@ -2633,7 +2615,7 @@ public class MessagesStorage {
if (withTransaction) {
database.commitTransaction();
}
MessagesController.getInstance().dialogsUnreadCountIncr(messagesCounts);
MessagesController.getInstance().processDialogsUpdateRead(messagesCounts);
if (!mediaCounts.isEmpty()) {
state = database.executeFast("REPLACE INTO media_counts VALUES(?, ?)");
......@@ -2687,6 +2669,19 @@ public class MessagesStorage {
}
}
public void markMessageAsSendError(final int mid) {
storageQueue.postRunnable(new Runnable() {
@Override
public void run() {
try {
database.executeFast("UPDATE messages SET send_state = 2 WHERE mid = " + mid).stepThis().dispose();
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
});
}
private Integer updateMessageStateAndIdInternal(long random_id, Integer _oldId, int newId, int date) {
if (_oldId != null && _oldId == newId && date != 0) {
SQLitePreparedStatement state = null;
......
TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java
View file @ 2b15ac63
......@@ -419,7 +419,7 @@ public class NotificationsController {
}
if (photoPath != null) {
BitmapDrawable img = ImageLoader.getInstance().getImageFromMemory(photoPath, null, "50_50");
BitmapDrawable img = ImageLoader.getInstance().getImageFromMemory(photoPath, null, "50_50", null);
if (img != null) {
mBuilder.setLargeIcon(img.getBitmap());
}
......@@ -596,21 +596,22 @@ public class NotificationsController {
}
}
public void processDialogsUpdateRead(final HashMap<Long, Integer> dialogsToUpdate, boolean replace) {
public void processDialogsUpdateRead(final HashMap<Long, Integer> dialogsToUpdate) {
int old_unread_count = total_unread_count;
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Context.MODE_PRIVATE);
for (HashMap.Entry<Long, Integer> entry : dialogsToUpdate.entrySet()) {
long dialog_id = entry.getKey();
int notify_override = preferences.getInt("notify2_" + dialog_id, 0);
boolean isChat = (int)dialog_id < 0;
Integer currentCount = pushDialogs.get(dialog_id);
boolean canAddValue = !(notify_override == 2 || (!preferences.getBoolean("EnableAll", true) || isChat && !preferences.getBoolean("EnableGroup", true)) && notify_override == 0);
boolean canAddValue = !(notify_override == 2 || (!preferences.getBoolean("EnableAll", true) || ((int)dialog_id < 0) && !preferences.getBoolean("EnableGroup", true)) && notify_override == 0);
Integer currentCount = pushDialogs.get(dialog_id);
Integer newCount = entry.getValue();
if (replace || newCount < 0) {
if (newCount < 0) {
newCount *= -1;
if (currentCount == null) {
continue;
}
newCount = currentCount + newCount;
}
if (currentCount != null) {
total_unread_count -= currentCount;
......@@ -630,17 +631,6 @@ public class NotificationsController {
total_unread_count += newCount;
pushDialogs.put(dialog_id, newCount);
}
} else if (canAddValue) {
if (newCount > 2000000) {
newCount = 2000000 - newCount;
}
if (currentCount == null) {
currentCount = 0;
}
currentCount += newCount;
total_unread_count += newCount;
pushDialogs.put(dialog_id, currentCount);
}
}
if (old_unread_count != total_unread_count) {
showOrUpdateNotification(notifyCheck);
......
TMessagesProj/src/main/java/org/telegram/android/SendMessagesHelper.java
View file @ 2b15ac63
......@@ -147,6 +147,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
for (int a = 0; a < arr.size(); a++) {
DelayedMessage obj = arr.get(a);
if (enc && obj.sendEncryptedRequest != null || !enc && obj.sendRequest != null) {
MessagesStorage.getInstance().markMessageAsSendError(obj.obj.messageOwner.id);
obj.obj.messageOwner.send_state = MessageObject.MESSAGE_SEND_STATE_SEND_ERROR;
arr.remove(a);
a--;
......@@ -392,6 +393,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
newMsg.from_id = UserConfig.getClientUserId();
newMsg.out = true;
newMsg.date = ConnectionsManager.getInstance().getCurrentTime();
UserConfig.saveConfig(false);
}
if (newMsg.random_id == 0) {
newMsg.random_id = getNextRandomId();
......@@ -453,11 +455,11 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
newMsg.ttl = encryptedChat.ttl;
}
UserConfig.saveConfig(false);
final MessageObject newMsgObj = new MessageObject(newMsg, null, 2);
MessageObject newMsgObj = new MessageObject(newMsg, null, 2);
newMsgObj.messageOwner.send_state = MessageObject.MESSAGE_SEND_STATE_SENDING;
final ArrayList<MessageObject> objArr = new ArrayList<MessageObject>();
ArrayList<MessageObject> objArr = new ArrayList<MessageObject>();
objArr.add(newMsgObj);
ArrayList<TLRPC.Message> arr = new ArrayList<TLRPC.Message>();
arr.add(newMsg);
......@@ -553,7 +555,6 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
delayedMessage.obj = newMsgObj;
delayedMessage.documentLocation = document;
delayedMessage.location = document.thumb.location;
performSendDelayedMessage(delayedMessage);
} else {
TLRPC.TL_inputMediaDocument media = new TLRPC.TL_inputMediaDocument();
media.id = new TLRPC.TL_inputDocument();
......@@ -889,6 +890,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
}
});
} else {
MessagesStorage.getInstance().markMessageAsSendError(newMsgObj.messageOwner.id);
AndroidUtilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
......@@ -994,6 +996,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
}
});
} else {
MessagesStorage.getInstance().markMessageAsSendError(newMsgObj.messageOwner.id);
AndroidUtilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
......
TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java
View file @ 2b15ac63
......@@ -988,7 +988,6 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
}
} catch(Exception e) {
FileLog.e("tmessages", e);
return true;
}
return false;
}
......
TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
View file @ 2b15ac63
......@@ -166,7 +166,7 @@ public class Utilities {
public static String bytesToHex(byte[] bytes) {
char[] hexChars = new char[bytes.length * 2];
int v;
for ( int j = 0; j < bytes.length; j++ ) {
for (int j = 0; j < bytes.length; j++) {
v = bytes[j] & 0xFF;
hexChars[j * 2] = hexArray[v >>> 4];
hexChars[j * 2 + 1] = hexArray[v & 0x0F];
......@@ -174,6 +174,15 @@ public class Utilities {
return new String(hexChars);
}
public static byte[] hexToBytes(String hex) {
int len = hex.length();
byte[] data = new byte[len / 2];
for (int i = 0; i < len; i += 2) {
data[i / 2] = (byte) ((Character.digit(hex.charAt(i), 16) << 4) + Character.digit(hex.charAt(i + 1), 16));
}
return data;
}
public static boolean isGoodPrime(byte[] prime, int g) {
if (!(g >= 2 && g <= 7)) {
return false;
......
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