Skip to content

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

Optimize files upload, gif auto play after download, crash and bug fixes

parent 51aa4141
Expand all Show whitespace changes
Inline Side-by-side
Showing with 682 additions and 1106 deletions
TMessagesProj/build.gradle
View file @ ec533c5f
......@@ -82,7 +82,7 @@ android {
defaultConfig {
minSdkVersion 8
targetSdkVersion 19
versionCode 219
versionName "1.4.9"
versionCode 220
versionName "1.4.10"
}
}
TMessagesProj/src/main/java/jawnae/pyronet/ByteStream.java
View file @ ec533c5f
......@@ -18,38 +18,29 @@
package jawnae.pyronet;
import org.telegram.messenger.BuffersStorage;
import org.telegram.messenger.ByteBufferDesc;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
public class ByteStream {
private final List<ByteBuffer> queue;
private final ArrayList<ByteBufferDesc> queue;
public ByteStream() {
// the queue is expected to be relatively small, and iterated often.
// hence removing the first element will be fast, even when using an
// ArrayList
this.queue = new ArrayList<ByteBuffer>();
this.queue = new ArrayList<ByteBufferDesc>();
}
/**
* Appends the ByteBuffer instance to the ByteStream. The bytes are not
* copied, so do not modify the contents of the ByteBuffer.
*/
public void append(ByteBuffer buf) {
if (buf == null)
public void append(ByteBufferDesc buf) {
if (buf == null) {
throw new NullPointerException();
}
this.queue.add(buf);
}
/**
* Returns whether there are any bytes pending in this stream
*/
public boolean hasData() {
int size = this.queue.size();
for (ByteBuffer aQueue : this.queue) {
for (ByteBufferDesc aQueue : this.queue) {
if (aQueue.hasRemaining()) {
return true;
}
......@@ -57,29 +48,13 @@ public class ByteStream {
return false;
}
public int getByteCount() {
int size = this.queue.size();
int sum = 0;
for (ByteBuffer aQueue : this.queue) {
sum += aQueue.remaining();
}
return sum;
}
/**
* Fills the specified buffer with as much bytes as possible. When N bytes
* are read, the buffer position will be increased by N
*/
public void get(ByteBuffer dst) {
if (dst == null) {
throw new NullPointerException();
}
for (ByteBuffer data: this.queue) {
// data pos/lim must not be modified
data = data.slice();
for (ByteBufferDesc bufferDesc : this.queue) {
ByteBuffer data = bufferDesc.buffer.slice();
if (data.remaining() > dst.remaining()) {
data.limit(dst.remaining());
......@@ -95,48 +70,25 @@ public class ByteStream {
}
}
/**
* Discards the specified amount of bytes from the stream.
*
* @throws PyroException
* if it failed to discard the specified number of bytes
*/
public void discard(int count) {
int original = count;
while (count > 0) {
// peek at the first buffer
ByteBuffer data = this.queue.get(0);
ByteBufferDesc data = this.queue.get(0);
if (count < data.remaining()) {
// discarding less bytes than remaining in buffer
if (count < data.buffer.remaining()) {
data.position(data.position() + count);
count = 0;
break;
}
// discard the first buffer
this.queue.remove(0);
count -= data.remaining();
BuffersStorage.getInstance().reuseFreeBuffer(data);
count -= data.buffer.remaining();
}
if (count != 0) {
// apparantly we cannot discard the amount of bytes
// the user demanded, this is a bug in other code
throw new PyroException("discarded " + (original - count) + "/"
+ original + " bytes");
throw new PyroException("discarded " + (original - count) + "/" + original + " bytes");
}
}
public byte read() {
ByteBuffer data = this.queue.get(0);
byte result = data.get();
if (!data.hasRemaining()) {
// discard the first buffer
this.queue.remove(0);
}
return result;
}
}
TMessagesProj/src/main/java/jawnae/pyronet/PyroClient.java
View file @ ec533c5f
......@@ -18,6 +18,8 @@
package jawnae.pyronet;
import org.telegram.messenger.ByteBufferDesc;
import java.io.EOFException;
import java.io.IOException;
import java.net.ConnectException;
......@@ -167,12 +169,6 @@ public class PyroClient {
this.doEagerWrite = enabled;
}
//
public void writeCopy(ByteBuffer data) throws PyroException {
this.write(this.selector.copy(data));
}
/**
* Will enqueue the bytes to send them<br>
* 1. when the selector is ready to write, if eagerWrite is disabled
......@@ -185,7 +181,7 @@ public class PyroClient {
* when shutdown() has been called.
*/
public void write(ByteBuffer data) throws PyroException {
public void write(ByteBufferDesc data) throws PyroException {
this.selector.checkThread();
if (!this.key.isValid()) {
......
TMessagesProj/src/main/java/jawnae/pyronet/PyroSelector.java
View file @ ec533c5f
......@@ -56,25 +56,6 @@ public class PyroSelector {
//
public ByteBuffer malloc(int size) {
return ByteBuffer.allocate(size);
}
public ByteBuffer malloc(byte[] array) {
ByteBuffer copy = this.malloc(array.length);
copy.put(array);
copy.flip();
return copy;
}
public ByteBuffer copy(ByteBuffer buffer) {
ByteBuffer copy = this.malloc(buffer.remaining());
copy.put(buffer);
buffer.position(buffer.position() - copy.remaining());
copy.flip();
return copy;
}
public final boolean isNetworkThread() {
return DO_NOT_CHECK_NETWORK_THREAD || networkThread == Thread.currentThread();
}
......
TMessagesProj/src/main/java/org/telegram/messenger/AbsSerializedData.java
View file @ ec533c5f
......@@ -30,6 +30,7 @@ public abstract class AbsSerializedData {
public abstract String readString();
public abstract byte[] readByteArray();
public abstract ByteBufferDesc readByteBuffer();
public abstract void writeByteBuffer(ByteBufferDesc buffer);
public abstract double readDouble();
public abstract int length();
}
TMessagesProj/src/main/java/org/telegram/messenger/ByteBufferDesc.java
View file @ ec533c5f
......@@ -78,7 +78,7 @@ public class ByteBufferDesc extends AbsSerializedData {
if (!justCalc) {
buffer.putLong(x);
} else {
len += 4;
len += 8;
}
} catch(Exception e) {
FileLog.e("tmessages", "write int64 error");
......@@ -227,6 +227,54 @@ public class ByteBufferDesc extends AbsSerializedData {
}
}
public void writeByteBuffer(ByteBufferDesc b) {
try {
int l = b.limit();
if (l <= 253) {
if (!justCalc) {
buffer.put((byte) l);
} else {
len += 1;
}
} else {
if (!justCalc) {
buffer.put((byte) 254);
buffer.put((byte) l);
buffer.put((byte) (l >> 8));
buffer.put((byte) (l >> 16));
} else {
len += 4;
}
}
if (!justCalc) {
b.rewind();
buffer.put(b.buffer);
} else {
len += l;
}
int i = l <= 253 ? 1 : 4;
while((l + i) % 4 != 0) {
if (!justCalc) {
buffer.put((byte) 0);
} else {
len += 1;
}
i++;
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
public void writeRaw(ByteBufferDesc b) {
if (justCalc) {
len += b.limit();
} else {
b.rewind();
buffer.put(b.buffer);
}
}
public int readInt32() {
return readInt32(null);
}
......
TMessagesProj/src/main/java/org/telegram/messenger/FileUploadOperation.java
View file @ ec533c5f
......@@ -125,15 +125,21 @@ public class FileUploadOperation {
if (key != null && readed % 16 != 0) {
toAdd += 16 - readed % 16;
}
byte[] sendBuffer = new byte[readed + toAdd];
ByteBufferDesc sendBuffer = BuffersStorage.getInstance().getFreeBuffer(readed + toAdd);
if (readed != uploadChunkSize) {
isLastPart = true;
}
System.arraycopy(readBuffer, 0, sendBuffer, 0, readed);
sendBuffer.writeRaw(readBuffer, 0, readed);
sendBuffer.rewind();
if (key != null) {
sendBuffer = Utilities.aesIgeEncryption(sendBuffer, key, iv, true, true, 0);
for (int a = 0; a < toAdd; a++) {
sendBuffer.writeByte(0);
}
Utilities.aesIgeEncryption2(sendBuffer.buffer, key, iv, true, true, readed + toAdd);
}
if (!isBigFile) {
mdEnc.update(sendBuffer.buffer);
}
mdEnc.update(sendBuffer, 0, readed + toAdd);
if (isBigFile) {
TLRPC.TL_upload_saveBigFilePart req = new TLRPC.TL_upload_saveBigFilePart();
req.file_part = currentPartNum;
......
TMessagesProj/src/main/java/org/telegram/messenger/HandshakeAction.java
View file @ ec533c5f
......@@ -179,7 +179,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
byte[] transportData = messageOs.toByteArray();
datacenter.connection.sendData(transportData, false, false);
datacenter.connection.sendData(transportData, null, false, false);
return transportData;
}
......@@ -576,11 +576,11 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
return;
}
if (reqPQMsgData != null) {
datacenter.connection.sendData(reqPQMsgData, false, false);
datacenter.connection.sendData(reqPQMsgData, null, false, false);
} else if (reqDHMsgData != null) {
datacenter.connection.sendData(reqDHMsgData, false, false);
datacenter.connection.sendData(reqDHMsgData, null, false, false);
} else if (setClientDHParamsMsgData != null) {
datacenter.connection.sendData(setClientDHParamsMsgData, false, false);
datacenter.connection.sendData(setClientDHParamsMsgData, null, false, false);
}
}
......
TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
View file @ ec533c5f
......@@ -1016,8 +1016,23 @@ public class MediaController implements NotificationCenter.NotificationCenterDel
});
}
public static void saveFile(String path, Context context, final int type, final String name) {
final File sourceFile = new File(Utilities.getCacheDir(), path);
public static void saveFile(String path, String fullPath, Context context, final int type, final String name) {
if (path == null && fullPath == null) {
return;
}
File file = null;
if (fullPath != null && fullPath.length() != 0) {
file = new File(fullPath);
if (!file.exists()) {
file = null;
}
}
if (file == null) {
file = new File(Utilities.getCacheDir(), path);
}
final File sourceFile = file;
if (sourceFile.exists()) {
ProgressDialog progressDialog = null;
if (context != null) {
......@@ -1121,7 +1136,7 @@ public class MediaController implements NotificationCenter.NotificationCenterDel
return null;
}
if (currentGifMessageObject != null && messageObject.messageOwner.id == currentGifMessageObject.messageOwner.id) {
if (currentGifDrawable != null && currentGifMessageObject != null && messageObject.messageOwner.id == currentGifMessageObject.messageOwner.id) {
currentMediaCell = cell;
currentGifDrawable.parentView = new WeakReference<View>(cell);
return currentGifDrawable;
......
TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
View file @ ec533c5f
......@@ -3274,7 +3274,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}
if (!(res instanceof TLRPC.TL_updates_differenceSlice)) {
if ((dialog_id != openned_dialog_id || ApplicationLoader.lastPauseTime != 0) && !obj.messageOwner.out && obj.messageOwner.unread && (lastMessage == null || lastMessage.messageOwner.date < obj.messageOwner.date)) {
if ((dialog_id != openned_dialog_id || ApplicationLoader.lastPauseTime != 0) && !obj.isOut() && obj.messageOwner.unread && (lastMessage == null || lastMessage.messageOwner.date < obj.messageOwner.date)) {
if (!readMessages.contains(obj.messageOwner.id)) {
lastMessage = obj;
}
......@@ -3342,7 +3342,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
ConnectionsManager.getInstance().connectionState = 0;
processUpdatesQueue(true);
} else if (res instanceof TLRPC.TL_updates_differenceSlice) {
MessagesStorage.lastSeqValue = res.intermediate_state.seq;
//MessagesStorage.lastSeqValue = res.intermediate_state.seq;
MessagesStorage.lastDateValue = res.intermediate_state.date;
MessagesStorage.lastPtsValue = res.intermediate_state.pts;
MessagesStorage.lastQtsValue = res.intermediate_state.qts;
......@@ -3380,7 +3380,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter
processUpdateArray(arr, null, null);
} else if (updates instanceof TLRPC.TL_updateShortChatMessage) {
boolean missingData = chats.get(updates.chat_id) == null || users.get(updates.from_id) == null;
if (MessagesStorage.lastSeqValue + 1 == updates.seq && !missingData) {
if (missingData) {
needGetDiff = true;
} else {
if (MessagesStorage.lastSeqValue + 1 == updates.seq && !gettingDifference) {
TLRPC.TL_message message = new TLRPC.TL_message();
message.from_id = updates.from_id;
message.id = updates.id;
......@@ -3423,7 +3426,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}
});
MessagesStorage.getInstance().putMessages(arr, false, true);
} else if (!missingData && MessagesStorage.lastSeqValue != updates.seq) {
} else if (MessagesStorage.lastSeqValue != updates.seq) {
FileLog.e("tmessages", "need get diff TL_updateShortChatMessage, seq: " + MessagesStorage.lastSeqValue + " " + updates.seq);
if (gettingDifference || updatesStartWaitTime == 0 || updatesStartWaitTime != 0 && updatesStartWaitTime + 1500 > System.currentTimeMillis()) {
if (updatesStartWaitTime == 0) {
......@@ -3436,9 +3439,13 @@ public class MessagesController implements NotificationCenter.NotificationCenter
needGetDiff = true;
}
}
}
} else if (updates instanceof TLRPC.TL_updateShortMessage) {
boolean missingData = users.get(updates.from_id) == null;
if (MessagesStorage.lastSeqValue + 1 == updates.seq && !missingData) {
if (missingData) {
needGetDiff = true;
} else {
if (MessagesStorage.lastSeqValue + 1 == updates.seq && !gettingDifference) {
TLRPC.TL_message message = new TLRPC.TL_message();
message.from_id = updates.from_id;
message.id = updates.id;
......@@ -3482,7 +3489,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}
});
MessagesStorage.getInstance().putMessages(arr, false, true);
} else if (!missingData && MessagesStorage.lastSeqValue != updates.seq) {
} else if (MessagesStorage.lastSeqValue != updates.seq) {
FileLog.e("tmessages", "need get diff TL_updateShortMessage, seq: " + MessagesStorage.lastSeqValue + " " + updates.seq);
if (gettingDifference || updatesStartWaitTime == 0 || updatesStartWaitTime != 0 && updatesStartWaitTime + 1500 > System.currentTimeMillis()) {
if (updatesStartWaitTime == 0) {
......@@ -3495,8 +3502,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter
needGetDiff = true;
}
}
}
} else if (updates instanceof TLRPC.TL_updatesCombined) {
if (MessagesStorage.lastSeqValue + 1 == updates.seq_start || MessagesStorage.lastSeqValue == updates.seq_start) {
if ((MessagesStorage.lastSeqValue + 1 == updates.seq_start || MessagesStorage.lastSeqValue == updates.seq_start) && !gettingDifference) {
MessagesStorage.getInstance().putUsersAndChats(updates.users, updates.chats, true, true);
int lastPtsValue = MessagesStorage.lastPtsValue;
int lastQtsValue = MessagesStorage.lastQtsValue;
......@@ -3526,7 +3534,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}
}
} else if (updates instanceof TLRPC.TL_updates) {
if (MessagesStorage.lastSeqValue + 1 == updates.seq || updates.seq == 0 || updates.seq == MessagesStorage.lastSeqValue) {
if ((MessagesStorage.lastSeqValue + 1 == updates.seq || updates.seq == 0 || updates.seq == MessagesStorage.lastSeqValue) && !gettingDifference) {
MessagesStorage.getInstance().putUsersAndChats(updates.users, updates.chats, true, true);
int lastPtsValue = MessagesStorage.lastPtsValue;
int lastQtsValue = MessagesStorage.lastQtsValue;
......
TMessagesProj/src/main/java/org/telegram/messenger/NativeLoader.java
View file @ ec533c5f
......@@ -34,7 +34,7 @@ public class NativeLoader {
return;
}
if (Build.VERSION.SDK_INT > 10) {
if (Build.VERSION.SDK_INT >= 9) {
try {
String folder = null;
long libSize = 0;
......
TMessagesProj/src/main/java/org/telegram/messenger/SerializedData.java
View file @ ec533c5f
......@@ -119,6 +119,25 @@ public class SerializedData extends AbsSerializedData {
}
}
public void writeByteBuffer(ByteBufferDesc buffer) {
if (!justCalc) {
//TODO ?
} else {
int l = buffer.limit();
if (l <= 253) {
len += 1;
} else {
len += 4;
}
len += l;
int i = l <= 253 ? 1 : 4;
while((l + i) % 4 != 0) {
len += 1;
i++;
}
}
}
public int readInt32() {
return readInt32(null);
}
......
TMessagesProj/src/main/java/org/telegram/messenger/TLRPC.java
View file @ ec533c5f
......@@ -7360,31 +7360,6 @@ public class TLRPC {
}
}
public static class TL_upload_saveFilePart extends TLObject {
public static int constructor = 0xb304a621;
public long file_id;
public int file_part;
public byte[] bytes;
public Class responseClass () {
return Bool.class;
}
public void readParams(AbsSerializedData stream) {
file_id = stream.readInt64();
file_part = stream.readInt32();
bytes = stream.readByteArray();
}
public void serializeToStream(AbsSerializedData stream) {
stream.writeInt32(constructor);
stream.writeInt64(file_id);
stream.writeInt32(file_part);
stream.writeByteArray(bytes);
}
}
public static class TL_upload_getFile extends TLObject {
public static int constructor = 0xe3a6cfb5;
......@@ -8111,34 +8086,6 @@ public class TLRPC {
}
}
public static class TL_upload_saveBigFilePart extends TLObject {
public static int constructor = 0xde7b673d;
public long file_id;
public int file_part;
public int file_total_parts;
public byte[] bytes;
public Class responseClass () {
return Bool.class;
}
public void readParams(AbsSerializedData stream) {
file_id = stream.readInt64();
file_part = stream.readInt32();
file_total_parts = stream.readInt32();
bytes = stream.readByteArray();
}
public void serializeToStream(AbsSerializedData stream) {
stream.writeInt32(constructor);
stream.writeInt64(file_id);
stream.writeInt32(file_part);
stream.writeInt32(file_total_parts);
stream.writeByteArray(bytes);
}
}
//manually created
public static class UserStatus extends TLObject {
......@@ -9162,4 +9109,60 @@ public class TLRPC {
}
}
}
public static class TL_upload_saveBigFilePart extends TLObject {
public static int constructor = 0xde7b673d;
public long file_id;
public int file_part;
public int file_total_parts;
public ByteBufferDesc bytes;
public Class responseClass () {
return Bool.class;
}
public void serializeToStream(AbsSerializedData stream) {
stream.writeInt32(constructor);
stream.writeInt64(file_id);
stream.writeInt32(file_part);
stream.writeInt32(file_total_parts);
stream.writeByteBuffer(bytes);
}
@Override
public void freeResources() {
if (bytes != null) {
BuffersStorage.getInstance().reuseFreeBuffer(bytes);
bytes = null;
}
}
}
public static class TL_upload_saveFilePart extends TLObject {
public static int constructor = 0xb304a621;
public long file_id;
public int file_part;
public ByteBufferDesc bytes;
public Class responseClass () {
return Bool.class;
}
public void serializeToStream(AbsSerializedData stream) {
stream.writeInt32(constructor);
stream.writeInt64(file_id);
stream.writeInt32(file_part);
stream.writeByteBuffer(bytes);
}
@Override
public void freeResources() {
if (bytes != null) {
BuffersStorage.getInstance().reuseFreeBuffer(bytes);
bytes = null;
}
}
}
}
TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java
View file @ ec533c5f
......@@ -271,7 +271,10 @@ public class TcpConnection extends PyroClientAdapter {
connect();
}
public void sendData(final byte[] data, final boolean reportAck, final boolean startResponseTimeout) {
public void sendData(final byte[] data, final ByteBufferDesc buff, final boolean reportAck, final boolean startResponseTimeout) {
if (data == null && buff == null) {
return;
}
selector.scheduleTask(new Runnable() {
@Override
public void run() {
......@@ -285,9 +288,28 @@ public class TcpConnection extends PyroClientAdapter {
return;
}
int packetLength = data.length / 4;
int bufferLen = 0;
if (data != null) {
bufferLen = data.length;
} else if (buff != null) {
bufferLen = buff.limit();
}
int packetLength = bufferLen / 4;
if (packetLength < 0x7f) {
bufferLen++;
} else {
bufferLen += 4;
}
if (firstPacket) {
bufferLen++;
}
SerializedData buffer = new SerializedData();
ByteBufferDesc buffer = BuffersStorage.getInstance().getFreeBuffer(bufferLen);
if (firstPacket) {
buffer.writeByte((byte)0xef);
firstPacket = false;
}
if (packetLength < 0x7f) {
if (reportAck) {
packetLength |= (1 << 7);
......@@ -300,20 +322,16 @@ public class TcpConnection extends PyroClientAdapter {
}
buffer.writeInt32(packetLength);
}
if (data != null) {
buffer.writeRaw(data);
} else {
buffer.writeRaw(buff);
BuffersStorage.getInstance().reuseFreeBuffer(buff);
}
final byte[] packet = buffer.toByteArray();
buffer.rewind();
ByteBuffer sendBuffer = ByteBuffer.allocate((firstPacket ? 1 : 0) + packet.length);
sendBuffer.rewind();
sendBuffer.order(ByteOrder.LITTLE_ENDIAN);
if (firstPacket) {
sendBuffer.put((byte)0xef);
firstPacket = false;
}
sendBuffer.put(packet);
sendBuffer.rewind();
client.write(sendBuffer);
client.write(buffer);
}
});
}
......
TMessagesProj/src/main/java/org/telegram/objects/MessageObject.java
View file @ ec533c5f
......@@ -77,7 +77,7 @@ public class MessageObject {
fromUser = MessagesController.getInstance().users.get(message.from_id);
}
if (message.action instanceof TLRPC.TL_messageActionChatCreate) {
if (message.from_id == UserConfig.clientUserId) {
if (isFromMe()) {
messageText = LocaleController.getString("ActionYouCreateGroup", R.string.ActionYouCreateGroup);
} else {
if (fromUser != null) {
......@@ -88,7 +88,7 @@ public class MessageObject {
}
} else if (message.action instanceof TLRPC.TL_messageActionChatDeleteUser) {
if (message.action.user_id == message.from_id) {
if (message.from_id == UserConfig.clientUserId) {
if (isFromMe()) {
messageText = LocaleController.getString("ActionYouLeftUser", R.string.ActionYouLeftUser);
} else {
if (fromUser != null) {
......@@ -103,7 +103,7 @@ public class MessageObject {
MessagesController.getInstance().users.get(message.action.user_id);
}
if (who != null && fromUser != null) {
if (message.from_id == UserConfig.clientUserId) {
if (isFromMe()) {
messageText = LocaleController.getString("ActionYouKickUser", R.string.ActionYouKickUser).replace("un2", Utilities.formatName(who.first_name, who.last_name));
} else if (message.action.user_id == UserConfig.clientUserId) {
messageText = LocaleController.getString("ActionKickUserYou", R.string.ActionKickUserYou).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name));
......@@ -120,7 +120,7 @@ public class MessageObject {
MessagesController.getInstance().users.get(message.action.user_id);
}
if (whoUser != null && fromUser != null) {
if (message.from_id == UserConfig.clientUserId) {
if (isFromMe()) {
messageText = LocaleController.getString("ActionYouAddUser", R.string.ActionYouAddUser).replace("un2", Utilities.formatName(whoUser.first_name, whoUser.last_name));
} else if (message.action.user_id == UserConfig.clientUserId) {
messageText = LocaleController.getString("ActionAddUserYou", R.string.ActionAddUserYou).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name));
......@@ -135,7 +135,7 @@ public class MessageObject {
for (TLRPC.PhotoSize size : message.action.photo.sizes) {
photoThumbs.add(new PhotoObject(size));
}
if (message.from_id == UserConfig.clientUserId) {
if (isFromMe()) {
messageText = LocaleController.getString("ActionYouChangedPhoto", R.string.ActionYouChangedPhoto);
} else {
if (fromUser != null) {
......@@ -145,7 +145,7 @@ public class MessageObject {
}
}
} else if (message.action instanceof TLRPC.TL_messageActionChatEditTitle) {
if (message.from_id == UserConfig.clientUserId) {
if (isFromMe()) {
messageText = LocaleController.getString("ActionYouChangedTitle", R.string.ActionYouChangedTitle).replace("un2", message.action.title);
} else {
if (fromUser != null) {
......@@ -155,7 +155,7 @@ public class MessageObject {
}
}
} else if (message.action instanceof TLRPC.TL_messageActionChatDeletePhoto) {
if (message.from_id == UserConfig.clientUserId) {
if (isFromMe()) {
messageText = LocaleController.getString("ActionYouRemovedPhoto", R.string.ActionYouRemovedPhoto);
} else {
if (fromUser != null) {
......@@ -182,7 +182,7 @@ public class MessageObject {
} else {
timeString = String.format("%d", message.action.ttl);
}
if (message.from_id == UserConfig.clientUserId) {
if (isFromMe()) {
messageText = LocaleController.formatString("MessageLifetimeChangedOutgoing", R.string.MessageLifetimeChangedOutgoing, timeString);
} else {
if (fromUser != null) {
......@@ -192,7 +192,7 @@ public class MessageObject {
}
}
} else {
if (message.from_id == UserConfig.clientUserId) {
if (isFromMe()) {
messageText = LocaleController.getString("MessageLifetimeYouRemoved", R.string.MessageLifetimeYouRemoved);
} else {
if (fromUser != null) {
......@@ -265,22 +265,18 @@ public class MessageObject {
} else if (message.media != null && message.media instanceof TLRPC.TL_messageMediaPhoto) {
contentType = type = 1;
} else if (message.media != null && message.media instanceof TLRPC.TL_messageMediaGeo) {
if (message.from_id == UserConfig.clientUserId) {
contentType = type = 4;
} else {
contentType = type = 5;
}
contentType = 1;
type = 4;
} else if (message.media != null && message.media instanceof TLRPC.TL_messageMediaVideo) {
if (message.from_id == UserConfig.clientUserId) {
contentType = type = 6;
} else {
contentType = type = 7;
}
contentType = 1;
type = 3;
} else if (message.media != null && message.media instanceof TLRPC.TL_messageMediaContact) {
if (message.from_id == UserConfig.clientUserId) {
contentType = type = 12;
if (isFromMe()) {
contentType = 4;
type = 12;
} else {
contentType = type = 13;
contentType = 5;
type = 13;
}
} else if (message.media != null && message.media instanceof TLRPC.TL_messageMediaUnsupported) {
contentType = type = 0;
......@@ -289,7 +285,7 @@ public class MessageObject {
contentType = 1;
type = 8;
} else {
if (message.from_id == UserConfig.clientUserId) {
if (isFromMe()) {
contentType = type = 8;
} else {
contentType = type = 9;
......@@ -525,4 +521,12 @@ public class MessageObject {
linesOffset += currentBlockLinesCount;
}
}
public boolean isOut() {
return messageOwner.out;
}
public boolean isFromMe() {
return messageOwner.from_id == UserConfig.clientUserId;
}
}
TMessagesProj/src/main/java/org/telegram/objects/PhotoObject.java
View file @ ec533c5f
......@@ -37,6 +37,9 @@ public class PhotoObject {
}
public static PhotoObject getClosestImageWithSize(ArrayList<PhotoObject> arr, int width, int height) {
if (arr == null) {
return null;
}
int closestWidth = 9999;
int closestHeight = 9999;
PhotoObject closestObject = null;
......@@ -56,6 +59,9 @@ public class PhotoObject {
}
public static TLRPC.PhotoSize getClosestPhotoSizeWithSize(ArrayList<TLRPC.PhotoSize> sizes, int width, int height) {
if (sizes == null) {
return null;
}
int closestWidth = 9999;
int closestHeight = 9999;
TLRPC.PhotoSize closestObject = null;
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatAudioCell.java
View file @ ec533c5f
......@@ -298,7 +298,7 @@ public class ChatAudioCell extends ChatBaseCell implements SeekBar.SeekBarDelega
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
if (currentMessageObject.messageOwner.out) {
if (currentMessageObject.isOut()) {
avatarImage.imageX = layoutWidth - backgroundWidth + Utilities.dp(9);
seekBarX = layoutWidth - backgroundWidth + Utilities.dp(97);
buttonX = layoutWidth - backgroundWidth + Utilities.dp(67);
......@@ -359,7 +359,7 @@ public class ChatAudioCell extends ChatBaseCell implements SeekBar.SeekBarDelega
avatarImage.setImage((TLRPC.FileLocation)null, "50_50", getResources().getDrawable(Utilities.getUserAvatarForId(uid)));
}
if (messageObject.messageOwner.out) {
if (messageObject.isOut()) {
seekBar.type = 0;
progressView.setProgressColors(0xffb4e396, 0xff6ac453);
} else {
......@@ -393,7 +393,7 @@ public class ChatAudioCell extends ChatBaseCell implements SeekBar.SeekBarDelega
canvas.restore();
int state = buttonState;
if (!currentMessageObject.messageOwner.out) {
if (!currentMessageObject.isOut()) {
state += 4;
timePaint.setColor(0xffa1aab3);
} else {
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatBaseCell.java
View file @ ec533c5f
......@@ -38,7 +38,7 @@ public class ChatBaseCell extends BaseCell {
public static interface ChatBaseCellDelegate {
public abstract void didPressedUserAvatar(ChatBaseCell cell, TLRPC.User user);
public abstract void didPressedCanceSendButton(ChatBaseCell cell);
public abstract void didPressedCancelSendButton(ChatBaseCell cell);
public abstract void didLongPressed(ChatBaseCell cell);
public abstract boolean canPerformActions();
public boolean onSwipeLeft();
......@@ -246,7 +246,7 @@ public class ChatBaseCell extends BaseCell {
}
String newNameString = null;
if (drawName && isChat && newUser != null && !currentMessageObject.messageOwner.out) {
if (drawName && isChat && newUser != null && !currentMessageObject.isOut()) {
newNameString = Utilities.formatName(newUser.first_name, newUser.last_name);
}
......@@ -276,7 +276,7 @@ public class ChatBaseCell extends BaseCell {
}
currentUser = MessagesController.getInstance().users.get(messageObject.messageOwner.from_id);
if (isChat && !messageObject.messageOwner.out) {
if (isChat && !messageObject.isOut()) {
isAvatarVisible = true;
if (currentUser != null) {
if (currentUser.photo != null) {
......@@ -289,7 +289,7 @@ public class ChatBaseCell extends BaseCell {
}
if (!media) {
if (currentMessageObject.messageOwner.out) {
if (currentMessageObject.isOut()) {
currentTimePaint = timePaintOut;
} else {
currentTimePaint = timePaintIn;
......@@ -303,7 +303,7 @@ public class ChatBaseCell extends BaseCell {
namesOffset = 0;
if (drawName && isChat && currentUser != null && !currentMessageObject.messageOwner.out) {
if (drawName && isChat && currentUser != null && !currentMessageObject.isOut()) {
currentNameString = Utilities.formatName(currentUser.first_name, currentUser.last_name);
nameWidth = getMaxNameWidth();
......@@ -457,13 +457,13 @@ public class ChatBaseCell extends BaseCell {
timeLayout = new StaticLayout(currentTimeString, currentTimePaint, timeWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
if (!media) {
if (!currentMessageObject.messageOwner.out) {
if (!currentMessageObject.isOut()) {
timeX = backgroundWidth - Utilities.dp(9) - timeWidth + (isChat ? Utilities.dp(52) : 0);
} else {
timeX = layoutWidth - timeWidth - Utilities.dpf(38.5f);
}
} else {
if (!currentMessageObject.messageOwner.out) {
if (!currentMessageObject.isOut()) {
timeX = backgroundWidth - Utilities.dp(4) - timeWidth + (isChat ? Utilities.dp(52) : 0);
} else {
timeX = layoutWidth - timeWidth - Utilities.dpf(42.0f);
......@@ -502,7 +502,7 @@ public class ChatBaseCell extends BaseCell {
}
Drawable currentBackgroundDrawable = null;
if (currentMessageObject.messageOwner.out) {
if (currentMessageObject.isOut()) {
if (isPressed() && isCheckPressed || !isCheckPressed && isPressed) {
if (!media) {
currentBackgroundDrawable = backgroundDrawableOutSelected;
......@@ -551,7 +551,7 @@ public class ChatBaseCell extends BaseCell {
if (drawForwardedName && forwardedNameLayout != null) {
canvas.save();
if (currentMessageObject.messageOwner.out) {
if (currentMessageObject.isOut()) {
forwardNamePaint.setColor(0xff4a923c);
forwardNameX = currentBackgroundDrawable.getBounds().left + Utilities.dp(10);
forwardNameY = Utilities.dp(10 + (drawName ? 18 : 0));
......@@ -566,7 +566,7 @@ public class ChatBaseCell extends BaseCell {
}
if (media) {
setDrawableBounds(mediaBackgroundDrawable, timeX - Utilities.dp(3), layoutHeight - Utilities.dpf(27.5f), timeWidth + Utilities.dp(6 + (currentMessageObject.messageOwner.out ? 20 : 0)), Utilities.dpf(16.5f));
setDrawableBounds(mediaBackgroundDrawable, timeX - Utilities.dp(3), layoutHeight - Utilities.dpf(27.5f), timeWidth + Utilities.dp(6 + (currentMessageObject.isOut() ? 20 : 0)), Utilities.dpf(16.5f));
mediaBackgroundDrawable.draw(canvas);
canvas.save();
......@@ -580,7 +580,7 @@ public class ChatBaseCell extends BaseCell {
canvas.restore();
}
if (currentMessageObject.messageOwner.out) {
if (currentMessageObject.isOut()) {
boolean drawCheck1 = false;
boolean drawCheck2 = false;
boolean drawClock = false;
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
View file @ ec533c5f
......@@ -131,7 +131,7 @@ public class ChatMessageCell extends ChatBaseCell {
}
pressedLink = null;
int maxWidth;
if (isChat && !messageObject.messageOwner.out) {
if (isChat && !messageObject.isOut()) {
maxWidth = Utilities.displaySize.x - Utilities.dp(122);
drawName = true;
} else {
......@@ -149,7 +149,7 @@ public class ChatMessageCell extends ChatBaseCell {
maxChildWidth = Math.max(maxChildWidth, forwardedNameWidth);
int timeMore = timeWidth + Utilities.dp(6);
if (messageObject.messageOwner.out) {
if (messageObject.isOut()) {
timeMore += Utilities.dpf(20.5f);
}
......@@ -176,7 +176,7 @@ public class ChatMessageCell extends ChatBaseCell {
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
if (currentMessageObject.messageOwner.out) {
if (currentMessageObject.isOut()) {
textX = layoutWidth - backgroundWidth + Utilities.dp(10);
textY = Utilities.dp(10) + namesOffset;
} else {
......@@ -192,7 +192,7 @@ public class ChatMessageCell extends ChatBaseCell {
return;
}
if (currentMessageObject.messageOwner.out) {
if (currentMessageObject.isOut()) {
textX = layoutWidth - backgroundWidth + Utilities.dp(10);
textY = Utilities.dp(10) + namesOffset;
} else {
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
View file @ ec533c5f
......@@ -465,7 +465,7 @@ public class DialogCell extends BaseCell {
} else {
if (chat != null) {
String name = "";
if (message.messageOwner.from_id == UserConfig.clientUserId) {
if (message.isFromMe()) {
name = LocaleController.getString("FromYou", R.string.FromYou);
} else {
if (fromUser != null) {
......@@ -507,7 +507,7 @@ public class DialogCell extends BaseCell {
}
}
if (message.messageOwner.from_id == UserConfig.clientUserId) {
if (message.isFromMe()) {
if (message.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENDING) {
drawCheck1 = false;
drawCheck2 = false;
......
TMessagesProj/src/main/java/org/telegram/ui/GalleryImageViewer.java
View file @ ec533c5f
......@@ -726,9 +726,9 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
return;
}
if (isVideo) {
MediaController.saveFile(currentFileName, this, 1, null);
MediaController.saveFile(currentFileName, null, this, 1, null);
} else {
MediaController.saveFile(currentFileName, this, 0, null);
MediaController.saveFile(currentFileName, null, this, 0, null);
}
break;
// case R.id.gallery_menu_send: {
......
TMessagesProj/src/main/java/org/telegram/ui/PhotoCropActivity.java
View file @ ec533c5f
......@@ -182,7 +182,7 @@ public class PhotoCropActivity extends BaseFragment {
}
private void updateBitmapSize() {
if (viewWidth == 0 || viewHeight == 0) {
if (viewWidth == 0 || viewHeight == 0 || imageToCrop == null) {
return;
}
float percX = (rectX - bitmapX) / bitmapWidth;
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
View file @ ec533c5f
......@@ -21,10 +21,12 @@ import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
import android.text.Html;
import android.text.Spannable;
import android.text.method.LinkMovementMethod;
import android.util.Base64;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
......@@ -93,6 +95,18 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
private int telegramFaqRow;
private int languageRow;
private static class LinkMovementMethodMy extends LinkMovementMethod {
@Override
public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) {
try {
return super.onTouchEvent(widget, buffer, event);
} catch (Exception e) {
FileLog.e("tmessages", e);
}
return false;
}
}
@Override
public boolean onFragmentCreate() {
super.onFragmentCreate();
......@@ -252,7 +266,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
message.setText(Html.fromHtml(LocaleController.getString("AskAQuestionInfo", R.string.AskAQuestionInfo)));
message.setTextSize(18);
message.setPadding(Utilities.dp(8), Utilities.dp(5), Utilities.dp(8), Utilities.dp(6));
message.setMovementMethod(LinkMovementMethod.getInstance());
message.setMovementMethod(new LinkMovementMethodMy());
AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
builder.setView(message);
......@@ -642,6 +656,9 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
button2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (parentActivity == null) {
return;
}
AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
......
TMessagesProj/src/main/res/drawable/chat_incoming_photo_states.xml deleted 100644 → 0
View file @ 51aa4141
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:drawable="@drawable/msg_in_photo_selected" />
<item android:state_checked="true" android:drawable="@drawable/msg_in_photo_selected" />
<item android:state_pressed="true" android:drawable="@drawable/msg_in_photo_selected" />
<item android:drawable="@drawable/msg_in_photo" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/chat_outgoing_photo_states.xml deleted 100644 → 0
View file @ 51aa4141
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:drawable="@drawable/msg_out_photo_selected" />
<item android:state_checked="true" android:drawable="@drawable/msg_out_photo_selected" />
<item android:state_pressed="true" android:drawable="@drawable/msg_out_photo_selected" />
<item android:drawable="@drawable/msg_out_photo"/>
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/layout/chat_group_incoming_video_layout.xml deleted 100644 → 0
View file @ 51aa4141
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_gravity="top">
<org.telegram.ui.Views.BackupImageView
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_marginLeft="6dp"
android:id="@+id/chat_group_avatar_image"
android:scaleType="fitCenter"
android:layout_marginBottom="2dp"
android:layout_gravity="bottom"/>
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="13dp"
android:layout_gravity="top"
android:id="@+id/chat_bubble_layout"
android:addStatesFromChildren="true">
<org.telegram.ui.Views.BackupImageView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_margin="6dp"
android:layout_gravity="top"
android:scaleType="centerCrop"
android:minHeight="100dp"
android:minWidth="100dp"
android:id="@+id/chat_photo_image"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="16dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_gravity="top"
android:background="@drawable/phototime"
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/ic_video"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="#ffffff"
android:textSize="12dp"
android:layout_marginLeft="4dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:layout_marginBottom="1dp"
android:id="@+id/chat_video_time"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="16dp"
android:id="@+id/chat_time_layout"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom"
android:background="@drawable/phototime">
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="#ffffff"
android:textSize="12dp"
android:layout_gravity="bottom"
android:layout_marginBottom="1dp"
android:id="@+id/chat_time_text"/>
</LinearLayout>
</org.telegram.ui.Views.FrameLayoutFixed>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#54759e"
android:background="@drawable/chat_incoming_media_states"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:id="@+id/chat_view_action_button"
android:textSize="14dp"
android:layout_gravity="center"
android:descendantFocusability="blocksDescendants"
android:clickable="true"
android:gravity="center"
android:textStyle="bold"
android:layout_marginLeft="10dp"
android:visibility="gone"/>
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_height="wrap_content"
android:layout_width="140dp"
android:layout_marginLeft="10dp"
android:layout_gravity="center_vertical"
android:id="@+id/chat_view_action_layout"
android:visibility="gone">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:scaleType="centerInside"
android:layout_marginRight="4dp"
android:layout_gravity="right|center"
android:id="@+id/chat_view_action_cancel_button"
android:src="@drawable/ic_msg_btn_cross_custom"
android:clickable="true"/>
<ProgressBar
android:layout_width="fill_parent"
android:layout_height="3dp"
android:layout_gravity="left|center_vertical"
android:progressDrawable="@drawable/progress_chat"
style="?android:attr/progressBarStyleHorizontal"
android:progress="50"
android:layout_marginLeft="12dp"
android:layout_marginRight="36dp"
android:id="@+id/chat_view_action_progress"
android:max="100"/>
</org.telegram.ui.Views.FrameLayoutFixed>
</LinearLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/chat_incoming_video_layout.xml deleted 100644 → 0
View file @ 51aa4141
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_gravity="top">
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="9dp"
android:id="@+id/chat_bubble_layout"
android:layout_gravity="top"
android:addStatesFromChildren="true">
<org.telegram.ui.Views.BackupImageView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_margin="6dp"
android:layout_gravity="top"
android:scaleType="centerCrop"
android:minHeight="100dp"
android:minWidth="100dp"
android:id="@+id/chat_photo_image"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="16dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_gravity="top"
android:background="@drawable/phototime"
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/ic_video"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="#ffffff"
android:textSize="12dp"
android:layout_marginLeft="4dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:layout_marginBottom="1dp"
android:id="@+id/chat_video_time"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="16dp"
android:id="@+id/chat_time_layout"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom"
android:background="@drawable/phototime">
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="#ffffff"
android:textSize="12dp"
android:layout_gravity="bottom"
android:layout_marginBottom="1dp"
android:id="@+id/chat_time_text"/>
</LinearLayout>
</org.telegram.ui.Views.FrameLayoutFixed>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#54759e"
android:background="@drawable/chat_incoming_media_states"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:id="@+id/chat_view_action_button"
android:textSize="14dp"
android:layout_gravity="center"
android:descendantFocusability="blocksDescendants"
android:clickable="true"
android:gravity="center"
android:visibility="gone"
android:textStyle="bold"
android:layout_marginLeft="10dp"/>
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_height="wrap_content"
android:layout_width="140dp"
android:layout_marginLeft="10dp"
android:layout_gravity="center_vertical"
android:id="@+id/chat_view_action_layout"
android:visibility="gone">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:scaleType="centerInside"
android:layout_marginRight="4dp"
android:layout_gravity="right|center"
android:id="@+id/chat_view_action_cancel_button"
android:src="@drawable/ic_msg_btn_cross_custom"
android:clickable="true"/>
<ProgressBar
android:layout_width="fill_parent"
android:layout_height="3dp"
android:layout_gravity="left|center_vertical"
android:progressDrawable="@drawable/progress_chat"
style="?android:attr/progressBarStyleHorizontal"
android:progress="50"
android:layout_marginLeft="12dp"
android:layout_marginRight="36dp"
android:id="@+id/chat_view_action_progress"
android:max="100"/>
</org.telegram.ui.Views.FrameLayoutFixed>
</LinearLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/chat_outgoing_video_layout.xml deleted 100644 → 0
View file @ 51aa4141
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:paddingBottom="1dp"
android:paddingTop="1dp">
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_height="wrap_content"
android:layout_width="140dp"
android:layout_marginRight="10dp"
android:id="@+id/chat_view_action_layout"
android:layout_gravity="center"
android:visibility="gone">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:scaleType="centerInside"
android:layout_marginLeft="4dp"
android:id="@+id/chat_view_action_cancel_button"
android:src="@drawable/ic_msg_btn_cross_custom"
android:layout_gravity="left|center"
android:clickable="true"/>
<ProgressBar
android:layout_width="fill_parent"
android:layout_height="3dp"
android:layout_gravity="right|center_vertical"
android:progressDrawable="@drawable/progress_chat"
style="?android:attr/progressBarStyleHorizontal"
android:progress="50"
android:layout_marginLeft="36dp"
android:layout_marginRight="12dp"
android:id="@+id/chat_view_action_progress"
android:max="100"/>
</org.telegram.ui.Views.FrameLayoutFixed>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#54759e"
android:background="@drawable/chat_incoming_media_states"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:id="@+id/chat_view_action_button"
android:textSize="14dp"
android:layout_marginRight="10dp"
android:descendantFocusability="blocksDescendants"
android:clickable="true"
android:gravity="center"
android:visibility="gone"
android:textStyle="bold"
android:layout_gravity="center"/>
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="9dp"
android:id="@+id/chat_bubble_layout"
android:layout_gravity="top"
android:addStatesFromChildren="true">
<org.telegram.ui.Views.BackupImageView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_margin="6dp"
android:layout_gravity="top"
android:scaleType="centerCrop"
android:minHeight="100dp"
android:minWidth="100dp"
android:id="@+id/chat_photo_image"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="16dp"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_gravity="top"
android:background="@drawable/phototime"
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:src="@drawable/ic_video"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="#ffffff"
android:textSize="12dp"
android:layout_marginLeft="4dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:layout_marginBottom="1dp"
android:id="@+id/chat_video_time"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="16dp"
android:id="@+id/chat_time_layout"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom"
android:background="@drawable/phototime">
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="#ffffff"
android:textSize="12dp"
android:layout_gravity="bottom"
android:id="@+id/chat_time_text"
android:layout_marginBottom="1dp"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/msg_check_w"
android:layout_marginTop="1dp"
android:layout_marginLeft="3dp"
android:layout_marginRight="-8dp"
android:id="@+id/chat_row_check"
android:visibility="visible"
android:layout_gravity="top"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:id="@+id/chat_row_halfcheck"
android:visibility="visible"
android:src="@drawable/msg_halfcheck_w"
android:layout_gravity="top"/>
</LinearLayout>
</org.telegram.ui.Views.FrameLayoutFixed>
</LinearLayout>
\ No newline at end of file
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