Skip to content

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

update to 1.3.19 

Spanish localization by Borja Campina
Applied pull request by Yuri Orlov
(https://github.com/DrKLO/Telegram/pull/27)
parent 1a4d0786
Show whitespace changes
Inline Side-by-side
Showing with 6230 additions and 3449 deletions
TMessagesProj/build.gradle
View file @ 9814a6e9
...@@ -3,7 +3,7 @@ buildscript { ...@@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.7.+' classpath 'com.android.tools.build:gradle:0.8.+'
} }
} }
apply plugin: 'android' apply plugin: 'android'
...@@ -31,7 +31,7 @@ tasks.withType(JavaCompile) { ...@@ -31,7 +31,7 @@ tasks.withType(JavaCompile) {
} }
dependencies { dependencies {
compile 'com.google.android.gms:play-services:4.0.+' compile 'com.google.android.gms:play-services:4.1.+'
compile 'net.hockeyapp.android:HockeySDK:3.0.1' compile 'net.hockeyapp.android:HockeySDK:3.0.1'
compile 'com.android.support:support-v4:19.0.+' compile 'com.android.support:support-v4:19.0.+'
compile 'com.android.support:appcompat-v7:19.0.+' compile 'com.android.support:appcompat-v7:19.0.+'
...@@ -40,7 +40,7 @@ dependencies { ...@@ -40,7 +40,7 @@ dependencies {
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '19.0.0' buildToolsVersion '19.0.1'
signingConfigs { signingConfigs {
debug { debug {
......
TMessagesProj/src/main/AndroidManifest.xml
View file @ 9814a6e9
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.telegram.messenger" package="org.telegram.messenger"
android:versionCode="131" android:versionCode="148"
android:versionName="1.3.7"> android:versionName="1.3.19">
<supports-screens android:anyDensity="true" <supports-screens android:anyDensity="true"
android:smallScreens="true" android:smallScreens="true"
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
android:largeHeap="true"> android:largeHeap="true">
<meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="your-google-maps-api-key-here" /> <meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="your-google-maps-api-key-here" />
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
<activity <activity
android:name="org.telegram.ui.LaunchActivity" android:name="org.telegram.ui.LaunchActivity"
...@@ -168,4 +169,3 @@ ...@@ -168,4 +169,3 @@
</application> </application>
</manifest> </manifest>
TMessagesProj/src/main/java/org/telegram/TL/TLObject.java
View file @ 9814a6e9
...@@ -32,7 +32,7 @@ public class TLObject { ...@@ -32,7 +32,7 @@ public class TLObject {
} }
public int layer () { public int layer () {
return 8; return 11;
} }
public void parseVector(TLRPC.Vector vector, SerializedData data) { public void parseVector(TLRPC.Vector vector, SerializedData data) {
......
TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java
View file @ 9814a6e9
...@@ -15,6 +15,7 @@ import android.net.ConnectivityManager; ...@@ -15,6 +15,7 @@ import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.os.Build; import android.os.Build;
import android.util.Base64; import android.util.Base64;
import android.util.Log;
import org.telegram.TL.TLClassStore; import org.telegram.TL.TLClassStore;
import org.telegram.TL.TLObject; import org.telegram.TL.TLObject;
...@@ -33,7 +34,7 @@ import java.util.regex.Matcher; ...@@ -33,7 +34,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.TcpConnectionDelegate { public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.TcpConnectionDelegate {
public static boolean DEBUG_VERSION = false; public static boolean DEBUG_VERSION = true;
public static int APP_ID = 2458; public static int APP_ID = 2458;
public static String APP_HASH = "5bce48dc7d331e62c955669eb7233217"; public static String APP_HASH = "5bce48dc7d331e62c955669eb7233217";
public static String HOCKEY_APP_HASH = "your-hockeyapp-api-key-here"; public static String HOCKEY_APP_HASH = "your-hockeyapp-api-key-here";
...@@ -100,6 +101,22 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -100,6 +101,22 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
public void run() { public void run() {
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
if (ApplicationLoader.lastPauseTime != 0 && ApplicationLoader.lastPauseTime < currentTime - nextSleepTimeout) { if (ApplicationLoader.lastPauseTime != 0 && ApplicationLoader.lastPauseTime < currentTime - nextSleepTimeout) {
boolean dontSleep = false;
for (RPCRequest request : runningRequests) {
if (request.retryCount < 10 && (request.runningStartTime + 60 > (int)(currentTime / 1000)) && ((request.flags & RPCRequest.RPCRequestClassDownloadMedia) != 0 || (request.flags & RPCRequest.RPCRequestClassUploadMedia) != 0)) {
dontSleep = true;
break;
}
}
if (!dontSleep) {
for (RPCRequest request : requestQueue) {
if ((request.flags & RPCRequest.RPCRequestClassDownloadMedia) != 0 || (request.flags & RPCRequest.RPCRequestClassUploadMedia) != 0) {
dontSleep = true;
break;
}
}
}
if (!dontSleep) {
if (!paused) { if (!paused) {
FileLog.e("tmessages", "pausing network and timers by sleep time = " + nextSleepTimeout); FileLog.e("tmessages", "pausing network and timers by sleep time = " + nextSleepTimeout);
for (Datacenter datacenter : datacenters.values()) { for (Datacenter datacenter : datacenters.values()) {
...@@ -130,6 +147,10 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -130,6 +147,10 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} else {
ApplicationLoader.lastPauseTime += 30 * 1000;
FileLog.e("tmessages", "don't sleep 30 seconds because of upload or download request");
}
} }
if (paused) { if (paused) {
paused = false; paused = false;
...@@ -240,8 +261,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -240,8 +261,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
if (datacenterSetId == useDifferentBackend) { if (datacenterSetId == useDifferentBackend) {
currentDatacenterId = preferences.getInt("currentDatacenterId", 0); currentDatacenterId = preferences.getInt("currentDatacenterId", 0);
timeDifference = preferences.getInt("timeDifference", 0); timeDifference = preferences.getInt("timeDifference", 0);
lastDcUpdateTime = preferences.getInt("lastDcUpdateTime", 0); //TODO uncomment lastDcUpdateTime = preferences.getInt("lastDcUpdateTime", 0);
//lastDcUpdateTime = 0;
try { try {
sessionsToDestroy.clear(); sessionsToDestroy.clear();
String sessionsString = preferences.getString("sessionsToDestroy", null); String sessionsString = preferences.getString("sessionsToDestroy", null);
...@@ -635,7 +655,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -635,7 +655,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
TLObject wrapInLayer(TLObject object, int datacenterId, RPCRequest request) { TLObject wrapInLayer(TLObject object, int datacenterId, RPCRequest request) {
if (object.layer() > 0) { if (object.layer() > 0) {
Datacenter datacenter = datacenterWithId(datacenterId); Datacenter datacenter = datacenterWithId(datacenterId);
if (datacenter.lastInitVersion != currentAppVersion) { if (datacenter == null || datacenter.lastInitVersion != currentAppVersion) {
request.initRequest = true; request.initRequest = true;
TLRPC.initConnection invoke = new TLRPC.initConnection(); TLRPC.initConnection invoke = new TLRPC.initConnection();
invoke.query = object; invoke.query = object;
...@@ -704,6 +724,12 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -704,6 +724,12 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
requestQueue.add(request); requestQueue.add(request);
if (paused && ((request.flags & RPCRequest.RPCRequestClassDownloadMedia) != 0 || (request.flags & RPCRequest.RPCRequestClassUploadMedia) != 0)) {
ApplicationLoader.lastPauseTime = System.currentTimeMillis();
nextSleepTimeout = 30000;
FileLog.e("tmessages", "wakeup by download or upload request");
}
processRequestQueue(0, 0); processRequestQueue(0, 0);
} }
}); });
...@@ -941,6 +967,12 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -941,6 +967,12 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
Integer tokenIt = activeTransportTokens.get(requestDatacenter.datacenterId); Integer tokenIt = activeTransportTokens.get(requestDatacenter.datacenterId);
int datacenterTransportToken = tokenIt != null ? tokenIt : 0; int datacenterTransportToken = tokenIt != null ? tokenIt : 0;
Integer uploadTokenIt = activeUploadTransportTokens.get(requestDatacenter.datacenterId);
int datacenterUploadTransportToken = uploadTokenIt != null ? uploadTokenIt : 0;
Integer downloadTokenIt = activeDownloadTransportTokens.get(requestDatacenter.datacenterId);
int datacenterDownloadTransportToken = downloadTokenIt != null ? downloadTokenIt : 0;
double maxTimeout = 8.0; double maxTimeout = 8.0;
if ((request.flags & RPCRequest.RPCRequestClassGeneric) != 0) { if ((request.flags & RPCRequest.RPCRequestClassGeneric) != 0) {
...@@ -952,12 +984,18 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -952,12 +984,18 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
FileLog.d("tmessages", "Don't have any network connection, skipping download request"); FileLog.d("tmessages", "Don't have any network connection, skipping download request");
continue; continue;
} }
if (datacenterDownloadTransportToken == 0) {
continue;
}
maxTimeout = 40.0; maxTimeout = 40.0;
} else if ((request.flags & RPCRequest.RPCRequestClassUploadMedia) != 0) { } else if ((request.flags & RPCRequest.RPCRequestClassUploadMedia) != 0) {
if (!haveNetwork) { if (!haveNetwork) {
FileLog.d("tmessages", "Don't have any network connection, skipping upload request"); FileLog.d("tmessages", "Don't have any network connection, skipping upload request");
continue; continue;
} }
if (datacenterUploadTransportToken == 0) {
continue;
}
maxTimeout = 30.0; maxTimeout = 30.0;
} }
...@@ -988,20 +1026,19 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -988,20 +1026,19 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
FileLog.d("tmessages", "Request token is valid, not retrying " + request.rawRequest); FileLog.d("tmessages", "Request token is valid, not retrying " + request.rawRequest);
continue; continue;
} else if ((request.flags & RPCRequest.RPCRequestClassDownloadMedia) != 0) { } else if ((request.flags & RPCRequest.RPCRequestClassDownloadMedia) != 0) {
int downloadToken = requestDatacenter.downloadConnection.channelToken; if (datacenterDownloadTransportToken != 0 && request.transportChannelToken == datacenterDownloadTransportToken) {
if (downloadToken != 0 && request.transportChannelToken == downloadToken) {
FileLog.d("tmessages", "Request download token is valid, not retrying " + request.rawRequest); FileLog.d("tmessages", "Request download token is valid, not retrying " + request.rawRequest);
continue; continue;
} }
} else if ((request.flags & RPCRequest.RPCRequestClassUploadMedia) != 0) { } else if ((request.flags & RPCRequest.RPCRequestClassUploadMedia) != 0) {
int uploadToken = requestDatacenter.uploadConnection.channelToken; if (datacenterUploadTransportToken != 0 && request.transportChannelToken == datacenterUploadTransportToken) {
if (uploadToken != 0 && request.transportChannelToken == uploadToken) {
FileLog.d("tmessages", "Request upload token is valid, not retrying " + request.rawRequest); FileLog.d("tmessages", "Request upload token is valid, not retrying " + request.rawRequest);
continue; continue;
} }
} }
} }
request.retryCount++;
NetworkMessage networkMessage = new NetworkMessage(); NetworkMessage networkMessage = new NetworkMessage();
networkMessage.protoMessage = new TLRPC.TL_protoMessage(); networkMessage.protoMessage = new TLRPC.TL_protoMessage();
...@@ -1022,10 +1059,12 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -1022,10 +1059,12 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
request.transportChannelToken = datacenterTransportToken; request.transportChannelToken = datacenterTransportToken;
addMessageToDatacenter(genericMessagesToDatacenters, requestDatacenter.datacenterId, networkMessage); addMessageToDatacenter(genericMessagesToDatacenters, requestDatacenter.datacenterId, networkMessage);
} else if ((request.flags & RPCRequest.RPCRequestClassDownloadMedia) != 0) { } else if ((request.flags & RPCRequest.RPCRequestClassDownloadMedia) != 0) {
request.transportChannelToken = datacenterDownloadTransportToken;
ArrayList<NetworkMessage> arr = new ArrayList<NetworkMessage>(); ArrayList<NetworkMessage> arr = new ArrayList<NetworkMessage>();
arr.add(networkMessage); arr.add(networkMessage);
proceedToSendingMessages(arr, sessionId, requestDatacenter.downloadConnection, false, false); proceedToSendingMessages(arr, sessionId, requestDatacenter.downloadConnection, false, false);
} else if ((request.flags & RPCRequest.RPCRequestClassUploadMedia) != 0) { } else if ((request.flags & RPCRequest.RPCRequestClassUploadMedia) != 0) {
request.transportChannelToken = datacenterUploadTransportToken;
ArrayList<NetworkMessage> arr = new ArrayList<NetworkMessage>(); ArrayList<NetworkMessage> arr = new ArrayList<NetworkMessage>();
arr.add(networkMessage); arr.add(networkMessage);
proceedToSendingMessages(arr, sessionId, requestDatacenter.uploadConnection, false, false); proceedToSendingMessages(arr, sessionId, requestDatacenter.uploadConnection, false, false);
...@@ -1147,6 +1186,9 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -1147,6 +1186,9 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
continue; continue;
} }
Integer uploadTokenIt = activeUploadTransportTokens.get(requestDatacenter.datacenterId);
request.transportChannelToken = uploadTokenIt != null ? uploadTokenIt : 0;
uploadRunningRequestCount++; uploadRunningRequestCount++;
} else if ((request.flags & RPCRequest.RPCRequestClassDownloadMedia) != 0) { } else if ((request.flags & RPCRequest.RPCRequestClassDownloadMedia) != 0) {
if (!haveNetwork) { if (!haveNetwork) {
...@@ -1158,6 +1200,9 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -1158,6 +1200,9 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
continue; continue;
} }
Integer downloadTokenIt = activeDownloadTransportTokens.get(requestDatacenter.datacenterId);
request.transportChannelToken = downloadTokenIt != null ? downloadTokenIt : 0;
downloadRunningRequestCount++; downloadRunningRequestCount++;
} }
} }
...@@ -1166,8 +1211,9 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -1166,8 +1211,9 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
SerializedData os = new SerializedData(); SerializedData os = new SerializedData();
request.rpcRequest.serializeToStream(os); request.rpcRequest.serializeToStream(os);
int requestLength = os.length();
if (os.length() != 0) { if (requestLength != 0) {
long sessionId = 0; long sessionId = 0;
if ((request.flags & RPCRequest.RPCRequestClassGeneric) != 0) { if ((request.flags & RPCRequest.RPCRequestClassGeneric) != 0) {
sessionId = requestDatacenter.authSessionId; sessionId = requestDatacenter.authSessionId;
...@@ -1177,18 +1223,31 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -1177,18 +1223,31 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
sessionId = requestDatacenter.authUploadSessionId; sessionId = requestDatacenter.authUploadSessionId;
} }
if ((request.flags & RPCRequest.RPCRequestClassCanCompress) != 0) {
try {
byte[] data = Utilities.compress(os.toByteArray());
if (data.length < requestLength) {
TLRPC.TL_gzip_packed packed = new TLRPC.TL_gzip_packed();
packed.packed_data = data;
request.rpcRequest = packed;
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
NetworkMessage networkMessage = new NetworkMessage(); NetworkMessage networkMessage = new NetworkMessage();
networkMessage.protoMessage = new TLRPC.TL_protoMessage(); networkMessage.protoMessage = new TLRPC.TL_protoMessage();
networkMessage.protoMessage.msg_id = messageId; networkMessage.protoMessage.msg_id = messageId;
networkMessage.protoMessage.seqno = generateMessageSeqNo(sessionId, true); networkMessage.protoMessage.seqno = generateMessageSeqNo(sessionId, true);
networkMessage.protoMessage.bytes = os.length(); networkMessage.protoMessage.bytes = requestLength;
networkMessage.protoMessage.body = request.rpcRequest; networkMessage.protoMessage.body = request.rpcRequest;
networkMessage.rawRequest = request.rawRequest; networkMessage.rawRequest = request.rawRequest;
networkMessage.requestId = request.token; networkMessage.requestId = request.token;
request.runningMessageId = messageId; request.runningMessageId = messageId;
request.runningMessageSeqNo = networkMessage.protoMessage.seqno; request.runningMessageSeqNo = networkMessage.protoMessage.seqno;
request.serializedLength = os.length(); request.serializedLength = requestLength;
request.runningStartTime = (int)(System.currentTimeMillis() / 1000); request.runningStartTime = (int)(System.currentTimeMillis() / 1000);
if (request.requiresCompletion) { if (request.requiresCompletion) {
runningRequests.add(request); runningRequests.add(request);
...@@ -1454,8 +1513,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -1454,8 +1513,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
byte[] transportData = createConnectionData(currentMessages, sessionId, quickAckId, connection); byte[] transportData = createConnectionData(currentMessages, sessionId, quickAckId, connection);
if (transportData != null) { if (transportData != null) {
if (reportAck && quickAckId.size() != 0) if (reportAck && quickAckId.size() != 0) {
{
ArrayList<Long> requestIds = new ArrayList<Long>(); ArrayList<Long> requestIds = new ArrayList<Long>();
for (NetworkMessage message : messagesToSend) { for (NetworkMessage message : messagesToSend) {
...@@ -1933,14 +1991,16 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -1933,14 +1991,16 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
isError = true; isError = true;
if (datacenter.datacenterId == currentDatacenterId || datacenter.datacenterId == movingToDatacenterId) { if (datacenter.datacenterId == currentDatacenterId || datacenter.datacenterId == movingToDatacenterId) {
if ((request.flags & RPCRequest.RPCRequestClassGeneric) != 0) { if ((request.flags & RPCRequest.RPCRequestClassGeneric) != 0) {
if (UserConfig.clientActivated) {
UserConfig.clearConfig();
Utilities.RunOnUIThread(new Runnable() { Utilities.RunOnUIThread(new Runnable() {
@Override @Override
public void run() { public void run() {
NotificationCenter.Instance.postNotificationName(1234); NotificationCenter.Instance.postNotificationName(1234);
UserConfig.clearConfig();
} }
}); });
} }
}
} else { } else {
datacenter.authorized = false; datacenter.authorized = false;
saveSession(); saveSession();
...@@ -2078,7 +2138,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -2078,7 +2138,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
TLObject result = Utilities.decompress(packet.packed_data, getRequestWithMessageId(messageId)); TLObject result = Utilities.decompress(packet.packed_data, getRequestWithMessageId(messageId));
processMessage(result, messageId, messageSeqNo, messageSalt, connection, sessionId, innerMsgId, containerMessageId); processMessage(result, messageId, messageSeqNo, messageSalt, connection, sessionId, innerMsgId, containerMessageId);
} else if (message instanceof TLRPC.Updates) { } else if (message instanceof TLRPC.Updates) {
MessagesController.Instance.processUpdates((TLRPC.Updates)message); MessagesController.Instance.processUpdates((TLRPC.Updates)message, false);
} else { } else {
FileLog.e("tmessages", "***** Error: unknown message class " + message); FileLog.e("tmessages", "***** Error: unknown message class " + message);
} }
...@@ -2275,6 +2335,20 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -2275,6 +2335,20 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
} else { } else {
connectionState = 1; connectionState = 1;
} }
if (DEBUG_VERSION) {
try {
ConnectivityManager cm = (ConnectivityManager)ApplicationLoader.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo[] networkInfos = cm.getAllNetworkInfo();
for (NetworkInfo info : networkInfos) {
FileLog.e("tmessages", "Network: " + info.getTypeName() + " status: " + info.getState() + " info: " + info.getExtraInfo() + " object: " + info.getDetailedState() + " other: " + info);
}
if (networkInfos.length == 0) {
FileLog.e("tmessages", "no network available");
}
} catch (Exception e) {
FileLog.e("tmessages", "NETWORK STATE GET ERROR");
}
}
final int stateCopy = connectionState; final int stateCopy = connectionState;
Utilities.RunOnUIThread(new Runnable() { Utilities.RunOnUIThread(new Runnable() {
@Override @Override
...@@ -2477,7 +2551,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. ...@@ -2477,7 +2551,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
public void run() { public void run() {
moveToDatacenter(datacenterId); moveToDatacenter(datacenterId);
} }
}, 1000); }, 1000, false);
} }
} }
}, null, true, RPCRequest.RPCRequestClassGeneric, currentDatacenterId); }, null, true, RPCRequest.RPCRequestClassGeneric, currentDatacenterId);
......
TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java 0 → 100644
View file @ 9814a6e9
/*
* This is the source code of Telegram for Android v. 1.3.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013.
*/
package org.telegram.messenger;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
import android.content.ContentResolver;
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
import android.provider.BaseColumns;
import android.provider.ContactsContract;
import android.util.SparseArray;
import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLObject;
import org.telegram.TL.TLRPC;
import org.telegram.ui.ApplicationLoader;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
public class ContactsController {
public static ContactsController Instance = new ContactsController();
private Account currentAccount;
public boolean loadingContacts = false;
private boolean ignoreChanges = false;
private boolean contactsSyncInProgress = false;
private final Integer observerLock = 1;
private HashMap<Integer, Contact> delayedDontactsToDelete = null;
public boolean contactsLoaded = false;
private boolean contactsBookLoaded = false;
private ArrayList<Integer> delayedContactsUpdate = new ArrayList<Integer>();
public static class Contact {
public int id;
public ArrayList<String> phones = new ArrayList<String>();
public ArrayList<String> phoneTypes = new ArrayList<String>();
public ArrayList<String> shortPhones = new ArrayList<String>();
public ArrayList<Integer> phoneDeleted = new ArrayList<Integer>();
public String first_name;
public String last_name;
}
private String[] projectioPhones = {
ContactsContract.CommonDataKinds.Phone.CONTACT_ID,
ContactsContract.CommonDataKinds.Phone.NUMBER,
ContactsContract.CommonDataKinds.Phone.TYPE,
ContactsContract.CommonDataKinds.Phone.LABEL
};
private String[] projectionNames = {
ContactsContract.CommonDataKinds.StructuredName.CONTACT_ID,
ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME,
ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME,
ContactsContract.Data.DISPLAY_NAME,
ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME
};
public HashMap<Integer, Contact> contactsBook = new HashMap<Integer, Contact>();
public HashMap<String, Contact> contactsBookSPhones = new HashMap<String, Contact>();
public HashMap<String, ArrayList<Contact>> contactsSectionsDict = new HashMap<String, ArrayList<Contact>>();
public ArrayList<String> sortedContactsSectionsArray = new ArrayList<String>();
public ArrayList<TLRPC.TL_contact> contacts = new ArrayList<TLRPC.TL_contact>();
public SparseArray<TLRPC.TL_contact> contactsDict = new SparseArray<TLRPC.TL_contact>();
public HashMap<String, ArrayList<TLRPC.TL_contact>> usersSectionsDict = new HashMap<String, ArrayList<TLRPC.TL_contact>>();
public ArrayList<String> sortedUsersSectionsArray = new ArrayList<String>();
private class MyContentObserver extends ContentObserver {
public MyContentObserver() {
super(null);
}
@Override
public void onChange(boolean selfChange) {
super.onChange(selfChange);
synchronized (observerLock) {
if (ignoreChanges) {
FileLog.e("tmessages", "contacts changed - ignore");
return;
}
}
Utilities.stageQueue.postRunnable(new Runnable() {
@Override
public void run() {
MessagesController.Instance.scheduleContactsReload = System.currentTimeMillis() + 2000;
FileLog.e("tmessages", "contacts changed schedule - apply in " + MessagesController.Instance.scheduleContactsReload);
}
});
}
@Override
public boolean deliverSelfNotifications() {
return false;
}
}
public ContactsController() {
Utilities.globalQueue.postRunnable(new Runnable() {
@Override
public void run() {
ApplicationLoader.applicationContext.getContentResolver().registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, new MyContentObserver());
}
});
}
public void cleanup() {
contactsBook.clear();
contactsBookSPhones.clear();
contactsSectionsDict.clear();
sortedContactsSectionsArray.clear();
contacts.clear();
contactsDict.clear();
usersSectionsDict.clear();
sortedUsersSectionsArray.clear();
delayedContactsUpdate.clear();
delayedDontactsToDelete = null;
loadingContacts = false;
contactsSyncInProgress = false;
contactsLoaded = false;
contactsBookLoaded = false;
}
public void checkAppAccount() {
AccountManager am = AccountManager.get(ApplicationLoader.applicationContext);
Account[] accounts = am.getAccountsByType("org.telegram.messenger.account");
boolean recreateAccount = false;
if (UserConfig.currentUser != null) {
if (accounts.length == 1) {
Account acc = accounts[0];
if (!acc.name.equals(UserConfig.currentUser.phone)) {
recreateAccount = true;
} else {
currentAccount = acc;
}
} else {
recreateAccount = true;
}
readContacts();
} else {
if (accounts.length > 0) {
recreateAccount = true;
}
}
if (recreateAccount) {
for (Account c : accounts) {
am.removeAccount(c, null, null);
}
if (UserConfig.currentUser != null) {
currentAccount = new Account(UserConfig.currentUser.phone, "org.telegram.messenger.account");
am.addAccountExplicitly(currentAccount, "", null);
}
}
}
public void readContacts() {
Utilities.stageQueue.postRunnable(new Runnable() {
@Override
public void run() {
if (contactsBook.size() != 0 || contactsSyncInProgress) {
return;
}
contactsSyncInProgress = true;
MessagesStorage.Instance.getCachedPhoneBook();
}
});
}
private HashMap<Integer, Contact> readContactsFromPhoneBook() {
HashMap<Integer, Contact> contactsMap = new HashMap<Integer, Contact>();
ContentResolver cr = ApplicationLoader.applicationContext.getContentResolver();
String ids = "";
Cursor pCur = cr.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI, projectioPhones, null, null, null);
if (pCur != null) {
if (pCur.getCount() > 0) {
while (pCur.moveToNext()) {
String number = pCur.getString(1);
if (number == null || number.length() == 0) {
continue;
}
number = PhoneFormat.stripExceptNumbers(number);
if (number.length() == 0) {
continue;
}
Integer id = pCur.getInt(0);
if (ids.length() != 0) {
ids += ",";
}
ids += id;
int type = pCur.getInt(2);
Contact contact = contactsMap.get(id);
if (contact == null) {
contact = new Contact();
contact.first_name = "";
contact.last_name = "";
contact.id = id;
contactsMap.put(id, contact);
}
boolean addNumber = true;
if (number.length() > 8) {
String shortNumber = number.substring(number.length() - 8);
if (contact.shortPhones.contains(shortNumber)) {
addNumber = false;
} else {
contact.shortPhones.add(shortNumber);
}
} else {
if (contact.shortPhones.contains(number)) {
addNumber = false;
} else {
contact.shortPhones.add(number);
}
}
if (addNumber) {
contact.phones.add(number);
contact.phoneDeleted.add(0);
}
if (type == ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM) {
contact.phoneTypes.add(pCur.getString(3));
} else if (type == ContactsContract.CommonDataKinds.Phone.TYPE_HOME) {
contact.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneHome));
} else if (type == ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE) {
contact.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneMobile));
} else if (type == ContactsContract.CommonDataKinds.Phone.TYPE_WORK) {
contact.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneWork));
} else if (type == ContactsContract.CommonDataKinds.Phone.TYPE_MAIN) {
contact.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneMain));
} else {
contact.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneOther));
}
}
}
pCur.close();
}
pCur = cr.query(ContactsContract.Data.CONTENT_URI, projectionNames, ContactsContract.CommonDataKinds.StructuredName.CONTACT_ID + " IN (" + ids + ") AND " + ContactsContract.Data.MIMETYPE + " = '" + ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE + "'", null, null);
if (pCur != null && pCur.getCount() > 0) {
while (pCur.moveToNext()) {
int id = pCur.getInt(0);
String fname = pCur.getString(1);
String sname = pCur.getString(2);
String sname2 = pCur.getString(3);
String mname = pCur.getString(4);
Contact contact = contactsMap.get(id);
if (contact != null) {
contact.first_name = fname;
contact.last_name = sname;
if (contact.first_name == null) {
contact.first_name = "";
}
if (mname != null && mname.length() != 0) {
if (contact.first_name.length() != 0) {
contact.first_name += " " + mname;
} else {
contact.first_name = mname;
}
}
if (contact.last_name == null) {
contact.last_name = "";
}
if (contact.last_name.length() == 0 && contact.first_name.length() == 0 && sname2 != null && sname2.length() != 0) {
contact.first_name = sname2;
}
}
}
pCur.close();
}
return contactsMap;
}
public HashMap<Integer, Contact> getContactsCopy(HashMap<Integer, Contact> original) {
HashMap<Integer, Contact> ret = new HashMap<Integer, Contact>();
for (HashMap.Entry<Integer, Contact> entry : original.entrySet()) {
Contact copyContact = new Contact();
Contact originalContact = entry.getValue();
copyContact.phoneDeleted.addAll(originalContact.phoneDeleted);
copyContact.phones.addAll(originalContact.phones);
copyContact.phoneTypes.addAll(originalContact.phoneTypes);
copyContact.shortPhones.addAll(originalContact.shortPhones);
copyContact.first_name = originalContact.first_name;
copyContact.last_name = originalContact.last_name;
copyContact.id = originalContact.id;
ret.put(copyContact.id, copyContact);
}
return ret;
}
public void performSyncPhoneBook(final HashMap<Integer, Contact> contactHashMap, final boolean request, final boolean first) {
Utilities.globalQueue.postRunnable(new Runnable() {
@Override
public void run() {
FileLog.e("tmessages", "start read contacts from phone");
final HashMap<Integer, Contact> contactsMap = readContactsFromPhoneBook();
final HashMap<String, Contact> contactsBookShort = new HashMap<String, Contact>();
int oldCount = contactHashMap.size();
ArrayList<TLRPC.TL_inputPhoneContact> toImport = new ArrayList<TLRPC.TL_inputPhoneContact>();
if (!contactHashMap.isEmpty()) {
HashMap<Integer, Contact> contactsMapCopy = new HashMap<Integer, Contact>(contactsMap);
for (HashMap.Entry<Integer, Contact> pair : contactsMap.entrySet()) {
Integer id = pair.getKey();
Contact value = pair.getValue();
Contact existing = contactHashMap.get(id);
if (existing == null || existing != null && (!existing.first_name.equals(value.first_name) || !existing.last_name.equals(value.last_name))) {
for (int a = 0; a < value.phones.size(); a++) {
String sphone = value.shortPhones.get(a);
contactsBookShort.put(sphone, value);
if (existing != null) {
int index = existing.shortPhones.indexOf(sphone);
if (index != -1) {
Integer deleted = existing.phoneDeleted.get(index);
value.phoneDeleted.set(a, deleted);
if (deleted == 1) {
continue;
}
}
}
if (request) {
TLRPC.TL_inputPhoneContact imp = new TLRPC.TL_inputPhoneContact();
imp.client_id = id;
imp.first_name = value.first_name;
imp.last_name = value.last_name;
imp.phone = value.phones.get(a);
toImport.add(imp);
}
}
if (existing != null) {
contactHashMap.remove(id);
}
} else {
for (int a = 0; a < value.phones.size(); a++) {
String sphone = value.shortPhones.get(a);
contactsBookShort.put(sphone, value);
int index = existing.shortPhones.indexOf(sphone);
if (index == -1) {
if (request) {
TLRPC.TL_inputPhoneContact imp = new TLRPC.TL_inputPhoneContact();
imp.client_id = id;
imp.first_name = value.first_name;
imp.last_name = value.last_name;
imp.phone = value.phones.get(a);
toImport.add(imp);
}
} else {
value.phoneDeleted.set(a, existing.phoneDeleted.get(index));
existing.phones.remove(index);
existing.shortPhones.remove(index);
existing.phoneDeleted.remove(index);
}
}
if (existing.phones.isEmpty()) {
contactHashMap.remove(id);
}
}
}
if (!first && contactHashMap.isEmpty() && toImport.isEmpty() && oldCount == contactsMap.size()) {
FileLog.e("tmessages", "contacts not changed!");
return;
}
if (request && !contactHashMap.isEmpty() && !contactsMap.isEmpty()) {
if (toImport.isEmpty()) {
MessagesStorage.Instance.putCachedPhoneBook(contactsMap);
}
Utilities.stageQueue.postRunnable(new Runnable() {
@Override
public void run() {
delayedDontactsToDelete = contactHashMap;
FileLog.e("tmessages", "need delete contacts");
}
});
}
} else if (request) {
for (HashMap.Entry<Integer, Contact> pair : contactsMap.entrySet()) {
Contact value = pair.getValue();
int id = pair.getKey();
for (int a = 0; a < value.phones.size(); a++) {
TLRPC.TL_inputPhoneContact imp = new TLRPC.TL_inputPhoneContact();
imp.client_id = id;
imp.first_name = value.first_name;
imp.last_name = value.last_name;
imp.phone = value.phones.get(a);
toImport.add(imp);
}
}
}
Utilities.stageQueue.postRunnable(new Runnable() {
@Override
public void run() {
contactsBookSPhones = contactsBookShort;
contactsBook = contactsMap;
contactsSyncInProgress = false;
contactsBookLoaded = true;
}
});
FileLog.e("tmessages", "done procrssing contacts");
if (request) {
if (!toImport.isEmpty()) {
FileLog.e("tmessages", "start import contacts");
TLRPC.TL_contacts_importContacts req = new TLRPC.TL_contacts_importContacts();
req.contacts = toImport;
req.replace = false;
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override
public void run(TLObject response, TLRPC.TL_error error) {
if (error == null) {
FileLog.e("tmessages", "contacts imported");
MessagesStorage.Instance.putCachedPhoneBook(contactsMap);
TLRPC.TL_contacts_importedContacts res = (TLRPC.TL_contacts_importedContacts)response;
MessagesStorage.Instance.putUsersAndChats(res.users, null, true, true);
ArrayList<TLRPC.TL_contact> cArr = new ArrayList<TLRPC.TL_contact>();
for (TLRPC.TL_importedContact c : res.imported) {
TLRPC.TL_contact contact = new TLRPC.TL_contact();
contact.user_id = c.user_id;
cArr.add(contact);
}
processLoadedContacts(cArr, res.users, 2);
} else {
FileLog.e("tmessages", "import contacts error " + error.text);
}
}
}, null, true, RPCRequest.RPCRequestClassGeneric | RPCRequest.RPCRequestClassFailOnServerErrors | RPCRequest.RPCRequestClassCanCompress);
} else if (first) {
Utilities.stageQueue.postRunnable(new Runnable() {
@Override
public void run() {
loadContacts(true);
}
});
} else {
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
updateUnregisteredContacts(contacts);
NotificationCenter.Instance.postNotificationName(MessagesController.contactsDidLoaded);
ArrayList<TLRPC.User> toDelete = getContactsToDelete(contacts, MessagesController.Instance.users, 0);
if (!toDelete.isEmpty()) {
deleteContact(toDelete);
}
}
});
}
} else {
MessagesStorage.Instance.putCachedPhoneBook(contactsMap);
}
}
});
}
public void loadContacts(boolean fromCache) {
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
loadingContacts = true;
}
});
if (fromCache) {
FileLog.e("tmessages", "load contacts from cache");
MessagesStorage.Instance.getContacts();
} else {
FileLog.e("tmessages", "load contacts from server");
TLRPC.TL_contacts_getContacts req = new TLRPC.TL_contacts_getContacts();
req.hash = UserConfig.contactsHash;
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override
public void run(TLObject response, TLRPC.TL_error error) {
if (error == null) {
TLRPC.contacts_Contacts res = (TLRPC.contacts_Contacts)response;
if (res instanceof TLRPC.TL_contacts_contactsNotModified) {
delayedDontactsToDelete = null;
contactsLoaded = true;
if (!delayedContactsUpdate.isEmpty() && contactsLoaded && contactsBookLoaded) {
applyContactsUpdates(delayedContactsUpdate, null, null, null);
delayedContactsUpdate.clear();
}
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
loadingContacts = false;
NotificationCenter.Instance.postNotificationName(MessagesController.contactsDidLoaded);
}
});
return;
}
processLoadedContacts(res.contacts, res.users, 0);
}
}
}, null, true, RPCRequest.RPCRequestClassGeneric);
}
}
private ArrayList<TLRPC.User> getContactsToDelete(ArrayList<TLRPC.TL_contact> contactsArr, AbstractMap<Integer, TLRPC.User> usersDict, int from) {
final ArrayList<TLRPC.User> toDelete = new ArrayList<TLRPC.User>();
if (delayedDontactsToDelete != null && !delayedDontactsToDelete.isEmpty()) {
try {
final HashMap<String, TLRPC.User> contactsPhonesShort = new HashMap<String, TLRPC.User>();
for (TLRPC.TL_contact value : contactsArr) {
TLRPC.User user = usersDict.get(value.user_id);
if (user == null || user.phone == null || user.phone.length() == 0) {
continue;
}
if (user.phone.length() > 8) {
String shortPhone = user.phone.substring(user.phone.length() - 8);
contactsPhonesShort.put(shortPhone, user);
} else {
contactsPhonesShort.put(user.phone, user);
}
}
int removed = 0;
for (HashMap.Entry<Integer, Contact> entry : delayedDontactsToDelete.entrySet()) {
Contact contact = entry.getValue();
boolean was = false;
for (int a = 0; a < contact.shortPhones.size(); a++) {
String phone = contact.shortPhones.get(a);
TLRPC.User user = contactsPhonesShort.get(phone);
if (user != null) {
was = true;
toDelete.add(user);
contact.shortPhones.remove(a);
a--;
}
}
if (!was || contact.shortPhones.size() == 0) {
removed++;
}
}
if (from != 2 || removed == delayedDontactsToDelete.size()) {
delayedDontactsToDelete = null;
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
return toDelete;
}
public void processLoadedContacts(final ArrayList<TLRPC.TL_contact> contactsArr, final ArrayList<TLRPC.User> usersArr, final int from) {
//from:
//0 - from server
//1 - from db
//2 - from imported contacts
Utilities.stageQueue.postRunnable(new Runnable() {
@Override
public void run() {
FileLog.e("tmessages", "done loading contacts");
if (from == 1 && contactsArr.isEmpty()) {
loadContacts(false);
return;
}
final HashMap<Integer, TLRPC.User> usersDict = new HashMap<Integer, TLRPC.User>();
for (TLRPC.User user : usersArr) {
usersDict.put(user.id, user);
}
if (from == 1) {
for (TLRPC.TL_contact contact : contactsArr) {
if (usersDict.get(contact.user_id) == null) {
loadContacts(false);
FileLog.e("tmessages", "contacts are broken, load from server");
return;
}
}
}
if (from == 0 || from == 2) {
MessagesStorage.Instance.putUsersAndChats(usersArr, null, true, true);
MessagesStorage.Instance.putContacts(contactsArr, true);
Collections.sort(contactsArr, new Comparator<TLRPC.TL_contact>() {
@Override
public int compare(TLRPC.TL_contact tl_contact, TLRPC.TL_contact tl_contact2) {
if (tl_contact.user_id > tl_contact2.user_id) {
return 1;
} else if (tl_contact.user_id < tl_contact2.user_id) {
return -1;
}
return 0;
}
});
String ids = "";
for (TLRPC.TL_contact aContactsArr : contactsArr) {
if (ids.length() != 0) {
ids += ",";
}
ids += aContactsArr.user_id;
}
UserConfig.contactsHash = Utilities.MD5(ids);
UserConfig.saveConfig(false);
if (from == 2) {
loadContacts(false);
}
}
Collections.sort(contactsArr, new Comparator<TLRPC.TL_contact>() {
@Override
public int compare(TLRPC.TL_contact tl_contact, TLRPC.TL_contact tl_contact2) {
TLRPC.User user1 = usersDict.get(tl_contact.user_id);
TLRPC.User user2 = usersDict.get(tl_contact2.user_id);
String name1 = user1.first_name;
if (name1 == null || name1.length() == 0) {
name1 = user1.last_name;
}
String name2 = user2.first_name;
if (name2 == null || name2.length() == 0) {
name2 = user2.last_name;
}
return name1.compareTo(name2);
}
});
final SparseArray<TLRPC.TL_contact> contactsDictionary = new SparseArray<TLRPC.TL_contact>();
final HashMap<String, ArrayList<TLRPC.TL_contact>> sectionsDict = new HashMap<String, ArrayList<TLRPC.TL_contact>>();
final ArrayList<String> sortedSectionsArray = new ArrayList<String>();
for (TLRPC.TL_contact value : contactsArr) {
TLRPC.User user = usersDict.get(value.user_id);
if (user == null) {
continue;
}
contactsDictionary.put(value.user_id, value);
String key = user.first_name;
if (key == null || key.length() == 0) {
key = user.last_name;
}
if (key.length() == 0) {
key = "#";
} else {
key = key.toUpperCase();
}
if (key.length() > 1) {
key = key.substring(0, 1);
}
ArrayList<TLRPC.TL_contact> arr = sectionsDict.get(key);
if (arr == null) {
arr = new ArrayList<TLRPC.TL_contact>();
sectionsDict.put(key, arr);
sortedSectionsArray.add(key);
}
arr.add(value);
}
Collections.sort(sortedSectionsArray, new Comparator<String>() {
@Override
public int compare(String s, String s2) {
char cv1 = s.charAt(0);
char cv2 = s2.charAt(0);
if (cv1 == '#') {
return 1;
} else if (cv2 == '#') {
return -1;
}
return s.compareTo(s2);
}
});
final ArrayList<TLRPC.User> toDelete = getContactsToDelete(contactsArr, usersDict, from);
if (from != 2) {
contactsLoaded = true;
}
if (!delayedContactsUpdate.isEmpty() && contactsLoaded && contactsBookLoaded) {
applyContactsUpdates(delayedContactsUpdate, null, null, null);
delayedContactsUpdate.clear();
}
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
for (TLRPC.User user : usersArr) {
if (from == 1) {
MessagesController.Instance.users.putIfAbsent(user.id, user);
} else {
MessagesController.Instance.users.put(user.id, user);
if (user.id == UserConfig.clientUserId) {
UserConfig.currentUser = user;
}
}
}
contacts = contactsArr;
contactsDict = contactsDictionary;
usersSectionsDict = sectionsDict;
sortedUsersSectionsArray = sortedSectionsArray;
if (from != 2) {
loadingContacts = false;
}
performWriteContactsToPhoneBook();
updateUnregisteredContacts(contactsArr);
NotificationCenter.Instance.postNotificationName(MessagesController.contactsDidLoaded);
if (!toDelete.isEmpty()) {
deleteContact(toDelete);
}
}
});
}
});
}
private void updateUnregisteredContacts(final ArrayList<TLRPC.TL_contact> contactsArr) {
final HashMap<String, TLRPC.TL_contact> contactsPhonesShort = new HashMap<String, TLRPC.TL_contact>();
for (TLRPC.TL_contact value : contactsArr) {
TLRPC.User user = MessagesController.Instance.users.get(value.user_id);
if (user == null || user.phone == null || user.phone.length() == 0) {
continue;
}
if (user.phone.length() > 8) {
String shortPhone = user.phone.substring(user.phone.length() - 8);
contactsPhonesShort.put(shortPhone, value);
} else {
contactsPhonesShort.put(user.phone, value);
}
}
final HashMap<String, ArrayList<Contact>> sectionsPhoneDict = new HashMap<String, ArrayList<Contact>>();
final ArrayList<String> sortedSectionsPhoneArray = new ArrayList<String>();
for (HashMap.Entry<Integer, Contact> pair : contactsBook.entrySet()) {
Contact value = pair.getValue();
int id = pair.getKey();
boolean skip = false;
for (int a = 0; a < value.phones.size(); a++) {
String sphone = value.shortPhones.get(a);
if (contactsPhonesShort.containsKey(sphone) || value.phoneDeleted.get(a) == 1) {
skip = true;
break;
}
}
if (skip) {
continue;
}
String key = value.first_name;
if (key.length() == 0) {
key = value.last_name;
}
if (key.length() == 0) {
key = "#";
if (value.phones.size() != 0) {
value.first_name = "+" + value.phones.get(0);
}
} else {
key = key.toUpperCase();
}
if (key.length() > 1) {
key = key.substring(0, 1);
}
ArrayList<Contact> arr = sectionsPhoneDict.get(key);
if (arr == null) {
arr = new ArrayList<Contact>();
sectionsPhoneDict.put(key, arr);
sortedSectionsPhoneArray.add(key);
}
arr.add(value);
}
for (HashMap.Entry<String, ArrayList<Contact>> entry : sectionsPhoneDict.entrySet()) {
Collections.sort(entry.getValue(), new Comparator<Contact>() {
@Override
public int compare(Contact contact, Contact contact2) {
String toComapre1 = contact.first_name;
if (toComapre1.length() == 0) {
toComapre1 = contact.last_name;
}
String toComapre2 = contact2.first_name;
if (toComapre2.length() == 0) {
toComapre2 = contact2.last_name;
}
return toComapre1.compareTo(toComapre2);
}
});
}
Collections.sort(sortedSectionsPhoneArray, new Comparator<String>() {
@Override
public int compare(String s, String s2) {
char cv1 = s.charAt(0);
char cv2 = s2.charAt(0);
if (cv1 == '#') {
return 1;
} else if (cv2 == '#') {
return -1;
}
return s.compareTo(s2);
}
});
contactsSectionsDict = sectionsPhoneDict;
sortedContactsSectionsArray = sortedSectionsPhoneArray;
}
private void buildContactsSectionsArrays(boolean sort) {
if (sort) {
Collections.sort(contacts, new Comparator<TLRPC.TL_contact>() {
@Override
public int compare(TLRPC.TL_contact tl_contact, TLRPC.TL_contact tl_contact2) {
TLRPC.User user1 = MessagesController.Instance.users.get(tl_contact.user_id);
TLRPC.User user2 = MessagesController.Instance.users.get(tl_contact2.user_id);
String name1 = user1.first_name;
if (name1 == null || name1.length() == 0) {
name1 = user1.last_name;
}
String name2 = user2.first_name;
if (name2 == null || name2.length() == 0) {
name2 = user2.last_name;
}
return name1.compareTo(name2);
}
});
}
String ids = "";
final HashMap<String, ArrayList<TLRPC.TL_contact>> sectionsDict = new HashMap<String, ArrayList<TLRPC.TL_contact>>();
final ArrayList<String> sortedSectionsArray = new ArrayList<String>();
for (TLRPC.TL_contact value : contacts) {
TLRPC.User user = MessagesController.Instance.users.get(value.user_id);
if (user == null) {
continue;
}
String key = user.first_name;
if (key == null || key.length() == 0) {
key = user.last_name;
}
if (key.length() == 0) {
key = "#";
} else {
key = key.toUpperCase();
}
if (key.length() > 1) {
key = key.substring(0, 1);
}
ArrayList<TLRPC.TL_contact> arr = sectionsDict.get(key);
if (arr == null) {
arr = new ArrayList<TLRPC.TL_contact>();
sectionsDict.put(key, arr);
sortedSectionsArray.add(key);
}
arr.add(value);
if (ids.length() != 0) {
ids += ",";
}
ids += value.user_id;
}
UserConfig.contactsHash = Utilities.MD5(ids);
UserConfig.saveConfig(false);
Collections.sort(sortedSectionsArray, new Comparator<String>() {
@Override
public int compare(String s, String s2) {
char cv1 = s.charAt(0);
char cv2 = s2.charAt(0);
if (cv1 == '#') {
return 1;
} else if (cv2 == '#') {
return -1;
}
return s.compareTo(s2);
}
});
usersSectionsDict = sectionsDict;
sortedUsersSectionsArray = sortedSectionsArray;
}
private void performWriteContactsToPhoneBook() {
Utilities.globalQueue.postRunnable(new Runnable() {
@Override
public void run() {
try {
Uri rawContactUri = ContactsContract.RawContacts.CONTENT_URI.buildUpon().appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_NAME, currentAccount.name).appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_TYPE, currentAccount.type).build();
Cursor c1 = ApplicationLoader.applicationContext.getContentResolver().query(rawContactUri, new String[]{BaseColumns._ID, ContactsContract.RawContacts.SYNC2}, null, null, null);
HashMap<Integer, Long> bookContacts = new HashMap<Integer, Long>();
if (c1 != null) {
while (c1.moveToNext()) {
bookContacts.put(c1.getInt(1), c1.getLong(0));
}
c1.close();
for (TLRPC.TL_contact u : contacts) {
if (!bookContacts.containsKey(u.user_id)) {
TLRPC.User user = MessagesController.Instance.users.get(u.user_id);
addContactToPhoneBook(user);
}
}
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
});
}
private void applyContactsUpdates(ArrayList<Integer> ids, ConcurrentHashMap<Integer, TLRPC.User> userDict, ArrayList<TLRPC.TL_contact> newC, ArrayList<Integer> contactsTD) {
if (newC == null || contactsTD == null) {
newC = new ArrayList<TLRPC.TL_contact>();
contactsTD = new ArrayList<Integer>();
for (Integer uid : ids) {
if (uid > 0) {
TLRPC.TL_contact contact = new TLRPC.TL_contact();
contact.user_id = uid;
newC.add(contact);
if (!delayedContactsUpdate.isEmpty()) {
int idx = delayedContactsUpdate.indexOf(-uid);
if (idx != -1) {
delayedContactsUpdate.remove(idx);
}
}
} else if (uid < 0) {
contactsTD.add(-uid);
if (!delayedContactsUpdate.isEmpty()) {
int idx = delayedContactsUpdate.indexOf(-uid);
if (idx != -1) {
delayedContactsUpdate.remove(idx);
}
}
}
}
}
FileLog.e("tmessages", "process update - contacts add = " + newC.size() + " delete = " + contactsTD.size());
String toAdd = "";
String toDelete = "";
boolean reloadContacts = false;
for (TLRPC.TL_contact newContact : newC) {
TLRPC.User user = null;
if (userDict != null) {
user = userDict.get(newContact.user_id);
}
if (user == null) {
user = MessagesController.Instance.users.get(newContact.user_id);
}
if (user == null || user.phone == null && user.phone.length() == 0) {
reloadContacts = true;
continue;
}
String phone = user.phone;
if (phone.length() > 8) {
phone = phone.substring(phone.length() - 8);
}
Contact contact = contactsBookSPhones.get(phone);
if (contact != null) {
int index = contact.shortPhones.indexOf(phone);
if (index != -1) {
contact.phoneDeleted.set(index, 0);
}
}
if (toAdd.length() != 0) {
toAdd += ",";
}
toAdd += phone;
}
for (final Integer uid : contactsTD) {
Utilities.globalQueue.postRunnable(new Runnable() {
@Override
public void run() {
deleteContactFromPhoneBook(uid);
}
});
TLRPC.User user = null;
if (userDict != null) {
user = userDict.get(uid);
}
if (user == null) {
user = MessagesController.Instance.users.get(uid);
}
if (user == null) {
reloadContacts = true;
continue;
}
if (user.phone != null && user.phone.length() > 0) {
String phone = user.phone;
if (phone.length() > 8) {
phone = phone.substring(phone.length() - 8);
}
Contact contact = contactsBookSPhones.get(phone);
if (contact != null) {
int index = contact.shortPhones.indexOf(phone);
if (index != -1) {
contact.phoneDeleted.set(index, 1);
}
}
if (toDelete.length() != 0) {
toDelete += ",";
}
toDelete += phone;
}
}
if (toAdd.length() != 0 || toDelete.length() != 0) {
MessagesStorage.Instance.applyPhoneBookUpdates(toAdd, toDelete);
}
if (reloadContacts) {
Utilities.stageQueue.postRunnable(new Runnable() {
@Override
public void run() {
loadContacts(false);
}
});
} else {
final ArrayList<TLRPC.TL_contact> newContacts = newC;
final ArrayList<Integer> contactsToDelete = contactsTD;
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
for (TLRPC.TL_contact contact : newContacts) {
if (contactsDict.get(contact.user_id) == null) {
contacts.add(contact);
contactsDict.put(contact.user_id, contact);
}
}
for (Integer uid : contactsToDelete) {
TLRPC.TL_contact contact = contactsDict.get(uid);
if (contact != null) {
contacts.remove(contact);
contactsDict.remove(uid);
}
}
if (!newContacts.isEmpty()) {
updateUnregisteredContacts(contacts);
performWriteContactsToPhoneBook();
}
performSyncPhoneBook(getContactsCopy(contactsBook), false, false);
buildContactsSectionsArrays(!newContacts.isEmpty());
NotificationCenter.Instance.postNotificationName(MessagesController.contactsDidLoaded);
}
});
}
}
public void processContactsUpdates(ArrayList<Integer> ids, ConcurrentHashMap<Integer, TLRPC.User> userDict) {
final ArrayList<TLRPC.TL_contact> newContacts = new ArrayList<TLRPC.TL_contact>();
final ArrayList<Integer> contactsToDelete = new ArrayList<Integer>();
for (Integer uid : ids) {
if (uid > 0) {
TLRPC.TL_contact contact = new TLRPC.TL_contact();
contact.user_id = uid;
newContacts.add(contact);
if (!delayedContactsUpdate.isEmpty()) {
int idx = delayedContactsUpdate.indexOf(-uid);
if (idx != -1) {
delayedContactsUpdate.remove(idx);
}
}
} else if (uid < 0) {
contactsToDelete.add(-uid);
if (!delayedContactsUpdate.isEmpty()) {
int idx = delayedContactsUpdate.indexOf(-uid);
if (idx != -1) {
delayedContactsUpdate.remove(idx);
}
}
}
}
if (!contactsToDelete.isEmpty()) {
MessagesStorage.Instance.deleteContacts(contactsToDelete);
}
if (!newContacts.isEmpty()) {
MessagesStorage.Instance.putContacts(newContacts, false);
}
if (!contactsLoaded || !contactsBookLoaded) {
delayedContactsUpdate.addAll(ids);
FileLog.e("tmessages", "delay update - contacts add = " + newContacts.size() + " delete = " + contactsToDelete.size());
} else {
applyContactsUpdates(ids, userDict, newContacts, contactsToDelete);
}
}
public long addContactToPhoneBook(TLRPC.User user) {
if (currentAccount == null || user == null || user.phone == null || user.phone.length() == 0) {
return -1;
}
long res = -1;
synchronized (observerLock) {
ignoreChanges = true;
}
ArrayList<ContentProviderOperation> query = new ArrayList<ContentProviderOperation>();
ContentProviderOperation.Builder builder = ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI);
builder.withValue(ContactsContract.RawContacts.ACCOUNT_NAME, currentAccount.name);
builder.withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, currentAccount.type);
builder.withValue(ContactsContract.RawContacts.SYNC1, user.phone);
builder.withValue(ContactsContract.RawContacts.SYNC2, user.id);
query.add(builder.build());
builder = ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI);
builder.withValueBackReference(ContactsContract.CommonDataKinds.StructuredName.RAW_CONTACT_ID, 0);
builder.withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE);
builder.withValue(ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME, user.first_name);
builder.withValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME, user.last_name);
query.add(builder.build());
builder = ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI);
builder.withValueBackReference(ContactsContract.CommonDataKinds.StructuredName.RAW_CONTACT_ID, 0);
builder.withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
builder.withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, "+" + user.phone);
builder.withValue(ContactsContract.CommonDataKinds.Phone.TYPE, ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE);
query.add(builder.build());
builder = ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI);
builder.withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0);
builder.withValue(ContactsContract.Data.MIMETYPE, "vnd.android.cursor.item/vnd.org.telegram.messenger.android.profile");
builder.withValue(ContactsContract.Data.DATA1, "+" + user.phone);
builder.withValue(ContactsContract.Data.DATA2, "Telegram Profile");
builder.withValue(ContactsContract.Data.DATA3, "+" + user.phone);
builder.withValue(ContactsContract.Data.DATA4, user.id);
query.add(builder.build());
try {
ContentProviderResult[] result = ApplicationLoader.applicationContext.getContentResolver().applyBatch(ContactsContract.AUTHORITY, query);
res = Long.parseLong(result[0].uri.getLastPathSegment());
} catch (Exception e) {
FileLog.e("tmessages", e);
}
synchronized (observerLock) {
ignoreChanges = false;
}
return res;
}
private void deleteContactFromPhoneBook(int uid) {
ContentResolver contentResolver = ApplicationLoader.applicationContext.getContentResolver();
synchronized (observerLock) {
ignoreChanges = true;
}
try {
Uri rawContactUri = ContactsContract.RawContacts.CONTENT_URI.buildUpon().appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true").appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_NAME, currentAccount.name).appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_TYPE, currentAccount.type).build();
int value = contentResolver.delete(rawContactUri, ContactsContract.RawContacts.SYNC2 + " = " + uid, null);
} catch (Exception e) {
FileLog.e("tmessages", e);
}
synchronized (observerLock) {
ignoreChanges = false;
}
}
public void addContact(TLRPC.User user) {
if (user == null) {
return;
}
TLRPC.TL_contacts_importContacts req = new TLRPC.TL_contacts_importContacts();
ArrayList<TLRPC.TL_inputPhoneContact> contactsParams = new ArrayList<TLRPC.TL_inputPhoneContact>();
TLRPC.TL_inputPhoneContact c = new TLRPC.TL_inputPhoneContact();
c.phone = user.phone;
c.first_name = user.first_name;
c.last_name = user.last_name;
c.client_id = 0;
contactsParams.add(c);
req.contacts = contactsParams;
req.replace = false;
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override
public void run(TLObject response, TLRPC.TL_error error) {
if (error != null) {
return;
}
final TLRPC.TL_contacts_importedContacts res = (TLRPC.TL_contacts_importedContacts)response;
MessagesStorage.Instance.putUsersAndChats(res.users, null, true, true);
for (final TLRPC.User u : res.users) {
Utilities.globalQueue.postRunnable(new Runnable() {
@Override
public void run() {
addContactToPhoneBook(u);
}
});
TLRPC.TL_contact newContact = new TLRPC.TL_contact();
newContact.user_id = u.id;
ArrayList<TLRPC.TL_contact> arrayList = new ArrayList<TLRPC.TL_contact>();
arrayList.add(newContact);
MessagesStorage.Instance.putContacts(arrayList, false);
if (u.phone != null && u.phone.length() > 0) {
String name = Utilities.formatName(u.first_name, u.last_name);
String phone = u.phone;
if (phone.length() > 8) {
phone = phone.substring(phone.length() - 8);
}
MessagesStorage.Instance.applyPhoneBookUpdates(phone, "");
Contact contact = contactsBookSPhones.get(phone);
if (contact != null) {
int index = contact.shortPhones.indexOf(phone);
if (index != -1) {
contact.phoneDeleted.set(index, 0);
}
}
}
}
performSyncPhoneBook(getContactsCopy(contactsBook), false, false);
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
for (TLRPC.User u : res.users) {
MessagesController.Instance.users.put(u.id, u);
if (contactsDict.get(u.id) == null) {
TLRPC.TL_contact newContact = new TLRPC.TL_contact();
newContact.user_id = u.id;
contacts.add(newContact);
contactsDict.put(newContact.user_id, newContact);
}
}
buildContactsSectionsArrays(true);
NotificationCenter.Instance.postNotificationName(MessagesController.contactsDidLoaded);
}
});
}
}, null, true, RPCRequest.RPCRequestClassGeneric | RPCRequest.RPCRequestClassFailOnServerErrors | RPCRequest.RPCRequestClassCanCompress);
}
public void deleteContact(final ArrayList<TLRPC.User> users) {
if (users == null || users.isEmpty()) {
return;
}
TLRPC.TL_contacts_deleteContacts req = new TLRPC.TL_contacts_deleteContacts();
final ArrayList<Integer> uids = new ArrayList<Integer>();
for (TLRPC.User user : users) {
TLRPC.InputUser inputUser = MessagesController.getInputUser(user);
if (inputUser == null) {
continue;
}
uids.add(user.id);
req.id.add(inputUser);
}
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override
public void run(TLObject response, TLRPC.TL_error error) {
if (error != null) {
return;
}
MessagesStorage.Instance.deleteContacts(uids);
Utilities.globalQueue.postRunnable(new Runnable() {
@Override
public void run() {
for (TLRPC.User user : users) {
deleteContactFromPhoneBook(user.id);
}
}
});
for (TLRPC.User user : users) {
if (user.phone != null && user.phone.length() > 0) {
String name = Utilities.formatName(user.first_name, user.last_name);
String phone = user.phone;
if (phone.length() > 8) {
phone = phone.substring(phone.length() - 8);
}
MessagesStorage.Instance.applyPhoneBookUpdates(phone, "");
Contact contact = contactsBookSPhones.get(phone);
if (contact != null) {
int index = contact.shortPhones.indexOf(phone);
if (index != -1) {
contact.phoneDeleted.set(index, 1);
}
}
}
}
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
boolean remove = false;
for (TLRPC.User user : users) {
TLRPC.TL_contact contact = contactsDict.get(user.id);
if (contact != null) {
remove = true;
contacts.remove(contact);
contactsDict.remove(user.id);
}
}
if (remove) {
buildContactsSectionsArrays(false);
}
NotificationCenter.Instance.postNotificationName(MessagesController.updateInterfaces, MessagesController.UPDATE_MASK_NAME);
NotificationCenter.Instance.postNotificationName(MessagesController.contactsDidLoaded);
}
});
}
}, null, true, RPCRequest.RPCRequestClassGeneric);
}
}
TMessagesProj/src/main/java/org/telegram/messenger/DispatchQueue.java
View file @ 9814a6e9
...@@ -42,10 +42,14 @@ public class DispatchQueue extends Thread { ...@@ -42,10 +42,14 @@ public class DispatchQueue extends Thread {
} }
public void postRunnable(Runnable runnable) { public void postRunnable(Runnable runnable) {
postRunnable(runnable, 0); postRunnable(runnable, 0, false);
} }
public void postRunnable(Runnable runnable, int delay) { public void postRunnable(Runnable runnable, boolean inFront) {
postRunnable(runnable, 0, true);
}
public void postRunnable(Runnable runnable, int delay, boolean inFront) {
if (handler == null) { if (handler == null) {
try { try {
synchronized (handlerSyncObject) { synchronized (handlerSyncObject) {
...@@ -58,7 +62,11 @@ public class DispatchQueue extends Thread { ...@@ -58,7 +62,11 @@ public class DispatchQueue extends Thread {
if (handler != null) { if (handler != null) {
if (delay <= 0) { if (delay <= 0) {
if (inFront) {
handler.postAtFrontOfQueue(runnable);
} else {
handler.post(runnable); handler.post(runnable);
}
} else { } else {
handler.postDelayed(runnable, delay); handler.postDelayed(runnable, delay);
} }
......
TMessagesProj/src/main/java/org/telegram/messenger/ExportAuthorizationAction.java
View file @ 9814a6e9
...@@ -53,7 +53,7 @@ public class ExportAuthorizationAction extends Action { ...@@ -53,7 +53,7 @@ public class ExportAuthorizationAction extends Action {
public void run() { public void run() {
beginExport(); beginExport();
} }
}, retryCount * 1500); }, retryCount * 1500, false);
} }
} }
} }
...@@ -84,7 +84,7 @@ public class ExportAuthorizationAction extends Action { ...@@ -84,7 +84,7 @@ public class ExportAuthorizationAction extends Action {
public void run() { public void run() {
beginExport(); beginExport();
} }
}, retryCount * 1500); }, retryCount * 1500, false);
} }
} }
} }
......
TMessagesProj/src/main/java/org/telegram/messenger/FileLoadOperation.java
View file @ 9814a6e9
...@@ -420,7 +420,12 @@ public class FileLoadOperation { ...@@ -420,7 +420,12 @@ public class FileLoadOperation {
if (renamed) { if (renamed) {
image = BitmapFactory.decodeStream(new FileInputStream(cacheFileFinal), null, opts); image = BitmapFactory.decodeStream(new FileInputStream(cacheFileFinal), null, opts);
} else { } else {
try {
image = BitmapFactory.decodeStream(new FileInputStream(cacheFileTemp), null, opts); image = BitmapFactory.decodeStream(new FileInputStream(cacheFileTemp), null, opts);
} catch (Exception e) {
FileLog.e("tmessages", e);
image = BitmapFactory.decodeStream(new FileInputStream(cacheFileFinal), null, opts);
}
} }
if (filter != null && image != null) { if (filter != null && image != null) {
float bitmapW = image.getWidth(); float bitmapW = image.getWidth();
...@@ -440,10 +445,11 @@ public class FileLoadOperation { ...@@ -440,10 +445,11 @@ public class FileLoadOperation {
if (FileLoader.Instance.runtimeHack != null) { if (FileLoader.Instance.runtimeHack != null) {
FileLoader.Instance.runtimeHack.trackFree(image.getRowBytes() * image.getHeight()); FileLoader.Instance.runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
} }
delegate.didFinishLoadingFile(FileLoadOperation.this);
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
delegate.didFailedLoadingFile(FileLoadOperation.this);
} }
delegate.didFinishLoadingFile(FileLoadOperation.this);
} }
}); });
} else { } else {
......
TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
View file @ 9814a6e9
...@@ -15,13 +15,12 @@ import android.graphics.BitmapFactory; ...@@ -15,13 +15,12 @@ import android.graphics.BitmapFactory;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.media.ExifInterface; import android.media.ExifInterface;
import android.os.Build; import android.os.Build;
import android.view.View;
import android.widget.ImageView;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.objects.MessageObject; import org.telegram.objects.MessageObject;
import org.telegram.ui.ApplicationLoader; import org.telegram.ui.ApplicationLoader;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.BackupImageView;
import org.telegram.ui.Views.ImageReceiver;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
...@@ -134,15 +133,13 @@ public class FileLoader { ...@@ -134,15 +133,13 @@ public class FileLoader {
private class CacheImage { private class CacheImage {
public String key; public String key;
public ArrayList<View> imageViewArray; final public ArrayList<Object> imageViewArray = new ArrayList<Object>();
public FileLoadOperation loadOperation; public FileLoadOperation loadOperation;
public void addImageView(View imageView) { public void addImageView(Object imageView) {
if (imageViewArray == null) { synchronized (imageViewArray) {
imageViewArray = new ArrayList<View>();
}
boolean exist = false; boolean exist = false;
for (View v : imageViewArray) { for (Object v : imageViewArray) {
if (v == imageView) { if (v == imageView) {
exist = true; exist = true;
break; break;
...@@ -152,11 +149,12 @@ public class FileLoader { ...@@ -152,11 +149,12 @@ public class FileLoader {
imageViewArray.add(imageView); imageViewArray.add(imageView);
} }
} }
}
public void removeImageView(View imageView) { public void removeImageView(Object imageView) {
if (imageViewArray != null) { synchronized (imageViewArray) {
for (int a = 0; a < imageViewArray.size(); a++) { for (int a = 0; a < imageViewArray.size(); a++) {
View obj = imageViewArray.get(a); Object obj = imageViewArray.get(a);
if (obj == null || obj == imageView) { if (obj == null || obj == imageView) {
imageViewArray.remove(a); imageViewArray.remove(a);
a--; a--;
...@@ -166,19 +164,23 @@ public class FileLoader { ...@@ -166,19 +164,23 @@ public class FileLoader {
} }
public void callAndClear(Bitmap image) { public void callAndClear(Bitmap image) {
synchronized (imageViewArray) {
if (image != null) { if (image != null) {
for (View imgView : imageViewArray) { for (Object imgView : imageViewArray) {
if (imgView instanceof BackupImageView) { if (imgView instanceof BackupImageView) {
((BackupImageView)imgView).setImageBitmap(image, key); ((BackupImageView)imgView).setImageBitmap(image, key);
} else if (imgView instanceof ImageView) { } else if (imgView instanceof ImageReceiver) {
((ImageView)imgView).setImageBitmap(image); ((ImageReceiver)imgView).setImageBitmap(image, key);
}
} }
} }
} }
Utilities.imageLoadQueue.postRunnable(new Runnable() { Utilities.imageLoadQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
synchronized (imageViewArray) {
imageViewArray.clear(); imageViewArray.clear();
}
loadOperation = null; loadOperation = null;
} }
}); });
...@@ -189,9 +191,11 @@ public class FileLoader { ...@@ -189,9 +191,11 @@ public class FileLoader {
loadOperation.cancel(); loadOperation.cancel();
loadOperation = null; loadOperation = null;
} }
synchronized (imageViewArray) {
imageViewArray.clear(); imageViewArray.clear();
} }
} }
}
public void incrementUseCount(String key) { public void incrementUseCount(String key) {
Integer count = BitmapUseCounts.get(key); Integer count = BitmapUseCounts.get(key);
...@@ -548,25 +552,42 @@ public class FileLoader { ...@@ -548,25 +552,42 @@ public class FileLoader {
memCache.evictAll(); memCache.evictAll();
} }
public void cancelLoadingForImageView(final View imageView) { private Integer getTag(Object obj) {
if (obj instanceof BackupImageView) {
return (Integer)((BackupImageView)obj).getTag(R.string.CacheTag);
} else if (obj instanceof ImageReceiver) {
return ((ImageReceiver)obj).TAG;
}
return 0;
}
private void setTag(Object obj, Integer tag) {
if (obj instanceof BackupImageView) {
((BackupImageView)obj).setTag(R.string.CacheTag, tag);
} else if (obj instanceof ImageReceiver) {
((ImageReceiver)obj).TAG = tag;
}
}
public void cancelLoadingForImageView(final Object imageView) {
if (imageView == null) { if (imageView == null) {
return; return;
} }
Utilities.imageLoadQueue.postRunnable(new Runnable() { Utilities.imageLoadQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
Integer num = (Integer)imageView.getTag(R.string.CacheTag); Integer TAG = getTag(imageView);
if (num == null) { if (TAG == null) {
num = lastImageNum; TAG = lastImageNum;
imageView.setTag(R.string.CacheTag, num); setTag(imageView, TAG);
lastImageNum++; lastImageNum++;
if (lastImageNum == Integer.MAX_VALUE) { if (lastImageNum == Integer.MAX_VALUE) {
lastImageNum = 0; lastImageNum = 0;
} }
} }
CacheImage ei = imageLoadingByKeys.get(num); CacheImage ei = imageLoadingByKeys.get(TAG);
if (ei != null) { if (ei != null) {
imageLoadingByKeys.remove(num); imageLoadingByKeys.remove(TAG);
ei.removeImageView(imageView); ei.removeImageView(imageView);
if (ei.imageViewArray.size() == 0) { if (ei.imageViewArray.size() == 0) {
checkOperationsAndClear(ei.loadOperation); checkOperationsAndClear(ei.loadOperation);
...@@ -578,17 +599,18 @@ public class FileLoader { ...@@ -578,17 +599,18 @@ public class FileLoader {
}); });
} }
public Bitmap getImageFromMemory(TLRPC.FileLocation url, View imageView, String filter, boolean cancel) { public Bitmap getImageFromMemory(TLRPC.FileLocation url, Object imageView, String filter, boolean cancel) {
return getImageFromMemory(url, null, imageView, filter, cancel); return getImageFromMemory(url, null, imageView, filter, cancel);
} }
public Bitmap getImageFromMemory(String url, View imageView, String filter, boolean cancel) { public Bitmap getImageFromMemory(String url, Object imageView, String filter, boolean cancel) {
return getImageFromMemory(null, url, imageView, filter, cancel); return getImageFromMemory(null, url, imageView, filter, cancel);
} }
public Bitmap getImageFromMemory(TLRPC.FileLocation url, String httpUrl, View imageView, String filter, boolean cancel) { public Bitmap getImageFromMemory(TLRPC.FileLocation url, String httpUrl, Object imageView, String filter, boolean cancel) {
if ((url == null && httpUrl == null) || imageView == null) if (url == null && httpUrl == null) {
return null; return null;
}
String key; String key;
if (httpUrl != null) { if (httpUrl != null) {
key = Utilities.MD5(httpUrl); key = Utilities.MD5(httpUrl);
...@@ -600,7 +622,7 @@ public class FileLoader { ...@@ -600,7 +622,7 @@ public class FileLoader {
} }
Bitmap img = imageFromKey(key); Bitmap img = imageFromKey(key);
if (img != null && cancel) { if (imageView != null && img != null && cancel) {
cancelLoadingForImageView(imageView); cancelLoadingForImageView(imageView);
} }
return img; return img;
...@@ -637,19 +659,19 @@ public class FileLoader { ...@@ -637,19 +659,19 @@ public class FileLoader {
}); });
} }
public void loadImage(final String url, final View imageView, final String filter, final boolean cancel) { public void loadImage(final String url, final Object imageView, final String filter, final boolean cancel) {
loadImage(null, url, imageView, filter, cancel, 0); loadImage(null, url, imageView, filter, cancel, 0);
} }
public void loadImage(final TLRPC.FileLocation url, final View imageView, final String filter, final boolean cancel) { public void loadImage(final TLRPC.FileLocation url, final Object imageView, final String filter, final boolean cancel) {
loadImage(url, null, imageView, filter, cancel, 0); loadImage(url, null, imageView, filter, cancel, 0);
} }
public void loadImage(final TLRPC.FileLocation url, final View imageView, final String filter, final boolean cancel, final int size) { public void loadImage(final TLRPC.FileLocation url, final Object imageView, final String filter, final boolean cancel, final int size) {
loadImage(url, null, imageView, filter, cancel, size); loadImage(url, null, imageView, filter, cancel, size);
} }
public void loadImage(final TLRPC.FileLocation url, final String httpUrl, final View imageView, final String filter, final boolean cancel, final int size) { public void loadImage(final TLRPC.FileLocation url, final String httpUrl, final Object imageView, final String filter, final boolean cancel, final int size) {
if ((url == null && httpUrl == null) || imageView == null || (url != null && !(url instanceof TLRPC.TL_fileLocation) && !(url instanceof TLRPC.TL_fileEncryptedLocation))) { if ((url == null && httpUrl == null) || imageView == null || (url != null && !(url instanceof TLRPC.TL_fileLocation) && !(url instanceof TLRPC.TL_fileEncryptedLocation))) {
return; return;
} }
...@@ -666,10 +688,10 @@ public class FileLoader { ...@@ -666,10 +688,10 @@ public class FileLoader {
key += "@" + filter; key += "@" + filter;
} }
Integer num = (Integer)imageView.getTag(R.string.CacheTag); Integer TAG = getTag(imageView);
if (num == null) { if (TAG == null) {
num = lastImageNum; TAG = lastImageNum;
imageView.setTag(R.string.CacheTag, num); setTag(imageView, TAG);
lastImageNum++; lastImageNum++;
if (lastImageNum == Integer.MAX_VALUE) if (lastImageNum == Integer.MAX_VALUE)
lastImageNum = 0; lastImageNum = 0;
...@@ -679,7 +701,7 @@ public class FileLoader { ...@@ -679,7 +701,7 @@ public class FileLoader {
boolean addToByKeys = true; boolean addToByKeys = true;
CacheImage alreadyLoadingImage = imageLoading.get(key); CacheImage alreadyLoadingImage = imageLoading.get(key);
if (cancel) { if (cancel) {
CacheImage ei = imageLoadingByKeys.get(num); CacheImage ei = imageLoadingByKeys.get(TAG);
if (ei != null) { if (ei != null) {
if (ei != alreadyLoadingImage) { if (ei != alreadyLoadingImage) {
ei.removeImageView(imageView); ei.removeImageView(imageView);
...@@ -697,7 +719,7 @@ public class FileLoader { ...@@ -697,7 +719,7 @@ public class FileLoader {
if (alreadyLoadingImage != null && addToByKeys) { if (alreadyLoadingImage != null && addToByKeys) {
alreadyLoadingImage.addImageView(imageView); alreadyLoadingImage.addImageView(imageView);
imageLoadingByKeys.put(num, alreadyLoadingImage); imageLoadingByKeys.put(TAG, alreadyLoadingImage);
added = true; added = true;
} }
...@@ -705,7 +727,7 @@ public class FileLoader { ...@@ -705,7 +727,7 @@ public class FileLoader {
final CacheImage img = new CacheImage(); final CacheImage img = new CacheImage();
img.key = key; img.key = key;
img.addImageView(imageView); img.addImageView(imageView);
imageLoadingByKeys.put(num, img); imageLoadingByKeys.put(TAG, img);
imageLoading.put(key, img); imageLoading.put(key, img);
final String arg2 = key; final String arg2 = key;
...@@ -744,9 +766,8 @@ public class FileLoader { ...@@ -744,9 +766,8 @@ public class FileLoader {
Utilities.imageLoadQueue.postRunnable(new Runnable() { Utilities.imageLoadQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
for (View view : img.imageViewArray) { for (Object view : img.imageViewArray) {
Integer num = (Integer)view.getTag(R.string.CacheTag); imageLoadingByKeys.remove(getTag(view));
imageLoadingByKeys.remove(num);
imageLoading.remove(arg2); imageLoading.remove(arg2);
checkOperationsAndClear(operation); checkOperationsAndClear(operation);
} }
...@@ -814,15 +835,16 @@ public class FileLoader { ...@@ -814,15 +835,16 @@ public class FileLoader {
} }
} }
public void processImage(Bitmap image, View imageView, String filter, boolean cancel) { public void processImage(Bitmap image, Object imageView, String filter, boolean cancel) {
if (filter == null || imageView == null) { if (filter == null || imageView == null) {
return; return;
} }
Integer num = (Integer)imageView.getTag(R.string.CacheTag);
if (num == null) { Integer TAG = getTag(imageView);
num = lastImageNum; if (TAG == null) {
imageView.setTag(R.string.CacheTag, num); TAG = lastImageNum;
setTag(image, TAG);
lastImageNum++; lastImageNum++;
if (lastImageNum == Integer.MAX_VALUE) if (lastImageNum == Integer.MAX_VALUE)
lastImageNum = 0; lastImageNum = 0;
...@@ -832,7 +854,7 @@ public class FileLoader { ...@@ -832,7 +854,7 @@ public class FileLoader {
boolean addToByKeys = true; boolean addToByKeys = true;
CacheImage alreadyLoadingImage = imageLoading.get(filter); CacheImage alreadyLoadingImage = imageLoading.get(filter);
if (cancel) { if (cancel) {
CacheImage ei = imageLoadingByKeys.get(num); CacheImage ei = imageLoadingByKeys.get(TAG);
if (ei != null) { if (ei != null) {
if (ei != alreadyLoadingImage) { if (ei != alreadyLoadingImage) {
ei.removeImageView(imageView); ei.removeImageView(imageView);
...@@ -850,7 +872,7 @@ public class FileLoader { ...@@ -850,7 +872,7 @@ public class FileLoader {
if (alreadyLoadingImage != null && addToByKeys) { if (alreadyLoadingImage != null && addToByKeys) {
alreadyLoadingImage.addImageView(imageView); alreadyLoadingImage.addImageView(imageView);
imageLoadingByKeys.put(num, alreadyLoadingImage); imageLoadingByKeys.put(TAG, alreadyLoadingImage);
added = true; added = true;
} }
...@@ -858,7 +880,7 @@ public class FileLoader { ...@@ -858,7 +880,7 @@ public class FileLoader {
CacheImage img = new CacheImage(); CacheImage img = new CacheImage();
img.key = filter; img.key = filter;
img.addImageView(imageView); img.addImageView(imageView);
imageLoadingByKeys.put(num, img); imageLoadingByKeys.put(TAG, img);
imageLoading.put(filter, img); imageLoading.put(filter, img);
enqueueImageProcessingOperationWithImage(image, filter, filter, img); enqueueImageProcessingOperationWithImage(image, filter, filter, img);
...@@ -873,9 +895,8 @@ public class FileLoader { ...@@ -873,9 +895,8 @@ public class FileLoader {
Utilities.imageLoadQueue.postRunnable(new Runnable() { Utilities.imageLoadQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
for (View v : img.imageViewArray) { for (Object v : img.imageViewArray) {
Integer num = (Integer)v.getTag(R.string.CacheTag); imageLoadingByKeys.remove(getTag(v));
imageLoadingByKeys.remove(num);
} }
checkOperationsAndClear(img.loadOperation); checkOperationsAndClear(img.loadOperation);
imageLoading.remove(key); imageLoading.remove(key);
......
TMessagesProj/src/main/java/org/telegram/messenger/FileLog.java
View file @ 9814a6e9
...@@ -118,6 +118,8 @@ public class FileLog { ...@@ -118,6 +118,8 @@ public class FileLog {
} }
} }
}); });
} else {
e.printStackTrace();
} }
} }
......
TMessagesProj/src/main/java/org/telegram/messenger/FileUploadOperation.java
View file @ 9814a6e9
...@@ -109,7 +109,16 @@ public class FileUploadOperation { ...@@ -109,7 +109,16 @@ public class FileUploadOperation {
isBigFile = true; isBigFile = true;
} }
uploadChunkSize = (int)Math.max(32, Math.ceil(totalFileSize / (1024.0f * 3000))) * 1024; uploadChunkSize = (int)Math.max(32, Math.ceil(totalFileSize / (1024.0f * 3000)));
if (1024 % uploadChunkSize != 0) {
int chunkSize = 64;
while (uploadChunkSize > chunkSize) {
chunkSize *= 2;
}
uploadChunkSize = chunkSize;
}
uploadChunkSize *= 1024;
totalPartsCount = (int)Math.ceil((float)totalFileSize / (float)uploadChunkSize); totalPartsCount = (int)Math.ceil((float)totalFileSize / (float)uploadChunkSize);
readBuffer = new byte[uploadChunkSize]; readBuffer = new byte[uploadChunkSize];
} }
......
TMessagesProj/src/main/java/org/telegram/messenger/GcmBroadcastReceiver.java
View file @ 9814a6e9
...@@ -14,6 +14,7 @@ import android.content.Context; ...@@ -14,6 +14,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.os.PowerManager;
import com.google.android.gms.gcm.GoogleCloudMessaging; import com.google.android.gms.gcm.GoogleCloudMessaging;
...@@ -27,6 +28,10 @@ public class GcmBroadcastReceiver extends BroadcastReceiver { ...@@ -27,6 +28,10 @@ public class GcmBroadcastReceiver extends BroadcastReceiver {
setResultCode(Activity.RESULT_OK); setResultCode(Activity.RESULT_OK);
if (intent.getAction().equals("com.google.android.c2dm.intent.RECEIVE")) { if (intent.getAction().equals("com.google.android.c2dm.intent.RECEIVE")) {
PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
final PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "lock");
wl.acquire();
SharedPreferences preferences = context.getSharedPreferences("Notifications", Context.MODE_PRIVATE); SharedPreferences preferences = context.getSharedPreferences("Notifications", Context.MODE_PRIVATE);
boolean globalEnabled = preferences.getBoolean("EnableAll", true); boolean globalEnabled = preferences.getBoolean("EnableAll", true);
if (!globalEnabled) { if (!globalEnabled) {
...@@ -38,12 +43,13 @@ public class GcmBroadcastReceiver extends BroadcastReceiver { ...@@ -38,12 +43,13 @@ public class GcmBroadcastReceiver extends BroadcastReceiver {
public void run() { public void run() {
GoogleCloudMessaging gcm = GoogleCloudMessaging.getInstance(context); GoogleCloudMessaging gcm = GoogleCloudMessaging.getInstance(context);
String messageType = gcm.getMessageType(intent); String messageType = gcm.getMessageType(intent);
sendNotification(context, intent.getExtras()); ConnectionsManager.Instance.resumeNetworkMaybe();
wl.release();
} }
}); });
thread.setPriority(Thread.MAX_PRIORITY); thread.setPriority(Thread.MAX_PRIORITY);
thread.start(); thread.start();
} else if (intent.getAction().equals("com.google.android.c2dm.intent.RECEIVE")) { } else if (intent.getAction().equals("com.google.android.c2dm.intent.REGISTRATION")) {
String registration = intent.getStringExtra("registration_id"); String registration = intent.getStringExtra("registration_id");
if (intent.getStringExtra("error") != null) { if (intent.getStringExtra("error") != null) {
FileLog.e("tmessages", "Registration failed, should try again later."); FileLog.e("tmessages", "Registration failed, should try again later.");
...@@ -54,157 +60,4 @@ public class GcmBroadcastReceiver extends BroadcastReceiver { ...@@ -54,157 +60,4 @@ public class GcmBroadcastReceiver extends BroadcastReceiver {
} }
} }
} }
private void sendNotification(Context context, Bundle extras) {
ConnectionsManager.Instance.resumeNetworkMaybe();
/*if (!UserConfig.clientActivated || context == null || extras == null) {
return;
}
SharedPreferences preferences = context.getSharedPreferences("Notifications", Context.MODE_PRIVATE);
boolean groupEnabled = preferences.getBoolean("EnableGroup", true);
boolean globalVibrate = preferences.getBoolean("EnableVibrateAll", true);
boolean groupVibrate = preferences.getBoolean("EnableVibrateGroup", true);
if (ApplicationLoader.Instance != null && (ApplicationLoader.lastPauseTime == 0 || ApplicationLoader.lastPauseTime > System.currentTimeMillis() - 200)) {
return;
}
String defaultPath = null;
Uri defaultUri = Settings.System.DEFAULT_NOTIFICATION_URI;
if (defaultUri != null) {
defaultPath = defaultUri.getPath();
}
String globalSound = preferences.getString("GlobalSoundPath", defaultPath);
String chatSound = preferences.getString("GroupSoundPath", defaultPath);
String userSoundPath = null;
String chatSoundPath = null;
NotificationManager mNotificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
Intent intent = new Intent(context, LaunchActivity.class);
String msg = extras.getString("message");
try {
String to_id = extras.getString("user_id");
int to = Integer.parseInt(to_id);
if (to != UserConfig.clientUserId) {
return;
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
int chat_id = 0;
int user_id = 0;
String custom = extras.getString("custom");
try {
if (custom != null) {
JSONObject obj = new JSONObject(custom);
if (obj.has("chat_id")) {
Object object = obj.get("chat_id");
if (object instanceof Integer) {
chat_id = (Integer)object;
} else if (object instanceof String) {
chat_id = Integer.parseInt((String)object);
}
if (chat_id != 0) {
intent.putExtra("chatId", chat_id);
}
} else if (obj.has("from_id")) {
Object object = obj.get("from_id");
if (object instanceof Integer) {
user_id = (Integer)object;
} else if (object instanceof String) {
user_id = Integer.parseInt((String)object);
}
if (user_id != 0) {
intent.putExtra("userId", user_id);
}
}
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
if (user_id != 0) {
String key = "notify_" + user_id;
boolean value = preferences.getBoolean(key, true);
if (!value) {
return;
}
userSoundPath = preferences.getString("sound_path_" + user_id, null);
}
if (chat_id != 0) {
if (!groupEnabled) {
return;
}
String key = "notify_" + (-chat_id);
boolean value = preferences.getBoolean(key, true);
if (!value) {
return;
}
chatSoundPath = preferences.getString("sound_chat_path_" + chat_id, null);
}
boolean needVibrate;
String choosenSoundPath = null;
if (chat_id != 0) {
needVibrate = groupVibrate;
} else {
needVibrate = globalVibrate;
}
if (user_id != 0) {
if (userSoundPath != null) {
choosenSoundPath = userSoundPath;
} else if (globalSound != null) {
choosenSoundPath = globalSound;
}
} else if (chat_id != 0) {
if (chatSoundPath != null) {
choosenSoundPath = chatSoundPath;
} else if (chatSound != null) {
choosenSoundPath = chatSound;
}
} else {
choosenSoundPath = globalSound;
}
intent.setAction("com.tmessages.openchat" + Math.random() + Integer.MAX_VALUE);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
//intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent contentIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_ONE_SHOT);
NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context)
.setContentTitle(ApplicationLoader.applicationContext.getString(R.string.AppName))
.setSmallIcon(R.drawable.notification)
.setStyle(new NotificationCompat.BigTextStyle()
.bigText(msg))
.setContentText(msg)
.setAutoCancel(true)
.setTicker(msg);
if (needVibrate) {
mBuilder.setVibrate(new long[]{0, 100, 0, 100});
}
if (choosenSoundPath != null && !choosenSoundPath.equals("NoSound")) {
if (choosenSoundPath.equals(defaultPath)) {
mBuilder.setSound(defaultUri);
} else {
mBuilder.setSound(Uri.parse(choosenSoundPath));
}
}
mBuilder.setContentIntent(contentIntent);
mNotificationManager.cancel(NOTIFICATION_ID);
Notification notification = mBuilder.build();
notification.ledARGB = 0xff00ff00;
notification.ledOnMS = 1000;
notification.ledOffMS = 1000;
notification.flags |= Notification.FLAG_SHOW_LIGHTS;
mNotificationManager.notify(NOTIFICATION_ID, notification);*/
}
} }
TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
View file @ 9814a6e9
This source diff could not be displayed because it is too large. You can view the blob instead.
TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
View file @ 9814a6e9
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
package org.telegram.messenger; package org.telegram.messenger;
import android.text.Html; import android.text.Html;
import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import org.telegram.SQLite.SQLiteCursor; import org.telegram.SQLite.SQLiteCursor;
...@@ -74,6 +73,11 @@ public class MessagesStorage { ...@@ -74,6 +73,11 @@ public class MessagesStorage {
database.executeFast("INSERT INTO params VALUES(1, 0, 0, 0, 0, 0, 0, NULL)").stepThis().dispose(); database.executeFast("INSERT INTO params VALUES(1, 0, 0, 0, 0, 0, 0, NULL)").stepThis().dispose();
database.executeFast("CREATE TABLE user_photos(uid INTEGER, id INTEGER, data BLOB, PRIMARY KEY (uid, id))").stepThis().dispose(); database.executeFast("CREATE TABLE user_photos(uid INTEGER, id INTEGER, data BLOB, PRIMARY KEY (uid, id))").stepThis().dispose();
database.executeFast("CREATE TABLE user_contacts_v6(uid INTEGER PRIMARY KEY, fname TEXT, sname TEXT)").stepThis().dispose();
database.executeFast("CREATE TABLE user_phones_v6(uid INTEGER, phone TEXT, sphone TEXT, deleted INTEGER, PRIMARY KEY (uid, phone))").stepThis().dispose();
database.executeFast("CREATE INDEX IF NOT EXISTS sphone_deleted_idx_user_phones ON user_phones_v6(sphone, deleted);").stepThis().dispose();
database.executeFast("CREATE INDEX IF NOT EXISTS date_idx_dialogs ON dialogs(date);").stepThis().dispose(); database.executeFast("CREATE INDEX IF NOT EXISTS date_idx_dialogs ON dialogs(date);").stepThis().dispose();
database.executeFast("CREATE INDEX IF NOT EXISTS date_idx_enc_tasks ON enc_tasks(date);").stepThis().dispose(); database.executeFast("CREATE INDEX IF NOT EXISTS date_idx_enc_tasks ON enc_tasks(date);").stepThis().dispose();
database.executeFast("CREATE INDEX IF NOT EXISTS last_mid_idx_dialogs ON dialogs(last_mid);").stepThis().dispose(); database.executeFast("CREATE INDEX IF NOT EXISTS last_mid_idx_dialogs ON dialogs(last_mid);").stepThis().dispose();
...@@ -133,6 +137,10 @@ public class MessagesStorage { ...@@ -133,6 +137,10 @@ public class MessagesStorage {
database.executeFast("CREATE INDEX IF NOT EXISTS mid_out_idx_messages ON messages(mid, out);").stepThis().dispose(); database.executeFast("CREATE INDEX IF NOT EXISTS mid_out_idx_messages ON messages(mid, out);").stepThis().dispose();
database.executeFast("CREATE INDEX IF NOT EXISTS task_idx_messages ON messages(uid, out, read_state, ttl, date, send_state);").stepThis().dispose(); database.executeFast("CREATE INDEX IF NOT EXISTS task_idx_messages ON messages(uid, out, read_state, ttl, date, send_state);").stepThis().dispose();
database.executeFast("CREATE INDEX IF NOT EXISTS uid_date_mid_idx_messages ON messages(uid, date, mid);").stepThis().dispose(); database.executeFast("CREATE INDEX IF NOT EXISTS uid_date_mid_idx_messages ON messages(uid, date, mid);").stepThis().dispose();
database.executeFast("CREATE TABLE IF NOT EXISTS user_contacts_v6(uid INTEGER PRIMARY KEY, fname TEXT, sname TEXT)").stepThis().dispose();
database.executeFast("CREATE TABLE IF NOT EXISTS user_phones_v6(uid INTEGER, phone TEXT, sphone TEXT, deleted INTEGER, PRIMARY KEY (uid, phone))").stepThis().dispose();
database.executeFast("CREATE INDEX IF NOT EXISTS sphone_deleted_idx_user_phones ON user_phones_v6(sphone, deleted);").stepThis().dispose();
} }
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
...@@ -291,6 +299,9 @@ public class MessagesStorage { ...@@ -291,6 +299,9 @@ public class MessagesStorage {
} }
public void getUserPhotos(final int uid, final int offset, final int count, final long max_id, final int classGuid) { public void getUserPhotos(final int uid, final int offset, final int count, final long max_id, final int classGuid) {
storageQueue.postRunnable(new Runnable() {
@Override
public void run() {
try { try {
SQLiteCursor cursor; SQLiteCursor cursor;
...@@ -323,6 +334,21 @@ public class MessagesStorage { ...@@ -323,6 +334,21 @@ public class MessagesStorage {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} }
}, true);
}
public void clearUserPhotos(final int uid) {
storageQueue.postRunnable(new Runnable() {
@Override
public void run() {
try {
database.executeFast("DELETE FROM user_photos WHERE uid = " + uid).stepThis().dispose();
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
});
}
public void putUserPhotos(final int uid, final TLRPC.photos_Photos photos) { public void putUserPhotos(final int uid, final TLRPC.photos_Photos photos) {
if (photos == null || photos.photos.isEmpty()) { if (photos == null || photos.photos.isEmpty()) {
...@@ -394,10 +420,11 @@ public class MessagesStorage { ...@@ -394,10 +420,11 @@ public class MessagesStorage {
int minDate = Integer.MAX_VALUE; int minDate = Integer.MAX_VALUE;
SparseArray<ArrayList<Integer>> messages = new SparseArray<ArrayList<Integer>>(); SparseArray<ArrayList<Integer>> messages = new SparseArray<ArrayList<Integer>>();
String mids = ""; String mids = "";
SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT mid, ttl FROM messages WHERE uid = %d AND out = %d AND read_state = 1 AND ttl > 0 AND date <= %d AND send_state = 0", ((long)chat_id) << 32, isOut, time)); SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT mid, ttl, read_state FROM messages WHERE uid = %d AND out = %d AND ttl > 0 AND date <= %d AND send_state = 0", ((long)chat_id) << 32, isOut, time));
while (cursor.next()) { while (cursor.next()) {
int mid = cursor.intValue(0); int mid = cursor.intValue(0);
int ttl = cursor.intValue(1); int ttl = cursor.intValue(1);
int read_state = cursor.intValue(2);
int date = readTime + ttl; int date = readTime + ttl;
minDate = Math.min(minDate, date); minDate = Math.min(minDate, date);
ArrayList<Integer> arr = messages.get(date); ArrayList<Integer> arr = messages.get(date);
...@@ -690,6 +717,63 @@ public class MessagesStorage { ...@@ -690,6 +717,63 @@ public class MessagesStorage {
}); });
} }
public void updateChatInfo(final int chat_id, final int user_id, final boolean deleted, final int invited_id, final int version) {
storageQueue.postRunnable(new Runnable() {
@Override
public void run() {
try {
SQLiteCursor cursor = database.queryFinalized("SELECT participants FROM chat_settings WHERE uid = " + chat_id);
TLRPC.ChatParticipants info = null;
ArrayList<TLRPC.User> loadedUsers = new ArrayList<TLRPC.User>();
if (cursor.next()) {
byte[] userData = cursor.byteArrayValue(0);
if (userData != null) {
SerializedData data = new SerializedData(userData);
info = (TLRPC.ChatParticipants)TLClassStore.Instance().TLdeserialize(data, data.readInt32());
}
}
cursor.dispose();
if (info != null) {
if (deleted) {
for (int a = 0; a < info.participants.size(); a++) {
TLRPC.TL_chatParticipant participant = info.participants.get(a);
if (participant.user_id == user_id) {
info.participants.remove(a);
break;
}
}
} else {
TLRPC.TL_chatParticipant participant = new TLRPC.TL_chatParticipant();
participant.user_id = user_id;
participant.inviter_id = invited_id;
participant.date = ConnectionsManager.Instance.getCurrentTime();
info.participants.add(participant);
}
info.version = version;
final TLRPC.ChatParticipants finalInfo = info;
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
NotificationCenter.Instance.postNotificationName(MessagesController.chatInfoDidLoaded, finalInfo.chat_id, finalInfo);
}
});
SQLitePreparedStatement state = database.executeFast("REPLACE INTO chat_settings VALUES(?, ?)");
SerializedData data = new SerializedData();
info.serializeToStream(data);
state.bindInteger(1, chat_id);
state.bindByteArray(2, data.toByteArray());
state.step();
state.dispose();
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
});
}
public void loadChatInfo(final int chat_id) { public void loadChatInfo(final int chat_id) {
storageQueue.postRunnable(new Runnable() { storageQueue.postRunnable(new Runnable() {
@Override @Override
...@@ -883,7 +967,7 @@ public class MessagesStorage { ...@@ -883,7 +967,7 @@ public class MessagesStorage {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} }
}); }, true);
} }
public void putContacts(final ArrayList<TLRPC.TL_contact> contacts, final boolean deleteAll) { public void putContacts(final ArrayList<TLRPC.TL_contact> contacts, final boolean deleteAll) {
...@@ -914,6 +998,118 @@ public class MessagesStorage { ...@@ -914,6 +998,118 @@ public class MessagesStorage {
}); });
} }
public void deleteContacts(final ArrayList<Integer> uids) {
if (uids == null || uids.isEmpty()) {
return;
}
storageQueue.postRunnable(new Runnable() {
@Override
public void run() {
try {
String ids = "";
for (Integer uid : uids) {
if (ids.length() != 0) {
ids += ",";
}
ids += "" + uid;
}
database.executeFast("DELETE FROM contacts WHERE uid IN (" + ids + ")").stepThis().dispose();
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
});
}
public void applyPhoneBookUpdates(final String adds, final String deletes) {
if (adds.length() == 0 && deletes.length() == 0) {
return;
}
storageQueue.postRunnable(new Runnable() {
@Override
public void run() {
try {
if (adds.length() != 0) {
database.executeFast(String.format(Locale.US, "UPDATE user_phones_v6 SET deleted = 0 WHERE sphone IN (%s)", adds)).stepThis().dispose();
}
if (deletes.length() != 0) {
database.executeFast(String.format(Locale.US, "UPDATE user_phones_v6 SET deleted = 1 WHERE sphone IN (%s)", deletes)).stepThis().dispose();
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
});
}
public void putCachedPhoneBook(final HashMap<Integer, ContactsController.Contact> contactHashMap) {
storageQueue.postRunnable(new Runnable() {
@Override
public void run() {
try {
database.executeFast("DELETE FROM user_contacts_v6 WHERE 1").stepThis().dispose();
database.executeFast("DELETE FROM user_phones_v6 WHERE 1").stepThis().dispose();
database.beginTransaction();
SQLitePreparedStatement state = database.executeFast("REPLACE INTO user_contacts_v6 VALUES(?, ?, ?)");
SQLitePreparedStatement state2 = database.executeFast("REPLACE INTO user_phones_v6 VALUES(?, ?, ?, ?)");
for (HashMap.Entry<Integer, ContactsController.Contact> entry : contactHashMap.entrySet()) {
ContactsController.Contact contact = entry.getValue();
state.requery();
state.bindInteger(1, contact.id);
state.bindString(2, contact.first_name);
state.bindString(3, contact.last_name);
state.step();
for (int a = 0; a < contact.phones.size(); a++) {
state2.requery();
state2.bindInteger(1, contact.id);
state2.bindString(2, contact.phones.get(a));
state2.bindString(3, contact.shortPhones.get(a));
state2.bindInteger(4, contact.phoneDeleted.get(a));
state2.step();
}
}
state.dispose();
state2.dispose();
database.commitTransaction();
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
});
}
public void getCachedPhoneBook() {
storageQueue.postRunnable(new Runnable() {
@Override
public void run() {
HashMap<Integer, ContactsController.Contact> contactHashMap = new HashMap<Integer, ContactsController.Contact>();
try {
SQLiteCursor cursor = database.queryFinalized("SELECT us.uid, us.fname, us.sname, up.phone, up.sphone, up.deleted FROM user_contacts_v6 as us LEFT JOIN user_phones_v6 as up ON us.uid = up.uid WHERE 1");
while (cursor.next()) {
int uid = cursor.intValue(0);
ContactsController.Contact contact = contactHashMap.get(uid);
if (contact == null) {
contact = new ContactsController.Contact();
contact.first_name = cursor.stringValue(1);
contact.last_name = cursor.stringValue(2);
contact.id = uid;
contactHashMap.put(uid, contact);
}
contact.phones.add(cursor.stringValue(3));
contact.shortPhones.add(cursor.stringValue(4));
contact.phoneDeleted.add(cursor.intValue(5));
contact.phoneTypes.add("");
}
cursor.dispose();
} catch (Exception e) {
FileLog.e("tmessages", e);
} finally {
ContactsController.Instance.performSyncPhoneBook(contactHashMap, true, true);
}
}
}, true);
}
public void getContacts() { public void getContacts() {
storageQueue.postRunnable(new Runnable() { storageQueue.postRunnable(new Runnable() {
@Override @Override
...@@ -954,12 +1150,12 @@ public class MessagesStorage { ...@@ -954,12 +1150,12 @@ public class MessagesStorage {
} }
cursor.dispose(); cursor.dispose();
} }
MessagesController.Instance.processLoadedContacts(contacts, users, 1); ContactsController.Instance.processLoadedContacts(contacts, users, 1);
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} }
}); }, true);
} }
public void putMediaCount(final long uid, final int count) { public void putMediaCount(final long uid, final int count) {
...@@ -1007,7 +1203,7 @@ public class MessagesStorage { ...@@ -1007,7 +1203,7 @@ public class MessagesStorage {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} }
}); }, true);
} }
public void loadMedia(final long uid, final int offset, final int count, final int max_id, final int classGuid) { public void loadMedia(final long uid, final int offset, final int count, final int max_id, final int classGuid) {
...@@ -1083,7 +1279,7 @@ public class MessagesStorage { ...@@ -1083,7 +1279,7 @@ public class MessagesStorage {
MessagesController.Instance.processLoadedMedia(res, uid, offset, count, max_id, true, classGuid); MessagesController.Instance.processLoadedMedia(res, uid, offset, count, max_id, true, classGuid);
} }
} }
}); }, true);
} }
public void putMedia(final long uid, final ArrayList<TLRPC.Message> messages) { public void putMedia(final long uid, final ArrayList<TLRPC.Message> messages) {
...@@ -1103,8 +1299,6 @@ public class MessagesStorage { ...@@ -1103,8 +1299,6 @@ public class MessagesStorage {
state2.bindInteger(3, message.date); state2.bindInteger(3, message.date);
state2.bindByteArray(4, data.toByteArray()); state2.bindByteArray(4, data.toByteArray());
state2.step(); state2.step();
} else {
Log.e("tmessages", "test");
} }
} }
state2.dispose(); state2.dispose();
...@@ -1136,7 +1330,7 @@ public class MessagesStorage { ...@@ -1136,7 +1330,7 @@ public class MessagesStorage {
if (lower_id != 0) { if (lower_id != 0) {
if (forward) { if (forward) {
cursor = database.queryFinalized(String.format(Locale.US, "SELECT read_state, data, send_state, mid, date FROM messages WHERE uid = %d AND mid > %d ORDER BY date ASC, mid ASC LIMIT %d", dialog_id, max_id, count_query)); cursor = database.queryFinalized(String.format(Locale.US, "SELECT read_state, data, send_state, mid, date FROM messages WHERE uid = %d AND date >= %d AND mid > %d ORDER BY date ASC, mid ASC LIMIT %d", dialog_id, minDate, max_id, count_query));
} else if (minDate != 0) { } else if (minDate != 0) {
if (max_id != 0) { if (max_id != 0) {
cursor = database.queryFinalized(String.format(Locale.US, "SELECT read_state, data, send_state, mid, date FROM messages WHERE uid = %d AND date < %d AND mid < %d ORDER BY date DESC, mid DESC LIMIT %d", dialog_id, minDate, max_id, count_query)); cursor = database.queryFinalized(String.format(Locale.US, "SELECT read_state, data, send_state, mid, date FROM messages WHERE uid = %d AND date < %d AND mid < %d ORDER BY date DESC, mid DESC LIMIT %d", dialog_id, minDate, max_id, count_query));
...@@ -1275,7 +1469,7 @@ public class MessagesStorage { ...@@ -1275,7 +1469,7 @@ public class MessagesStorage {
MessagesController.Instance.processLoadedMessages(res, dialog_id, offset, count_query, max_id, true, classGuid, min_unread_id, max_unread_id, count_unread, max_unread_date, forward); MessagesController.Instance.processLoadedMessages(res, dialog_id, offset, count_query, max_id, true, classGuid, min_unread_id, max_unread_id, count_unread, max_unread_date, forward);
} }
} }
}); }, true);
} }
public void startTransaction(boolean useQueue) { public void startTransaction(boolean useQueue) {
...@@ -1559,9 +1753,87 @@ public class MessagesStorage { ...@@ -1559,9 +1753,87 @@ public class MessagesStorage {
HashMap<Long, TLRPC.Message> messagesMap = new HashMap<Long, TLRPC.Message>(); HashMap<Long, TLRPC.Message> messagesMap = new HashMap<Long, TLRPC.Message>();
HashMap<Long, Integer> messagesCounts = new HashMap<Long, Integer>(); HashMap<Long, Integer> messagesCounts = new HashMap<Long, Integer>();
HashMap<Long, Integer> mediaCounts = new HashMap<Long, Integer>(); HashMap<Long, Integer> mediaCounts = new HashMap<Long, Integer>();
HashMap<Integer, Long> messagesIdsMap = new HashMap<Integer, Long>();
HashMap<Integer, Long> messagesMediaIdsMap = new HashMap<Integer, Long>();
String messageIds = "";
String messageMediaIds = "";
SQLitePreparedStatement state = database.executeFast("REPLACE INTO messages VALUES(?, ?, ?, ?, ?, ?, ?, ?)"); SQLitePreparedStatement state = database.executeFast("REPLACE INTO messages VALUES(?, ?, ?, ?, ?, ?, ?, ?)");
SQLitePreparedStatement state2 = database.executeFast("REPLACE INTO media VALUES(?, ?, ?, ?)"); SQLitePreparedStatement state2 = database.executeFast("REPLACE INTO media VALUES(?, ?, ?, ?)");
SQLitePreparedStatement state3 = database.executeFast("REPLACE INTO randoms VALUES(?, ?)"); SQLitePreparedStatement state3 = database.executeFast("REPLACE INTO randoms 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;
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;
}
}
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 += ",";
}
messageMediaIds += message.id;
messagesMediaIdsMap.put(message.id, dialog_id);
}
}
if (messageIds.length() > 0) {
SQLiteCursor cursor = database.queryFinalized("SELECT mid FROM messages WHERE mid IN(" + messageIds + ")");
while (cursor.next()) {
int mid = cursor.intValue(0);
messagesIdsMap.remove(mid);
}
cursor.dispose();
for (Long dialog_id : messagesIdsMap.values()) {
Integer count = messagesCounts.get(dialog_id);
if (count == null) {
count = 0;
}
count++;
messagesCounts.put(dialog_id, count);
}
}
if (messageMediaIds.length() > 0) {
SQLiteCursor cursor = database.queryFinalized("SELECT mid FROM media WHERE mid IN(" + messageMediaIds + ")");
while (cursor.next()) {
int mid = cursor.intValue(0);
messagesMediaIdsMap.remove(mid);
}
cursor.dispose();
for (Long dialog_id : messagesMediaIdsMap.values()) {
Integer count = mediaCounts.get(dialog_id);
if (count == null) {
count = 0;
}
count++;
mediaCounts.put(dialog_id, count);
}
}
for (TLRPC.Message message : messages) { for (TLRPC.Message message : messages) {
long dialog_id = message.dialog_id; long dialog_id = message.dialog_id;
if (dialog_id == 0) { if (dialog_id == 0) {
...@@ -1584,14 +1856,6 @@ public class MessagesStorage { ...@@ -1584,14 +1856,6 @@ public class MessagesStorage {
if (lastMessage == null || message.date > lastMessage.date) { if (lastMessage == null || message.date > lastMessage.date) {
messagesMap.put(dialog_id, message); messagesMap.put(dialog_id, message);
} }
if (message.unread && !message.out) {
Integer count = messagesCounts.get(dialog_id);
if (count == null) {
count = 0;
}
count++;
messagesCounts.put(dialog_id, count);
}
state.bindInteger(1, messageId); state.bindInteger(1, messageId);
state.bindLong(2, dialog_id); state.bindLong(2, dialog_id);
state.bindInteger(3, (message.unread ? 0 : 1)); state.bindInteger(3, (message.unread ? 0 : 1));
...@@ -1611,28 +1875,12 @@ public class MessagesStorage { ...@@ -1611,28 +1875,12 @@ public class MessagesStorage {
} }
if (message.media instanceof TLRPC.TL_messageMediaVideo || message.media instanceof TLRPC.TL_messageMediaPhoto) { if (message.media instanceof TLRPC.TL_messageMediaVideo || message.media instanceof TLRPC.TL_messageMediaPhoto) {
boolean exist = false;
SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT mid FROM media WHERE mid = %d LIMIT 1", message.id));
if (cursor.next()) {
exist = true;
}
cursor.dispose();
state2.requery(); state2.requery();
state2.bindInteger(1, messageId); state2.bindInteger(1, messageId);
state2.bindLong(2, dialog_id); state2.bindLong(2, dialog_id);
state2.bindInteger(3, message.date); state2.bindInteger(3, message.date);
state2.bindByteArray(4, bytes); state2.bindByteArray(4, bytes);
state2.step(); state2.step();
if (!exist) {
Integer count = mediaCounts.get(dialog_id);
if (count == null) {
count = 0;
}
count++;
mediaCounts.put(dialog_id, count);
}
} }
} }
state.dispose(); state.dispose();
...@@ -1662,6 +1910,7 @@ public class MessagesStorage { ...@@ -1662,6 +1910,7 @@ public class MessagesStorage {
if (withTransaction) { if (withTransaction) {
database.commitTransaction(); database.commitTransaction();
} }
MessagesController.Instance.dialogsUnreadCountIncr(messagesCounts);
if (!mediaCounts.isEmpty()) { if (!mediaCounts.isEmpty()) {
state = database.executeFast("REPLACE INTO media_counts VALUES(?, ?)"); state = database.executeFast("REPLACE INTO media_counts VALUES(?, ?)");
...@@ -2442,7 +2691,7 @@ public class MessagesStorage { ...@@ -2442,7 +2691,7 @@ public class MessagesStorage {
MessagesController.Instance.processLoadedDialogs(dialogs, encryptedChats, 0, 0, 100, true, true); MessagesController.Instance.processLoadedDialogs(dialogs, encryptedChats, 0, 0, 100, true, true);
} }
} }
}); }, true);
} }
public void putDialogs(final TLRPC.messages_Dialogs dialogs) { public void putDialogs(final TLRPC.messages_Dialogs dialogs) {
......
TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java
View file @ 9814a6e9
...@@ -12,43 +12,42 @@ import java.util.ArrayList; ...@@ -12,43 +12,42 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
public class NotificationCenter { public class NotificationCenter {
public static NotificationCenter Instance = new NotificationCenter();
final private HashMap<Integer, ArrayList<Object>> observers = new HashMap<Integer, ArrayList<Object>>(); final private HashMap<Integer, ArrayList<Object>> observers = new HashMap<Integer, ArrayList<Object>>();
final private HashMap<Integer, Object> memCache = new HashMap<Integer, Object>();
final private HashMap<String, Object> memCacheString = new HashMap<String, Object>(); final private HashMap<String, Object> memCache = new HashMap<String, Object>();
private boolean broadcasting = false;
final private HashMap<Integer, Object> removeAfterBroadcast = new HashMap<Integer, Object>(); final private HashMap<Integer, Object> removeAfterBroadcast = new HashMap<Integer, Object>();
final private HashMap<Integer, Object> addAfterBroadcast = new HashMap<Integer, Object>();
private boolean broadcasting = false;
public interface NotificationCenterDelegate { public interface NotificationCenterDelegate {
public abstract void didReceivedNotification(int id, Object... args); public abstract void didReceivedNotification(int id, Object... args);
} }
public static NotificationCenter Instance = new NotificationCenter();
public void addToMemCache(int id, Object object) { public void addToMemCache(int id, Object object) {
memCache.put(id, object); addToMemCache(String.valueOf(id), object);
} }
public void addToMemCache(String id, Object object) { public void addToMemCache(String id, Object object) {
memCacheString.put(id, object); memCache.put(id, object);
} }
public Object getFromMemCache(int id) { public Object getFromMemCache(int id) {
return getFromMemCache(String.valueOf(id), null);
}
public Object getFromMemCache(String id, Object defaultValue) {
Object obj = memCache.get(id); Object obj = memCache.get(id);
if (obj != null) { if (obj != null) {
memCache.remove(id); memCache.remove(id);
}
return obj; return obj;
} }
public Object getFromMemCache(String id, Object defaultValue) {
Object obj = memCacheString.get(id);
if (obj != null) {
memCacheString.remove(id);
} else {
return defaultValue; return defaultValue;
} }
return obj;
}
public void postNotificationName(int id, Object... args) { public void postNotificationName(int id, Object... args) {
synchronized (observers) { synchronized (observers) {
...@@ -66,15 +65,24 @@ public class NotificationCenter { ...@@ -66,15 +65,24 @@ public class NotificationCenter {
} }
removeAfterBroadcast.clear(); removeAfterBroadcast.clear();
} }
if (!addAfterBroadcast.isEmpty()) {
for (HashMap.Entry<Integer, Object> entry : addAfterBroadcast.entrySet()) {
addObserver(entry.getValue(), entry.getKey());
}
addAfterBroadcast.clear();
}
} }
} }
public void addObserver(Object observer, int id) { public void addObserver(Object observer, int id) {
synchronized (observers) { synchronized (observers) {
if (broadcasting) {
addAfterBroadcast.put(id, observer);
return;
}
ArrayList<Object> objects = observers.get(id); ArrayList<Object> objects = observers.get(id);
if (objects == null) { if (objects == null) {
objects = new ArrayList<Object>(); observers.put(id, (objects = new ArrayList<Object>()));
observers.put(id, objects);
} }
if (objects.contains(observer)) { if (objects.contains(observer)) {
return; return;
...@@ -83,25 +91,6 @@ public class NotificationCenter { ...@@ -83,25 +91,6 @@ public class NotificationCenter {
} }
} }
// public void removeObserver(Object observer) {
// synchronized (observers) {
// if (broadcasting) {
// removeAfterBroadcast.put(-1, observer);
// return;
// }
// Integer[] keyArr = (Integer[])observers.keySet().toArray();
// for (int a = 0; a < observers.size(); a++) {
// Integer id = keyArr[a];
// ArrayList<Object> objects = observers.get(id);
// objects.remove(observer);
// if (objects.size() == 0) {
// observers.remove(id);
// a--;
// }
// }
// }
// }
public void removeObserver(Object observer, int id) { public void removeObserver(Object observer, int id) {
synchronized (observers) { synchronized (observers) {
if (broadcasting) { if (broadcasting) {
......
TMessagesProj/src/main/java/org/telegram/messenger/RPCRequest.java
View file @ 9814a6e9
...@@ -29,6 +29,7 @@ public class RPCRequest { ...@@ -29,6 +29,7 @@ public class RPCRequest {
public static int RPCRequestClassUploadMedia = 4; public static int RPCRequestClassUploadMedia = 4;
public static int RPCRequestClassEnableUnauthorized = 8; public static int RPCRequestClassEnableUnauthorized = 8;
public static int RPCRequestClassFailOnServerErrors = 16; public static int RPCRequestClassFailOnServerErrors = 16;
public static int RPCRequestClassCanCompress = 32;
static int RPCRequestClassTransportMask = (RPCRequestClassGeneric | RPCRequestClassDownloadMedia | RPCRequestClassUploadMedia); static int RPCRequestClassTransportMask = (RPCRequestClassGeneric | RPCRequestClassDownloadMedia | RPCRequestClassUploadMedia);
...@@ -37,6 +38,7 @@ public class RPCRequest { ...@@ -37,6 +38,7 @@ public class RPCRequest {
int serverFailureCount; int serverFailureCount;
int flags; int flags;
public int retryCount = 0;
TLObject rawRequest; TLObject rawRequest;
TLObject rpcRequest; TLObject rpcRequest;
......
TMessagesProj/src/main/java/org/telegram/messenger/SmsListener.java
View file @ 9814a6e9
...@@ -15,8 +15,6 @@ import android.content.SharedPreferences; ...@@ -15,8 +15,6 @@ import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.telephony.SmsMessage; import android.telephony.SmsMessage;
import org.telegram.messenger.NotificationCenter;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
...@@ -27,6 +25,9 @@ public class SmsListener extends BroadcastReceiver { ...@@ -27,6 +25,9 @@ public class SmsListener extends BroadcastReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if(intent.getAction().equals("android.provider.Telephony.SMS_RECEIVED")) { if(intent.getAction().equals("android.provider.Telephony.SMS_RECEIVED")) {
if (!Utilities.isWaitingForSms()) {
return;
}
Bundle bundle = intent.getExtras(); Bundle bundle = intent.getExtras();
SmsMessage[] msgs; SmsMessage[] msgs;
if (bundle != null) { if (bundle != null) {
......
TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java
View file @ 9814a6e9
...@@ -50,6 +50,7 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -50,6 +50,7 @@ public class TcpConnection extends PyroClientAdapter {
private boolean hasSomeDataSinceLastConnect = false; private boolean hasSomeDataSinceLastConnect = false;
private int willRetryConnectCount = 5; private int willRetryConnectCount = 5;
private boolean isNextPort = false; private boolean isNextPort = false;
private final Integer timerSync = 1;
public int transportRequestClass; public int transportRequestClass;
...@@ -86,10 +87,12 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -86,10 +87,12 @@ public class TcpConnection extends PyroClientAdapter {
connectionState = TcpConnectionState.TcpConnectionStageConnecting; connectionState = TcpConnectionState.TcpConnectionStageConnecting;
try { try {
try { try {
synchronized (timerSync) {
if (reconnectTimer != null) { if (reconnectTimer != null) {
reconnectTimer.cancel(); reconnectTimer.cancel();
reconnectTimer = null; reconnectTimer = null;
} }
}
} catch (Exception e2) { } catch (Exception e2) {
FileLog.e("tmessages", e2); FileLog.e("tmessages", e2);
} }
...@@ -115,19 +118,22 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -115,19 +118,22 @@ public class TcpConnection extends PyroClientAdapter {
selector.wakeup(); selector.wakeup();
} catch (Exception e) { } catch (Exception e) {
try { try {
synchronized (timerSync) {
if (reconnectTimer != null) { if (reconnectTimer != null) {
reconnectTimer.cancel(); reconnectTimer.cancel();
reconnectTimer = null; reconnectTimer = null;
} }
}
} catch (Exception e2) { } catch (Exception e2) {
FileLog.e("tmessages", e2); FileLog.e("tmessages", e2);
} }
connectionState = TcpConnectionState.TcpConnectionStageReconnecting; connectionState = TcpConnectionState.TcpConnectionStageReconnecting;
if (delegate != null) { if (delegate != null) {
final TcpConnectionDelegate finalDelegate = delegate;
Utilities.stageQueue.postRunnable(new Runnable() { Utilities.stageQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
delegate.tcpConnectionClosed(TcpConnection.this); finalDelegate.tcpConnectionClosed(TcpConnection.this);
} }
}); });
} }
...@@ -160,10 +166,12 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -160,10 +166,12 @@ public class TcpConnection extends PyroClientAdapter {
@Override @Override
public void run() { public void run() {
try { try {
synchronized (timerSync) {
if (reconnectTimer != null) { if (reconnectTimer != null) {
reconnectTimer.cancel(); reconnectTimer.cancel();
reconnectTimer = null; reconnectTimer = null;
} }
}
} catch (Exception e2) { } catch (Exception e2) {
FileLog.e("tmessages", e2); FileLog.e("tmessages", e2);
} }
...@@ -181,10 +189,12 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -181,10 +189,12 @@ public class TcpConnection extends PyroClientAdapter {
} }
private void suspendConnectionInternal() { private void suspendConnectionInternal() {
synchronized (timerSync) {
if (reconnectTimer != null) { if (reconnectTimer != null) {
reconnectTimer.cancel(); reconnectTimer.cancel();
reconnectTimer = null; reconnectTimer = null;
} }
}
if (connectionState == TcpConnectionState.TcpConnectionStageIdle || connectionState == TcpConnectionState.TcpConnectionStageSuspended) { if (connectionState == TcpConnectionState.TcpConnectionStageIdle || connectionState == TcpConnectionState.TcpConnectionStageSuspended) {
return; return;
} }
...@@ -196,10 +206,11 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -196,10 +206,11 @@ public class TcpConnection extends PyroClientAdapter {
client = null; client = null;
} }
if (delegate != null) { if (delegate != null) {
final TcpConnectionDelegate finalDelegate = delegate;
Utilities.stageQueue.postRunnable(new Runnable() { Utilities.stageQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
delegate.tcpConnectionClosed(TcpConnection.this); finalDelegate.tcpConnectionClosed(TcpConnection.this);
} }
}); });
} }
...@@ -314,10 +325,11 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -314,10 +325,11 @@ public class TcpConnection extends PyroClientAdapter {
buffer.order(ByteOrder.BIG_ENDIAN); buffer.order(ByteOrder.BIG_ENDIAN);
final int ackId = buffer.getInt() & (~(1 << 31)); final int ackId = buffer.getInt() & (~(1 << 31));
if (delegate != null) { if (delegate != null) {
final TcpConnectionDelegate finalDelegate = delegate;
Utilities.stageQueue.postRunnable(new Runnable() { Utilities.stageQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
delegate.tcpConnectionQuiackAckReceived(TcpConnection.this, ackId); finalDelegate.tcpConnectionQuiackAckReceived(TcpConnection.this, ackId);
} }
}); });
} }
...@@ -360,12 +372,13 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -360,12 +372,13 @@ public class TcpConnection extends PyroClientAdapter {
} }
if (lastMessageId != -1 && lastMessageId != 0) { if (lastMessageId != -1 && lastMessageId != 0) {
if (delegate != null) { if (delegate != null) {
final TcpConnectionDelegate finalDelegate = delegate;
final int arg2 = buffer.remaining(); final int arg2 = buffer.remaining();
final int arg3 = currentPacketLength; final int arg3 = currentPacketLength;
Utilities.stageQueue.postRunnable(new Runnable() { Utilities.stageQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
delegate.tcpConnectionProgressChanged(TcpConnection.this, lastMessageId, arg2, arg3); finalDelegate.tcpConnectionProgressChanged(TcpConnection.this, lastMessageId, arg2, arg3);
} }
}); });
} }
...@@ -383,10 +396,11 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -383,10 +396,11 @@ public class TcpConnection extends PyroClientAdapter {
buffer.get(packetData); buffer.get(packetData);
if (delegate != null) { if (delegate != null) {
final TcpConnectionDelegate finalDelegate = delegate;
Utilities.stageQueue.postRunnable(new Runnable() { Utilities.stageQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
delegate.tcpConnectionReceivedData(TcpConnection.this, packetData); finalDelegate.tcpConnectionReceivedData(TcpConnection.this, packetData);
} }
}); });
} }
...@@ -394,10 +408,12 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -394,10 +408,12 @@ public class TcpConnection extends PyroClientAdapter {
} }
public void handleDisconnect(PyroClient client, Exception e) { public void handleDisconnect(PyroClient client, Exception e) {
synchronized (timerSync) {
if (reconnectTimer != null) { if (reconnectTimer != null) {
reconnectTimer.cancel(); reconnectTimer.cancel();
reconnectTimer = null; reconnectTimer = null;
} }
}
if (e != null) { if (e != null) {
FileLog.d("tmessages", "Disconnected " + TcpConnection.this + " with error " + e); FileLog.d("tmessages", "Disconnected " + TcpConnection.this + " with error " + e);
} else { } else {
...@@ -410,12 +426,11 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -410,12 +426,11 @@ public class TcpConnection extends PyroClientAdapter {
connectionState = TcpConnectionState.TcpConnectionStageIdle; connectionState = TcpConnectionState.TcpConnectionStageIdle;
} }
if (delegate != null) { if (delegate != null) {
final TcpConnectionDelegate finalDelegate = delegate;
Utilities.stageQueue.postRunnable(new Runnable() { Utilities.stageQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
if (delegate != null) { finalDelegate.tcpConnectionClosed(TcpConnection.this);
delegate.tcpConnectionClosed(TcpConnection.this);
}
} }
}); });
} }
...@@ -447,10 +462,12 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -447,10 +462,12 @@ public class TcpConnection extends PyroClientAdapter {
@Override @Override
public void run() { public void run() {
try { try {
synchronized (timerSync) {
if (reconnectTimer != null) { if (reconnectTimer != null) {
reconnectTimer.cancel(); reconnectTimer.cancel();
reconnectTimer = null; reconnectTimer = null;
} }
}
} catch (Exception e2) { } catch (Exception e2) {
FileLog.e("tmessages", e2); FileLog.e("tmessages", e2);
} }
...@@ -471,10 +488,11 @@ public class TcpConnection extends PyroClientAdapter { ...@@ -471,10 +488,11 @@ public class TcpConnection extends PyroClientAdapter {
channelToken = generateChannelToken(); channelToken = generateChannelToken();
FileLog.d("tmessages", String.format(TcpConnection.this + " Connected (%s:%d)", hostAddress, hostPort)); FileLog.d("tmessages", String.format(TcpConnection.this + " Connected (%s:%d)", hostAddress, hostPort));
if (delegate != null) { if (delegate != null) {
final TcpConnectionDelegate finalDelegate = delegate;
Utilities.stageQueue.postRunnable(new Runnable() { Utilities.stageQueue.postRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
delegate.tcpConnectionConnected(TcpConnection.this); finalDelegate.tcpConnectionConnected(TcpConnection.this);
} }
}); });
} }
......
TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java
View file @ 9814a6e9
...@@ -27,7 +27,6 @@ public class UserConfig { ...@@ -27,7 +27,6 @@ public class UserConfig {
public static int lastSendMessageId = -210000; public static int lastSendMessageId = -210000;
public static int lastLocalId = -210000; public static int lastLocalId = -210000;
public static String contactsHash = ""; public static String contactsHash = "";
public static String importHash = "";
private final static Integer sync = 1; private final static Integer sync = 1;
public static boolean saveIncomingPhotos = false; public static boolean saveIncomingPhotos = false;
...@@ -55,7 +54,6 @@ public class UserConfig { ...@@ -55,7 +54,6 @@ public class UserConfig {
editor.putInt("lastSendMessageId", lastSendMessageId); editor.putInt("lastSendMessageId", lastSendMessageId);
editor.putInt("lastLocalId", lastLocalId); editor.putInt("lastLocalId", lastLocalId);
editor.putString("contactsHash", contactsHash); editor.putString("contactsHash", contactsHash);
editor.putString("importHash", importHash);
editor.putBoolean("saveIncomingPhotos", saveIncomingPhotos); editor.putBoolean("saveIncomingPhotos", saveIncomingPhotos);
if (withFile) { if (withFile) {
SerializedData data = new SerializedData(); SerializedData data = new SerializedData();
...@@ -71,7 +69,6 @@ public class UserConfig { ...@@ -71,7 +69,6 @@ public class UserConfig {
editor.putInt("lastSendMessageId", lastSendMessageId); editor.putInt("lastSendMessageId", lastSendMessageId);
editor.putInt("lastLocalId", lastLocalId); editor.putInt("lastLocalId", lastLocalId);
editor.putString("contactsHash", contactsHash); editor.putString("contactsHash", contactsHash);
editor.putString("importHash", importHash);
editor.putBoolean("saveIncomingPhotos", saveIncomingPhotos); editor.putBoolean("saveIncomingPhotos", saveIncomingPhotos);
editor.remove("user"); editor.remove("user");
} }
...@@ -105,7 +102,7 @@ public class UserConfig { ...@@ -105,7 +102,7 @@ public class UserConfig {
lastSendMessageId = data.readInt32(); lastSendMessageId = data.readInt32();
lastLocalId = data.readInt32(); lastLocalId = data.readInt32();
contactsHash = data.readString(); contactsHash = data.readString();
importHash = data.readString(); data.readString();
saveIncomingPhotos = data.readBool(); saveIncomingPhotos = data.readBool();
if (currentUser.status != null) { if (currentUser.status != null) {
if (currentUser.status.expires != 0) { if (currentUser.status.expires != 0) {
...@@ -139,7 +136,6 @@ public class UserConfig { ...@@ -139,7 +136,6 @@ public class UserConfig {
lastSendMessageId = preferences.getInt("lastSendMessageId", -210000); lastSendMessageId = preferences.getInt("lastSendMessageId", -210000);
lastLocalId = preferences.getInt("lastLocalId", -210000); lastLocalId = preferences.getInt("lastLocalId", -210000);
contactsHash = preferences.getString("contactsHash", ""); contactsHash = preferences.getString("contactsHash", "");
importHash = preferences.getString("importHash", "");
saveIncomingPhotos = preferences.getBoolean("saveIncomingPhotos", false); saveIncomingPhotos = preferences.getBoolean("saveIncomingPhotos", false);
} }
if (lastLocalId > -210000) { if (lastLocalId > -210000) {
...@@ -164,7 +160,6 @@ public class UserConfig { ...@@ -164,7 +160,6 @@ public class UserConfig {
lastSendMessageId = preferences.getInt("lastSendMessageId", -210000); lastSendMessageId = preferences.getInt("lastSendMessageId", -210000);
lastLocalId = preferences.getInt("lastLocalId", -210000); lastLocalId = preferences.getInt("lastLocalId", -210000);
contactsHash = preferences.getString("contactsHash", ""); contactsHash = preferences.getString("contactsHash", "");
importHash = preferences.getString("importHash", "");
saveIncomingPhotos = preferences.getBoolean("saveIncomingPhotos", false); saveIncomingPhotos = preferences.getBoolean("saveIncomingPhotos", false);
String user = preferences.getString("user", null); String user = preferences.getString("user", null);
if (user != null) { if (user != null) {
...@@ -191,7 +186,6 @@ public class UserConfig { ...@@ -191,7 +186,6 @@ public class UserConfig {
registeredForPush = false; registeredForPush = false;
contactsHash = ""; contactsHash = "";
lastLocalId = -210000; lastLocalId = -210000;
importHash = "";
lastSendMessageId = -210000; lastSendMessageId = -210000;
saveIncomingPhotos = false; saveIncomingPhotos = false;
saveConfig(true); saveConfig(true);
......
TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
View file @ 9814a6e9
...@@ -10,13 +10,18 @@ package org.telegram.messenger; ...@@ -10,13 +10,18 @@ package org.telegram.messenger;
import android.app.Activity; import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.ContentUris;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.database.Cursor;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.Handler; import android.os.Handler;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
import android.text.Html; import android.text.Html;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.format.DateFormat; import android.text.format.DateFormat;
...@@ -49,7 +54,10 @@ import java.util.Calendar; ...@@ -49,7 +54,10 @@ import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Locale; import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
import javax.crypto.Cipher; import javax.crypto.Cipher;
...@@ -57,8 +65,13 @@ public class Utilities { ...@@ -57,8 +65,13 @@ public class Utilities {
public static Handler applicationHandler; public static Handler applicationHandler;
public static int statusBarHeight = 0; public static int statusBarHeight = 0;
public static float density = 1; public static float density = 1;
public static boolean isRTL = false;
public static Pattern pattern = Pattern.compile("[0-9]+");
private final static Integer lock = 1; private final static Integer lock = 1;
private static boolean waitingForSms = false;
private static final Integer smsLock = 2;
public static ArrayList<String> goodPrimes = new ArrayList<String>(); public static ArrayList<String> goodPrimes = new ArrayList<String>();
public static class TPFactorizedValue { public static class TPFactorizedValue {
...@@ -74,6 +87,30 @@ public class Utilities { ...@@ -74,6 +87,30 @@ public class Utilities {
public native static long doPQNative(long _what); public native static long doPQNative(long _what);
public native static byte[] aesIgeEncryption(byte[] _what, byte[] _key, byte[] _iv, boolean encrypt, boolean changeIv); public native static byte[] aesIgeEncryption(byte[] _what, byte[] _key, byte[] _iv, boolean encrypt, boolean changeIv);
public static boolean isWaitingForSms() {
boolean value = false;
synchronized (smsLock) {
value = waitingForSms;
}
return value;
}
public static void setWaitingForSms(boolean value) {
synchronized (smsLock) {
waitingForSms = value;
}
}
public static Integer parseInt(String value) {
Integer val = 0;
Matcher matcher = pattern.matcher(value);
if (matcher.find()) {
String num = matcher.group(0);
val = Integer.parseInt(num);
}
return val;
}
static { static {
density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("primes", Context.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("primes", Context.MODE_PRIVATE);
...@@ -360,6 +397,25 @@ public class Utilities { ...@@ -360,6 +397,25 @@ public class Utilities {
return null; return null;
} }
public static byte[] compress(byte[] data) {
if (data == null) {
return null;
}
byte[] packedData = null;
ByteArrayOutputStream bytesStream = new ByteArrayOutputStream();
try {
GZIPOutputStream zip = new GZIPOutputStream(bytesStream);
zip.write(data);
zip.close();
packedData = bytesStream.toByteArray();
} catch (IOException e) {
FileLog.e("tmessages", e);
}
return packedData;
}
private static final String TAG = "Typefaces"; private static final String TAG = "Typefaces";
private static final Hashtable<String, Typeface> cache = new Hashtable<String, Typeface>(); private static final Hashtable<String, Typeface> cache = new Hashtable<String, Typeface>();
...@@ -434,15 +490,25 @@ public class Utilities { ...@@ -434,15 +490,25 @@ public class Utilities {
public static FastDateFormat chatDate; public static FastDateFormat chatDate;
public static FastDateFormat chatFullDate; public static FastDateFormat chatFullDate;
static { public static void recreateFormatters() {
Locale locale = Locale.getDefault(); Locale locale = Locale.getDefault();
String lang = locale.getLanguage(); String lang = locale.getLanguage();
if (lang == null) {
lang = "en";
}
isRTL = lang.toLowerCase().equals("ar");
if (lang.equals("en")) { if (lang.equals("en")) {
formatterMonth = FastDateFormat.getInstance("MMM dd", locale); formatterMonth = FastDateFormat.getInstance("MMM dd", locale);
formatterYear = FastDateFormat.getInstance("dd.MM.yy", locale); formatterYear = FastDateFormat.getInstance("dd.MM.yy", locale);
formatterYearMax = FastDateFormat.getInstance("dd.MM.yyyy", locale); formatterYearMax = FastDateFormat.getInstance("dd.MM.yyyy", locale);
chatDate = FastDateFormat.getInstance("MMMM d", locale); chatDate = FastDateFormat.getInstance("MMMM d", locale);
chatFullDate = FastDateFormat.getInstance("MMMM d, yyyy", locale); chatFullDate = FastDateFormat.getInstance("MMMM d, yyyy", locale);
} else if (lang.startsWith("es")) {
formatterMonth = FastDateFormat.getInstance("dd 'de' MMM", locale);
formatterYear = FastDateFormat.getInstance("dd.MM.yy", locale);
formatterYearMax = FastDateFormat.getInstance("dd.MM.yyyy", locale);
chatDate = FastDateFormat.getInstance("d 'de' MMMM", locale);
chatFullDate = FastDateFormat.getInstance("d 'de' MMMM 'de' yyyy", locale);
} else { } else {
formatterMonth = FastDateFormat.getInstance("dd MMM", locale); formatterMonth = FastDateFormat.getInstance("dd MMM", locale);
formatterYear = FastDateFormat.getInstance("dd.MM.yy", locale); formatterYear = FastDateFormat.getInstance("dd.MM.yy", locale);
...@@ -467,6 +533,10 @@ public class Utilities { ...@@ -467,6 +533,10 @@ public class Utilities {
} }
} }
static {
recreateFormatters();
}
public static String formatDateChat(long date) { public static String formatDateChat(long date) {
Calendar rightNow = Calendar.getInstance(); Calendar rightNow = Calendar.getInstance();
int year = rightNow.get(Calendar.YEAR); int year = rightNow.get(Calendar.YEAR);
...@@ -508,13 +578,13 @@ public class Utilities { ...@@ -508,13 +578,13 @@ public class Utilities {
int dateYear = rightNow.get(Calendar.YEAR); int dateYear = rightNow.get(Calendar.YEAR);
if (dateDay == day && year == dateYear) { if (dateDay == day && year == dateYear) {
return String.format("%s %s", ApplicationLoader.applicationContext.getResources().getString(R.string.TodayAt), formatterDay.format(new Date(date * 1000))); return String.format("%s %s %s", ApplicationLoader.applicationContext.getString(R.string.LastSeen), ApplicationLoader.applicationContext.getString(R.string.TodayAt), formatterDay.format(new Date(date * 1000)));
} else if (dateDay + 1 == day && year == dateYear) { } else if (dateDay + 1 == day && year == dateYear) {
return String.format("%s %s", ApplicationLoader.applicationContext.getResources().getString(R.string.YesterdayAt), formatterDay.format(new Date(date * 1000))); return String.format("%s %s %s", ApplicationLoader.applicationContext.getString(R.string.LastSeen), ApplicationLoader.applicationContext.getString(R.string.YesterdayAt), formatterDay.format(new Date(date * 1000)));
} else if (year == dateYear) { } else if (year == dateYear) {
return String.format("%s %s %s", formatterMonth.format(new Date(date * 1000)), ApplicationLoader.applicationContext.getResources().getString(R.string.OtherAt), formatterDay.format(new Date(date * 1000))); return String.format("%s %s %s %s", ApplicationLoader.applicationContext.getString(R.string.LastSeenDate), formatterMonth.format(new Date(date * 1000)), ApplicationLoader.applicationContext.getString(R.string.OtherAt), formatterDay.format(new Date(date * 1000)));
} else { } else {
return String.format("%s %s %s", formatterYear.format(new Date(date * 1000)), ApplicationLoader.applicationContext.getResources().getString(R.string.OtherAt), formatterDay.format(new Date(date * 1000))); return String.format("%s %s %s %s", ApplicationLoader.applicationContext.getString(R.string.LastSeenDate), formatterYear.format(new Date(date * 1000)), ApplicationLoader.applicationContext.getString(R.string.OtherAt), formatterDay.format(new Date(date * 1000)));
} }
} }
...@@ -556,9 +626,6 @@ public class Utilities { ...@@ -556,9 +626,6 @@ public class Utilities {
public static void RunOnUIThread(Runnable runnable) { public static void RunOnUIThread(Runnable runnable) {
synchronized (lock) { synchronized (lock) {
if (applicationHandler == null) {
applicationHandler = new Handler(ApplicationLoader.applicationContext.getMainLooper());
}
applicationHandler.post(runnable); applicationHandler.post(runnable);
} }
} }
...@@ -682,6 +749,83 @@ public class Utilities { ...@@ -682,6 +749,83 @@ public class Utilities {
return storageDir; return storageDir;
} }
public static String getPath(final Context context, final Uri uri) {
final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
if (isExternalStorageDocument(uri)) {
final String docId = DocumentsContract.getDocumentId(uri);
final String[] split = docId.split(":");
final String type = split[0];
if ("primary".equalsIgnoreCase(type)) {
return Environment.getExternalStorageDirectory() + "/" + split[1];
}
} else if (isDownloadsDocument(uri)) {
final String id = DocumentsContract.getDocumentId(uri);
final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
return getDataColumn(context, contentUri, null, null);
} else if (isMediaDocument(uri)) {
final String docId = DocumentsContract.getDocumentId(uri);
final String[] split = docId.split(":");
final String type = split[0];
Uri contentUri = null;
if ("image".equals(type)) {
contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
} else if ("video".equals(type)) {
contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
} else if ("audio".equals(type)) {
contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
}
final String selection = "_id=?";
final String[] selectionArgs = new String[] {
split[1]
};
return getDataColumn(context, contentUri, selection, selectionArgs);
}
} else if ("content".equalsIgnoreCase(uri.getScheme())) {
return getDataColumn(context, uri, null, null);
} else if ("file".equalsIgnoreCase(uri.getScheme())) {
return uri.getPath();
}
return null;
}
public static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
Cursor cursor = null;
final String column = "_data";
final String[] projection = {
column
};
try {
cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
if (cursor != null && cursor.moveToFirst()) {
final int column_index = cursor.getColumnIndexOrThrow(column);
return cursor.getString(column_index);
}
} finally {
if (cursor != null)
cursor.close();
}
return null;
}
public static boolean isExternalStorageDocument(Uri uri) {
return "com.android.externalstorage.documents".equals(uri.getAuthority());
}
public static boolean isDownloadsDocument(Uri uri) {
return "com.android.providers.downloads.documents".equals(uri.getAuthority());
}
public static boolean isMediaDocument(Uri uri) {
return "com.android.providers.media.documents".equals(uri.getAuthority());
}
public static File generatePicturePath() { public static File generatePicturePath() {
try { try {
File storageDir = getAlbumDir(); File storageDir = getAlbumDir();
......
TMessagesProj/src/main/java/org/telegram/objects/MessageObject.java
View file @ 9814a6e9
...@@ -22,6 +22,7 @@ import org.telegram.ui.ApplicationLoader; ...@@ -22,6 +22,7 @@ import org.telegram.ui.ApplicationLoader;
import java.util.AbstractMap; import java.util.AbstractMap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
public class MessageObject { public class MessageObject {
...@@ -33,6 +34,7 @@ public class MessageObject { ...@@ -33,6 +34,7 @@ public class MessageObject {
public PhotoObject previewPhoto; public PhotoObject previewPhoto;
public String dateKey; public String dateKey;
public boolean deleted = false; public boolean deleted = false;
public Object TAG;
public MessageObject(TLRPC.Message message, AbstractMap<Integer, TLRPC.User> users) { public MessageObject(TLRPC.Message message, AbstractMap<Integer, TLRPC.User> users) {
messageOwner = message; messageOwner = message;
...@@ -45,7 +47,7 @@ public class MessageObject { ...@@ -45,7 +47,7 @@ public class MessageObject {
} }
if (message.action instanceof TLRPC.TL_messageActionChatCreate) { if (message.action instanceof TLRPC.TL_messageActionChatCreate) {
if (message.from_id == UserConfig.clientUserId) { if (message.from_id == UserConfig.clientUserId) {
messageText = ApplicationLoader.applicationContext.getString(R.string.ActionCreateGroup).replace("un1", ApplicationLoader.applicationContext.getString(R.string.FromYou)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionYouCreateGroup);
} else { } else {
if (fromUser != null) { if (fromUser != null) {
messageText = ApplicationLoader.applicationContext.getString(R.string.ActionCreateGroup).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionCreateGroup).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name));
...@@ -56,7 +58,7 @@ public class MessageObject { ...@@ -56,7 +58,7 @@ public class MessageObject {
} else if (message.action instanceof TLRPC.TL_messageActionChatDeleteUser) { } else if (message.action instanceof TLRPC.TL_messageActionChatDeleteUser) {
if (message.action.user_id == message.from_id) { if (message.action.user_id == message.from_id) {
if (message.from_id == UserConfig.clientUserId) { if (message.from_id == UserConfig.clientUserId) {
messageText = ApplicationLoader.applicationContext.getString(R.string.ActionLeftUser).replace("un1", ApplicationLoader.applicationContext.getString(R.string.FromYou)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionYouLeftUser);
} else { } else {
if (fromUser != null) { if (fromUser != null) {
messageText = ApplicationLoader.applicationContext.getString(R.string.ActionLeftUser).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionLeftUser).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name));
...@@ -69,17 +71,16 @@ public class MessageObject { ...@@ -69,17 +71,16 @@ public class MessageObject {
if (who == null) { if (who == null) {
MessagesController.Instance.users.get(message.action.user_id); MessagesController.Instance.users.get(message.action.user_id);
} }
String str = ApplicationLoader.applicationContext.getString(R.string.ActionKickUser);
if (who != null && fromUser != null) { if (who != null && fromUser != null) {
if (message.from_id == UserConfig.clientUserId) { if (message.from_id == UserConfig.clientUserId) {
messageText = str.replace("un2", Utilities.formatName(who.first_name, who.last_name)).replace("un1", ApplicationLoader.applicationContext.getString(R.string.FromYou)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionYouKickUser).replace("un2", Utilities.formatName(who.first_name, who.last_name));
} else if (message.action.user_id == UserConfig.clientUserId) { } else if (message.action.user_id == UserConfig.clientUserId) {
messageText = str.replace("un2", ApplicationLoader.applicationContext.getString(R.string.FromYou)).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionKickUserYou).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name));
} else { } else {
messageText = str.replace("un2", Utilities.formatName(who.first_name, who.last_name)).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionKickUser).replace("un2", Utilities.formatName(who.first_name, who.last_name)).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name));
} }
} else { } else {
messageText = str.replace("un2", "").replace("un1", ""); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionKickUser).replace("un2", "").replace("un1", "");
} }
} }
} else if (message.action instanceof TLRPC.TL_messageActionChatAddUser) { } else if (message.action instanceof TLRPC.TL_messageActionChatAddUser) {
...@@ -87,17 +88,16 @@ public class MessageObject { ...@@ -87,17 +88,16 @@ public class MessageObject {
if (whoUser == null) { if (whoUser == null) {
MessagesController.Instance.users.get(message.action.user_id); MessagesController.Instance.users.get(message.action.user_id);
} }
String str = ApplicationLoader.applicationContext.getString(R.string.ActionAddUser);
if (whoUser != null && fromUser != null) { if (whoUser != null && fromUser != null) {
if (message.from_id == UserConfig.clientUserId) { if (message.from_id == UserConfig.clientUserId) {
messageText = str.replace("un2", Utilities.formatName(whoUser.first_name, whoUser.last_name)).replace("un1", ApplicationLoader.applicationContext.getString(R.string.FromYou)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionYouAddUser).replace("un2", Utilities.formatName(whoUser.first_name, whoUser.last_name));
} else if (message.action.user_id == UserConfig.clientUserId) { } else if (message.action.user_id == UserConfig.clientUserId) {
messageText = str.replace("un2", ApplicationLoader.applicationContext.getString(R.string.FromYou)).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionAddUserYou).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name));
} else { } else {
messageText = str.replace("un2", Utilities.formatName(whoUser.first_name, whoUser.last_name)).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionAddUser).replace("un2", Utilities.formatName(whoUser.first_name, whoUser.last_name)).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name));
} }
} else { } else {
messageText = str.replace("un2", "").replace("un1", ""); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionAddUser).replace("un2", "").replace("un1", "");
} }
} else if (message.action instanceof TLRPC.TL_messageActionChatEditPhoto) { } else if (message.action instanceof TLRPC.TL_messageActionChatEditPhoto) {
photoThumbs = new ArrayList<PhotoObject>(); photoThumbs = new ArrayList<PhotoObject>();
...@@ -105,7 +105,7 @@ public class MessageObject { ...@@ -105,7 +105,7 @@ public class MessageObject {
photoThumbs.add(new PhotoObject(size)); photoThumbs.add(new PhotoObject(size));
} }
if (message.from_id == UserConfig.clientUserId) { if (message.from_id == UserConfig.clientUserId) {
messageText = ApplicationLoader.applicationContext.getString(R.string.ActionChangedPhoto).replace("un1", ApplicationLoader.applicationContext.getString(R.string.FromYou)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionYouChangedPhoto);
} else { } else {
if (fromUser != null) { if (fromUser != null) {
messageText = ApplicationLoader.applicationContext.getString(R.string.ActionChangedPhoto).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionChangedPhoto).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name));
...@@ -115,7 +115,7 @@ public class MessageObject { ...@@ -115,7 +115,7 @@ public class MessageObject {
} }
} else if (message.action instanceof TLRPC.TL_messageActionChatEditTitle) { } else if (message.action instanceof TLRPC.TL_messageActionChatEditTitle) {
if (message.from_id == UserConfig.clientUserId) { if (message.from_id == UserConfig.clientUserId) {
messageText = ApplicationLoader.applicationContext.getString(R.string.ActionChangedTitle).replace("un1", ApplicationLoader.applicationContext.getString(R.string.FromYou)).replace("un2", message.action.title); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionYouChangedTitle).replace("un2", message.action.title);
} else { } else {
if (fromUser != null) { if (fromUser != null) {
messageText = ApplicationLoader.applicationContext.getString(R.string.ActionChangedTitle).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)).replace("un2", message.action.title); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionChangedTitle).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)).replace("un2", message.action.title);
...@@ -125,7 +125,7 @@ public class MessageObject { ...@@ -125,7 +125,7 @@ public class MessageObject {
} }
} else if (message.action instanceof TLRPC.TL_messageActionChatDeletePhoto) { } else if (message.action instanceof TLRPC.TL_messageActionChatDeletePhoto) {
if (message.from_id == UserConfig.clientUserId) { if (message.from_id == UserConfig.clientUserId) {
messageText = ApplicationLoader.applicationContext.getString(R.string.ActionRemovedPhoto).replace("un1", ApplicationLoader.applicationContext.getString(R.string.FromYou)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionYouRemovedPhoto);
} else { } else {
if (fromUser != null) { if (fromUser != null) {
messageText = ApplicationLoader.applicationContext.getString(R.string.ActionRemovedPhoto).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); messageText = ApplicationLoader.applicationContext.getString(R.string.ActionRemovedPhoto).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name));
...@@ -162,7 +162,7 @@ public class MessageObject { ...@@ -162,7 +162,7 @@ public class MessageObject {
} }
} else { } else {
if (message.from_id == UserConfig.clientUserId) { if (message.from_id == UserConfig.clientUserId) {
messageText = String.format(ApplicationLoader.applicationContext.getString(R.string.MessageLifetimeRemoved), ApplicationLoader.applicationContext.getString(R.string.FromYou)); messageText = String.format(ApplicationLoader.applicationContext.getString(R.string.MessageLifetimeYouRemoved));
} else { } else {
if (fromUser != null) { if (fromUser != null) {
messageText = String.format(ApplicationLoader.applicationContext.getString(R.string.MessageLifetimeRemoved), fromUser.first_name); messageText = String.format(ApplicationLoader.applicationContext.getString(R.string.MessageLifetimeRemoved), fromUser.first_name);
...@@ -172,7 +172,8 @@ public class MessageObject { ...@@ -172,7 +172,8 @@ public class MessageObject {
} }
} }
} else if (message.action instanceof TLRPC.TL_messageActionLoginUnknownLocation) { } else if (message.action instanceof TLRPC.TL_messageActionLoginUnknownLocation) {
messageText = ApplicationLoader.applicationContext.getString(R.string.NotificationUnrecognizedDevice, message.action.title, message.action.address); String date = String.format("%s %s %s", Utilities.formatterYear.format(((long)message.date) * 1000), ApplicationLoader.applicationContext.getString(R.string.OtherAt), Utilities.formatterDay.format(((long)message.date) * 1000));
messageText = ApplicationLoader.applicationContext.getString(R.string.NotificationUnrecognizedDevice, UserConfig.currentUser.first_name, date, message.action.title, message.action.address);
} else if (message.action instanceof TLRPC.TL_messageActionUserJoined) { } else if (message.action instanceof TLRPC.TL_messageActionUserJoined) {
if (fromUser != null) { if (fromUser != null) {
messageText = ApplicationLoader.applicationContext.getString(R.string.NotificationContactJoined, Utilities.formatName(fromUser.first_name, fromUser.last_name)); messageText = ApplicationLoader.applicationContext.getString(R.string.NotificationContactJoined, Utilities.formatName(fromUser.first_name, fromUser.last_name));
...@@ -266,9 +267,17 @@ public class MessageObject { ...@@ -266,9 +267,17 @@ public class MessageObject {
} else { } else {
type = 17; type = 17;
} }
} else if (message.media != null && message.media instanceof TLRPC.TL_messageMediaAudio) {
if (message.from_id == UserConfig.clientUserId) {
type = 0;
} else {
type = 1;
}
} }
} else if (message instanceof TLRPC.TL_messageService) { } else if (message instanceof TLRPC.TL_messageService) {
if (message.action instanceof TLRPC.TL_messageActionChatEditPhoto || message.action instanceof TLRPC.TL_messageActionUserUpdatedPhoto) { if (message.action instanceof TLRPC.TL_messageActionLoginUnknownLocation) {
type = 1;
} else if (message.action instanceof TLRPC.TL_messageActionChatEditPhoto || message.action instanceof TLRPC.TL_messageActionUserUpdatedPhoto) {
type = 11; type = 11;
} else { } else {
type = 10; type = 10;
......
TMessagesProj/src/main/java/org/telegram/objects/PhotoObject.java
View file @ 9814a6e9
...@@ -30,7 +30,7 @@ public class PhotoObject { ...@@ -30,7 +30,7 @@ public class PhotoObject {
opts.outWidth = photo.w; opts.outWidth = photo.w;
opts.outHeight = photo.h; opts.outHeight = photo.h;
image = BitmapFactory.decodeByteArray(photoOwner.bytes, 0, photoOwner.bytes.length, opts); image = BitmapFactory.decodeByteArray(photoOwner.bytes, 0, photoOwner.bytes.length, opts);
if (FileLoader.Instance.runtimeHack != null) { if (image != null && FileLoader.Instance.runtimeHack != null) {
FileLoader.Instance.runtimeHack.trackFree(image.getRowBytes() * image.getHeight()); FileLoader.Instance.runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
} }
} }
...@@ -46,7 +46,7 @@ public class PhotoObject { ...@@ -46,7 +46,7 @@ public class PhotoObject {
} }
int diffW = Math.abs(obj.photoOwner.w - width); int diffW = Math.abs(obj.photoOwner.w - width);
int diffH = Math.abs(obj.photoOwner.h - height); int diffH = Math.abs(obj.photoOwner.h - height);
if (closestObject == null || closestWidth > diffW && closestHeight > diffH || closestObject.photoOwner instanceof TLRPC.TL_photoCachedSize) { if (closestObject == null || closestWidth > diffW || closestHeight > diffH || closestObject.photoOwner instanceof TLRPC.TL_photoCachedSize) {
closestObject = obj; closestObject = obj;
closestWidth = diffW; closestWidth = diffW;
closestHeight = diffH; closestHeight = diffH;
......
TMessagesProj/src/main/java/org/telegram/ui/ApplicationActivity.java
View file @ 9814a6e9
...@@ -25,6 +25,7 @@ import android.view.View; ...@@ -25,6 +25,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewTreeObserver; import android.view.ViewTreeObserver;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ConnectionsManager;
...@@ -196,7 +197,7 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati ...@@ -196,7 +197,7 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati
method.invoke(field.get(getSupportActionBar()), false); method.invoke(field.get(getSupportActionBar()), false);
} }
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); e.printStackTrace();
} }
} }
...@@ -333,6 +334,10 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati ...@@ -333,6 +334,10 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati
if (notificationView != null) { if (notificationView != null) {
notificationView.hide(false); notificationView.hide(false);
} }
View focusView = getCurrentFocus();
if (focusView instanceof EditText) {
focusView.clearFocus();
}
} }
@Override @Override
...@@ -581,13 +586,13 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati ...@@ -581,13 +586,13 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati
try { try {
if (statusView.getLayoutParams() instanceof android.support.v7.app.ActionBar.LayoutParams) { if (statusView.getLayoutParams() instanceof android.support.v7.app.ActionBar.LayoutParams) {
android.support.v7.app.ActionBar.LayoutParams statusParams = (android.support.v7.app.ActionBar.LayoutParams)statusView.getLayoutParams(); android.support.v7.app.ActionBar.LayoutParams statusParams = (android.support.v7.app.ActionBar.LayoutParams)statusView.getLayoutParams();
statusText.measure(View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.AT_MOST), 100); statusText.measure(View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
statusParams.width = (int)(statusText.getMeasuredWidth() + Utilities.dp(54)); statusParams.width = (statusText.getMeasuredWidth() + Utilities.dp(54));
statusView.setLayoutParams(statusParams); statusView.setLayoutParams(statusParams);
} else if (statusView.getLayoutParams() instanceof android.app.ActionBar.LayoutParams) { } else if (statusView.getLayoutParams() instanceof android.app.ActionBar.LayoutParams) {
android.app.ActionBar.LayoutParams statusParams = (android.app.ActionBar.LayoutParams)statusView.getLayoutParams(); android.app.ActionBar.LayoutParams statusParams = (android.app.ActionBar.LayoutParams)statusView.getLayoutParams();
statusText.measure(View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.AT_MOST), 100); statusText.measure(View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
statusParams.width = (int)(statusText.getMeasuredWidth() + Utilities.dp(54)); statusParams.width = (statusText.getMeasuredWidth() + Utilities.dp(54));
statusView.setLayoutParams(statusParams); statusView.setLayoutParams(statusParams);
} }
} catch (Exception e) { } catch (Exception e) {
...@@ -621,7 +626,7 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati ...@@ -621,7 +626,7 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati
ApplicationLoader.fragmentsStack.remove(ApplicationLoader.fragmentsStack.size() - 1); ApplicationLoader.fragmentsStack.remove(ApplicationLoader.fragmentsStack.size() - 1);
current.onFragmentDestroy(); current.onFragmentDestroy();
} }
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean animations = preferences.getBoolean("view_animations", true); boolean animations = preferences.getBoolean("view_animations", true);
if (animations) { if (animations) {
if (bySwipe) { if (bySwipe) {
...@@ -660,7 +665,7 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati ...@@ -660,7 +665,7 @@ public class ApplicationActivity extends ActionBarActivity implements Notificati
BaseFragment prev = ApplicationLoader.fragmentsStack.get(ApplicationLoader.fragmentsStack.size() - 2); BaseFragment prev = ApplicationLoader.fragmentsStack.get(ApplicationLoader.fragmentsStack.size() - 2);
FragmentManager fm = getSupportFragmentManager(); FragmentManager fm = getSupportFragmentManager();
FragmentTransaction fTrans = fm.beginTransaction(); FragmentTransaction fTrans = fm.beginTransaction();
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean animations = preferences.getBoolean("view_animations", true); boolean animations = preferences.getBoolean("view_animations", true);
if (animations) { if (animations) {
if (bySwipe) { if (bySwipe) {
......
TMessagesProj/src/main/java/org/telegram/ui/ApplicationLoader.java
View file @ 9814a6e9
...@@ -8,13 +8,16 @@ ...@@ -8,13 +8,16 @@
package org.telegram.ui; package org.telegram.ui;
import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Handler;
import android.view.ViewConfiguration; import android.view.ViewConfiguration;
import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.ConnectionResult;
...@@ -22,7 +25,6 @@ import com.google.android.gms.common.GooglePlayServicesUtil; ...@@ -22,7 +25,6 @@ import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.android.gms.gcm.GoogleCloudMessaging; import com.google.android.gms.gcm.GoogleCloudMessaging;
import org.telegram.PhoneFormat.PhoneFormat; import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.messenger.MessagesController; import org.telegram.messenger.MessagesController;
...@@ -34,6 +36,7 @@ import org.telegram.ui.Views.BaseFragment; ...@@ -34,6 +36,7 @@ import org.telegram.ui.Views.BaseFragment;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
public class ApplicationLoader extends Application { public class ApplicationLoader extends Application {
...@@ -48,6 +51,7 @@ public class ApplicationLoader extends Application { ...@@ -48,6 +51,7 @@ public class ApplicationLoader extends Application {
public static long lastPauseTime; public static long lastPauseTime;
public static Bitmap cachedWallpaper = null; public static Bitmap cachedWallpaper = null;
public static Context applicationContext; public static Context applicationContext;
private Locale currentLocale;
public static ApplicationLoader Instance = null; public static ApplicationLoader Instance = null;
...@@ -56,42 +60,47 @@ public class ApplicationLoader extends Application { ...@@ -56,42 +60,47 @@ public class ApplicationLoader extends Application {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
currentLocale = Locale.getDefault();
Instance = this; Instance = this;
java.lang.System.setProperty("java.net.preferIPv4Stack", "true"); java.lang.System.setProperty("java.net.preferIPv4Stack", "true");
java.lang.System.setProperty("java.net.preferIPv6Addresses", "false"); java.lang.System.setProperty("java.net.preferIPv6Addresses", "false");
applicationContext = getApplicationContext(); applicationContext = getApplicationContext();
Utilities.getTypeface("fonts/rmedium.ttf"); Utilities.applicationHandler = new Handler(applicationContext.getMainLooper());
UserConfig.loadConfig(); UserConfig.loadConfig();
SharedPreferences preferences = getSharedPreferences("Notifications", MODE_PRIVATE);
if (UserConfig.currentUser != null) { if (UserConfig.currentUser != null) {
int value = preferences.getInt("version", 0); boolean changed = false;
if (value != 15) { SharedPreferences preferences = getSharedPreferences("Notifications", MODE_PRIVATE);
UserConfig.contactsHash = ""; int v = preferences.getInt("v", 0);
MessagesStorage.lastDateValue = 0; if (v != 1) {
MessagesStorage.lastPtsValue = 0; SharedPreferences preferences2 = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
MessagesStorage.lastSeqValue = 0; SharedPreferences.Editor editor = preferences2.edit();
MessagesStorage.lastQtsValue = 0; if (preferences.contains("view_animations")) {
UserConfig.saveConfig(false); editor.putBoolean("view_animations", preferences.getBoolean("view_animations", false));
MessagesStorage.Instance.cleanUp(); }
ArrayList<TLRPC.User> users = new ArrayList<TLRPC.User>(); if (preferences.contains("selectedBackground")) {
users.add(UserConfig.currentUser); editor.putInt("selectedBackground", preferences.getInt("selectedBackground", 1000001));
MessagesStorage.Instance.putUsersAndChats(users, null, true, true); }
if (preferences.contains("selectedColor")) {
SharedPreferences.Editor editor = preferences.edit(); editor.putInt("selectedColor", preferences.getInt("selectedColor", 0));
editor.putInt("version", 15); }
if (preferences.contains("fons_size")) {
editor.putInt("fons_size", preferences.getInt("fons_size", 16));
}
editor.commit();
editor = preferences.edit();
editor.putInt("v", 1);
editor.remove("view_animations");
editor.remove("selectedBackground");
editor.remove("selectedColor");
editor.remove("fons_size");
editor.commit(); editor.commit();
} else {
MessagesStorage init = MessagesStorage.Instance;
} }
MessagesStorage init = MessagesStorage.Instance;
MessagesController.Instance.users.put(UserConfig.clientUserId, UserConfig.currentUser); MessagesController.Instance.users.put(UserConfig.clientUserId, UserConfig.currentUser);
} else {
SharedPreferences.Editor editor = preferences.edit();
editor.putInt("version", 15);
editor.commit();
} }
MessagesController.Instance.checkAppAccount();
try { try {
ViewConfiguration config = ViewConfiguration.get(this); ViewConfiguration config = ViewConfiguration.get(this);
...@@ -101,7 +110,7 @@ public class ApplicationLoader extends Application { ...@@ -101,7 +110,7 @@ public class ApplicationLoader extends Application {
menuKeyField.setBoolean(config, false); menuKeyField.setBoolean(config, false);
} }
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); e.printStackTrace();
} }
if (checkPlayServices()) { if (checkPlayServices()) {
...@@ -123,6 +132,20 @@ public class ApplicationLoader extends Application { ...@@ -123,6 +132,20 @@ public class ApplicationLoader extends Application {
FileLog.e("tmessages", "start application with time " + lastPauseTime); FileLog.e("tmessages", "start application with time " + lastPauseTime);
} }
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
Locale newLocale = newConfig.locale;
if (newLocale != null) {
String d1 = newLocale.getDisplayName();
String d2 = currentLocale.getDisplayName();
if (d1 != null && d2 != null && !d1.equals(d2)) {
Utilities.recreateFormatters();
}
currentLocale = newLocale;
}
}
public static void resetLastPauseTime() { public static void resetLastPauseTime() {
lastPauseTime = 0; lastPauseTime = 0;
ConnectionsManager.Instance.applicationMovedToForeground(); ConnectionsManager.Instance.applicationMovedToForeground();
......
TMessagesProj/src/main/java/org/telegram/ui/Cells/BaseCell.java 0 → 100644
View file @ 9814a6e9
/*
* This is the source code of Telegram for Android v. 1.3.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013.
*/
package org.telegram.ui.Cells;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.View;
public class BaseCell extends View {
public BaseCell(Context context) {
super(context);
}
public BaseCell(Context context, AttributeSet attrs) {
super(context, attrs);
}
public BaseCell(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
protected void setDrawableBounds(Drawable drawable, int x, int y) {
setDrawableBounds(drawable, x, y, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
}
protected void setDrawableBounds(Drawable drawable, int x, int y, int w, int h) {
drawable.setBounds(x, y, x + w, y + h);
}
}
TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatOrUserCell.java 0 → 100644
View file @ 9814a6e9
/*
* This is the source code of Telegram for Android v. 1.3.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013.
*/
package org.telegram.ui.Cells;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.drawable.Drawable;
import android.text.Html;
import android.text.Layout;
import android.text.StaticLayout;
import android.text.TextPaint;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.ContactsController;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities;
import org.telegram.ui.ApplicationLoader;
import org.telegram.ui.Views.ImageReceiver;
import java.lang.ref.WeakReference;
public class ChatOrUserCell extends BaseCell {
private static TextPaint namePaint;
private static TextPaint nameEncryptedPaint;
private static TextPaint onlinePaint;
private static TextPaint offlinePaint;
private static Drawable lockDrawable;
private static Paint linePaint;
private CharSequence currentName;
private ImageReceiver avatarImage;
private String subLabel;
private ChatOrUserCellLayout cellLayout;
private TLRPC.User user = null;
private TLRPC.Chat chat = null;
private TLRPC.EncryptedChat encryptedChat = null;
private String lastName = null;
private int lastStatus = 0;
private TLRPC.FileLocation lastAvatar = null;
public boolean usePadding = true;
public boolean useBoldFont = false;
public boolean useSeparator = false;
public float drawAlpha = 1;
public ChatOrUserCell(Context context) {
super(context);
init();
}
public ChatOrUserCell(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public ChatOrUserCell(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
private void init() {
if (namePaint == null) {
namePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
namePaint.setTextSize(Utilities.dp(18));
namePaint.setColor(0xff222222);
}
if (nameEncryptedPaint == null) {
nameEncryptedPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
nameEncryptedPaint.setTextSize(Utilities.dp(18));
nameEncryptedPaint.setColor(0xff00a60e);
}
if (onlinePaint == null) {
onlinePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
onlinePaint.setTextSize(Utilities.dp(15));
onlinePaint.setColor(0xff316f9f);
}
if (offlinePaint == null) {
offlinePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
offlinePaint.setTextSize(Utilities.dp(15));
offlinePaint.setColor(0xff999999);
}
if (lockDrawable == null) {
lockDrawable = getResources().getDrawable(R.drawable.ic_lock_green);
}
if (linePaint == null) {
linePaint = new Paint();
linePaint.setColor(0xffdcdcdc);
}
if (avatarImage == null) {
avatarImage = new ImageReceiver();
avatarImage.parentView = new WeakReference<View>(this);
}
if (cellLayout == null) {
cellLayout = new ChatOrUserCellLayout();
}
}
public void setData(TLRPC.User u, TLRPC.Chat c, TLRPC.EncryptedChat ec, CharSequence n, String s) {
currentName = n;
user = u;
chat = c;
encryptedChat = ec;
subLabel = s;
update(0);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), Utilities.dp(64));
}
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
if (user == null && chat == null && encryptedChat == null) {
super.onLayout(changed, left, top, right, bottom);
return;
}
if (changed) {
buildLayout();
}
}
public void buildLayout() {
cellLayout.build(getMeasuredWidth(), getMeasuredHeight());
}
public void update(int mask) {
int placeHolderId = 0;
TLRPC.FileLocation photo = null;
if (user != null) {
if (user.photo != null) {
photo = user.photo.photo_small;
}
placeHolderId = Utilities.getUserAvatarForId(user.id);
} else if (chat != null) {
if (chat.photo != null) {
photo = chat.photo.photo_small;
}
placeHolderId = Utilities.getGroupAvatarForId(chat.id);
}
if (mask != 0) {
boolean continueUpdate = false;
if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 && user != null || (mask & MessagesController.UPDATE_MASK_CHAT_AVATAR) != 0 && chat != null) {
if (lastAvatar != null && photo == null || lastAvatar == null && photo != null && lastAvatar != null && photo != null && (lastAvatar.volume_id != photo.volume_id || lastAvatar.local_id != photo.local_id)) {
continueUpdate = true;
}
}
if (!continueUpdate && (mask & MessagesController.UPDATE_MASK_STATUS) != 0 && user != null) {
int newStatus = 0;
if (user.status != null) {
newStatus = user.status.expires;
if (lastStatus == 0) {
lastStatus = user.status.was_online;
}
}
if (newStatus != lastStatus) {
continueUpdate = true;
}
}
if (!continueUpdate && ((mask & MessagesController.UPDATE_MASK_NAME) != 0 && user != null) || (mask & MessagesController.UPDATE_MASK_CHAT_NAME) != 0 && chat != null) {
String newName;
if (user != null) {
newName = user.first_name + user.last_name;
} else {
newName = chat.title;
}
if (!newName.equals(lastName)) {
continueUpdate = true;
}
}
if (!continueUpdate) {
return;
}
}
if (user != null) {
if (user.status != null) {
lastStatus = user.status.expires;
if (lastStatus == 0) {
lastStatus = user.status.was_online;
}
} else {
lastStatus = 0;
}
lastName = user.first_name + user.last_name;
} else if (chat != null) {
lastName = chat.title;
}
lastAvatar = photo;
avatarImage.setImage(photo, "50_50", placeHolderId == 0 ? null : getResources().getDrawable(placeHolderId));
if (getMeasuredWidth() != 0 || getMeasuredHeight() != 0) {
buildLayout();
} else {
requestLayout();
}
postInvalidate();
}
@Override
protected void onDraw(Canvas canvas) {
if (user == null && chat == null && encryptedChat == null) {
return;
}
if (cellLayout == null) {
requestLayout();
return;
}
if (drawAlpha != 1) {
canvas.saveLayerAlpha(0, 0, canvas.getWidth(), canvas.getHeight(), (int)(255 * drawAlpha), Canvas.HAS_ALPHA_LAYER_SAVE_FLAG);
}
if (cellLayout.drawNameLock) {
setDrawableBounds(lockDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
lockDrawable.draw(canvas);
}
canvas.save();
canvas.translate(cellLayout.nameLeft, cellLayout.nameTop);
cellLayout.nameLayout.draw(canvas);
canvas.restore();
if (cellLayout.onlineLayout != null) {
canvas.save();
canvas.translate(cellLayout.onlineLeft, cellLayout.onlineTop);
cellLayout.onlineLayout.draw(canvas);
canvas.restore();
}
avatarImage.draw(canvas, cellLayout.avatarLeft, cellLayout.avatarTop, Utilities.dp(50), Utilities.dp(50));
if (useSeparator) {
int h = getMeasuredHeight();
if (!usePadding) {
canvas.drawLine(0, h - 1, getMeasuredWidth(), h, linePaint);
} else {
canvas.drawLine(Utilities.dp(11), h - 1, getMeasuredWidth() - Utilities.dp(11), h, linePaint);
}
}
}
private class ChatOrUserCellLayout {
private int nameLeft;
private int nameTop;
private int nameWidth;
private StaticLayout nameLayout;
private boolean drawNameLock;
private int nameLockLeft;
private int nameLockTop = Utilities.dp(15);
private int onlineLeft;
private int onlineTop = Utilities.dp(36);
private int onlineWidth;
private StaticLayout onlineLayout;
private int avatarTop = Utilities.dp(7);
private int avatarLeft;
public void build(int width, int height) {
CharSequence nameString = "";
TextPaint currentNamePaint;
if (encryptedChat != null) {
drawNameLock = true;
if (!Utilities.isRTL) {
nameLockLeft = Utilities.dp(61 + (usePadding ? 11 : 0));
nameLeft = Utilities.dp(65 + (usePadding ? 11 : 0)) + lockDrawable.getIntrinsicWidth();
} else {
nameLockLeft = width - Utilities.dp(63 + (usePadding ? 11 : 0)) - lockDrawable.getIntrinsicWidth();
nameLeft = usePadding ? Utilities.dp(11) : 0;
}
} else {
drawNameLock = false;
if (!Utilities.isRTL) {
nameLeft = Utilities.dp(61 + (usePadding ? 11 : 0));
} else {
nameLeft = usePadding ? Utilities.dp(11) : 0;
}
}
if (currentName != null) {
nameString = currentName;
} else {
if (useBoldFont) {
if (user != null) {
if (user.first_name.length() != 0 && user.last_name.length() != 0) {
nameString = Html.fromHtml(user.first_name + " <b>" + user.last_name + "</b>");
} else if (user.first_name.length() != 0) {
nameString = Html.fromHtml("<b>" + user.first_name + "</b>");
} else {
nameString = Html.fromHtml("<b>" + user.last_name + "</b>");
}
}
} else {
String nameString2 = "";
if (chat != null) {
nameString2 = chat.title;
} else if (user != null) {
if (user.id != 333000 && ContactsController.Instance.contactsDict.get(user.id) == null) {
if (ContactsController.Instance.contactsDict.size() == 0 && ContactsController.Instance.loadingContacts) {
nameString2 = Utilities.formatName(user.first_name, user.last_name);
} else {
if (user.phone != null && user.phone.length() != 0) {
nameString2 = PhoneFormat.Instance.format("+" + user.phone);
} else {
nameString2 = Utilities.formatName(user.first_name, user.last_name);
}
}
} else {
nameString2 = Utilities.formatName(user.first_name, user.last_name);
}
}
nameString = nameString2.replace("\n", " ");
}
}
if (nameString.length() == 0) {
nameString = ApplicationLoader.applicationContext.getString(R.string.HiddenName);
}
if (encryptedChat != null) {
currentNamePaint = nameEncryptedPaint;
} else {
currentNamePaint = namePaint;
}
if (!Utilities.isRTL) {
onlineWidth = nameWidth = width - nameLeft - Utilities.dp(3 + (usePadding ? 11 : 0));
} else {
onlineWidth = nameWidth = width - nameLeft - Utilities.dp(61 + (usePadding ? 11 : 0));
}
if (drawNameLock) {
nameWidth -= Utilities.dp(6) + lockDrawable.getIntrinsicWidth();
}
CharSequence nameStringFinal = TextUtils.ellipsize(nameString, currentNamePaint, nameWidth - Utilities.dp(12), TextUtils.TruncateAt.END);
nameLayout = new StaticLayout(nameStringFinal, currentNamePaint, nameWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
if (chat == null) {
if (!Utilities.isRTL) {
onlineLeft = Utilities.dp(61 + (usePadding ? 11 : 0));
} else {
onlineLeft = usePadding ? Utilities.dp(11) : 0;
}
String onlineString = "";
TextPaint currentOnlinePaint = offlinePaint;
if (subLabel != null) {
onlineString = subLabel;
} else {
if (user != null) {
if (user.status == null) {
onlineString = getResources().getString(R.string.Offline);
} else {
int currentTime = ConnectionsManager.Instance.getCurrentTime();
if (user.id == UserConfig.clientUserId || user.status.expires > currentTime || user.status.was_online > currentTime) {
currentOnlinePaint = onlinePaint;
onlineString = getResources().getString(R.string.Online);
} else {
if (user.status.was_online <= 10000 && user.status.expires <= 10000) {
onlineString = getResources().getString(R.string.Invisible);
} else {
int value = user.status.was_online;
if (value == 0) {
value = user.status.expires;
}
onlineString = getResources().getString(R.string.LastSeen) + " " + Utilities.formatDateOnline(value);
}
}
}
}
}
CharSequence onlineStringFinal = TextUtils.ellipsize(onlineString, currentOnlinePaint, nameWidth - Utilities.dp(12), TextUtils.TruncateAt.END);
onlineLayout = new StaticLayout(onlineStringFinal, currentOnlinePaint, nameWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
nameTop = Utilities.dp(12);
} else {
onlineLayout = null;
nameTop = Utilities.dp(22);
}
if (!Utilities.isRTL) {
avatarLeft = usePadding ? Utilities.dp(11) : 0;
} else {
avatarLeft = width - Utilities.dp(50 + (usePadding ? 11 : 0));
}
avatarImage.imageX = avatarLeft;
avatarImage.imageY = avatarTop;
avatarImage.imageW = Utilities.dp(50);
avatarImage.imageH = Utilities.dp(50);
double widthpx = 0;
float left = 0;
if (Utilities.isRTL) {
if (nameLayout.getLineCount() > 0) {
left = nameLayout.getLineLeft(0);
if (left == 0) {
widthpx = Math.ceil(nameLayout.getLineWidth(0));
if (widthpx < nameWidth) {
nameLeft += (nameWidth - widthpx);
}
}
}
if (onlineLayout != null && onlineLayout.getLineCount() > 0) {
left = onlineLayout.getLineLeft(0);
if (left == 0) {
widthpx = Math.ceil(onlineLayout.getLineWidth(0));
if (widthpx < onlineWidth) {
onlineLeft += (onlineWidth - widthpx);
}
}
}
} else {
if (nameLayout.getLineCount() > 0) {
left = nameLayout.getLineRight(0);
if (left == nameWidth) {
widthpx = Math.ceil(nameLayout.getLineWidth(0));
if (widthpx < nameWidth) {
nameLeft -= (nameWidth - widthpx);
}
}
}
if (onlineLayout != null && onlineLayout.getLineCount() > 0) {
left = onlineLayout.getLineRight(0);
if (left == onlineWidth) {
widthpx = Math.ceil(onlineLayout.getLineWidth(0));
if (widthpx < onlineWidth) {
onlineLeft -= (onlineWidth - widthpx);
}
}
}
}
}
}
}
TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java 0 → 100644
View file @ 9814a6e9
/*
* This is the source code of Telegram for Android v. 1.3.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013.
*/
package org.telegram.ui.Cells;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.text.Html;
import android.text.Layout;
import android.text.StaticLayout;
import android.text.TextPaint;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLRPC;
import org.telegram.messenger.ContactsController;
import org.telegram.messenger.Emoji;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities;
import org.telegram.objects.MessageObject;
import org.telegram.ui.ApplicationLoader;
import org.telegram.ui.Views.ImageReceiver;
import java.lang.ref.WeakReference;
public class DialogCell extends BaseCell {
private static TextPaint namePaint;
private static TextPaint nameEncryptedPaint;
private static TextPaint nameUnknownPaint;
private static TextPaint messagePaint;
private static TextPaint messagePrintingPaint;
private static TextPaint timePaint;
private static TextPaint countPaint;
private static Drawable checkDrawable;
private static Drawable halfCheckDrawable;
private static Drawable clockDrawable;
private static Drawable errorDrawable;
private static Drawable lockDrawable;
private static Drawable countDrawable;
private TLRPC.TL_dialog currentDialog;
private ImageReceiver avatarImage;
private DialogCellLayout cellLayout;
private TLRPC.User user = null;
private TLRPC.Chat chat = null;
private TLRPC.EncryptedChat encryptedChat = null;
private CharSequence lastPrintString = null;
private void init() {
if (namePaint == null) {
namePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
namePaint.setTextSize(Utilities.dp(19));
namePaint.setColor(0xff222222);
namePaint.setTypeface(Utilities.getTypeface("fonts/rmedium.ttf"));
}
if (nameEncryptedPaint == null) {
nameEncryptedPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
nameEncryptedPaint.setTextSize(Utilities.dp(19));
nameEncryptedPaint.setColor(0xff00a60e);
nameEncryptedPaint.setTypeface(Utilities.getTypeface("fonts/rmedium.ttf"));
}
if (nameUnknownPaint == null) {
nameUnknownPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
nameUnknownPaint.setTextSize(Utilities.dp(19));
nameUnknownPaint.setColor(0xff316f9f);
nameUnknownPaint.setTypeface(Utilities.getTypeface("fonts/rmedium.ttf"));
}
if (messagePaint == null) {
messagePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
messagePaint.setTextSize(Utilities.dp(16));
messagePaint.setColor(0xff808080);
}
if (messagePrintingPaint == null) {
messagePrintingPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
messagePrintingPaint.setTextSize(Utilities.dp(16));
messagePrintingPaint.setColor(0xff316f9f);
}
if (timePaint == null) {
timePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
timePaint.setTextSize(Utilities.dp(14));
timePaint.setColor(0xff9e9e9e);
}
if (countPaint == null) {
countPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
countPaint.setTextSize(Utilities.dp(13));
countPaint.setColor(0xffffffff);
}
if (lockDrawable == null) {
lockDrawable = getResources().getDrawable(R.drawable.ic_lock_green);
}
if (checkDrawable == null) {
checkDrawable = getResources().getDrawable(R.drawable.dialogs_check);
}
if (halfCheckDrawable == null) {
halfCheckDrawable = getResources().getDrawable(R.drawable.dialogs_halfcheck);
}
if (clockDrawable == null) {
clockDrawable = getResources().getDrawable(R.drawable.msg_clock);
}
if (errorDrawable == null) {
errorDrawable = getResources().getDrawable(R.drawable.dialogs_warning);
}
if (countDrawable == null) {
countDrawable = getResources().getDrawable(R.drawable.dialogs_badge);
}
if (avatarImage == null) {
avatarImage = new ImageReceiver();
avatarImage.parentView = new WeakReference<View>(this);
}
if (cellLayout == null) {
cellLayout = new DialogCellLayout();
}
}
public DialogCell(Context context) {
super(context);
init();
}
public DialogCell(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public DialogCell(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
public void setDialog(TLRPC.TL_dialog dialog) {
currentDialog = dialog;
update(0);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), Utilities.dp(70));
}
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
if (currentDialog == null) {
super.onLayout(changed, left, top, right, bottom);
return;
}
if (changed) {
buildLayout();
}
}
public void buildLayout() {
cellLayout.build(getMeasuredWidth(), getMeasuredHeight());
}
public void update(int mask) {
if (mask != 0) {
boolean continueUpdate = false;
if ((mask & MessagesController.UPDATE_MASK_USER_PRINT) != 0) {
CharSequence printString = MessagesController.Instance.printingStrings.get(currentDialog.id);
if (lastPrintString != null && printString == null || lastPrintString == null && printString != null || lastPrintString != null && printString != null && !lastPrintString.equals(printString)) {
continueUpdate = true;
}
}
if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0) {
if (chat == null) {
continueUpdate = true;
}
}
if ((mask & MessagesController.UPDATE_MASK_NAME) != 0) {
if (chat == null) {
continueUpdate = true;
}
}
if ((mask & MessagesController.UPDATE_MASK_CHAT_AVATAR) != 0) {
if (user == null) {
continueUpdate = true;
}
}
if ((mask & MessagesController.UPDATE_MASK_CHAT_NAME) != 0) {
if (user == null) {
continueUpdate = true;
}
}
if (!continueUpdate) {
return;
}
}
user = null;
chat = null;
encryptedChat = null;
int lower_id = (int)currentDialog.id;
if (lower_id != 0) {
if (lower_id < 0) {
chat = MessagesController.Instance.chats.get(-lower_id);
} else {
user = MessagesController.Instance.users.get(lower_id);
}
} else {
encryptedChat = MessagesController.Instance.encryptedChats.get((int)(currentDialog.id >> 32));
if (encryptedChat != null) {
user = MessagesController.Instance.users.get(encryptedChat.user_id);
}
}
int placeHolderId = 0;
TLRPC.FileLocation photo = null;
if (user != null) {
if (user.photo != null) {
photo = user.photo.photo_small;
}
placeHolderId = Utilities.getUserAvatarForId(user.id);
} else if (chat != null) {
if (chat.photo != null) {
photo = chat.photo.photo_small;
}
placeHolderId = Utilities.getGroupAvatarForId(chat.id);
}
avatarImage.setImage(photo, "50_50", placeHolderId == 0 ? null : getResources().getDrawable(placeHolderId));
if (getMeasuredWidth() != 0 || getMeasuredHeight() != 0) {
buildLayout();
} else {
requestLayout();
}
invalidate();
}
@Override
protected void onDraw(Canvas canvas) {
if (currentDialog == null) {
return;
}
if (cellLayout == null) {
requestLayout();
return;
}
if (cellLayout.drawNameLock) {
setDrawableBounds(lockDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
lockDrawable.draw(canvas);
}
canvas.save();
canvas.translate(cellLayout.nameLeft, cellLayout.nameTop);
cellLayout.nameLayout.draw(canvas);
canvas.restore();
canvas.save();
canvas.translate(cellLayout.timeLeft, cellLayout.timeTop);
cellLayout.timeLayout.draw(canvas);
canvas.restore();
canvas.save();
canvas.translate(cellLayout.messageLeft, cellLayout.messageTop);
cellLayout.messageLayout.draw(canvas);
canvas.restore();
if (cellLayout.drawClock) {
setDrawableBounds(clockDrawable, cellLayout.checkDrawLeft, cellLayout.checkDrawTop);
clockDrawable.draw(canvas);
} else if (cellLayout.drawCheck2) {
if (cellLayout.drawCheck1) {
setDrawableBounds(halfCheckDrawable, cellLayout.halfCheckDrawLeft, cellLayout.checkDrawTop);
halfCheckDrawable.draw(canvas);
setDrawableBounds(checkDrawable, cellLayout.checkDrawLeft, cellLayout.checkDrawTop);
checkDrawable.draw(canvas);
} else {
setDrawableBounds(checkDrawable, cellLayout.checkDrawLeft, cellLayout.checkDrawTop);
checkDrawable.draw(canvas);
}
}
if (cellLayout.drawError) {
setDrawableBounds(errorDrawable, cellLayout.errorLeft, cellLayout.errorTop);
errorDrawable.draw(canvas);
} else if (cellLayout.drawCount) {
setDrawableBounds(countDrawable, cellLayout.countLeft - Utilities.dp(5), cellLayout.countTop, cellLayout.countWidth + Utilities.dp(10), countDrawable.getIntrinsicHeight());
countDrawable.draw(canvas);
canvas.save();
canvas.translate(cellLayout.countLeft, cellLayout.countTop + Utilities.dp(3));
cellLayout.countLayout.draw(canvas);
canvas.restore();
}
avatarImage.draw(canvas, cellLayout.avatarLeft, cellLayout.avatarTop, Utilities.dp(54), Utilities.dp(54));
}
private class DialogCellLayout {
private int nameLeft;
private int nameTop = Utilities.dp(10);
private int nameWidth;
private StaticLayout nameLayout;
private boolean drawNameLock;
private int nameLockLeft;
private int nameLockTop = Utilities.dp(13);
private int timeLeft;
private int timeTop = Utilities.dp(13);
private int timeWidth;
private StaticLayout timeLayout;
private boolean drawCheck1;
private boolean drawCheck2;
private boolean drawClock;
private int checkDrawLeft;
private int checkDrawTop = Utilities.dp(15);
private int halfCheckDrawLeft;
private int messageTop = Utilities.dp(40);
private int messageLeft;
private int messageWidth;
private StaticLayout messageLayout;
private boolean drawError;
private int errorTop = Utilities.dp(37);
private int errorLeft;
private boolean drawCount;
private int countTop = Utilities.dp(37);
private int countLeft;
private int countWidth;
private StaticLayout countLayout;
private int avatarTop = Utilities.dp(8);
private int avatarLeft;
public void build(int width, int height) {
MessageObject message = MessagesController.Instance.dialogMessage.get(currentDialog.top_message);
String nameString = "";
String timeString = "";
String countString = null;
CharSequence messageString = "";
CharSequence printingString = MessagesController.Instance.printingStrings.get(currentDialog.id);
TextPaint currentNamePaint = namePaint;
TextPaint currentMessagePaint = messagePaint;
boolean checkMessage = true;
if (encryptedChat != null) {
drawNameLock = true;
if (!Utilities.isRTL) {
nameLockLeft = Utilities.dp(77);
nameLeft = Utilities.dp(81) + lockDrawable.getIntrinsicWidth();
} else {
nameLockLeft = width - Utilities.dp(77) - lockDrawable.getIntrinsicWidth();
nameLeft = Utilities.dp(14);
}
} else {
drawNameLock = false;
if (!Utilities.isRTL) {
nameLeft = Utilities.dp(77);
} else {
nameLeft = Utilities.dp(14);
}
}
if (message == null) {
if (printingString != null) {
lastPrintString = messageString = printingString;
currentMessagePaint = messagePrintingPaint;
} else {
lastPrintString = null;
if (encryptedChat != null) {
currentMessagePaint = messagePrintingPaint;
if (encryptedChat instanceof TLRPC.TL_encryptedChatRequested) {
messageString = ApplicationLoader.applicationContext.getString(R.string.EncryptionProcessing);
} else if (encryptedChat instanceof TLRPC.TL_encryptedChatWaiting) {
messageString = String.format(ApplicationLoader.applicationContext.getString(R.string.AwaitingEncryption), user.first_name);
} else if (encryptedChat instanceof TLRPC.TL_encryptedChatDiscarded) {
messageString = ApplicationLoader.applicationContext.getString(R.string.EncryptionRejected);
} else if (encryptedChat instanceof TLRPC.TL_encryptedChat) {
if (encryptedChat.admin_id == UserConfig.clientUserId) {
if (user != null) {
messageString = String.format(ApplicationLoader.applicationContext.getString(R.string.EncryptedChatStartedOutgoing), user.first_name);
}
} else {
if (user != null) {
messageString = String.format(ApplicationLoader.applicationContext.getString(R.string.EncryptedChatStartedIncoming), user.first_name);
}
}
}
}
}
if (currentDialog.last_message_date != 0) {
timeString = Utilities.stringForMessageListDate(currentDialog.last_message_date);
}
drawCheck1 = false;
drawCheck2 = false;
drawClock = false;
drawCount = false;
drawError = false;
} else {
TLRPC.User fromUser = MessagesController.Instance.users.get(message.messageOwner.from_id);
if (currentDialog.last_message_date != 0) {
timeString = Utilities.stringForMessageListDate(currentDialog.last_message_date);
} else {
timeString = Utilities.stringForMessageListDate(message.messageOwner.date);
}
if (printingString != null) {
lastPrintString = messageString = printingString;
currentMessagePaint = messagePrintingPaint;
} else {
lastPrintString = null;
if (message.messageOwner instanceof TLRPC.TL_messageService) {
messageString = message.messageText;
currentMessagePaint = messagePrintingPaint;
} else {
if (chat != null) {
String name = "";
if (message.messageOwner.from_id == UserConfig.clientUserId) {
name = ApplicationLoader.applicationContext.getString(R.string.FromYou);
} else {
if (fromUser != null) {
if (fromUser.first_name.length() > 0) {
name = fromUser.first_name;
} else {
name = fromUser.last_name;
}
}
}
if (message.messageOwner.media != null && !(message.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) {
messageString = message.messageText;
currentMessagePaint = messagePrintingPaint;
} else {
checkMessage = false;
if (message.messageOwner.message != null) {
messageString = Emoji.replaceEmoji(Html.fromHtml(String.format("<font color=#316f9f>%s:</font> <font color=#808080>%s</font>", name, message.messageOwner.message.replace("\n", " "))));
}
}
} else {
messageString = message.messageText;
if (message.messageOwner.media != null && !(message.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) {
currentMessagePaint = messagePrintingPaint;
}
}
}
}
if (currentDialog.unread_count != 0) {
drawCount = true;
countString = String.format("%d", currentDialog.unread_count);
} else {
drawCount = false;
}
if (message.messageOwner.id < 0 && message.messageOwner.send_state != MessagesController.MESSAGE_SEND_STATE_SENT) {
if (MessagesController.Instance.sendingMessages.get(message.messageOwner.id) == null) {
message.messageOwner.send_state = MessagesController.MESSAGE_SEND_STATE_SEND_ERROR;
}
}
if (message.messageOwner.from_id == UserConfig.clientUserId) {
if (message.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENDING) {
drawCheck1 = false;
drawCheck2 = false;
drawClock = true;
drawError = false;
} else if (message.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR) {
drawCheck1 = false;
drawCheck2 = false;
drawClock = false;
drawError = true;
drawCount = false;
} else if (message.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENT) {
if (!message.messageOwner.unread) {
drawCheck1 = true;
drawCheck2 = true;
} else {
drawCheck1 = false;
drawCheck2 = true;
}
drawClock = false;
drawError = false;
}
} else {
drawCheck1 = false;
drawCheck2 = false;
drawClock = false;
drawError = false;
}
}
timeWidth = (int)Math.ceil(timePaint.measureText(timeString));
timeLayout = new StaticLayout(timeString, timePaint, timeWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
if (!Utilities.isRTL) {
timeLeft = width - Utilities.dp(11) - timeWidth;
} else {
timeLeft = Utilities.dp(11);
}
if (chat != null) {
nameString = chat.title;
} else if (user != null) {
if (user.id != 333000 && ContactsController.Instance.contactsDict.get(user.id) == null) {
if (ContactsController.Instance.contactsDict.size() == 0 && (!ContactsController.Instance.contactsLoaded || ContactsController.Instance.loadingContacts)) {
nameString = Utilities.formatName(user.first_name, user.last_name);
} else {
if (user.phone != null && user.phone.length() != 0) {
nameString = PhoneFormat.Instance.format("+" + user.phone);
} else {
currentNamePaint = nameUnknownPaint;
nameString = Utilities.formatName(user.first_name, user.last_name);
}
}
} else {
nameString = Utilities.formatName(user.first_name, user.last_name);
}
if (encryptedChat != null) {
currentNamePaint = nameEncryptedPaint;
}
}
if (nameString.length() == 0) {
nameString = ApplicationLoader.applicationContext.getString(R.string.HiddenName);
}
if (!Utilities.isRTL) {
nameWidth = width - nameLeft - Utilities.dp(14) - timeWidth;
} else {
nameWidth = width - nameLeft - Utilities.dp(77) - timeWidth;
nameLeft += timeWidth;
}
if (drawNameLock) {
nameWidth -= Utilities.dp(4) + lockDrawable.getIntrinsicWidth();
}
if (drawClock) {
int w = clockDrawable.getIntrinsicWidth() + Utilities.dp(2);
nameWidth -= w;
if (!Utilities.isRTL) {
checkDrawLeft = timeLeft - w;
} else {
checkDrawLeft = timeLeft + timeWidth + Utilities.dp(2);
nameLeft += w;
}
} else if (drawCheck2) {
int w = checkDrawable.getIntrinsicWidth() + Utilities.dp(2);
nameWidth -= w;
if (drawCheck1) {
nameWidth -= halfCheckDrawable.getIntrinsicWidth() - Utilities.dp(5);
if (!Utilities.isRTL) {
halfCheckDrawLeft = timeLeft - w;
checkDrawLeft = halfCheckDrawLeft - Utilities.dp(5);
} else {
checkDrawLeft = timeLeft + timeWidth + Utilities.dp(2);
halfCheckDrawLeft = checkDrawLeft + Utilities.dp(5);
nameLeft += w + halfCheckDrawable.getIntrinsicWidth() - Utilities.dp(5);
}
} else {
if (!Utilities.isRTL) {
checkDrawLeft = timeLeft - w;
} else {
checkDrawLeft = timeLeft + timeWidth + Utilities.dp(2);
nameLeft += w;
}
}
}
CharSequence nameStringFinal = TextUtils.ellipsize(nameString.replace("\n", " "), currentNamePaint, nameWidth - Utilities.dp(12), TextUtils.TruncateAt.END);
nameLayout = new StaticLayout(nameStringFinal, currentNamePaint, nameWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
messageWidth = width - Utilities.dp(88);
if (!Utilities.isRTL) {
messageLeft = Utilities.dp(77);
avatarLeft = Utilities.dp(11);
} else {
messageLeft = Utilities.dp(11);
avatarLeft = width - Utilities.dp(65);
}
avatarImage.imageX = avatarLeft;
avatarImage.imageY = avatarTop;
avatarImage.imageW = Utilities.dp(54);
avatarImage.imageH = Utilities.dp(54);
if (drawError) {
int w = errorDrawable.getIntrinsicWidth() + Utilities.dp(8);
messageWidth -= w;
if (!Utilities.isRTL) {
errorLeft = width - errorDrawable.getIntrinsicWidth() - Utilities.dp(11);
} else {
errorLeft = Utilities.dp(11);
messageLeft += w;
}
} else if (countString != null) {
countWidth = Math.max(Utilities.dp(12), (int)Math.ceil(countPaint.measureText(countString)));
countLayout = new StaticLayout(countString, countPaint, countWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
int w = countWidth + Utilities.dp(18);
messageWidth -= w;
if (!Utilities.isRTL) {
countLeft = width - countWidth - Utilities.dp(16);
} else {
countLeft = Utilities.dp(16);
messageLeft += w;
}
drawCount = true;
} else {
drawCount = false;
}
if (checkMessage) {
if (messageString == null) {
messageString = "";
}
String mess = messageString.toString().replace("\n", " ");
if (mess.length() > 150) {
mess = mess.substring(0, 150);
}
messageString = Emoji.replaceEmoji(mess);
}
CharSequence messageStringFinal = TextUtils.ellipsize(messageString, currentMessagePaint, messageWidth - Utilities.dp(12), TextUtils.TruncateAt.END);
messageLayout = new StaticLayout(messageStringFinal, currentMessagePaint, messageWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
double widthpx = 0;
float left = 0;
if (Utilities.isRTL) {
if (nameLayout.getLineCount() > 0) {
left = nameLayout.getLineLeft(0);
if (left == 0) {
widthpx = Math.ceil(nameLayout.getLineWidth(0));
if (widthpx < nameWidth) {
nameLeft += (nameWidth - widthpx);
}
}
}
if (messageLayout.getLineCount() > 0) {
left = messageLayout.getLineLeft(0);
if (left == 0) {
widthpx = Math.ceil(messageLayout.getLineWidth(0));
if (widthpx < messageWidth) {
messageLeft += (messageWidth - widthpx);
}
}
}
} else {
if (nameLayout.getLineCount() > 0) {
left = nameLayout.getLineRight(0);
if (left == nameWidth) {
widthpx = Math.ceil(nameLayout.getLineWidth(0));
if (widthpx < nameWidth) {
nameLeft -= (nameWidth - widthpx);
}
}
}
if (messageLayout.getLineCount() > 0) {
left = messageLayout.getLineRight(0);
if (left == messageWidth) {
widthpx = Math.ceil(messageLayout.getLineWidth(0));
if (widthpx < messageWidth) {
messageLeft -= (messageWidth - widthpx);
}
}
}
}
}
}
}
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file @ 9814a6e9
...@@ -16,7 +16,6 @@ import android.content.Intent; ...@@ -16,7 +16,6 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Point; import android.graphics.Point;
import android.graphics.Rect; import android.graphics.Rect;
...@@ -52,6 +51,7 @@ import android.view.ViewGroup; ...@@ -52,6 +51,7 @@ import android.view.ViewGroup;
import android.view.ViewParent; import android.view.ViewParent;
import android.view.ViewTreeObserver; import android.view.ViewTreeObserver;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import android.widget.AbsListView; import android.widget.AbsListView;
...@@ -61,6 +61,7 @@ import android.widget.EditText; ...@@ -61,6 +61,7 @@ import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.PopupWindow; import android.widget.PopupWindow;
import android.widget.ProgressBar; import android.widget.ProgressBar;
...@@ -69,6 +70,7 @@ import android.widget.TextView; ...@@ -69,6 +70,7 @@ import android.widget.TextView;
import org.telegram.PhoneFormat.PhoneFormat; import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.ContactsController;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.objects.MessageObject; import org.telegram.objects.MessageObject;
import org.telegram.objects.PhotoObject; import org.telegram.objects.PhotoObject;
...@@ -125,12 +127,14 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -125,12 +127,14 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
private Point displaySize = new Point(); private Point displaySize = new Point();
private boolean paused = true; private boolean paused = true;
private boolean readWhenResume = false; private boolean readWhenResume = false;
private boolean sendByEnter = false;
private int readWithDate = 0; private int readWithDate = 0;
private int readWithMid = 0; private int readWithMid = 0;
private boolean swipeOpening = false; private boolean swipeOpening = false;
public boolean scrollToTopOnResume = false; public boolean scrollToTopOnResume = false;
private boolean scrollToTopUnReadOnResume = false; private boolean scrollToTopUnReadOnResume = false;
private boolean isCustomTheme = false; private boolean isCustomTheme = false;
private boolean downloadPhotos = true;
private ImageView topPlaneClose; private ImageView topPlaneClose;
private View pagedownButton; private View pagedownButton;
private TextView topPanelText; private TextView topPanelText;
...@@ -173,6 +177,8 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -173,6 +177,8 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
private HashMap<String, ArrayList<ProgressBar>> loadingFile = new HashMap<String, ArrayList<ProgressBar>>(); private HashMap<String, ArrayList<ProgressBar>> loadingFile = new HashMap<String, ArrayList<ProgressBar>>();
private HashMap<Integer, String> progressByTag = new HashMap<Integer, String>(); private HashMap<Integer, String> progressByTag = new HashMap<Integer, String>();
private CharSequence lastPrintString;
ActionMode mActionMode = null; ActionMode mActionMode = null;
private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() { private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() {
@Override @Override
...@@ -276,7 +282,6 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -276,7 +282,6 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
NotificationCenter.Instance.addObserver(this, MessagesController.updateInterfaces); NotificationCenter.Instance.addObserver(this, MessagesController.updateInterfaces);
NotificationCenter.Instance.addObserver(this, MessagesController.didReceivedNewMessages); NotificationCenter.Instance.addObserver(this, MessagesController.didReceivedNewMessages);
NotificationCenter.Instance.addObserver(this, MessagesController.closeChats); NotificationCenter.Instance.addObserver(this, MessagesController.closeChats);
NotificationCenter.Instance.addObserver(this, MessagesController.userPrintUpdate);
NotificationCenter.Instance.addObserver(this, MessagesController.messagesReaded); NotificationCenter.Instance.addObserver(this, MessagesController.messagesReaded);
NotificationCenter.Instance.addObserver(this, MessagesController.messagesDeleted); NotificationCenter.Instance.addObserver(this, MessagesController.messagesDeleted);
NotificationCenter.Instance.addObserver(this, MessagesController.messageReceivedByServer); NotificationCenter.Instance.addObserver(this, MessagesController.messageReceivedByServer);
...@@ -293,11 +298,16 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -293,11 +298,16 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
NotificationCenter.Instance.addObserver(this, 997); NotificationCenter.Instance.addObserver(this, 997);
loading = true; loading = true;
MessagesController.Instance.loadMessages(dialog_id, 0, 30, 0, true, 0, classGuid, true, false); MessagesController.Instance.loadMessages(dialog_id, 0, 30, 0, true, 0, classGuid, true, false);
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
fontSize = preferences.getInt("fons_size", 16); fontSize = preferences.getInt("fons_size", 16);
sendByEnter = preferences.getBoolean("send_by_enter", false);
if (currentChat != null) {
downloadPhotos = preferences.getBoolean("photo_download_chat", true);
} else {
downloadPhotos = preferences.getBoolean("photo_download_user", true);
}
keyboardHeight = ApplicationLoader.applicationContext.getSharedPreferences("emoji", 0).getInt("kbd_height", Emoji.scale(200.0f));
keyboardHeightLand = ApplicationLoader.applicationContext.getSharedPreferences("emoji", 0).getInt("kbd_height_land3", Emoji.scale(200.0f));
return true; return true;
} }
...@@ -309,7 +319,6 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -309,7 +319,6 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
NotificationCenter.Instance.removeObserver(this, MessagesController.updateInterfaces); NotificationCenter.Instance.removeObserver(this, MessagesController.updateInterfaces);
NotificationCenter.Instance.removeObserver(this, MessagesController.didReceivedNewMessages); NotificationCenter.Instance.removeObserver(this, MessagesController.didReceivedNewMessages);
NotificationCenter.Instance.removeObserver(this, MessagesController.closeChats); NotificationCenter.Instance.removeObserver(this, MessagesController.closeChats);
NotificationCenter.Instance.removeObserver(this, MessagesController.userPrintUpdate);
NotificationCenter.Instance.removeObserver(this, MessagesController.messagesReaded); NotificationCenter.Instance.removeObserver(this, MessagesController.messagesReaded);
NotificationCenter.Instance.removeObserver(this, MessagesController.messagesDeleted); NotificationCenter.Instance.removeObserver(this, MessagesController.messagesDeleted);
NotificationCenter.Instance.removeObserver(this, MessagesController.messageReceivedByServer); NotificationCenter.Instance.removeObserver(this, MessagesController.messageReceivedByServer);
...@@ -377,7 +386,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -377,7 +386,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
ImageView backgroundImage = (ImageView) fragmentView.findViewById(R.id.background_image); ImageView backgroundImage = (ImageView) fragmentView.findViewById(R.id.background_image);
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
int selectedBackground = preferences.getInt("selectedBackground", 1000001); int selectedBackground = preferences.getInt("selectedBackground", 1000001);
int selectedColor = preferences.getInt("selectedColor", 0); int selectedColor = preferences.getInt("selectedColor", 0);
if (selectedColor != 0) { if (selectedColor != 0) {
...@@ -475,13 +484,13 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -475,13 +484,13 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
loading = true; loading = true;
} }
} }
if (firstVisibleItem + visibleItemCount >= totalItemCount - 4) { if (firstVisibleItem + visibleItemCount >= totalItemCount - 6) {
if (!unread_end_reached && !loadingForward) { if (!unread_end_reached && !loadingForward) {
MessagesController.Instance.loadMessages(dialog_id, 0, 20, minMessageId, true, minDate, classGuid, false, true); MessagesController.Instance.loadMessages(dialog_id, 0, 20, minMessageId, true, maxDate, classGuid, false, true);
loadingForward = true; loadingForward = true;
} }
} }
if (firstVisibleItem + visibleItemCount == totalItemCount) { if (firstVisibleItem + visibleItemCount == totalItemCount && unread_end_reached) {
showPagedownButton(false, true); showPagedownButton(false, true);
} }
} else { } else {
...@@ -528,25 +537,34 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -528,25 +537,34 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
showEmojiPopup(false); showEmojiPopup(false);
} }
return true; return true;
} else if (i == KeyEvent.KEYCODE_ENTER && sendByEnter && keyEvent.getAction() == KeyEvent.ACTION_DOWN) {
sendMessage();
return true;
} }
return false; return false;
} }
}); });
sendButton.setOnClickListener(new View.OnClickListener() { messsageEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public void onClick(View view) {
String message = messsageEditText.getText().toString().trim();
if (processSendingText(message)) {
messsageEditText.setText("");
lastTypingTimeSend = 0;
chatListView.post(new Runnable() {
@Override @Override
public void run() { public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
chatListView.setSelectionFromTop(messages.size() - 1, -10000 - chatListView.getPaddingTop()); if (i == EditorInfo.IME_ACTION_SEND) {
sendMessage();
return true;
} else if (sendByEnter) {
if (keyEvent != null && i == EditorInfo.IME_NULL && keyEvent.getAction() == KeyEvent.ACTION_DOWN) {
sendMessage();
return true;
} }
});
} }
return false;
}
});
sendButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
sendMessage();
} }
}); });
...@@ -597,6 +615,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -597,6 +615,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
@Override @Override
public void afterTextChanged(Editable editable) { public void afterTextChanged(Editable editable) {
if (sendByEnter && editable.length() > 0 && editable.charAt(editable.length() - 1) == '\n') {
sendMessage();
}
int i = 0; int i = 0;
ImageSpan[] arrayOfImageSpan = editable.getSpans(0, editable.length(), ImageSpan.class); ImageSpan[] arrayOfImageSpan = editable.getSpans(0, editable.length(), ImageSpan.class);
int j = arrayOfImageSpan.length; int j = arrayOfImageSpan.length;
...@@ -701,6 +722,20 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -701,6 +722,20 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
return fragmentView; return fragmentView;
} }
private void sendMessage() {
String message = messsageEditText.getText().toString().trim();
if (processSendingText(message)) {
messsageEditText.setText("");
lastTypingTimeSend = 0;
chatListView.post(new Runnable() {
@Override
public void run() {
chatListView.setSelectionFromTop(messages.size() - 1, -10000 - chatListView.getPaddingTop());
}
});
}
}
private void showPagedownButton(boolean show, boolean animated) { private void showPagedownButton(boolean show, boolean animated) {
if (pagedownButton == null) { if (pagedownButton == null) {
return; return;
...@@ -937,7 +972,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -937,7 +972,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
title.setCompoundDrawablePadding(0); title.setCompoundDrawablePadding(0);
} }
} else if (currentUser != null) { } else if (currentUser != null) {
if (currentUser.id != 333000 && MessagesController.Instance.contactsDict.get(currentUser.id) == null && (MessagesController.Instance.contactsDict.size() != 0 || !MessagesController.Instance.loadingContacts)) { if (currentUser.id != 333000 && ContactsController.Instance.contactsDict.get(currentUser.id) == null && (ContactsController.Instance.contactsDict.size() != 0 || !ContactsController.Instance.loadingContacts)) {
if (currentUser.phone != null && currentUser.phone.length() != 0) { if (currentUser.phone != null && currentUser.phone.length() != 0) {
actionBar.setTitle(PhoneFormat.Instance.format("+" + currentUser.phone)); actionBar.setTitle(PhoneFormat.Instance.format("+" + currentUser.phone));
} else { } else {
...@@ -960,6 +995,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -960,6 +995,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
CharSequence printString = MessagesController.Instance.printingStrings.get(dialog_id); CharSequence printString = MessagesController.Instance.printingStrings.get(dialog_id);
if (printString == null || printString.length() == 0) { if (printString == null || printString.length() == 0) {
lastPrintString = null;
setTypingAnimation(false); setTypingAnimation(false);
if (currentChat != null) { if (currentChat != null) {
if (currentChat instanceof TLRPC.TL_chatForbidden) { if (currentChat instanceof TLRPC.TL_chatForbidden) {
...@@ -988,12 +1024,13 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -988,12 +1024,13 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
if (value == 0) { if (value == 0) {
value = currentUser.status.expires; value = currentUser.status.expires;
} }
actionBar.setSubtitle(String.format("%s %s", getStringEntry(R.string.LastSeen), Utilities.formatDateOnline(value))); actionBar.setSubtitle(Utilities.formatDateOnline(value));
} }
} }
} }
} }
} else { } else {
lastPrintString = printString;
actionBar.setSubtitle(printString); actionBar.setSubtitle(printString);
setTypingAnimation(true); setTypingAnimation(true);
} }
...@@ -1053,7 +1090,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -1053,7 +1090,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
@Override @Override
public void run() { public void run() {
contentView.setPadding(0, 0, 0, layoutParams.height); contentView.setPadding(0, 0, 0, layoutParams.height);
contentView.forceLayout(); contentView.requestLayout();
} }
}); });
} }
...@@ -1077,8 +1114,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -1077,8 +1114,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
processSendingPhoto(currentPicturePath); processSendingPhoto(currentPicturePath);
currentPicturePath = null; currentPicturePath = null;
} else if (requestCode == 1) { } else if (requestCode == 1) {
if (data == null) {
return;
}
Uri imageUri = data.getData(); Uri imageUri = data.getData();
if (imageUri == null) { if (imageUri == null || imageUri.getScheme() == null) {
return; return;
} }
String imageFilePath = null; String imageFilePath = null;
...@@ -1093,14 +1133,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -1093,14 +1133,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
return; return;
} }
try { try {
Cursor cursor = inflaterActivity.getContentResolver().query(imageUri, new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null); imageFilePath = Utilities.getPath(inflaterActivity, imageUri);
if (cursor == null) {
return;
}
if (cursor.moveToFirst()) {
imageFilePath = cursor.getString(0);
}
cursor.close();
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
...@@ -1133,13 +1166,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -1133,13 +1166,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
return; return;
} }
try { try {
Cursor cursor = inflaterActivity.getContentResolver().query(uri, new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null); videoPath = Utilities.getPath(inflaterActivity, uri);
if (cursor == null) {
return;
}
cursor.moveToFirst();
videoPath = cursor.getString(0);
cursor.close();
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
...@@ -1450,11 +1477,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -1450,11 +1477,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
} }
} else if (id == MessagesController.updateInterfaces) { } else if (id == MessagesController.updateInterfaces) {
int updateMask = (Integer)args[0]; int updateMask = (Integer)args[0];
if ((updateMask & MessagesController.UPDATE_MASK_NAME) != 0 || (updateMask & MessagesController.UPDATE_MASK_STATUS) != 0) { if ((updateMask & MessagesController.UPDATE_MASK_NAME) != 0 || (updateMask & MessagesController.UPDATE_MASK_STATUS) != 0 || (updateMask & MessagesController.UPDATE_MASK_CHAT_NAME) != 0) {
updateSubtitle(); updateSubtitle();
updateOnlineCount(); updateOnlineCount();
} }
if ((updateMask & MessagesController.UPDATE_MASK_AVATAR) != 0) { if ((updateMask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (updateMask & MessagesController.UPDATE_MASK_CHAT_AVATAR) != 0 || (updateMask & MessagesController.UPDATE_MASK_NAME) != 0) {
checkAndUpdateAvatar(); checkAndUpdateAvatar();
if (animationInProgress) { if (animationInProgress) {
invalidateAfterAnimation = true; invalidateAfterAnimation = true;
...@@ -1464,6 +1491,15 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -1464,6 +1491,15 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
} }
} }
} }
if ((updateMask & MessagesController.UPDATE_MASK_USER_PRINT) != 0) {
CharSequence printString = MessagesController.Instance.printingStrings.get(dialog_id);
if (lastPrintString != null && printString == null || lastPrintString == null && printString != null || lastPrintString != null && printString != null && !lastPrintString.equals(printString)) {
updateSubtitle();
}
}
if ((updateMask & MessagesController.UPDATE_MASK_USER_PHONE) != 0) {
updateContactStatus();
}
} else if (id == MessagesController.didReceivedNewMessages) { } else if (id == MessagesController.didReceivedNewMessages) {
long did = (Long)args[0]; long did = (Long)args[0];
if (did == dialog_id) { if (did == dialog_id) {
...@@ -1505,9 +1541,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -1505,9 +1541,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
readWithDate = currentMaxDate; readWithDate = currentMaxDate;
readWithMid = currentMinMsgId; readWithMid = currentMinMsgId;
} else { } else {
if (messages.size() > 0) {
MessagesController.Instance.markDialogAsRead(dialog_id, messages.get(0).messageOwner.id, currentMinMsgId, 0, currentMaxDate, true); MessagesController.Instance.markDialogAsRead(dialog_id, messages.get(0).messageOwner.id, currentMinMsgId, 0, currentMaxDate, true);
} }
} }
}
updateVisibleRows(); updateVisibleRows();
} else { } else {
boolean markAsRead = false; boolean markAsRead = false;
...@@ -1613,11 +1651,6 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -1613,11 +1651,6 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
Utilities.hideKeyboard(messsageEditText); Utilities.hideKeyboard(messsageEditText);
} }
removeSelfFromStack(); removeSelfFromStack();
} else if (id == MessagesController.userPrintUpdate) {
long uid = (Long)args[0];
if (uid == dialog_id) {
updateSubtitle();
}
} else if (id == MessagesController.messagesReaded) { } else if (id == MessagesController.messagesReaded) {
ArrayList<Integer> markAsReadMessages = (ArrayList<Integer>)args[0]; ArrayList<Integer> markAsReadMessages = (ArrayList<Integer>)args[0];
boolean updated = false; boolean updated = false;
...@@ -1818,9 +1851,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -1818,9 +1851,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
if (currentUser == null) { if (currentUser == null) {
topPanel.setVisibility(View.GONE); topPanel.setVisibility(View.GONE);
} else { } else {
if (!(currentEncryptedChat instanceof TLRPC.TL_encryptedChat) || currentUser.id == 333000 || (currentUser.phone != null && currentUser.phone.length() != 0 && if (currentEncryptedChat != null && !(currentEncryptedChat instanceof TLRPC.TL_encryptedChat)
MessagesController.Instance.contactsDict.get(currentUser.id) != null && || currentUser.id == 333000
(MessagesController.Instance.contactsDict.size() != 0 || !MessagesController.Instance.loadingContacts))) { || (currentUser.phone != null && currentUser.phone.length() != 0 &&
ContactsController.Instance.contactsDict.get(currentUser.id) != null &&
(ContactsController.Instance.contactsDict.size() != 0 || !ContactsController.Instance.loadingContacts))) {
topPanel.setVisibility(View.GONE); topPanel.setVisibility(View.GONE);
} else { } else {
topPanel.setVisibility(View.VISIBLE); topPanel.setVisibility(View.VISIBLE);
...@@ -1848,6 +1883,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -1848,6 +1883,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
topPanel.setOnClickListener(new View.OnClickListener() { topPanel.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (parentActivity == null) {
return;
}
ContactAddActivity fragment = new ContactAddActivity(); ContactAddActivity fragment = new ContactAddActivity();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putInt("user_id", currentUser.id); args.putInt("user_id", currentUser.id);
...@@ -2013,7 +2051,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -2013,7 +2051,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
((ApplicationActivity)parentActivity).showActionBar(); ((ApplicationActivity)parentActivity).showActionBar();
((ApplicationActivity)parentActivity).updateActionBar(); ((ApplicationActivity)parentActivity).updateActionBar();
fixLayout(); fixLayout();
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
String lastMessageText = preferences.getString("dialog_" + dialog_id, null); String lastMessageText = preferences.getString("dialog_" + dialog_id, null);
if (lastMessageText != null) { if (lastMessageText != null) {
SharedPreferences.Editor editor = preferences.edit(); SharedPreferences.Editor editor = preferences.edit();
...@@ -2021,6 +2059,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -2021,6 +2059,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
editor.commit(); editor.commit();
ignoreTextChange = true; ignoreTextChange = true;
messsageEditText.setText(lastMessageText); messsageEditText.setText(lastMessageText);
messsageEditText.setSelection(messsageEditText.getText().length());
ignoreTextChange = false; ignoreTextChange = false;
} }
if (messsageEditText != null) { if (messsageEditText != null) {
...@@ -2074,14 +2113,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -2074,14 +2113,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
MessagesController.Instance.openned_dialog_id = 0; MessagesController.Instance.openned_dialog_id = 0;
if (messsageEditText != null && messsageEditText.length() != 0) { if (messsageEditText != null && messsageEditText.length() != 0) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit(); SharedPreferences.Editor editor = preferences.edit();
editor.putString("dialog_" + dialog_id, messsageEditText.getText().toString()); editor.putString("dialog_" + dialog_id, messsageEditText.getText().toString());
editor.commit(); editor.commit();
} }
if (messsageEditText != null) {
messsageEditText.clearFocus();
}
} }
private void fixLayout() { private void fixLayout() {
...@@ -2386,6 +2422,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -2386,6 +2422,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
} }
} else if (option == 2) { } else if (option == 2) {
if (selectedObject != null) { if (selectedObject != null) {
if (parentActivity == null) {
return;
}
forwaringMessage = selectedObject; forwaringMessage = selectedObject;
selectedObject = null; selectedObject = null;
...@@ -2447,6 +2486,10 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -2447,6 +2486,10 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
if (did != dialog_id) { if (did != dialog_id) {
int lower_part = (int)did; int lower_part = (int)did;
if (lower_part != 0) { if (lower_part != 0) {
ActionBarActivity inflaterActivity = parentActivity;
if (inflaterActivity == null) {
inflaterActivity = (ActionBarActivity)getActivity();
}
activity.removeSelfFromStack(); activity.removeSelfFromStack();
ChatActivity fragment = new ChatActivity(); ChatActivity fragment = new ChatActivity();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
...@@ -2455,23 +2498,31 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -2455,23 +2498,31 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
fragment.setArguments(bundle); fragment.setArguments(bundle);
fragment.scrollToTopOnResume = true; fragment.scrollToTopOnResume = true;
ActionBarActivity act = (ActionBarActivity)getActivity(); ActionBarActivity act = (ActionBarActivity)getActivity();
((ApplicationActivity)parentActivity).presentFragment(fragment, "chat" + Math.random(), false); if (inflaterActivity != null) {
((ApplicationActivity)inflaterActivity).presentFragment(fragment, "chat" + Math.random(), false);
}
} else if (lower_part < 0) { } else if (lower_part < 0) {
bundle.putInt("chat_id", -lower_part); bundle.putInt("chat_id", -lower_part);
fragment.setArguments(bundle); fragment.setArguments(bundle);
fragment.scrollToTopOnResume = true; fragment.scrollToTopOnResume = true;
((ApplicationActivity)parentActivity).presentFragment(fragment, "chat" + Math.random(), false); if (inflaterActivity != null) {
((ApplicationActivity)inflaterActivity).presentFragment(fragment, "chat" + Math.random(), false);
}
} }
removeSelfFromStack(); removeSelfFromStack();
if (forwaringMessage != null) { if (forwaringMessage != null) {
if (forwaringMessage.messageOwner.id > 0) {
MessagesController.Instance.sendMessage(forwaringMessage, did); MessagesController.Instance.sendMessage(forwaringMessage, did);
}
forwaringMessage = null; forwaringMessage = null;
} else { } else {
ArrayList<Integer> ids = new ArrayList<Integer>(selectedMessagesIds.keySet()); ArrayList<Integer> ids = new ArrayList<Integer>(selectedMessagesIds.keySet());
Collections.sort(ids); Collections.sort(ids);
for (Integer id : ids) { for (Integer id : ids) {
if (id > 0) {
MessagesController.Instance.sendMessage(selectedMessagesIds.get(id), did); MessagesController.Instance.sendMessage(selectedMessagesIds.get(id), did);
} }
}
selectedMessagesIds.clear(); selectedMessagesIds.clear();
} }
} else { } else {
...@@ -2547,14 +2598,14 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -2547,14 +2598,14 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
Intent pickIntent = new Intent(); Intent pickIntent = new Intent();
pickIntent.setType("video/*"); pickIntent.setType("video/*");
pickIntent.setAction(Intent.ACTION_GET_CONTENT); pickIntent.setAction(Intent.ACTION_GET_CONTENT);
pickIntent.putExtra(MediaStore.EXTRA_SIZE_LIMIT, 1024 * 1024 * 1000); pickIntent.putExtra(MediaStore.EXTRA_SIZE_LIMIT, (long)(1024 * 1024 * 1000));
Intent takeVideoIntent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE); Intent takeVideoIntent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
File video = Utilities.generateVideoPath(); File video = Utilities.generateVideoPath();
if (video != null) { if (video != null) {
if(android.os.Build.VERSION.SDK_INT > 10) { if(android.os.Build.VERSION.SDK_INT > 16) {
takeVideoIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(video)); takeVideoIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(video));
} }
takeVideoIntent.putExtra(MediaStore.EXTRA_SIZE_LIMIT, 1024 * 1024 * 1000); takeVideoIntent.putExtra(MediaStore.EXTRA_SIZE_LIMIT, (long)(1024 * 1024 * 1000));
currentPicturePath = video.getAbsolutePath(); currentPicturePath = video.getAbsolutePath();
} }
Intent chooserIntent = Intent.createChooser(pickIntent, ""); Intent chooserIntent = Intent.createChooser(pickIntent, "");
...@@ -2906,7 +2957,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -2906,7 +2957,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
ChatListRowHolderEx holder = (ChatListRowHolderEx)view.getTag(); ChatListRowHolderEx holder = (ChatListRowHolderEx)view.getTag();
if (holder == null) { if (holder == null) {
holder = new ChatListRowHolderEx(view); holder = new ChatListRowHolderEx(view, type);
view.setTag(holder); view.setTag(holder);
} }
holder.message = message; holder.message = message;
...@@ -3069,11 +3120,17 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3069,11 +3120,17 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
public ImageView addContactButton; public ImageView addContactButton;
public View addContactView; public View addContactView;
public View chatBubbleView; public View chatBubbleView;
public View photoProgressView;
public ProgressBar actionProgress; public ProgressBar actionProgress;
public View actionView; public View actionView;
public ImageView actionCancelButton; public ImageView actionCancelButton;
private PhotoObject photoObjectToSet = null;
private File photoFile = null;
private String photoFileName = null;
private String photoFilter = null;
public void update() { public void update() {
TLRPC.User fromUser = MessagesController.Instance.users.get(message.messageOwner.from_id); TLRPC.User fromUser = MessagesController.Instance.users.get(message.messageOwner.from_id);
...@@ -3115,24 +3172,38 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3115,24 +3172,38 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
forwardedUserText.setText(Html.fromHtml(getStringEntry(R.string.From) + " <b>" + Utilities.formatName(fwdUser.first_name, fwdUser.last_name) + "</b>")); forwardedUserText.setText(Html.fromHtml(getStringEntry(R.string.From) + " <b>" + Utilities.formatName(fwdUser.first_name, fwdUser.last_name) + "</b>"));
} }
} else if (type == 2 || type == 3 || type == 6 || type == 7) { } else if (type == 2 || type == 3 || type == 6 || type == 7) {
int width = (int)(Math.min(displaySize.x, displaySize.y) / 2.5f); int width = (int)(Math.min(displaySize.x, displaySize.y) * 0.7f);
PhotoObject photo = PhotoObject.getClosestImageWithSize(message.photoThumbs, width, width + 100); int height = width + Utilities.dp(100);
if (type == 6 || type == 7) {
width = (int)(Math.min(displaySize.x, displaySize.y) / 2.5f);
height = width + 100;
}
if (width > 800) {
width = 800;
}
if (height > 800) {
height = 800;
}
PhotoObject photo = PhotoObject.getClosestImageWithSize(message.photoThumbs, width, height);
if (type == 3) {
if (photoProgressView != null) {
photoProgressView.setVisibility(View.GONE);
}
}
if (photo != null) { if (photo != null) {
float scale = (float)photo.photoOwner.w / (float)width; float scale = (float)photo.photoOwner.w / (float)width;
if (scale < 1 && photo.photoOwner.w * scale < Utilities.dp(100)) {
scale = photo.photoOwner.w / Utilities.dp(100);
}
int w = (int)(photo.photoOwner.w / scale); int w = (int)(photo.photoOwner.w / scale);
int h = (int)(photo.photoOwner.h / scale); int h = (int)(photo.photoOwner.h / scale);
if (h > Utilities.dp(160)) { if (h > height) {
float scale2 = h; float scale2 = h;
h = Utilities.dp(160); h = height;
scale2 /= h; scale2 /= h;
w = (int)(w / scale2); w = (int)(w / scale2);
} else if (h < Utilities.dp(90)) { } else if (h < Utilities.dp(120)) {
h = Utilities.dp(90); h = Utilities.dp(120);
float hScale = (float)photo.photoOwner.h / h; float hScale = (float)photo.photoOwner.h / h;
if (photo.photoOwner.w / hScale < width) { if (photo.photoOwner.w / hScale < width) {
w = (int)(photo.photoOwner.w / hScale); w = (int)(photo.photoOwner.w / hScale);
...@@ -3144,14 +3215,47 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3144,14 +3215,47 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
params.height = h; params.height = h;
photoImage.setLayoutParams(params); photoImage.setLayoutParams(params);
LinearLayout.LayoutParams params2 = (LinearLayout.LayoutParams)chatBubbleView.getLayoutParams();
params2.width = w + Utilities.dp(12);
params2.height = h + Utilities.dp(12);
chatBubbleView.setLayoutParams(params2);
if (photo.image != null) { if (photo.image != null) {
photoImage.setImageBitmap(photo.image); photoImage.setImageBitmap(photo.image);
} else { } else {
if (type == 2 || type == 3) {
String fileName = MessageObject.getAttachFileName(photo.photoOwner);
File cacheFile = new File(Utilities.getCacheDir(), fileName);
if (!cacheFile.exists()) {
photoFileName = fileName;
photoFile = cacheFile;
} else {
photoFileName = null;
photoFile = null;
}
}
if (photoFileName == null) {
if (message.imagePreview != null) { if (message.imagePreview != null) {
photoImage.setImage(photo.photoOwner.location, String.format(Locale.US, "%d_%d", (int)(w / Utilities.density), (int)(h / Utilities.density)), message.imagePreview); photoImage.setImage(photo.photoOwner.location, String.format(Locale.US, "%d_%d", (int)(w / Utilities.density), (int)(h / Utilities.density)), message.imagePreview);
} else { } else {
photoImage.setImage(photo.photoOwner.location, String.format(Locale.US, "%d_%d", (int)(w / Utilities.density), (int)(h / Utilities.density)), message.messageOwner.out ? R.drawable.photo_placeholder_out : R.drawable.photo_placeholder_in); photoImage.setImage(photo.photoOwner.location, String.format(Locale.US, "%d_%d", (int)(w / Utilities.density), (int)(h / Utilities.density)), message.messageOwner.out ? R.drawable.photo_placeholder_out : R.drawable.photo_placeholder_in);
} }
} else {
if (downloadPhotos) {
addToLoadingFile(photoFileName, actionProgress);
if (message.imagePreview != null) {
photoImage.setImage(photo.photoOwner.location, String.format(Locale.US, "%d_%d", (int)(w / Utilities.density), (int)(h / Utilities.density)), message.imagePreview, photo.photoOwner.size);
} else {
photoImage.setImage(photo.photoOwner.location, String.format(Locale.US, "%d_%d", (int)(w / Utilities.density), (int)(h / Utilities.density)), message.messageOwner.out ? R.drawable.photo_placeholder_out : R.drawable.photo_placeholder_in, photo.photoOwner.size);
}
photoObjectToSet = null;
photoFilter = null;
} else {
photoFilter = String.format(Locale.US, "%d_%d", (int)(w / Utilities.density), (int)(h / Utilities.density));
photoObjectToSet = photo;
photoImage.setImageBitmap(message.imagePreview);
}
}
} }
} }
...@@ -3203,7 +3307,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3203,7 +3307,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
} }
int placeHolderId = Utilities.getUserAvatarForId(contactUser.id); int placeHolderId = Utilities.getUserAvatarForId(contactUser.id);
contactAvatar.setImage(photo, "50_50", placeHolderId); contactAvatar.setImage(photo, "50_50", placeHolderId);
if (contactUser.id != UserConfig.clientUserId && MessagesController.Instance.contactsDict.get(contactUser.id) == null) { if (contactUser.id != UserConfig.clientUserId && ContactsController.Instance.contactsDict.get(contactUser.id) == null) {
addContactView.setVisibility(View.VISIBLE); addContactView.setVisibility(View.VISIBLE);
} else { } else {
addContactView.setVisibility(View.GONE); addContactView.setVisibility(View.GONE);
...@@ -3289,8 +3393,13 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3289,8 +3393,13 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
halfCheckImage.setImageResource(R.drawable.msg_clock); halfCheckImage.setImageResource(R.drawable.msg_clock);
} }
halfCheckImage.setVisibility(View.VISIBLE); halfCheckImage.setVisibility(View.VISIBLE);
if (actionView != null || photoProgressView != null) {
if (actionView != null) { if (actionView != null) {
actionView.setVisibility(View.VISIBLE); actionView.setVisibility(View.VISIBLE);
}
if (photoProgressView != null) {
photoProgressView.setVisibility(View.VISIBLE);
}
Float progress = FileLoader.Instance.fileProgresses.get(message.messageOwner.attachPath); Float progress = FileLoader.Instance.fileProgresses.get(message.messageOwner.attachPath);
if (progress != null) { if (progress != null) {
actionProgress.setProgress((int)(progress * 100)); actionProgress.setProgress((int)(progress * 100));
...@@ -3312,6 +3421,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3312,6 +3421,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
if (actionView != null) { if (actionView != null) {
actionView.setVisibility(View.GONE); actionView.setVisibility(View.GONE);
} }
if (photoProgressView != null) {
photoProgressView.setVisibility(View.GONE);
}
if (actionAttachButton != null) { if (actionAttachButton != null) {
actionAttachButton.setVisibility(View.GONE); actionAttachButton.setVisibility(View.GONE);
} }
...@@ -3336,13 +3448,16 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3336,13 +3448,16 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
if (actionView != null) { if (actionView != null) {
actionView.setVisibility(View.GONE); actionView.setVisibility(View.GONE);
} }
if (photoProgressView != null) {
photoProgressView.setVisibility(View.GONE);
}
if (actionAttachButton != null) { if (actionAttachButton != null) {
actionAttachButton.setVisibility(View.VISIBLE); actionAttachButton.setVisibility(View.VISIBLE);
} }
} }
} }
} }
if (message.type == 6 || message.type == 7 || message.type == 16 || message.type == 17) { if (message.type == 2 || message.type == 3 || message.type == 6 || message.type == 7 || message.type == 16 || message.type == 17) {
Integer tag = (Integer)actionProgress.getTag(); Integer tag = (Integer)actionProgress.getTag();
String file = progressByTag.get(tag); String file = progressByTag.get(tag);
if (file != null) { if (file != null) {
...@@ -3352,31 +3467,50 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3352,31 +3467,50 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
if (file != null) { if (file != null) {
progressBarMap.remove(file); progressBarMap.remove(file);
} }
String fileName = message.getFileName(); String fileName = null;
if (photoFileName != null) {
fileName = photoFileName;
} else {
fileName = message.getFileName();
}
boolean load = false; boolean load = false;
if (message.messageOwner.attachPath != null && message.messageOwner.attachPath.length() != 0) { if (message.type != 2 && message.type != 3 && message.messageOwner.attachPath != null && message.messageOwner.attachPath.length() != 0) {
File f = new File(message.messageOwner.attachPath); File f = new File(message.messageOwner.attachPath);
if (f.exists()) { if (f.exists()) {
if (actionAttachButton != null) {
actionAttachButton.setVisibility(View.VISIBLE); actionAttachButton.setVisibility(View.VISIBLE);
actionView.setVisibility(View.GONE);
if (message.type == 6 || message.type == 7) { if (message.type == 6 || message.type == 7) {
actionAttachButton.setText(getStringEntry(R.string.ViewVideo)); actionAttachButton.setText(getStringEntry(R.string.ViewVideo));
} else if (message.type == 16 || message.type == 17) { } else if (message.type == 16 || message.type == 17) {
actionAttachButton.setText(getStringEntry(R.string.Open)); actionAttachButton.setText(getStringEntry(R.string.Open));
} }
}
if (actionView != null) {
actionView.setVisibility(View.GONE);
}
if (photoProgressView != null) {
photoProgressView.setVisibility(View.GONE);
}
} else { } else {
load = true; load = true;
} }
} else { } else {
File cacheFile = new File(Utilities.getCacheDir(), fileName); File cacheFile = null;
if (cacheFile.exists()) { if (((message.type == 2 || message.type == 3) && photoFileName == null) || (cacheFile = new File(Utilities.getCacheDir(), fileName)).exists()) {
if (actionAttachButton != null) {
actionAttachButton.setVisibility(View.VISIBLE); actionAttachButton.setVisibility(View.VISIBLE);
actionView.setVisibility(View.GONE);
if (message.type == 6 || message.type == 7) { if (message.type == 6 || message.type == 7) {
actionAttachButton.setText(getStringEntry(R.string.ViewVideo)); actionAttachButton.setText(getStringEntry(R.string.ViewVideo));
} else if (message.type == 16 || message.type == 17) { } else if (message.type == 16 || message.type == 17) {
actionAttachButton.setText(getStringEntry(R.string.Open)); actionAttachButton.setText(getStringEntry(R.string.Open));
} }
}
if (actionView != null) {
actionView.setVisibility(View.GONE);
}
if (photoProgressView != null) {
photoProgressView.setVisibility(View.GONE);
}
} else { } else {
load = true; load = true;
} }
...@@ -3391,10 +3525,35 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3391,10 +3525,35 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
} }
progressByTag.put((Integer)actionProgress.getTag(), fileName); progressByTag.put((Integer)actionProgress.getTag(), fileName);
addToLoadingFile(fileName, actionProgress); addToLoadingFile(fileName, actionProgress);
if (actionView != null) {
if ((message.type == 2 || message.type == 3) && downloadPhotos) {
actionView.setVisibility(View.GONE);
} else {
actionView.setVisibility(View.VISIBLE); actionView.setVisibility(View.VISIBLE);
if (photoFileName != null) {
actionCancelButton.setImageResource(R.drawable.photo_download_cancel_states);
}
}
}
if (photoProgressView != null) {
photoProgressView.setVisibility(View.VISIBLE);
}
if (actionAttachButton != null) {
actionAttachButton.setVisibility(View.GONE); actionAttachButton.setVisibility(View.GONE);
}
} else {
if (actionView != null) {
if ((message.type == 2 || message.type == 3) && !downloadPhotos) {
actionView.setVisibility(View.VISIBLE);
actionCancelButton.setImageResource(R.drawable.photo_download_states);
} else { } else {
actionView.setVisibility(View.GONE); actionView.setVisibility(View.GONE);
}
}
if (photoProgressView != null) {
photoProgressView.setVisibility(View.GONE);
}
if (actionAttachButton != null) {
actionAttachButton.setVisibility(View.VISIBLE); actionAttachButton.setVisibility(View.VISIBLE);
if (message.type == 6 || message.type == 7) { if (message.type == 6 || message.type == 7) {
actionAttachButton.setText(String.format("%s %.1f MB", getStringEntry(R.string.DOWNLOAD), message.messageOwner.media.video.size / 1024.0f / 1024.0f)); actionAttachButton.setText(String.format("%s %.1f MB", getStringEntry(R.string.DOWNLOAD), message.messageOwner.media.video.size / 1024.0f / 1024.0f));
...@@ -3424,8 +3583,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3424,8 +3583,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
phoneTextView.setMaxWidth(width); phoneTextView.setMaxWidth(width);
} }
} }
}
public ChatListRowHolderEx(View view) { public ChatListRowHolderEx(View view, int type) {
avatarImageView = (BackupImageView)view.findViewById(R.id.chat_group_avatar_image); avatarImageView = (BackupImageView)view.findViewById(R.id.chat_group_avatar_image);
nameTextView = (TextView)view.findViewById(R.id.chat_user_group_name); nameTextView = (TextView)view.findViewById(R.id.chat_user_group_name);
messageLayout = (MessageLayout)view.findViewById(R.id.message_layout); messageLayout = (MessageLayout)view.findViewById(R.id.message_layout);
...@@ -3448,6 +3608,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3448,6 +3608,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
addContactButton = (ImageView)view.findViewById(R.id.add_contact_button); addContactButton = (ImageView)view.findViewById(R.id.add_contact_button);
addContactView = view.findViewById(R.id.add_contact_view); addContactView = view.findViewById(R.id.add_contact_view);
chatBubbleView = view.findViewById(R.id.chat_bubble_layout); chatBubbleView = view.findViewById(R.id.chat_bubble_layout);
photoProgressView = view.findViewById(R.id.photo_progress);
if (messageTextView != null) { if (messageTextView != null) {
messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize); messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize);
} }
...@@ -3457,6 +3618,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3457,6 +3618,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
progressTag++; progressTag++;
} }
if (type != 2 && type != 3) {
if (actionView != null) { if (actionView != null) {
if (isCustomTheme) { if (isCustomTheme) {
actionView.setBackgroundResource(R.drawable.system_black); actionView.setBackgroundResource(R.drawable.system_black);
...@@ -3464,6 +3626,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3464,6 +3626,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
actionView.setBackgroundResource(R.drawable.system_blue); actionView.setBackgroundResource(R.drawable.system_blue);
} }
} }
}
if (messageLayoutAction != null) { if (messageLayoutAction != null) {
if (isCustomTheme) { if (isCustomTheme) {
...@@ -3581,6 +3744,22 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3581,6 +3744,22 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
} }
updateVisibleRows(); updateVisibleRows();
} }
} else if (message.type == 2 || message.type == 3) {
if (photoFile != null && !photoFile.exists() && photoObjectToSet != null) {
if (loadingFile.containsKey(photoFileName)) {
loadingFile.remove(photoFileName);
FileLoader.Instance.cancelLoadingForImageView(photoImage);
updateVisibleRows();
} else {
addToLoadingFile(photoFileName, actionProgress);
if (message.imagePreview != null) {
photoImage.setImage(photoObjectToSet.photoOwner.location, photoFilter, message.imagePreview, photoObjectToSet.photoOwner.size);
} else {
photoImage.setImage(photoObjectToSet.photoOwner.location, photoFilter, message.messageOwner.out ? R.drawable.photo_placeholder_out : R.drawable.photo_placeholder_in, photoObjectToSet.photoOwner.size);
}
updateVisibleRows();
}
}
} }
} }
} }
...@@ -3621,6 +3800,26 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3621,6 +3800,26 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
} }
} }
private void alertUserOpenError() {
AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
builder.setTitle(R.string.AppName);
builder.setPositiveButton(R.string.OK, null);
if (message.type == 6 || message.type == 7) {
builder.setMessage(R.string.NoPlayerInstalled);
} else {
builder.setMessage(String.format(getStringEntry(R.string.NoHandleAppInstalled), message.messageOwner.media.document.mime_type));
}
visibleDialog = builder.show();
visibleDialog.setCanceledOnTouchOutside(true);
visibleDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
visibleDialog = null;
}
});
}
private void processOnClick(View view) { private void processOnClick(View view) {
if (mActionMode != null) { if (mActionMode != null) {
processRowSelect(view); processRowSelect(view);
...@@ -3635,9 +3834,19 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3635,9 +3834,19 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
LocationActivity fragment = new LocationActivity(); LocationActivity fragment = new LocationActivity();
((ApplicationActivity)parentActivity).presentFragment(fragment, "location_view", false); ((ApplicationActivity)parentActivity).presentFragment(fragment, "location_view", false);
} else if (message.type == 2 || message.type == 3) { } else if (message.type == 2 || message.type == 3) {
if (photoFile == null || photoObjectToSet == null || photoFile != null && photoFile.exists()) {
NotificationCenter.Instance.addToMemCache(51, message); NotificationCenter.Instance.addToMemCache(51, message);
Intent intent = new Intent(parentActivity, GalleryImageViewer.class); Intent intent = new Intent(parentActivity, GalleryImageViewer.class);
startActivity(intent); startActivity(intent);
} else {
addToLoadingFile(photoFileName, actionProgress);
if (message.imagePreview != null) {
photoImage.setImage(photoObjectToSet.photoOwner.location, photoFilter, message.imagePreview, photoObjectToSet.photoOwner.size);
} else {
photoImage.setImage(photoObjectToSet.photoOwner.location, photoFilter, message.messageOwner.out ? R.drawable.photo_placeholder_out : R.drawable.photo_placeholder_in, photoObjectToSet.photoOwner.size);
}
updateVisibleRows();
}
} else if (message.type == 11) { } else if (message.type == 11) {
NotificationCenter.Instance.addToMemCache(51, message); NotificationCenter.Instance.addToMemCache(51, message);
Intent intent = new Intent(parentActivity, GalleryImageViewer.class); Intent intent = new Intent(parentActivity, GalleryImageViewer.class);
...@@ -3651,6 +3860,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3651,6 +3860,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
f = new File(Utilities.getCacheDir(), fileName); f = new File(Utilities.getCacheDir(), fileName);
} }
if (f != null && f.exists()) { if (f != null && f.exists()) {
String realMimeType = null;
try { try {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
if (message.type == 6 || message.type == 7) { if (message.type == 6 || message.type == 7) {
...@@ -3660,9 +3870,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3660,9 +3870,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
int idx = fileName.lastIndexOf("."); int idx = fileName.lastIndexOf(".");
if (idx != -1) { if (idx != -1) {
String ext = fileName.substring(idx + 1); String ext = fileName.substring(idx + 1);
String mimeType = myMime.getMimeTypeFromExtension(ext.toLowerCase()); realMimeType = myMime.getMimeTypeFromExtension(ext.toLowerCase());
if (mimeType != null) { if (realMimeType != null) {
intent.setDataAndType(Uri.fromFile(f), mimeType); intent.setDataAndType(Uri.fromFile(f), realMimeType);
} else { } else {
intent.setDataAndType(Uri.fromFile(f), "text/plain"); intent.setDataAndType(Uri.fromFile(f), "text/plain");
} }
...@@ -3670,25 +3880,18 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ...@@ -3670,25 +3880,18 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
intent.setDataAndType(Uri.fromFile(f), "text/plain"); intent.setDataAndType(Uri.fromFile(f), "text/plain");
} }
} }
if (realMimeType != null) {
try {
startActivity(intent); startActivity(intent);
} catch (Exception e) { } catch (Exception e) {
AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity); intent.setDataAndType(Uri.fromFile(f), "text/plain");
builder.setTitle(R.string.AppName); startActivity(intent);
builder.setPositiveButton(R.string.OK, null);
if (message.type == 6 || message.type == 7) {
builder.setMessage(R.string.NoPlayerInstalled);
} else {
builder.setMessage(String.format(getStringEntry(R.string.NoHandleAppInstalled), message.messageOwner.media.document.mime_type));
} }
visibleDialog = builder.show(); } else {
visibleDialog.setCanceledOnTouchOutside(true); startActivity(intent);
visibleDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
visibleDialog = null;
} }
}); } catch (Exception e) {
alertUserOpenError();
} }
} else { } else {
if (message.messageOwner.send_state != MessagesController.MESSAGE_SEND_STATE_SEND_ERROR && message.messageOwner.send_state != MessagesController.MESSAGE_SEND_STATE_SENDING || !message.messageOwner.out) { if (message.messageOwner.send_state != MessagesController.MESSAGE_SEND_STATE_SEND_ERROR && message.messageOwner.send_state != MessagesController.MESSAGE_SEND_STATE_SENDING || !message.messageOwner.out) {
......
TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java
View file @ 9814a6e9
...@@ -44,6 +44,7 @@ import org.telegram.messenger.NotificationCenter; ...@@ -44,6 +44,7 @@ import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig; import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Cells.ChatOrUserCell;
import org.telegram.ui.Views.AvatarUpdater; import org.telegram.ui.Views.AvatarUpdater;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.BackupImageView;
import org.telegram.ui.Views.BaseFragment; import org.telegram.ui.Views.BaseFragment;
...@@ -239,8 +240,8 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -239,8 +240,8 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
} }
@Override @Override
public void didSelectContact(int user_id) { public void didSelectContact(TLRPC.User user) {
MessagesController.Instance.addUserToChat(chat_id, user_id, info); MessagesController.Instance.addUserToChat(chat_id, user, info);
} }
@Override @Override
...@@ -277,9 +278,12 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -277,9 +278,12 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
public void didReceivedNotification(int id, Object... args) { public void didReceivedNotification(int id, Object... args) {
if (id == MessagesController.updateInterfaces) { if (id == MessagesController.updateInterfaces) {
int mask = (Integer)args[0];
if ((mask & MessagesController.UPDATE_MASK_CHAT_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_CHAT_NAME) != 0 || (mask & MessagesController.UPDATE_MASK_CHAT_MEMBERS) != 0) {
updateOnlineCount(); updateOnlineCount();
if (listView != null) { }
listView.invalidateViews(); if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0 || (mask & MessagesController.UPDATE_MASK_STATUS) != 0) {
updateVisibleRows(mask);
} }
} else if (id == MessagesController.chatInfoDidLoaded) { } else if (id == MessagesController.chatInfoDidLoaded) {
int chatId = (Integer)args[0]; int chatId = (Integer)args[0];
...@@ -355,6 +359,19 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -355,6 +359,19 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
return true; return true;
} }
private void updateVisibleRows(int mask) {
if (listView == null) {
return;
}
int count = listView.getChildCount();
for (int a = 0; a < count; a++) {
View child = listView.getChildAt(a);
if (child instanceof ChatOrUserCell) {
((ChatOrUserCell) child).update(mask);
}
}
}
private void updateOnlineCount() { private void updateOnlineCount() {
if (info == null) { if (info == null) {
return; return;
...@@ -451,11 +468,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -451,11 +468,11 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
private void kickUser(TLRPC.TL_chatParticipant user) { private void kickUser(TLRPC.TL_chatParticipant user) {
if (user != null) { if (user != null) {
MessagesController.Instance.deleteUserFromChat(chat_id, user.user_id, info); MessagesController.Instance.deleteUserFromChat(chat_id, MessagesController.Instance.users.get(user.user_id), info);
} else { } else {
NotificationCenter.Instance.removeObserver(this, MessagesController.closeChats); NotificationCenter.Instance.removeObserver(this, MessagesController.closeChats);
NotificationCenter.Instance.postNotificationName(MessagesController.closeChats); NotificationCenter.Instance.postNotificationName(MessagesController.closeChats);
MessagesController.Instance.deleteUserFromChat(chat_id, UserConfig.clientUserId, info); MessagesController.Instance.deleteUserFromChat(chat_id, MessagesController.Instance.users.get(UserConfig.clientUserId), info);
MessagesController.Instance.deleteDialog(-chat_id, 0, false); MessagesController.Instance.deleteDialog(-chat_id, 0, false);
finishFragment(); finishFragment();
} }
...@@ -674,60 +691,19 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ...@@ -674,60 +691,19 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen
TLRPC.User user = MessagesController.Instance.users.get(part.user_id); TLRPC.User user = MessagesController.Instance.users.get(part.user_id);
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new ChatOrUserCell(mContext);
view = li.inflate(R.layout.messages_search_user_layout, viewGroup, false); ((ChatOrUserCell)view).useBoldFont = true;
} ((ChatOrUserCell)view).usePadding = false;
ContactsActivity.ContactListRowHolder holder = (ContactsActivity.ContactListRowHolder)view.getTag(); ((ChatOrUserCell)view).useSeparator = true;
if (holder == null) {
holder = new ContactsActivity.ContactListRowHolder(view);
view.setTag(holder);
} }
View divider = view.findViewById(R.id.settings_row_divider); ((ChatOrUserCell)view).setData(user, null, null, null, null);
divider.setVisibility(View.VISIBLE);
if (user.first_name.length() != 0 && user.last_name.length() != 0) {
holder.nameTextView.setText(Html.fromHtml(user.first_name + " <b>" + user.last_name + "</b>"));
} else if (user.first_name.length() != 0) {
holder.nameTextView.setText(Html.fromHtml("<b>" + user.first_name + "</b>"));
} else {
holder.nameTextView.setText(Html.fromHtml("<b>" + user.last_name + "</b>"));
}
// if (info.admin_id != UserConfig.clientUserId && part.inviter_id != UserConfig.clientUserId && part.user_id != UserConfig.clientUserId) { // if (info.admin_id != UserConfig.clientUserId && part.inviter_id != UserConfig.clientUserId && part.user_id != UserConfig.clientUserId) {
// //
// } else { // } else {
// //
// } // }
TLRPC.FileLocation photo = null;
if (user.photo != null) {
photo = user.photo.photo_small;
}
int placeHolderId = Utilities.getUserAvatarForId(user.id);
holder.avatarImage.setImage(photo, "50_50", placeHolderId);
if (user.status == null) {
holder.messageTextView.setTextColor(0xff808080);
holder.messageTextView.setText(getStringEntry(R.string.Offline));
} else {
int currentTime = ConnectionsManager.Instance.getCurrentTime();
if ((user.status.expires > currentTime || user.status.was_online > currentTime || user.id == UserConfig.clientUserId) && user.status.expires != 0) {
holder.messageTextView.setTextColor(0xff357aa8);
holder.messageTextView.setText(getStringEntry(R.string.Online));
} else {
if (user.status.was_online <= 10000 && user.status.expires <= 10000) {
holder.messageTextView.setText(getStringEntry(R.string.Invisible));
} else {
int value = user.status.was_online;
if (value == 0) {
value = user.status.expires;
}
holder.messageTextView.setText(String.format("%s %s", getStringEntry(R.string.LastSeen), Utilities.formatDateOnline(value)));
}
holder.messageTextView.setTextColor(0xff808080);
}
}
} else if (type == 5) { } else if (type == 5) {
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
......
TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java
View file @ 9814a6e9
...@@ -131,7 +131,7 @@ public class ChatProfileChangeNameActivity extends BaseFragment { ...@@ -131,7 +131,7 @@ public class ChatProfileChangeNameActivity extends BaseFragment {
} }
((ApplicationActivity)parentActivity).updateActionBar(); ((ApplicationActivity)parentActivity).updateActionBar();
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean animations = preferences.getBoolean("view_animations", true); boolean animations = preferences.getBoolean("view_animations", true);
if (!animations) { if (!animations) {
firstNameField.requestFocus(); firstNameField.requestFocus();
......
TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java
View file @ 9814a6e9
...@@ -26,6 +26,7 @@ import android.widget.TextView; ...@@ -26,6 +26,7 @@ import android.widget.TextView;
import org.telegram.PhoneFormat.PhoneFormat; import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.ContactsController;
import org.telegram.messenger.MessagesController; import org.telegram.messenger.MessagesController;
import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
...@@ -49,7 +50,8 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent ...@@ -49,7 +50,8 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
NotificationCenter.Instance.addObserver(this, MessagesController.updateInterfaces); NotificationCenter.Instance.addObserver(this, MessagesController.updateInterfaces);
user_id = getArguments().getInt("user_id", 0); user_id = getArguments().getInt("user_id", 0);
phone = getArguments().getString("phone"); phone = getArguments().getString("phone");
return true; TLRPC.User user = MessagesController.Instance.users.get(user_id);
return user != null;
} }
@Override @Override
...@@ -64,9 +66,11 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent ...@@ -64,9 +66,11 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
fragmentView = inflater.inflate(R.layout.contact_add_layout, container, false); fragmentView = inflater.inflate(R.layout.contact_add_layout, container, false);
TLRPC.User user = MessagesController.Instance.users.get(user_id); TLRPC.User user = MessagesController.Instance.users.get(user_id);
if (user.phone == null) {
if (phone != null) { if (phone != null) {
user.phone = PhoneFormat.stripExceptNumbers(phone); user.phone = PhoneFormat.stripExceptNumbers(phone);
} }
}
onlineText = (TextView)fragmentView.findViewById(R.id.settings_online); onlineText = (TextView)fragmentView.findViewById(R.id.settings_online);
avatarImage = (BackupImageView)fragmentView.findViewById(R.id.settings_avatar_image); avatarImage = (BackupImageView)fragmentView.findViewById(R.id.settings_avatar_image);
...@@ -137,7 +141,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent ...@@ -137,7 +141,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
if (value == 0) { if (value == 0) {
value = user.status.expires; value = user.status.expires;
} }
onlineText.setText(String.format("%s %s", getStringEntry(R.string.LastSeen), Utilities.formatDateOnline(value))); onlineText.setText(Utilities.formatDateOnline(value));
} }
} }
} }
...@@ -151,9 +155,12 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent ...@@ -151,9 +155,12 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
public void didReceivedNotification(int id, Object... args) { public void didReceivedNotification(int id, Object... args) {
if (id == MessagesController.updateInterfaces) { if (id == MessagesController.updateInterfaces) {
int mask = (Integer)args[0];
if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_STATUS) != 0) {
updateAvatarLayout(); updateAvatarLayout();
} }
} }
}
@Override @Override
public boolean canApplyUpdateStatus() { public boolean canApplyUpdateStatus() {
...@@ -197,8 +204,9 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent ...@@ -197,8 +204,9 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
TLRPC.User user = MessagesController.Instance.users.get(user_id); TLRPC.User user = MessagesController.Instance.users.get(user_id);
user.first_name = firstNameField.getText().toString(); user.first_name = firstNameField.getText().toString();
user.last_name = lastNameField.getText().toString(); user.last_name = lastNameField.getText().toString();
MessagesController.Instance.addContact(user); ContactsController.Instance.addContact(user);
finishFragment(); finishFragment();
NotificationCenter.Instance.postNotificationName(MessagesController.updateInterfaces, MessagesController.UPDATE_MASK_NAME);
} }
} }
}); });
...@@ -212,7 +220,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent ...@@ -212,7 +220,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
} }
((ApplicationActivity)parentActivity).updateActionBar(); ((ApplicationActivity)parentActivity).updateActionBar();
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean animations = preferences.getBoolean("view_animations", true); boolean animations = preferences.getBoolean("view_animations", true);
if (!animations) { if (!animations) {
firstNameField.requestFocus(); firstNameField.requestFocus();
......
TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
View file @ 9814a6e9
...@@ -30,16 +30,15 @@ import android.widget.BaseAdapter; ...@@ -30,16 +30,15 @@ import android.widget.BaseAdapter;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ContactsController;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.messenger.MessagesController; import org.telegram.messenger.MessagesController;
import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig; import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Cells.ChatOrUserCell;
import org.telegram.ui.Views.BaseFragment; import org.telegram.ui.Views.BaseFragment;
import org.telegram.ui.Views.OnSwipeTouchListener; import org.telegram.ui.Views.OnSwipeTouchListener;
import org.telegram.ui.Views.PinnedHeaderListView; import org.telegram.ui.Views.PinnedHeaderListView;
...@@ -49,7 +48,6 @@ import java.lang.reflect.Field; ...@@ -49,7 +48,6 @@ import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
...@@ -70,7 +68,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -70,7 +68,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
private TextView epmtyTextView; private TextView epmtyTextView;
private HashMap<Integer, TLRPC.User> ignoreUsers; private HashMap<Integer, TLRPC.User> ignoreUsers;
private SupportMenuItem searchItem; private SupportMenuItem searchItem;
private boolean isRTL;
private Timer searchDialogsTimer; private Timer searchDialogsTimer;
public ArrayList<TLRPC.User> searchResult; public ArrayList<TLRPC.User> searchResult;
...@@ -78,14 +75,13 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -78,14 +75,13 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
public ContactsActivityDelegate delegate; public ContactsActivityDelegate delegate;
public static interface ContactsActivityDelegate { public static interface ContactsActivityDelegate {
public abstract void didSelectContact(int user_id); public abstract void didSelectContact(TLRPC.User user);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public boolean onFragmentCreate() { public boolean onFragmentCreate() {
super.onFragmentCreate(); super.onFragmentCreate();
NotificationCenter.Instance.addObserver(this, MessagesController.contactsBookDidLoaded);
NotificationCenter.Instance.addObserver(this, MessagesController.contactsDidLoaded); NotificationCenter.Instance.addObserver(this, MessagesController.contactsDidLoaded);
NotificationCenter.Instance.addObserver(this, MessagesController.updateInterfaces); NotificationCenter.Instance.addObserver(this, MessagesController.updateInterfaces);
NotificationCenter.Instance.addObserver(this, MessagesController.encryptedChatCreated); NotificationCenter.Instance.addObserver(this, MessagesController.encryptedChatCreated);
...@@ -105,7 +101,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -105,7 +101,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public void onFragmentDestroy() { public void onFragmentDestroy() {
super.onFragmentDestroy(); super.onFragmentDestroy();
NotificationCenter.Instance.removeObserver(this, MessagesController.contactsBookDidLoaded);
NotificationCenter.Instance.removeObserver(this, MessagesController.contactsDidLoaded); NotificationCenter.Instance.removeObserver(this, MessagesController.contactsDidLoaded);
NotificationCenter.Instance.removeObserver(this, MessagesController.updateInterfaces); NotificationCenter.Instance.removeObserver(this, MessagesController.updateInterfaces);
NotificationCenter.Instance.removeObserver(this, MessagesController.encryptedChatCreated); NotificationCenter.Instance.removeObserver(this, MessagesController.encryptedChatCreated);
...@@ -132,10 +127,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -132,10 +127,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
if (fragmentView == null) { if (fragmentView == null) {
Locale locale = Locale.getDefault();
String lang = locale.getLanguage();
isRTL = lang != null && lang.toLowerCase().equals("ar");
fragmentView = inflater.inflate(R.layout.contacts_layout, container, false); fragmentView = inflater.inflate(R.layout.contacts_layout, container, false);
epmtyTextView = (TextView)fragmentView.findViewById(R.id.searchEmptyView); epmtyTextView = (TextView)fragmentView.findViewById(R.id.searchEmptyView);
...@@ -150,23 +141,23 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -150,23 +141,23 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) { public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
if (searching && searchWas) { if (searching && searchWas) {
int user_id = searchResult.get(i).id; TLRPC.User user = searchResult.get(i);
if (user_id == UserConfig.clientUserId) { if (user.id == UserConfig.clientUserId) {
return; return;
} }
if (returnAsResult) { if (returnAsResult) {
if (ignoreUsers != null && ignoreUsers.containsKey(user_id)) { if (ignoreUsers != null && ignoreUsers.containsKey(user.id)) {
return; return;
} }
didSelectResult(user_id, true); didSelectResult(user, true);
} else { } else {
if (createSecretChat) { if (createSecretChat) {
creatingChat = true; creatingChat = true;
MessagesController.Instance.startSecretChat(parentActivity, user_id); MessagesController.Instance.startSecretChat(parentActivity, user);
} else { } else {
ChatActivity fragment = new ChatActivity(); ChatActivity fragment = new ChatActivity();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt("user_id", user_id); bundle.putInt("user_id", user.id);
fragment.setArguments(bundle); fragment.setArguments(bundle);
((ApplicationActivity)parentActivity).presentFragment(fragment, "chat" + Math.random(), destroyAfterSelect, false); ((ApplicationActivity)parentActivity).presentFragment(fragment, "chat" + Math.random(), destroyAfterSelect, false);
} }
...@@ -174,11 +165,14 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -174,11 +165,14 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
} else { } else {
int section = listViewAdapter.getSectionForPosition(i); int section = listViewAdapter.getSectionForPosition(i);
int row = listViewAdapter.getPositionInSectionForPosition(i); int row = listViewAdapter.getPositionInSectionForPosition(i);
int uid = 0; TLRPC.User user = null;
if (usersAsSections) { if (usersAsSections) {
if (section < MessagesController.Instance.sortedUsersSectionsArray.size()) { if (section < ContactsController.Instance.sortedUsersSectionsArray.size()) {
ArrayList<TLRPC.TL_contact> arr = MessagesController.Instance.usersSectionsDict.get(MessagesController.Instance.sortedUsersSectionsArray.get(section)); ArrayList<TLRPC.TL_contact> arr = ContactsController.Instance.usersSectionsDict.get(ContactsController.Instance.sortedUsersSectionsArray.get(section));
uid = arr.get(row).user_id; if (row >= arr.size()) {
return;
}
user = MessagesController.Instance.users.get(arr.get(row).user_id);
} }
} else { } else {
if (section == 0) { if (section == 0) {
...@@ -193,8 +187,8 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -193,8 +187,8 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
} }
return; return;
} else { } else {
if (row - 1 < MessagesController.Instance.contacts.size()) { if (row - 1 < ContactsController.Instance.contacts.size()) {
uid = MessagesController.Instance.contacts.get(row - 1).user_id; user = MessagesController.Instance.users.get(ContactsController.Instance.contacts.get(row - 1).user_id);
} else { } else {
return; return;
} }
...@@ -202,54 +196,37 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -202,54 +196,37 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
} }
} }
if (uid != 0) { if (user != null) {
if (uid == UserConfig.clientUserId) { if (user.id == UserConfig.clientUserId) {
return; return;
} }
if (returnAsResult) { if (returnAsResult) {
if (ignoreUsers != null && ignoreUsers.containsKey(uid)) { if (ignoreUsers != null && ignoreUsers.containsKey(user.id)) {
return; return;
} }
didSelectResult(uid, true); didSelectResult(user, true);
} else { } else {
if (createSecretChat) { if (createSecretChat) {
creatingChat = true; creatingChat = true;
MessagesController.Instance.startSecretChat(parentActivity, uid); MessagesController.Instance.startSecretChat(parentActivity, user);
} else { } else {
ChatActivity fragment = new ChatActivity(); ChatActivity fragment = new ChatActivity();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt("user_id", uid); bundle.putInt("user_id", user.id);
fragment.setArguments(bundle); fragment.setArguments(bundle);
((ApplicationActivity)parentActivity).presentFragment(fragment, "chat" + Math.random(), destroyAfterSelect, false); ((ApplicationActivity)parentActivity).presentFragment(fragment, "chat" + Math.random(), destroyAfterSelect, false);
} }
} }
} else { } else {
ArrayList<MessagesController.Contact> arr = MessagesController.Instance.contactsSectionsDict.get(MessagesController.Instance.sortedContactsSectionsArray.get(section - 1)); ArrayList<ContactsController.Contact> arr = ContactsController.Instance.contactsSectionsDict.get(ContactsController.Instance.sortedContactsSectionsArray.get(section - 1));
MessagesController.Contact contact = arr.get(row); ContactsController.Contact contact = arr.get(row);
String usePhone = null; String usePhone = null;
for (String phone : contact.phones) { if (!contact.phones.isEmpty()) {
if (usePhone == null) { usePhone = contact.phones.get(0);
usePhone = phone;
}
String cleanPhone = PhoneFormat.stripExceptNumbers(usePhone);
TLRPC.TL_contact cLocal = MessagesController.Instance.contactsByPhones.get(cleanPhone);
if (cLocal != null) {
if (cLocal.user_id == UserConfig.clientUserId) {
return;
}
if (createSecretChat) {
creatingChat = true;
MessagesController.Instance.startSecretChat(parentActivity, cLocal.user_id);
} else {
ChatActivity fragment = new ChatActivity();
Bundle bundle = new Bundle();
bundle.putInt("user_id", cLocal.user_id);
fragment.setArguments(bundle);
((ApplicationActivity)parentActivity).presentFragment(fragment, "chat" + Math.random(), destroyAfterSelect, false);
} }
if (usePhone == null) {
return; return;
} }
}
AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity); AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
builder.setMessage(getStringEntry(R.string.InviteUser)); builder.setMessage(getStringEntry(R.string.InviteUser));
builder.setTitle(getStringEntry(R.string.AppName)); builder.setTitle(getStringEntry(R.string.AppName));
...@@ -302,23 +279,22 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -302,23 +279,22 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
return fragmentView; return fragmentView;
} }
private void didSelectResult(final int user_id, boolean useAlert) { private void didSelectResult(final TLRPC.User user, boolean useAlert) {
if (useAlert && selectAlertString != 0) { if (useAlert && selectAlertString != 0) {
AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity); AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
builder.setTitle(R.string.AppName); builder.setTitle(R.string.AppName);
TLRPC.User user = MessagesController.Instance.users.get(user_id);
builder.setMessage(String.format(getStringEntry(selectAlertString), Utilities.formatName(user.first_name, user.last_name))); builder.setMessage(String.format(getStringEntry(selectAlertString), Utilities.formatName(user.first_name, user.last_name)));
builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialogInterface, int i) { public void onClick(DialogInterface dialogInterface, int i) {
didSelectResult(user_id, false); didSelectResult(user, false);
} }
}); });
builder.setNegativeButton(R.string.Cancel, null); builder.setNegativeButton(R.string.Cancel, null);
builder.show().setCanceledOnTouchOutside(true); builder.show().setCanceledOnTouchOutside(true);
} else { } else {
if (delegate != null) { if (delegate != null) {
delegate.didSelectContact(user_id); delegate.didSelectContact(user);
delegate = null; delegate = null;
} }
finishFragment(); finishFragment();
...@@ -422,7 +398,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -422,7 +398,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
ArrayList<TLRPC.User> resultArray = new ArrayList<TLRPC.User>(); ArrayList<TLRPC.User> resultArray = new ArrayList<TLRPC.User>();
ArrayList<CharSequence> resultArrayNames = new ArrayList<CharSequence>(); ArrayList<CharSequence> resultArrayNames = new ArrayList<CharSequence>();
for (TLRPC.TL_contact contact : MessagesController.Instance.contacts) { for (TLRPC.TL_contact contact : ContactsController.Instance.contacts) {
TLRPC.User user = MessagesController.Instance.users.get(contact.user_id); TLRPC.User user = MessagesController.Instance.users.get(contact.user_id);
if (user.first_name != null && user.first_name.toLowerCase().startsWith(q) || user.last_name != null && user.last_name.toLowerCase().startsWith(q)) { if (user.first_name != null && user.first_name.toLowerCase().startsWith(q) || user.last_name != null && user.last_name.toLowerCase().startsWith(q)) {
if (user.id == UserConfig.clientUserId) { if (user.id == UserConfig.clientUserId) {
...@@ -537,7 +513,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -537,7 +513,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
searchWas = false; searchWas = false;
ViewGroup group = (ViewGroup) listView.getParent(); ViewGroup group = (ViewGroup) listView.getParent();
listView.setAdapter(listViewAdapter); listView.setAdapter(listViewAdapter);
if (!isRTL) { if (!Utilities.isRTL) {
listView.setPadding(Utilities.dp(16), listView.getPaddingTop(), Utilities.dp(30), listView.getPaddingBottom()); listView.setPadding(Utilities.dp(16), listView.getPaddingTop(), Utilities.dp(30), listView.getPaddingBottom());
} else { } else {
listView.setPadding(Utilities.dp(30), listView.getPaddingTop(), Utilities.dp(16), listView.getPaddingBottom()); listView.setPadding(Utilities.dp(30), listView.getPaddingTop(), Utilities.dp(16), listView.getPaddingBottom());
...@@ -557,13 +533,14 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -557,13 +533,14 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public void didReceivedNotification(int id, Object... args) { public void didReceivedNotification(int id, Object... args) {
if (id == MessagesController.contactsDidLoaded || id == MessagesController.contactsBookDidLoaded) { if (id == MessagesController.contactsDidLoaded) {
if (listViewAdapter != null) { if (listViewAdapter != null) {
listViewAdapter.notifyDataSetChanged(); listViewAdapter.notifyDataSetChanged();
} }
} else if (id == MessagesController.updateInterfaces) { } else if (id == MessagesController.updateInterfaces) {
if (listView != null) { int mask = (Integer)args[0];
listView.invalidateViews(); if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0 || (mask & MessagesController.UPDATE_MASK_STATUS) != 0) {
updateVisibleRows(mask);
} }
} else if (id == MessagesController.encryptedChatCreated) { } else if (id == MessagesController.encryptedChatCreated) {
if (createSecretChat && creatingChat) { if (createSecretChat && creatingChat) {
...@@ -577,6 +554,19 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -577,6 +554,19 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
} }
} }
private void updateVisibleRows(int mask) {
if (listView == null) {
return;
}
int count = listView.getChildCount();
for (int a = 0; a < count; a++) {
View child = listView.getChildAt(a);
if (child instanceof ChatOrUserCell) {
((ChatOrUserCell) child).update(mask);
}
}
}
private class SearchAdapter extends BaseAdapter { private class SearchAdapter extends BaseAdapter {
private Context mContext; private Context mContext;
...@@ -619,76 +609,24 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -619,76 +609,24 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public View getView(int i, View view, ViewGroup viewGroup) { public View getView(int i, View view, ViewGroup viewGroup) {
int type = getItemViewType(i);
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new ChatOrUserCell(mContext);
if (type == 0) { ((ChatOrUserCell)view).usePadding = false;
view = li.inflate(R.layout.messages_search_user_layout, viewGroup, false);
} else {
view = li.inflate(R.layout.messages_search_chat_layout, viewGroup, false);
}
}
ContactListRowHolder holder = (ContactListRowHolder)view.getTag();
if (holder == null) {
holder = new ContactListRowHolder(view);
view.setTag(holder);
}
View divider = view.findViewById(R.id.settings_row_divider);
if (i == searchResult.size() - 1) {
divider.setVisibility(View.INVISIBLE);
} else {
divider.setVisibility(View.VISIBLE);
} }
Object obj = searchResult.get(i); ((ChatOrUserCell) view).useSeparator = i != searchResult.size() - 1;
CharSequence name = searchResultNames.get(i);
Object obj = searchResult.get(i);
TLRPC.User user = MessagesController.Instance.users.get(((TLRPC.User)obj).id); TLRPC.User user = MessagesController.Instance.users.get(((TLRPC.User)obj).id);
holder.nameTextView.setText(name);
if (user != null) { if (user != null) {
((ChatOrUserCell)view).setData(user, null, null, searchResultNames.get(i), null);
if (ignoreUsers != null) { if (ignoreUsers != null) {
if (ignoreUsers.containsKey(user.id)) { if (ignoreUsers.containsKey(user.id)) {
if(android.os.Build.VERSION.SDK_INT >= 11) { ((ChatOrUserCell)view).drawAlpha = 0.5f;
holder.avatarImage.setAlpha(0.5f);
holder.messageTextView.setAlpha(0.5f);
holder.nameTextView.setAlpha(0.5f);
}
} else { } else {
if(android.os.Build.VERSION.SDK_INT >= 11) { ((ChatOrUserCell)view).drawAlpha = 1.0f;
holder.avatarImage.setAlpha(1.0f);
holder.messageTextView.setAlpha(1.0f);
holder.nameTextView.setAlpha(1.0f);
}
}
}
TLRPC.FileLocation photo = null;
if (user.photo != null) {
photo = user.photo.photo_small;
}
int placeHolderId = Utilities.getUserAvatarForId(user.id);
holder.avatarImage.setImage(photo, "50_50", placeHolderId);
if (user.status == null) {
holder.messageTextView.setTextColor(0xff808080);
holder.messageTextView.setText(getStringEntry(R.string.Offline));
} else {
int currentTime = ConnectionsManager.Instance.getCurrentTime();
if (user.status.expires > currentTime || user.status.was_online > currentTime) {
holder.messageTextView.setTextColor(0xff357aa8);
holder.messageTextView.setText(getStringEntry(R.string.Online));
} else {
if (user.status.was_online <= 10000 && user.status.expires <= 10000) {
holder.messageTextView.setText(getStringEntry(R.string.Invisible));
} else {
int value = user.status.was_online;
if (value == 0) {
value = user.status.expires;
}
holder.messageTextView.setText(getStringEntry(R.string.LastSeen) + " " + Utilities.formatDateOnline(value));
}
holder.messageTextView.setTextColor(0xff808080);
} }
} }
} }
...@@ -697,17 +635,12 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -697,17 +635,12 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public int getItemViewType(int i) { public int getItemViewType(int i) {
Object obj = searchResult.get(i);
if (obj instanceof TLRPC.User) {
return 0; return 0;
} else {
return 1;
}
} }
@Override @Override
public int getViewTypeCount() { public int getViewTypeCount() {
return 2; return 1;
} }
@Override @Override
...@@ -737,12 +670,12 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -737,12 +670,12 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
public int getSectionCount() { public int getSectionCount() {
int count = 0; int count = 0;
if (usersAsSections) { if (usersAsSections) {
count += MessagesController.Instance.sortedUsersSectionsArray.size(); count += ContactsController.Instance.sortedUsersSectionsArray.size();
} else { } else {
count++; count++;
} }
if (!onlyUsers) { if (!onlyUsers) {
count += MessagesController.Instance.sortedContactsSectionsArray.size(); count += ContactsController.Instance.sortedContactsSectionsArray.size();
} }
return count; return count;
} }
...@@ -750,16 +683,16 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -750,16 +683,16 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public int getCountForSection(int section) { public int getCountForSection(int section) {
if (usersAsSections) { if (usersAsSections) {
if (section < MessagesController.Instance.sortedUsersSectionsArray.size()) { if (section < ContactsController.Instance.sortedUsersSectionsArray.size()) {
ArrayList<TLRPC.TL_contact> arr = MessagesController.Instance.usersSectionsDict.get(MessagesController.Instance.sortedUsersSectionsArray.get(section)); ArrayList<TLRPC.TL_contact> arr = ContactsController.Instance.usersSectionsDict.get(ContactsController.Instance.sortedUsersSectionsArray.get(section));
return arr.size(); return arr.size();
} }
} else { } else {
if (section == 0) { if (section == 0) {
return MessagesController.Instance.contacts.size() + 1; return ContactsController.Instance.contacts.size() + 1;
} }
} }
ArrayList<MessagesController.Contact> arr = MessagesController.Instance.contactsSectionsDict.get(MessagesController.Instance.sortedContactsSectionsArray.get(section - 1)); ArrayList<ContactsController.Contact> arr = ContactsController.Instance.contactsSectionsDict.get(ContactsController.Instance.sortedContactsSectionsArray.get(section - 1));
return arr.size(); return arr.size();
} }
...@@ -769,8 +702,8 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -769,8 +702,8 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
TLRPC.User user = null; TLRPC.User user = null;
int count = 0; int count = 0;
if (usersAsSections) { if (usersAsSections) {
if (section < MessagesController.Instance.sortedUsersSectionsArray.size()) { if (section < ContactsController.Instance.sortedUsersSectionsArray.size()) {
ArrayList<TLRPC.TL_contact> arr = MessagesController.Instance.usersSectionsDict.get(MessagesController.Instance.sortedUsersSectionsArray.get(section)); ArrayList<TLRPC.TL_contact> arr = ContactsController.Instance.usersSectionsDict.get(ContactsController.Instance.sortedUsersSectionsArray.get(section));
user = MessagesController.Instance.users.get(arr.get(position).user_id); user = MessagesController.Instance.users.get(arr.get(position).user_id);
count = arr.size(); count = arr.size();
} }
...@@ -782,86 +715,36 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -782,86 +715,36 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
convertView = li.inflate(R.layout.contacts_invite_row_layout, parent, false); convertView = li.inflate(R.layout.contacts_invite_row_layout, parent, false);
} }
View divider = convertView.findViewById(R.id.settings_row_divider); View divider = convertView.findViewById(R.id.settings_row_divider);
if (MessagesController.Instance.contacts.isEmpty()) { if (ContactsController.Instance.contacts.isEmpty()) {
divider.setVisibility(View.INVISIBLE); divider.setVisibility(View.INVISIBLE);
} else { } else {
divider.setVisibility(View.VISIBLE); divider.setVisibility(View.VISIBLE);
} }
return convertView; return convertView;
} }
user = MessagesController.Instance.users.get(MessagesController.Instance.contacts.get(position - 1).user_id); user = MessagesController.Instance.users.get(ContactsController.Instance.contacts.get(position - 1).user_id);
count = MessagesController.Instance.contacts.size(); count = ContactsController.Instance.contacts.size();
} }
} }
if (user != null) { if (user != null) {
if (convertView == null) { if (convertView == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = new ChatOrUserCell(mContext);
convertView = li.inflate(R.layout.messages_search_user_layout, parent, false); ((ChatOrUserCell)convertView).useBoldFont = true;
} ((ChatOrUserCell)convertView).usePadding = false;
ContactListRowHolder holder = (ContactListRowHolder)convertView.getTag();
if (holder == null) {
holder = new ContactListRowHolder(convertView);
convertView.setTag(holder);
} }
((ChatOrUserCell)convertView).setData(user, null, null, null, null);
if (ignoreUsers != null) { if (ignoreUsers != null) {
if (ignoreUsers.containsKey(user.id)) { if (ignoreUsers.containsKey(user.id)) {
if(android.os.Build.VERSION.SDK_INT >= 11) { ((ChatOrUserCell)convertView).drawAlpha = 0.5f;
holder.avatarImage.setAlpha(0.5f);
holder.messageTextView.setAlpha(0.5f);
holder.nameTextView.setAlpha(0.5f);
}
} else { } else {
if(android.os.Build.VERSION.SDK_INT >= 11) { ((ChatOrUserCell)convertView).drawAlpha = 1.0f;
holder.avatarImage.setAlpha(1.0f);
holder.messageTextView.setAlpha(1.0f);
holder.nameTextView.setAlpha(1.0f);
}
} }
} }
View divider = convertView.findViewById(R.id.settings_row_divider); ((ChatOrUserCell) convertView).useSeparator = position != count - 1;
if (position == count - 1) {
divider.setVisibility(View.INVISIBLE);
} else {
divider.setVisibility(View.VISIBLE);
}
TLRPC.FileLocation photo = null;
if (user.first_name.length() != 0 && user.last_name.length() != 0) {
holder.nameTextView.setText(Html.fromHtml(user.first_name + " <b>" + user.last_name + "</b>"));
} else if (user.first_name.length() != 0) {
holder.nameTextView.setText(Html.fromHtml("<b>" + user.first_name + "</b>"));
} else {
holder.nameTextView.setText(Html.fromHtml("<b>" + user.last_name + "</b>"));
}
if (user.photo != null) {
photo = user.photo.photo_small;
}
int placeHolderId = Utilities.getUserAvatarForId(user.id);
holder.avatarImage.setImage(photo, "50_50", placeHolderId);
if (user.status == null) {
holder.messageTextView.setText(getStringEntry(R.string.Offline));
holder.messageTextView.setTextColor(0xff808080);
} else {
int currentTime = ConnectionsManager.Instance.getCurrentTime();
if (user.status.expires > currentTime || user.status.was_online > currentTime) {
holder.messageTextView.setTextColor(0xff357aa8);
holder.messageTextView.setText(getStringEntry(R.string.Online));
} else {
if (user.status.was_online <= 10000 && user.status.expires <= 10000) {
holder.messageTextView.setText(getStringEntry(R.string.Invisible));
} else {
int value = user.status.was_online;
if (value == 0) {
value = user.status.expires;
}
holder.messageTextView.setText(getStringEntry(R.string.LastSeen) + " " + Utilities.formatDateOnline(value));
}
holder.messageTextView.setTextColor(0xff808080);
}
}
return convertView; return convertView;
} }
...@@ -873,14 +756,17 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -873,14 +756,17 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
} else { } else {
textView = (TextView)convertView.findViewById(R.id.settings_row_text); textView = (TextView)convertView.findViewById(R.id.settings_row_text);
} }
View divider = convertView.findViewById(R.id.settings_row_divider); View divider = convertView.findViewById(R.id.settings_row_divider);
ArrayList<MessagesController.Contact> arr = MessagesController.Instance.contactsSectionsDict.get(MessagesController.Instance.sortedContactsSectionsArray.get(section - 1)); ArrayList<ContactsController.Contact> arr = ContactsController.Instance.contactsSectionsDict.get(ContactsController.Instance.sortedContactsSectionsArray.get(section - 1));
MessagesController.Contact contact = arr.get(position); ContactsController.Contact contact = arr.get(position);
if (divider != null) {
if (position == arr.size() - 1) { if (position == arr.size() - 1) {
divider.setVisibility(View.INVISIBLE); divider.setVisibility(View.INVISIBLE);
} else { } else {
divider.setVisibility(View.VISIBLE); divider.setVisibility(View.VISIBLE);
} }
}
if (contact.first_name != null && contact.last_name != null) { if (contact.first_name != null && contact.last_name != null) {
textView.setText(Html.fromHtml(contact.first_name + " <b>" + contact.last_name + "</b>")); textView.setText(Html.fromHtml(contact.first_name + " <b>" + contact.last_name + "</b>"));
} else if (contact.first_name != null && contact.last_name == null) { } else if (contact.first_name != null && contact.last_name == null) {
...@@ -894,7 +780,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -894,7 +780,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public int getItemViewType(int section, int position) { public int getItemViewType(int section, int position) {
if (usersAsSections) { if (usersAsSections) {
if (section < MessagesController.Instance.sortedUsersSectionsArray.size()) { if (section < ContactsController.Instance.sortedUsersSectionsArray.size()) {
return 0; return 0;
} }
} else if (section == 0) { } else if (section == 0) {
...@@ -914,7 +800,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -914,7 +800,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public int getSectionHeaderViewType(int section) { public int getSectionHeaderViewType(int section) {
if (usersAsSections) { if (usersAsSections) {
if (section < MessagesController.Instance.sortedUsersSectionsArray.size()) { if (section < ContactsController.Instance.sortedUsersSectionsArray.size()) {
return 1; return 1;
} }
} else if (section == 0) { } else if (section == 0) {
...@@ -931,14 +817,14 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -931,14 +817,14 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public View getSectionHeaderView(int section, View convertView, ViewGroup parent) { public View getSectionHeaderView(int section, View convertView, ViewGroup parent) {
if (usersAsSections) { if (usersAsSections) {
if (section < MessagesController.Instance.sortedUsersSectionsArray.size()) { if (section < ContactsController.Instance.sortedUsersSectionsArray.size()) {
if (convertView == null) { if (convertView == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = li.inflate(R.layout.settings_section_layout, parent, false); convertView = li.inflate(R.layout.settings_section_layout, parent, false);
convertView.setBackgroundColor(0xffffffff); convertView.setBackgroundColor(0xffffffff);
} }
TextView textView = (TextView)convertView.findViewById(R.id.settings_section_text); TextView textView = (TextView)convertView.findViewById(R.id.settings_section_text);
textView.setText(MessagesController.Instance.sortedUsersSectionsArray.get(section)); textView.setText(ContactsController.Instance.sortedUsersSectionsArray.get(section));
return convertView; return convertView;
} }
} else { } else {
...@@ -957,20 +843,8 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter ...@@ -957,20 +843,8 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
convertView.setBackgroundColor(0xffffffff); convertView.setBackgroundColor(0xffffffff);
} }
TextView textView = (TextView)convertView.findViewById(R.id.settings_section_text); TextView textView = (TextView)convertView.findViewById(R.id.settings_section_text);
textView.setText(MessagesController.Instance.sortedContactsSectionsArray.get(section - 1)); textView.setText(ContactsController.Instance.sortedContactsSectionsArray.get(section - 1));
return convertView; return convertView;
} }
} }
public static class ContactListRowHolder {
public BackupImageView avatarImage;
public TextView messageTextView;
public TextView nameTextView;
public ContactListRowHolder(View view) {
messageTextView = (TextView)view.findViewById(R.id.messages_list_row_message);
nameTextView = (TextView)view.findViewById(R.id.messages_list_row_name);
avatarImage = (BackupImageView)view.findViewById(R.id.messages_list_row_avatar);
}
}
} }
TMessagesProj/src/main/java/org/telegram/ui/CountrySelectActivity.java
View file @ 9814a6e9
...@@ -41,7 +41,6 @@ import java.util.ArrayList; ...@@ -41,7 +41,6 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
...@@ -54,7 +53,6 @@ public class CountrySelectActivity extends ActionBarActivity { ...@@ -54,7 +53,6 @@ public class CountrySelectActivity extends ActionBarActivity {
private boolean searching; private boolean searching;
private BaseAdapter searchListViewAdapter; private BaseAdapter searchListViewAdapter;
private TextView epmtyTextView; private TextView epmtyTextView;
private boolean isRTL;
private HashMap<String, ArrayList<Country>> countries = new HashMap<String, ArrayList<Country>>(); private HashMap<String, ArrayList<Country>> countries = new HashMap<String, ArrayList<Country>>();
private ArrayList<String> sortedCountries = new ArrayList<String>(); private ArrayList<String> sortedCountries = new ArrayList<String>();
...@@ -71,10 +69,6 @@ public class CountrySelectActivity extends ActionBarActivity { ...@@ -71,10 +69,6 @@ public class CountrySelectActivity extends ActionBarActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Locale locale = Locale.getDefault();
String lang = locale.getLanguage();
isRTL = lang != null && lang.toLowerCase().equals("ar");
try { try {
BufferedReader reader = new BufferedReader(new InputStreamReader(getResources().getAssets().open("countries.txt"))); BufferedReader reader = new BufferedReader(new InputStreamReader(getResources().getAssets().open("countries.txt")));
String line; String line;
...@@ -260,7 +254,7 @@ public class CountrySelectActivity extends ActionBarActivity { ...@@ -260,7 +254,7 @@ public class CountrySelectActivity extends ActionBarActivity {
searchWas = false; searchWas = false;
ViewGroup group = (ViewGroup) listView.getParent(); ViewGroup group = (ViewGroup) listView.getParent();
listView.setAdapter(listViewAdapter); listView.setAdapter(listViewAdapter);
if (!isRTL) { if (!Utilities.isRTL) {
listView.setPadding(Utilities.dp(16), listView.getPaddingTop(), Utilities.dp(30), listView.getPaddingBottom()); listView.setPadding(Utilities.dp(16), listView.getPaddingTop(), Utilities.dp(30), listView.getPaddingBottom());
} else { } else {
listView.setPadding(Utilities.dp(30), listView.getPaddingTop(), Utilities.dp(16), listView.getPaddingBottom()); listView.setPadding(Utilities.dp(30), listView.getPaddingTop(), Utilities.dp(16), listView.getPaddingBottom());
......
TMessagesProj/src/main/java/org/telegram/ui/DocumentSelectActivity.java
View file @ 9814a6e9
...@@ -102,9 +102,13 @@ public class DocumentSelectActivity extends BaseFragment { ...@@ -102,9 +102,13 @@ public class DocumentSelectActivity extends BaseFragment {
@Override @Override
public void onFragmentDestroy() { public void onFragmentDestroy() {
try {
if (receiverRegistered) { if (receiverRegistered) {
parentActivity.unregisterReceiver(receiver); parentActivity.unregisterReceiver(receiver);
} }
} catch (Exception e) {
FileLog.e("tmessages", e);
}
super.onFragmentDestroy(); super.onFragmentDestroy();
} }
...@@ -376,6 +380,7 @@ public class DocumentSelectActivity extends BaseFragment { ...@@ -376,6 +380,7 @@ public class DocumentSelectActivity extends BaseFragment {
if (extDevice != null) { if (extDevice != null) {
result.removeAll(aliases.get(extDevice)); result.removeAll(aliases.get(extDevice));
for (String path : result) { for (String path : result) {
try {
boolean isSd = path.toLowerCase().contains("sd"); boolean isSd = path.toLowerCase().contains("sd");
ListItem item = new ListItem(); ListItem item = new ListItem();
item.title = getString(isSd ? R.string.SdCard : R.string.ExternalStorage); item.title = getString(isSd ? R.string.SdCard : R.string.ExternalStorage);
...@@ -383,6 +388,9 @@ public class DocumentSelectActivity extends BaseFragment { ...@@ -383,6 +388,9 @@ public class DocumentSelectActivity extends BaseFragment {
item.subtitle = getRootSubtitle(path); item.subtitle = getRootSubtitle(path);
item.file = new File(path); item.file = new File(path);
items.add(item); items.add(item);
} catch (Exception e) {
FileLog.e("tmessages", e);
}
} }
} }
} catch (Exception e) { } catch (Exception e) {
......
TMessagesProj/src/main/java/org/telegram/ui/GalleryImageViewer.java
View file @ 9814a6e9
...@@ -9,12 +9,14 @@ ...@@ -9,12 +9,14 @@
package org.telegram.ui; package org.telegram.ui;
import android.content.Intent; import android.content.Intent;
import android.graphics.Point;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.v4.view.PagerAdapter; import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.view.Display;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
...@@ -64,6 +66,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif ...@@ -64,6 +66,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
private ProgressBar loadingProgress; private ProgressBar loadingProgress;
private String currentFileName; private String currentFileName;
private int user_id = 0; private int user_id = 0;
private Point displaySize = new Point();
private ArrayList<MessageObject> imagesArrTemp = new ArrayList<MessageObject>(); private ArrayList<MessageObject> imagesArrTemp = new ArrayList<MessageObject>();
private HashMap<Integer, MessageObject> imagesByIdsTemp = new HashMap<Integer, MessageObject>(); private HashMap<Integer, MessageObject> imagesByIdsTemp = new HashMap<Integer, MessageObject>();
...@@ -80,6 +83,14 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif ...@@ -80,6 +83,14 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Display display = getWindowManager().getDefaultDisplay();
if(android.os.Build.VERSION.SDK_INT < 13) {
displaySize.set(display.getWidth(), display.getHeight());
} else {
display.getSize(displaySize);
}
classGuid = ConnectionsManager.Instance.generateClassGuid(); classGuid = ConnectionsManager.Instance.generateClassGuid();
setContentView(R.layout.gallery_layout); setContentView(R.layout.gallery_layout);
...@@ -112,6 +123,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif ...@@ -112,6 +123,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
NotificationCenter.Instance.addObserver(this, MessagesController.mediaCountDidLoaded); NotificationCenter.Instance.addObserver(this, MessagesController.mediaCountDidLoaded);
NotificationCenter.Instance.addObserver(this, MessagesController.mediaDidLoaded); NotificationCenter.Instance.addObserver(this, MessagesController.mediaDidLoaded);
NotificationCenter.Instance.addObserver(this, MessagesController.userPhotosLoaded); NotificationCenter.Instance.addObserver(this, MessagesController.userPhotosLoaded);
NotificationCenter.Instance.addObserver(this, 658);
Integer index = null; Integer index = null;
if (localPagerAdapter == null) { if (localPagerAdapter == null) {
...@@ -212,6 +224,9 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif ...@@ -212,6 +224,9 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
deleteButton.setOnClickListener(new View.OnClickListener() { deleteButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (mViewPager == null) {
return;
}
int item = mViewPager.getCurrentItem(); int item = mViewPager.getCurrentItem();
MessageObject obj = localPagerAdapter.imagesArr.get(item); MessageObject obj = localPagerAdapter.imagesArr.get(item);
if (obj.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENT) { if (obj.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENT) {
...@@ -241,6 +256,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif ...@@ -241,6 +256,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
NotificationCenter.Instance.removeObserver(this, MessagesController.mediaCountDidLoaded); NotificationCenter.Instance.removeObserver(this, MessagesController.mediaCountDidLoaded);
NotificationCenter.Instance.removeObserver(this, MessagesController.mediaDidLoaded); NotificationCenter.Instance.removeObserver(this, MessagesController.mediaDidLoaded);
NotificationCenter.Instance.removeObserver(this, MessagesController.userPhotosLoaded); NotificationCenter.Instance.removeObserver(this, MessagesController.userPhotosLoaded);
NotificationCenter.Instance.removeObserver(this, 658);
ConnectionsManager.Instance.cancelRpcsForClassGuid(classGuid); ConnectionsManager.Instance.cancelRpcsForClassGuid(classGuid);
} }
...@@ -354,7 +370,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif ...@@ -354,7 +370,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
getSupportActionBar().setTitle(String.format("%d %s %d", pos, getString(R.string.Of), totalCount)); getSupportActionBar().setTitle(String.format("%d %s %d", pos, getString(R.string.Of), totalCount));
if (title != null) { if (title != null) {
fakeTitleView.setText(String.format("%d %s %d", pos, getString(R.string.Of), totalCount)); fakeTitleView.setText(String.format("%d %s %d", pos, getString(R.string.Of), totalCount));
fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), 40); fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8)); title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8)); title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
} }
...@@ -450,10 +466,21 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif ...@@ -450,10 +466,21 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
} }
} }
} }
} else if (id == 658) {
try {
if (!isFinishing()) {
finish();
}
} catch (Exception e) {
e.printStackTrace();
}
} }
} }
private TLRPC.FileLocation getCurrentFile() { private TLRPC.FileLocation getCurrentFile() {
if (mViewPager == null) {
return null;
}
int item = mViewPager.getCurrentItem(); int item = mViewPager.getCurrentItem();
if (withoutBottom) { if (withoutBottom) {
return localPagerAdapter.imagesArrLocations.get(item); return localPagerAdapter.imagesArrLocations.get(item);
...@@ -775,7 +802,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif ...@@ -775,7 +802,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
getSupportActionBar().setTitle(String.format("%d %s %d", (totalCount - imagesArr.size()) + position + 1, getString(R.string.Of), totalCount)); getSupportActionBar().setTitle(String.format("%d %s %d", (totalCount - imagesArr.size()) + position + 1, getString(R.string.Of), totalCount));
if (title != null) { if (title != null) {
fakeTitleView.setText(String.format("%d %s %d", (totalCount - imagesArr.size()) + position + 1, getString(R.string.Of), totalCount)); fakeTitleView.setText(String.format("%d %s %d", (totalCount - imagesArr.size()) + position + 1, getString(R.string.Of), totalCount));
fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), 40); fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8)); title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8)); title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
} }
...@@ -794,7 +821,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif ...@@ -794,7 +821,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
getSupportActionBar().setTitle(String.format("%d %s %d", position + 1, getString(R.string.Of), imagesArrLocations.size())); getSupportActionBar().setTitle(String.format("%d %s %d", position + 1, getString(R.string.Of), imagesArrLocations.size()));
if (title != null) { if (title != null) {
fakeTitleView.setText(String.format("%d %s %d", position + 1, getString(R.string.Of), imagesArrLocations.size())); fakeTitleView.setText(String.format("%d %s %d", position + 1, getString(R.string.Of), imagesArrLocations.size()));
fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), 40); fakeTitleView.measure(View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.AT_MOST));
title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8)); title.setWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8)); title.setMaxWidth(fakeTitleView.getMeasuredWidth() + Utilities.dp(8));
} }
...@@ -885,7 +912,16 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif ...@@ -885,7 +912,16 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
ArrayList<TLRPC.PhotoSize> sizes = message.messageOwner.media.photo.sizes; ArrayList<TLRPC.PhotoSize> sizes = message.messageOwner.media.photo.sizes;
iv.isVideo = false; iv.isVideo = false;
if (sizes.size() > 0) { if (sizes.size() > 0) {
TLRPC.PhotoSize sizeFull = PhotoObject.getClosestPhotoSizeWithSize(sizes, 800, 800); int width = (int)(Math.min(displaySize.x, displaySize.y) * 0.7f);
int height = width + Utilities.dp(100);
if (width > 800) {
width = 800;
}
if (height > 800) {
height = 800;
}
TLRPC.PhotoSize sizeFull = PhotoObject.getClosestPhotoSizeWithSize(sizes, width, height);
if (message.imagePreview != null) { if (message.imagePreview != null) {
iv.setImage(sizeFull.location, null, message.imagePreview, sizeFull.size); iv.setImage(sizeFull.location, null, message.imagePreview, sizeFull.size);
} else { } else {
......
TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
View file @ 9814a6e9
...@@ -37,6 +37,7 @@ import android.widget.TextView; ...@@ -37,6 +37,7 @@ import android.widget.TextView;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.ContactsController;
import org.telegram.messenger.Emoji; import org.telegram.messenger.Emoji;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.messenger.MessagesController; import org.telegram.messenger.MessagesController;
...@@ -44,6 +45,7 @@ import org.telegram.messenger.NotificationCenter; ...@@ -44,6 +45,7 @@ import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig; import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Views.BackupImageView;
import org.telegram.ui.Views.BaseFragment; import org.telegram.ui.Views.BaseFragment;
import org.telegram.ui.Views.PinnedHeaderListView; import org.telegram.ui.Views.PinnedHeaderListView;
import org.telegram.ui.Views.SectionedBaseAdapter; import org.telegram.ui.Views.SectionedBaseAdapter;
...@@ -198,7 +200,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -198,7 +200,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
if (searching && searchWas) { if (searching && searchWas) {
user = searchResult.get(row); user = searchResult.get(row);
} else { } else {
ArrayList<TLRPC.TL_contact> arr = MessagesController.Instance.usersSectionsDict.get(MessagesController.Instance.sortedUsersSectionsArray.get(section)); ArrayList<TLRPC.TL_contact> arr = ContactsController.Instance.usersSectionsDict.get(ContactsController.Instance.sortedUsersSectionsArray.get(section));
user = MessagesController.Instance.users.get(arr.get(row).user_id); user = MessagesController.Instance.users.get(arr.get(row).user_id);
listView.invalidateViews(); listView.invalidateViews();
} }
...@@ -367,7 +369,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -367,7 +369,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
ArrayList<CharSequence> resultArrayNames = new ArrayList<CharSequence>(); ArrayList<CharSequence> resultArrayNames = new ArrayList<CharSequence>();
String q = query.toLowerCase(); String q = query.toLowerCase();
for (TLRPC.TL_contact contact : MessagesController.Instance.contacts) { for (TLRPC.TL_contact contact : ContactsController.Instance.contacts) {
TLRPC.User user = MessagesController.Instance.users.get(contact.user_id); TLRPC.User user = MessagesController.Instance.users.get(contact.user_id);
if (user.first_name.toLowerCase().startsWith(q) || user.last_name.toLowerCase().startsWith(q)) { if (user.first_name.toLowerCase().startsWith(q) || user.last_name.toLowerCase().startsWith(q)) {
if (user.id == UserConfig.clientUserId) { if (user.id == UserConfig.clientUserId) {
...@@ -432,9 +434,12 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -432,9 +434,12 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
listViewAdapter.notifyDataSetChanged(); listViewAdapter.notifyDataSetChanged();
} }
} else if (id == MessagesController.updateInterfaces) { } else if (id == MessagesController.updateInterfaces) {
int mask = (Integer)args[0];
if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0 || (mask & MessagesController.UPDATE_MASK_STATUS) != 0) {
if (listView != null) { if (listView != null) {
listView.invalidateViews(); listView.invalidateViews();
} }
}
} else if (id == MessagesController.chatDidCreated) { } else if (id == MessagesController.chatDidCreated) {
Utilities.RunOnUIThread(new Runnable() { Utilities.RunOnUIThread(new Runnable() {
@Override @Override
...@@ -467,7 +472,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -467,7 +472,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
if (searching && searchWas) { if (searching && searchWas) {
return searchResult == null || searchResult.isEmpty() ? 0 : 1; return searchResult == null || searchResult.isEmpty() ? 0 : 1;
} }
return MessagesController.Instance.sortedUsersSectionsArray.size(); return ContactsController.Instance.sortedUsersSectionsArray.size();
} }
@Override @Override
...@@ -475,7 +480,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -475,7 +480,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
if (searching && searchWas) { if (searching && searchWas) {
return searchResult == null ? 0 : searchResult.size(); return searchResult == null ? 0 : searchResult.size();
} }
ArrayList<TLRPC.TL_contact> arr = MessagesController.Instance.usersSectionsDict.get(MessagesController.Instance.sortedUsersSectionsArray.get(section)); ArrayList<TLRPC.TL_contact> arr = ContactsController.Instance.usersSectionsDict.get(ContactsController.Instance.sortedUsersSectionsArray.get(section));
return arr.size(); return arr.size();
} }
...@@ -488,7 +493,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -488,7 +493,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
user = MessagesController.Instance.users.get(searchResult.get(position).id); user = MessagesController.Instance.users.get(searchResult.get(position).id);
size = searchResult.size(); size = searchResult.size();
} else { } else {
ArrayList<TLRPC.TL_contact> arr = MessagesController.Instance.usersSectionsDict.get(MessagesController.Instance.sortedUsersSectionsArray.get(section)); ArrayList<TLRPC.TL_contact> arr = ContactsController.Instance.usersSectionsDict.get(ContactsController.Instance.sortedUsersSectionsArray.get(section));
user = MessagesController.Instance.users.get(arr.get(position).user_id); user = MessagesController.Instance.users.get(arr.get(position).user_id);
size = arr.size(); size = arr.size();
} }
...@@ -497,9 +502,9 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -497,9 +502,9 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = li.inflate(R.layout.group_create_row_layout, parent, false); convertView = li.inflate(R.layout.group_create_row_layout, parent, false);
} }
ContactsActivity.ContactListRowHolder holder = (ContactsActivity.ContactListRowHolder)convertView.getTag(); ContactListRowHolder holder = (ContactListRowHolder)convertView.getTag();
if (holder == null) { if (holder == null) {
holder = new ContactsActivity.ContactListRowHolder(convertView); holder = new ContactListRowHolder(convertView);
convertView.setTag(holder); convertView.setTag(holder);
} }
...@@ -552,7 +557,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -552,7 +557,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
if (value == 0) { if (value == 0) {
value = user.status.expires; value = user.status.expires;
} }
holder.messageTextView.setText(getStringEntry(R.string.LastSeen) + " " + Utilities.formatDateOnline(value)); holder.messageTextView.setText(Utilities.formatDateOnline(value));
} }
holder.messageTextView.setTextColor(0xff808080); holder.messageTextView.setTextColor(0xff808080);
} }
...@@ -592,9 +597,21 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen ...@@ -592,9 +597,21 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
if (searching && searchWas) { if (searching && searchWas) {
textView.setText(getStringEntry(R.string.AllContacts)); textView.setText(getStringEntry(R.string.AllContacts));
} else { } else {
textView.setText(MessagesController.Instance.sortedUsersSectionsArray.get(section)); textView.setText(ContactsController.Instance.sortedUsersSectionsArray.get(section));
} }
return convertView; return convertView;
} }
} }
public static class ContactListRowHolder {
public BackupImageView avatarImage;
public TextView messageTextView;
public TextView nameTextView;
public ContactListRowHolder(View view) {
messageTextView = (TextView)view.findViewById(R.id.messages_list_row_message);
nameTextView = (TextView)view.findViewById(R.id.messages_list_row_name);
avatarImage = (BackupImageView)view.findViewById(R.id.messages_list_row_avatar);
}
}
} }
TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java
View file @ 9814a6e9
...@@ -15,7 +15,6 @@ import android.content.Intent; ...@@ -15,7 +15,6 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.internal.view.SupportMenuItem; import android.support.v4.internal.view.SupportMenuItem;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
...@@ -27,12 +26,12 @@ import android.widget.ImageButton; ...@@ -27,12 +26,12 @@ import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.messenger.MessagesController; import org.telegram.messenger.MessagesController;
import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Cells.ChatOrUserCell;
import org.telegram.ui.Views.AvatarUpdater; import org.telegram.ui.Views.AvatarUpdater;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.BackupImageView;
import org.telegram.ui.Views.BaseFragment; import org.telegram.ui.Views.BaseFragment;
...@@ -228,8 +227,9 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -228,8 +227,9 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
@Override @Override
public void didReceivedNotification(int id, final Object... args) { public void didReceivedNotification(int id, final Object... args) {
if (id == MessagesController.updateInterfaces) { if (id == MessagesController.updateInterfaces) {
if (listView != null) { int mask = (Integer)args[0];
listView.invalidateViews(); if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0 || (mask & MessagesController.UPDATE_MASK_STATUS) != 0) {
updateVisibleRows(mask);
} }
} else if (id == MessagesController.chatDidFailCreate) { } else if (id == MessagesController.chatDidFailCreate) {
Utilities.HideProgressDialog(parentActivity); Utilities.HideProgressDialog(parentActivity);
...@@ -250,6 +250,19 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -250,6 +250,19 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
} }
} }
private void updateVisibleRows(int mask) {
if (listView == null) {
return;
}
int count = listView.getChildCount();
for (int a = 0; a < count; a++) {
View child = listView.getChildAt(a);
if (child instanceof ChatOrUserCell) {
((ChatOrUserCell) child).update(mask);
}
}
}
private class ListAdapter extends SectionedBaseAdapter { private class ListAdapter extends SectionedBaseAdapter {
private Context mContext; private Context mContext;
...@@ -295,58 +308,13 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati ...@@ -295,58 +308,13 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
TLRPC.User user = MessagesController.Instance.users.get(selectedContacts.get(position)); TLRPC.User user = MessagesController.Instance.users.get(selectedContacts.get(position));
if (convertView == null) { if (convertView == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = new ChatOrUserCell(mContext);
convertView = li.inflate(R.layout.messages_search_user_layout, parent, false); ((ChatOrUserCell)convertView).useBoldFont = true;
} ((ChatOrUserCell)convertView).usePadding = false;
ContactsActivity.ContactListRowHolder holder = (ContactsActivity.ContactListRowHolder)convertView.getTag();
if (holder == null) {
holder = new ContactsActivity.ContactListRowHolder(convertView);
convertView.setTag(holder);
}
View divider = convertView.findViewById(R.id.settings_row_divider);
if (position == selectedContacts.size() - 1) {
divider.setVisibility(View.INVISIBLE);
} else {
divider.setVisibility(View.VISIBLE);
} }
if (user.first_name.length() != 0 && user.last_name.length() != 0) { ((ChatOrUserCell)convertView).setData(user, null, null, null, null);
holder.nameTextView.setText(Html.fromHtml(user.first_name + " <b>" + user.last_name + "</b>")); ((ChatOrUserCell) convertView).useSeparator = position != selectedContacts.size() - 1;
} else if (user.first_name.length() != 0) {
holder.nameTextView.setText(Html.fromHtml("<b>" + user.first_name + "</b>"));
} else {
holder.nameTextView.setText(Html.fromHtml("<b>" + user.last_name + "</b>"));
}
TLRPC.FileLocation photo = null;
if (user.photo != null) {
photo = user.photo.photo_small;
}
int placeHolderId = Utilities.getUserAvatarForId(user.id);
holder.avatarImage.setImage(photo, "50_50", placeHolderId);
if (user.status == null) {
holder.messageTextView.setTextColor(0xff808080);
holder.messageTextView.setText(getStringEntry(R.string.Offline));
} else {
int currentTime = ConnectionsManager.Instance.getCurrentTime();
if (user.status.expires > currentTime || user.status.was_online > currentTime) {
holder.messageTextView.setTextColor(0xff357aa8);
holder.messageTextView.setText(getStringEntry(R.string.Online));
} else {
if (user.status.was_online <= 10000 && user.status.expires <= 10000) {
holder.messageTextView.setText(getStringEntry(R.string.Invisible));
} else {
int value = user.status.was_online;
if (value == 0) {
value = user.status.expires;
}
holder.messageTextView.setText(getStringEntry(R.string.LastSeen) + " " + Utilities.formatDateOnline(value));
}
holder.messageTextView.setTextColor(0xff808080);
}
}
return convertView; return convertView;
} }
......
TMessagesProj/src/main/java/org/telegram/ui/IntroActivity.java
View file @ 9814a6e9
...@@ -23,8 +23,7 @@ import android.widget.ImageView; ...@@ -23,8 +23,7 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.Utilities;
import java.util.Locale;
public class IntroActivity extends ActionBarActivity { public class IntroActivity extends ActionBarActivity {
private ViewPager viewPager; private ViewPager viewPager;
...@@ -32,7 +31,6 @@ public class IntroActivity extends ActionBarActivity { ...@@ -32,7 +31,6 @@ public class IntroActivity extends ActionBarActivity {
private ImageView topImage2; private ImageView topImage2;
private ViewGroup bottomPages; private ViewGroup bottomPages;
private int lastPage = 0; private int lastPage = 0;
private boolean isRTL = false;
private boolean justCreated = false; private boolean justCreated = false;
private boolean startPressed = false; private boolean startPressed = false;
private int[] icons; private int[] icons;
...@@ -45,10 +43,7 @@ public class IntroActivity extends ActionBarActivity { ...@@ -45,10 +43,7 @@ public class IntroActivity extends ActionBarActivity {
setContentView(R.layout.intro_layout); setContentView(R.layout.intro_layout);
Locale locale = Locale.getDefault(); if (Utilities.isRTL) {
String lang = locale.getLanguage();
if (lang != null && lang.toLowerCase().equals("ar")) {
isRTL = true;
icons = new int[] { icons = new int[] {
R.drawable.intro7, R.drawable.intro7,
R.drawable.intro6, R.drawable.intro6,
...@@ -212,7 +207,7 @@ public class IntroActivity extends ActionBarActivity { ...@@ -212,7 +207,7 @@ public class IntroActivity extends ActionBarActivity {
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (justCreated) { if (justCreated) {
if (isRTL) { if (Utilities.isRTL) {
viewPager.setCurrentItem(6); viewPager.setCurrentItem(6);
lastPage = 6; lastPage = 6;
} else { } else {
......
TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
View file @ 9814a6e9
...@@ -14,6 +14,7 @@ import android.content.Intent; ...@@ -14,6 +14,7 @@ import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcelable;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
...@@ -21,6 +22,7 @@ import org.telegram.messenger.MessagesController; ...@@ -21,6 +22,7 @@ import org.telegram.messenger.MessagesController;
import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig; import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities;
import org.telegram.ui.Views.PausableActivity; import org.telegram.ui.Views.PausableActivity;
public class LaunchActivity extends PausableActivity { public class LaunchActivity extends PausableActivity {
...@@ -46,7 +48,15 @@ public class LaunchActivity extends PausableActivity { ...@@ -46,7 +48,15 @@ public class LaunchActivity extends PausableActivity {
if (Intent.ACTION_SEND.equals(intent.getAction())) { if (Intent.ACTION_SEND.equals(intent.getAction())) {
if (intent.getType() != null) { if (intent.getType() != null) {
if (intent.getType().startsWith("image/")) { if (intent.getType().startsWith("image/")) {
String path = intent.getParcelableExtra(Intent.EXTRA_STREAM).toString(); Parcelable parcelable = intent.getParcelableExtra(Intent.EXTRA_STREAM);
if (parcelable == null) {
return;
}
String path = null;
if (parcelable instanceof Uri) {
path = Utilities.getPath(this, (Uri)parcelable);
} else {
path = intent.getParcelableExtra(Intent.EXTRA_STREAM).toString();
if (path.startsWith("content:")) { if (path.startsWith("content:")) {
Cursor cursor = getContentResolver().query(Uri.parse(path), new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null); Cursor cursor = getContentResolver().query(Uri.parse(path), new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null);
if (cursor != null) { if (cursor != null) {
...@@ -55,6 +65,7 @@ public class LaunchActivity extends PausableActivity { ...@@ -55,6 +65,7 @@ public class LaunchActivity extends PausableActivity {
cursor.close(); cursor.close();
} }
} }
}
if (path != null) { if (path != null) {
if (path.startsWith("file:")) { if (path.startsWith("file:")) {
path = path.replace("file://", ""); path = path.replace("file://", "");
...@@ -62,7 +73,15 @@ public class LaunchActivity extends PausableActivity { ...@@ -62,7 +73,15 @@ public class LaunchActivity extends PausableActivity {
NotificationCenter.Instance.addToMemCache(533, path); NotificationCenter.Instance.addToMemCache(533, path);
} }
} else if (intent.getType().startsWith("video/")) { } else if (intent.getType().startsWith("video/")) {
String path = intent.getParcelableExtra(Intent.EXTRA_STREAM).toString(); Parcelable parcelable = intent.getParcelableExtra(Intent.EXTRA_STREAM);
if (parcelable == null) {
return;
}
String path = null;
if (parcelable instanceof Uri) {
path = Utilities.getPath(this, (Uri)parcelable);
} else {
path = parcelable.toString();
if (path.startsWith("content:")) { if (path.startsWith("content:")) {
Cursor cursor = getContentResolver().query(Uri.parse(path), new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null); Cursor cursor = getContentResolver().query(Uri.parse(path), new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null);
if (cursor != null) { if (cursor != null) {
...@@ -71,6 +90,7 @@ public class LaunchActivity extends PausableActivity { ...@@ -71,6 +90,7 @@ public class LaunchActivity extends PausableActivity {
cursor.close(); cursor.close();
} }
} }
}
if (path != null) { if (path != null) {
if (path.startsWith("file:")) { if (path.startsWith("file:")) {
path = path.replace("file://", ""); path = path.replace("file://", "");
...@@ -79,18 +99,25 @@ public class LaunchActivity extends PausableActivity { ...@@ -79,18 +99,25 @@ public class LaunchActivity extends PausableActivity {
} }
} else if (intent.getType().equals("text/plain")) { } else if (intent.getType().equals("text/plain")) {
String text = intent.getStringExtra(Intent.EXTRA_TEXT); String text = intent.getStringExtra(Intent.EXTRA_TEXT);
if (text.length() != 0) { if (text != null && text.length() != 0) {
NotificationCenter.Instance.addToMemCache(535, text); NotificationCenter.Instance.addToMemCache(535, text);
} }
} }
} }
} else if (Intent.ACTION_VIEW.equals(intent.getAction())) { } else if (Intent.ACTION_VIEW.equals(intent.getAction())) {
try {
Cursor cursor = getContentResolver().query(intent.getData(), null, null, null, null); Cursor cursor = getContentResolver().query(intent.getData(), null, null, null, null);
if (cursor != null) {
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
int userId = cursor.getInt(cursor.getColumnIndex("DATA4")); int userId = cursor.getInt(cursor.getColumnIndex("DATA4"));
NotificationCenter.Instance.postNotificationName(MessagesController.closeChats); NotificationCenter.Instance.postNotificationName(MessagesController.closeChats);
NotificationCenter.Instance.addToMemCache("push_user_id", userId); NotificationCenter.Instance.addToMemCache("push_user_id", userId);
} }
cursor.close();
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
} else if (intent.getAction().equals("org.telegram.messenger.OPEN_ACCOUNT")) { } else if (intent.getAction().equals("org.telegram.messenger.OPEN_ACCOUNT")) {
NotificationCenter.Instance.addToMemCache("open_settings", 1); NotificationCenter.Instance.addToMemCache("open_settings", 1);
} }
...@@ -115,6 +142,7 @@ public class LaunchActivity extends PausableActivity { ...@@ -115,6 +142,7 @@ public class LaunchActivity extends PausableActivity {
} }
int chatId = getIntent().getIntExtra("chatId", 0); int chatId = getIntent().getIntExtra("chatId", 0);
int userId = getIntent().getIntExtra("userId", 0); int userId = getIntent().getIntExtra("userId", 0);
int encId = getIntent().getIntExtra("encId", 0);
if (chatId != 0) { if (chatId != 0) {
TLRPC.Chat chat = MessagesController.Instance.chats.get(chatId); TLRPC.Chat chat = MessagesController.Instance.chats.get(chatId);
if (chat != null) { if (chat != null) {
...@@ -127,6 +155,12 @@ public class LaunchActivity extends PausableActivity { ...@@ -127,6 +155,12 @@ public class LaunchActivity extends PausableActivity {
NotificationCenter.Instance.postNotificationName(MessagesController.closeChats); NotificationCenter.Instance.postNotificationName(MessagesController.closeChats);
NotificationCenter.Instance.addToMemCache("push_user_id", userId); NotificationCenter.Instance.addToMemCache("push_user_id", userId);
} }
} else if (encId != 0) {
TLRPC.EncryptedChat chat = MessagesController.Instance.encryptedChats.get(encId);
if (chat != null) {
NotificationCenter.Instance.postNotificationName(MessagesController.closeChats);
NotificationCenter.Instance.addToMemCache("push_enc_id", encId);
}
} }
} }
} }
TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java
View file @ 9814a6e9
...@@ -329,7 +329,10 @@ public class LocationActivity extends BaseFragment implements NotificationCenter ...@@ -329,7 +329,10 @@ public class LocationActivity extends BaseFragment implements NotificationCenter
@Override @Override
public void didReceivedNotification(int id, Object... args) { public void didReceivedNotification(int id, Object... args) {
if (id == MessagesController.updateInterfaces) { if (id == MessagesController.updateInterfaces) {
int mask = (Integer)args[0];
if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0) {
updateUserData(); updateUserData();
}
} else if (id == MessagesController.closeChats) { } else if (id == MessagesController.closeChats) {
removeSelfFromStack(); removeSelfFromStack();
} }
......
TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
View file @ 9814a6e9
...@@ -25,7 +25,6 @@ import android.view.animation.AccelerateDecelerateInterpolator; ...@@ -25,7 +25,6 @@ import android.view.animation.AccelerateDecelerateInterpolator;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Views.SlideView; import org.telegram.ui.Views.SlideView;
......
TMessagesProj/src/main/java/org/telegram/ui/LoginActivityPhoneView.java
View file @ 9814a6e9
...@@ -299,6 +299,10 @@ public class LoginActivityPhoneView extends SlideView implements AdapterView.OnI ...@@ -299,6 +299,10 @@ public class LoginActivityPhoneView extends SlideView implements AdapterView.OnI
@Override @Override
public void onNextPressed() { public void onNextPressed() {
if (codeField.length() == 0 || phoneField.length() == 0) {
delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidPhoneNumber));
return;
}
TLRPC.TL_auth_sendCode req = new TLRPC.TL_auth_sendCode(); TLRPC.TL_auth_sendCode req = new TLRPC.TL_auth_sendCode();
String phone = PhoneFormat.stripExceptNumbers("" + codeField.getText() + phoneField.getText()); String phone = PhoneFormat.stripExceptNumbers("" + codeField.getText() + phoneField.getText());
req.api_hash = ConnectionsManager.APP_HASH; req.api_hash = ConnectionsManager.APP_HASH;
...@@ -327,10 +331,13 @@ public class LoginActivityPhoneView extends SlideView implements AdapterView.OnI ...@@ -327,10 +331,13 @@ public class LoginActivityPhoneView extends SlideView implements AdapterView.OnI
Utilities.RunOnUIThread(new Runnable() { Utilities.RunOnUIThread(new Runnable() {
@Override @Override
public void run() { public void run() {
if (delegate != null) {
delegate.setPage(1, true, params, false); delegate.setPage(1, true, params, false);
} }
}
}); });
} else { } else {
if (delegate != null) {
if (error.text != null) { if (error.text != null) {
if (error.text.contains("PHONE_NUMBER_INVALID")) { if (error.text.contains("PHONE_NUMBER_INVALID")) {
delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidPhoneNumber)); delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidPhoneNumber));
...@@ -345,8 +352,11 @@ public class LoginActivityPhoneView extends SlideView implements AdapterView.OnI ...@@ -345,8 +352,11 @@ public class LoginActivityPhoneView extends SlideView implements AdapterView.OnI
} }
} }
} }
}
if (delegate != null) {
delegate.needHideProgress(); delegate.needHideProgress();
} }
}
}, null, true, RPCRequest.RPCRequestClassGeneric | RPCRequest.RPCRequestClassFailOnServerErrors); }, null, true, RPCRequest.RPCRequestClassGeneric | RPCRequest.RPCRequestClassFailOnServerErrors);
} }
......
TMessagesProj/src/main/java/org/telegram/ui/LoginActivityRegisterView.java
View file @ 9814a6e9
...@@ -22,6 +22,7 @@ import android.widget.TextView; ...@@ -22,6 +22,7 @@ import android.widget.TextView;
import org.telegram.TL.TLObject; import org.telegram.TL.TLObject;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.ContactsController;
import org.telegram.messenger.MessagesController; import org.telegram.messenger.MessagesController;
import org.telegram.messenger.MessagesStorage; import org.telegram.messenger.MessagesStorage;
import org.telegram.messenger.R; import org.telegram.messenger.R;
...@@ -191,7 +192,9 @@ public class LoginActivityRegisterView extends SlideView { ...@@ -191,7 +192,9 @@ public class LoginActivityRegisterView extends SlideView {
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() { ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override @Override
public void run(TLObject response, TLRPC.TL_error error) { public void run(TLObject response, TLRPC.TL_error error) {
if (delegate != null) {
delegate.needHideProgress(); delegate.needHideProgress();
}
if (error == null) { if (error == null) {
final TLRPC.TL_auth_authorization res = (TLRPC.TL_auth_authorization)response; final TLRPC.TL_auth_authorization res = (TLRPC.TL_auth_authorization)response;
Utilities.RunOnUIThread(new Runnable() { Utilities.RunOnUIThread(new Runnable() {
...@@ -211,11 +214,14 @@ public class LoginActivityRegisterView extends SlideView { ...@@ -211,11 +214,14 @@ public class LoginActivityRegisterView extends SlideView {
MessagesStorage.Instance.putUsersAndChats(users, null, true, true); MessagesStorage.Instance.putUsersAndChats(users, null, true, true);
//MessagesController.Instance.uploadAndApplyUserAvatar(avatarPhotoBig); //MessagesController.Instance.uploadAndApplyUserAvatar(avatarPhotoBig);
MessagesController.Instance.users.put(res.user.id, res.user); MessagesController.Instance.users.put(res.user.id, res.user);
MessagesController.Instance.checkAppAccount(); ContactsController.Instance.checkAppAccount();
if (delegate != null) {
delegate.needFinishActivity(); delegate.needFinishActivity();
} }
}
}); });
} else { } else {
if (delegate != null) {
if (error.text.contains("PHONE_NUMBER_INVALID")) { if (error.text.contains("PHONE_NUMBER_INVALID")) {
delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidPhoneNumber)); delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidPhoneNumber));
} else if (error.text.contains("PHONE_CODE_EMPTY") || error.text.contains("PHONE_CODE_INVALID")) { } else if (error.text.contains("PHONE_CODE_EMPTY") || error.text.contains("PHONE_CODE_INVALID")) {
...@@ -231,6 +237,7 @@ public class LoginActivityRegisterView extends SlideView { ...@@ -231,6 +237,7 @@ public class LoginActivityRegisterView extends SlideView {
} }
} }
} }
}
}, null, true, RPCRequest.RPCRequestClassGeneric); }, null, true, RPCRequest.RPCRequestClassGeneric);
} }
......
TMessagesProj/src/main/java/org/telegram/ui/LoginActivitySmsView.java
View file @ 9814a6e9
...@@ -24,6 +24,8 @@ import org.telegram.PhoneFormat.PhoneFormat; ...@@ -24,6 +24,8 @@ import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLObject; import org.telegram.TL.TLObject;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.ContactsController;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.MessagesController; import org.telegram.messenger.MessagesController;
import org.telegram.messenger.MessagesStorage; import org.telegram.messenger.MessagesStorage;
import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.NotificationCenter;
...@@ -47,6 +49,7 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente ...@@ -47,6 +49,7 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente
private Bundle currentParams; private Bundle currentParams;
private Timer timeTimer; private Timer timeTimer;
private final Integer timerSync = 1;
private int time = 60000; private int time = 60000;
private double lastCurrentTime; private double lastCurrentTime;
private boolean waitingForSms = false; private boolean waitingForSms = false;
...@@ -102,6 +105,7 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente ...@@ -102,6 +105,7 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente
@Override @Override
public void setParams(Bundle params) { public void setParams(Bundle params) {
codeField.setText(""); codeField.setText("");
Utilities.setWaitingForSms(true);
NotificationCenter.Instance.addObserver(this, 998); NotificationCenter.Instance.addObserver(this, 998);
currentParams = params; currentParams = params;
waitingForSms = true; waitingForSms = true;
...@@ -117,10 +121,16 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente ...@@ -117,10 +121,16 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente
codeField.requestFocus(); codeField.requestFocus();
time = 60000; time = 60000;
try {
synchronized(timerSync) {
if (timeTimer != null) { if (timeTimer != null) {
timeTimer.cancel(); timeTimer.cancel();
timeTimer = null; timeTimer = null;
} }
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
timeText.setText(String.format("%s 1:00", ApplicationLoader.applicationContext.getResources().getString(R.string.CallText))); timeText.setText(String.format("%s 1:00", ApplicationLoader.applicationContext.getResources().getString(R.string.CallText)));
lastCurrentTime = System.currentTimeMillis(); lastCurrentTime = System.currentTimeMillis();
timeTimer = new Timer(); timeTimer = new Timer();
...@@ -140,10 +150,12 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente ...@@ -140,10 +150,12 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente
timeText.setText(String.format("%s %d:%02d", ApplicationLoader.applicationContext.getResources().getString(R.string.CallText), minutes, seconds)); timeText.setText(String.format("%s %d:%02d", ApplicationLoader.applicationContext.getResources().getString(R.string.CallText), minutes, seconds));
} else { } else {
timeText.setText(ApplicationLoader.applicationContext.getResources().getString(R.string.Calling)); timeText.setText(ApplicationLoader.applicationContext.getResources().getString(R.string.Calling));
synchronized(timerSync) {
if (timeTimer != null) { if (timeTimer != null) {
timeTimer.cancel(); timeTimer.cancel();
timeTimer = null; timeTimer = null;
} }
}
TLRPC.TL_auth_sendCall req = new TLRPC.TL_auth_sendCall(); TLRPC.TL_auth_sendCall req = new TLRPC.TL_auth_sendCall();
req.phone_number = requestPhone; req.phone_number = requestPhone;
req.phone_code_hash = phoneHash; req.phone_code_hash = phoneHash;
...@@ -162,12 +174,25 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente ...@@ -162,12 +174,25 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente
@Override @Override
public void onNextPressed() { public void onNextPressed() {
waitingForSms = false; waitingForSms = false;
Utilities.setWaitingForSms(false);
NotificationCenter.Instance.removeObserver(this, 998); NotificationCenter.Instance.removeObserver(this, 998);
final TLRPC.TL_auth_signIn req = new TLRPC.TL_auth_signIn(); final TLRPC.TL_auth_signIn req = new TLRPC.TL_auth_signIn();
req.phone_number = requestPhone; req.phone_number = requestPhone;
req.phone_code = codeField.getText().toString(); req.phone_code = codeField.getText().toString();
req.phone_code_hash = phoneHash; req.phone_code_hash = phoneHash;
try {
synchronized(timerSync) {
if (timeTimer != null) {
timeTimer.cancel();
timeTimer = null;
}
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
if (delegate != null) {
delegate.needShowProgress(); delegate.needShowProgress();
}
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() { ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override @Override
public void run(TLObject response, TLRPC.TL_error error) { public void run(TLObject response, TLRPC.TL_error error) {
...@@ -182,10 +207,16 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente ...@@ -182,10 +207,16 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente
if (delegate == null) { if (delegate == null) {
return; return;
} }
try {
synchronized(timerSync) {
if (timeTimer != null) { if (timeTimer != null) {
timeTimer.cancel(); timeTimer.cancel();
timeTimer = null; timeTimer = null;
} }
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
UserConfig.clearConfig(); UserConfig.clearConfig();
MessagesStorage.Instance.cleanUp(); MessagesStorage.Instance.cleanUp();
MessagesController.Instance.cleanUp(); MessagesController.Instance.cleanUp();
...@@ -198,9 +229,11 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente ...@@ -198,9 +229,11 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente
users.add(UserConfig.currentUser); users.add(UserConfig.currentUser);
MessagesStorage.Instance.putUsersAndChats(users, null, true, true); MessagesStorage.Instance.putUsersAndChats(users, null, true, true);
MessagesController.Instance.users.put(res.user.id, res.user); MessagesController.Instance.users.put(res.user.id, res.user);
MessagesController.Instance.checkAppAccount(); ContactsController.Instance.checkAppAccount();
if (delegate != null) {
delegate.needFinishActivity(); delegate.needFinishActivity();
} }
}
}); });
} else { } else {
if (error.text.contains("PHONE_NUMBER_UNOCCUPIED") && registered == null) { if (error.text.contains("PHONE_NUMBER_UNOCCUPIED") && registered == null) {
...@@ -212,13 +245,58 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente ...@@ -212,13 +245,58 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente
params.putString("phoneHash", phoneHash); params.putString("phoneHash", phoneHash);
params.putString("code", req.phone_code); params.putString("code", req.phone_code);
delegate.setPage(2, true, params, false); delegate.setPage(2, true, params, false);
try {
synchronized(timerSync) {
if (timeTimer != null) { if (timeTimer != null) {
timeTimer.cancel(); timeTimer.cancel();
timeTimer = null; timeTimer = null;
} }
} }
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
}); });
} else { } else {
if (timeTimer == null) {
timeTimer = new Timer();
timeTimer.schedule(new TimerTask() {
@Override
public void run() {
double currentTime = System.currentTimeMillis();
double diff = currentTime - lastCurrentTime;
time -= diff;
lastCurrentTime = currentTime;
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
if (time >= 1000) {
int minutes = time / 1000 / 60;
int seconds = time / 1000 - minutes * 60;
timeText.setText(String.format("%s %d:%02d", ApplicationLoader.applicationContext.getResources().getString(R.string.CallText), minutes, seconds));
} else {
timeText.setText(ApplicationLoader.applicationContext.getResources().getString(R.string.Calling));
synchronized(timerSync) {
if (timeTimer != null) {
timeTimer.cancel();
timeTimer = null;
}
}
TLRPC.TL_auth_sendCall req = new TLRPC.TL_auth_sendCall();
req.phone_number = requestPhone;
req.phone_code_hash = phoneHash;
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override
public void run(TLObject response, TLRPC.TL_error error) {
}
}, null, true, RPCRequest.RPCRequestClassGeneric | RPCRequest.RPCRequestClassFailOnServerErrors);
}
}
});
}
}, 0, 1000);
}
if (delegate != null) {
if (error.text.contains("PHONE_NUMBER_INVALID")) { if (error.text.contains("PHONE_NUMBER_INVALID")) {
delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidPhoneNumber)); delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidPhoneNumber));
} else if (error.text.contains("PHONE_CODE_EMPTY") || error.text.contains("PHONE_CODE_INVALID")) { } else if (error.text.contains("PHONE_CODE_EMPTY") || error.text.contains("PHONE_CODE_INVALID")) {
...@@ -231,16 +309,24 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente ...@@ -231,16 +309,24 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente
} }
} }
} }
}
}, null, true, RPCRequest.RPCRequestClassGeneric | RPCRequest.RPCRequestClassFailOnServerErrors); }, null, true, RPCRequest.RPCRequestClassGeneric | RPCRequest.RPCRequestClassFailOnServerErrors);
} }
@Override @Override
public void onBackPressed() { public void onBackPressed() {
try {
synchronized(timerSync) {
if (timeTimer != null) { if (timeTimer != null) {
timeTimer.cancel(); timeTimer.cancel();
timeTimer = null; timeTimer = null;
} }
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
currentParams = null; currentParams = null;
Utilities.setWaitingForSms(false);
NotificationCenter.Instance.removeObserver(this, 998); NotificationCenter.Instance.removeObserver(this, 998);
waitingForSms = false; waitingForSms = false;
} }
...@@ -248,11 +334,18 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente ...@@ -248,11 +334,18 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente
@Override @Override
public void onDestroyActivity() { public void onDestroyActivity() {
super.onDestroyActivity(); super.onDestroyActivity();
Utilities.setWaitingForSms(false);
NotificationCenter.Instance.removeObserver(this, 998); NotificationCenter.Instance.removeObserver(this, 998);
try {
synchronized(timerSync) {
if (timeTimer != null) { if (timeTimer != null) {
timeTimer.cancel(); timeTimer.cancel();
timeTimer = null; timeTimer = null;
} }
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
waitingForSms = false; waitingForSms = false;
} }
......
TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java
View file @ 9814a6e9
...@@ -11,15 +11,12 @@ package org.telegram.ui; ...@@ -11,15 +11,12 @@ package org.telegram.ui;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.graphics.Typeface;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.support.v4.internal.view.SupportMenuItem; import android.support.v4.internal.view.SupportMenuItem;
import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.widget.SearchView; import android.support.v7.widget.SearchView;
import android.text.Html;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
...@@ -33,25 +30,22 @@ import android.widget.ImageView; ...@@ -33,25 +30,22 @@ import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLObject; import org.telegram.TL.TLObject;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.Emoji; import org.telegram.messenger.ContactsController;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.objects.MessageObject;
import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.MessagesController; import org.telegram.messenger.MessagesController;
import org.telegram.messenger.MessagesStorage; import org.telegram.messenger.MessagesStorage;
import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig; import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Cells.ChatOrUserCell;
import org.telegram.ui.Cells.DialogCell;
import org.telegram.ui.Views.BaseFragment; import org.telegram.ui.Views.BaseFragment;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
...@@ -65,7 +59,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -65,7 +59,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
private SearchView searchView; private SearchView searchView;
public int selectAlertString = 0; public int selectAlertString = 0;
private boolean serverOnly = false; private boolean serverOnly = false;
private boolean isRTL;
private static boolean dialogsLoaded = false; private static boolean dialogsLoaded = false;
private boolean searching = false; private boolean searching = false;
...@@ -91,7 +84,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -91,7 +84,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
NotificationCenter.Instance.addObserver(this, 999); NotificationCenter.Instance.addObserver(this, 999);
NotificationCenter.Instance.addObserver(this, MessagesController.updateInterfaces); NotificationCenter.Instance.addObserver(this, MessagesController.updateInterfaces);
NotificationCenter.Instance.addObserver(this, MessagesController.reloadSearchResults); NotificationCenter.Instance.addObserver(this, MessagesController.reloadSearchResults);
NotificationCenter.Instance.addObserver(this, MessagesController.userPrintUpdateAll);
NotificationCenter.Instance.addObserver(this, MessagesController.encryptedChatUpdated); NotificationCenter.Instance.addObserver(this, MessagesController.encryptedChatUpdated);
NotificationCenter.Instance.addObserver(this, MessagesController.contactsDidLoaded); NotificationCenter.Instance.addObserver(this, MessagesController.contactsDidLoaded);
NotificationCenter.Instance.addObserver(this, 1234); NotificationCenter.Instance.addObserver(this, 1234);
...@@ -100,8 +92,8 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -100,8 +92,8 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
serverOnly = getArguments().getBoolean("serverOnly", false); serverOnly = getArguments().getBoolean("serverOnly", false);
} }
if (!dialogsLoaded) { if (!dialogsLoaded) {
MessagesController.Instance.readContacts();
MessagesController.Instance.loadDialogs(0, 0, 100, true); MessagesController.Instance.loadDialogs(0, 0, 100, true);
ContactsController.Instance.checkAppAccount();
dialogsLoaded = true; dialogsLoaded = true;
} }
return true; return true;
...@@ -114,7 +106,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -114,7 +106,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
NotificationCenter.Instance.removeObserver(this, 999); NotificationCenter.Instance.removeObserver(this, 999);
NotificationCenter.Instance.removeObserver(this, MessagesController.updateInterfaces); NotificationCenter.Instance.removeObserver(this, MessagesController.updateInterfaces);
NotificationCenter.Instance.removeObserver(this, MessagesController.reloadSearchResults); NotificationCenter.Instance.removeObserver(this, MessagesController.reloadSearchResults);
NotificationCenter.Instance.removeObserver(this, MessagesController.userPrintUpdateAll);
NotificationCenter.Instance.removeObserver(this, MessagesController.encryptedChatUpdated); NotificationCenter.Instance.removeObserver(this, MessagesController.encryptedChatUpdated);
NotificationCenter.Instance.removeObserver(this, MessagesController.contactsDidLoaded); NotificationCenter.Instance.removeObserver(this, MessagesController.contactsDidLoaded);
NotificationCenter.Instance.removeObserver(this, 1234); NotificationCenter.Instance.removeObserver(this, 1234);
...@@ -133,9 +124,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -133,9 +124,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
fragmentView = inflater.inflate(R.layout.messages_list, container, false); fragmentView = inflater.inflate(R.layout.messages_list, container, false);
messagesListViewAdapter = new MessagesAdapter(parentActivity); messagesListViewAdapter = new MessagesAdapter(parentActivity);
Locale locale = Locale.getDefault();
String lang = locale.getLanguage();
isRTL = lang != null && lang.toLowerCase().equals("ar");
messagesListView = (ListView)fragmentView.findViewById(R.id.messages_list_view); messagesListView = (ListView)fragmentView.findViewById(R.id.messages_list_view);
messagesListView.setAdapter(messagesListViewAdapter); messagesListView.setAdapter(messagesListViewAdapter);
...@@ -248,7 +236,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -248,7 +236,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
if (which == 0) { if (which == 0) {
MessagesController.Instance.deleteDialog(selectedDialog, 0, true); MessagesController.Instance.deleteDialog(selectedDialog, 0, true);
} else if (which == 1) { } else if (which == 1) {
MessagesController.Instance.deleteUserFromChat((int) -selectedDialog, UserConfig.clientUserId, null); MessagesController.Instance.deleteUserFromChat((int) -selectedDialog, MessagesController.Instance.users.get(UserConfig.clientUserId), null);
MessagesController.Instance.deleteDialog(selectedDialog, 0, false); MessagesController.Instance.deleteDialog(selectedDialog, 0, false);
} }
} }
...@@ -314,7 +302,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -314,7 +302,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
actionBar.setDisplayShowCustomEnabled(false); actionBar.setDisplayShowCustomEnabled(false);
actionBar.setSubtitle(null); actionBar.setSubtitle(null);
actionBar.setCustomView(null); actionBar.setCustomView(null);
actionBar.setTitle(getStringEntry(R.string.AppName)); actionBar.setTitle(getStringEntry(R.string.SelectChat));
((ApplicationActivity)parentActivity).fixBackButton(); ((ApplicationActivity)parentActivity).fixBackButton();
} else { } else {
ImageView view = (ImageView)parentActivity.findViewById(16908332); ImageView view = (ImageView)parentActivity.findViewById(16908332);
...@@ -392,12 +380,10 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -392,12 +380,10 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
} }
} else if (id == 999) { } else if (id == 999) {
if (messagesListView != null) { if (messagesListView != null) {
updateVisibleRows(); updateVisibleRows(0);
} }
} else if (id == MessagesController.updateInterfaces) { } else if (id == MessagesController.updateInterfaces) {
if (messagesListViewAdapter != null) { updateVisibleRows((Integer)args[0]);
messagesListViewAdapter.notifyDataSetChanged();
}
} else if (id == MessagesController.reloadSearchResults) { } else if (id == MessagesController.reloadSearchResults) {
int token = (Integer)args[0]; int token = (Integer)args[0];
if (token == activityToken) { if (token == activityToken) {
...@@ -405,32 +391,24 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -405,32 +391,24 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
} }
} else if (id == 1234) { } else if (id == 1234) {
dialogsLoaded = false; dialogsLoaded = false;
} else if (id == MessagesController.userPrintUpdateAll) {
if (messagesListView != null) {
updateVisibleRows();
}
} else if (id == MessagesController.encryptedChatUpdated) { } else if (id == MessagesController.encryptedChatUpdated) {
if (messagesListView != null) { updateVisibleRows(0);
updateVisibleRows();
}
} else if (id == MessagesController.contactsDidLoaded) { } else if (id == MessagesController.contactsDidLoaded) {
if (messagesListView != null) { updateVisibleRows(0);
updateVisibleRows();
}
} }
} }
private void updateVisibleRows() { private void updateVisibleRows(int mask) {
if (searching && searchWas) { if (messagesListView == null) {
messagesListView.invalidate(); return;
} else { }
int count = messagesListView.getChildCount(); int count = messagesListView.getChildCount();
for (int a = 0; a < count; a++) { for (int a = 0; a < count; a++) {
View child = messagesListView.getChildAt(a); View child = messagesListView.getChildAt(a);
Object tag = child.getTag(); if (child instanceof DialogCell) {
if (tag instanceof MessagesListRowHolder) { ((DialogCell) child).update(mask);
((MessagesListRowHolder) tag).update(); } else if (child instanceof ChatOrUserCell) {
} ((ChatOrUserCell) child).update(mask);
} }
} }
} }
...@@ -452,15 +430,24 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -452,15 +430,24 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
if (lower_part != 0) { if (lower_part != 0) {
if (lower_part > 0) { if (lower_part > 0) {
TLRPC.User user = MessagesController.Instance.users.get(lower_part); TLRPC.User user = MessagesController.Instance.users.get(lower_part);
if (user == null) {
return;
}
builder.setMessage(String.format(getStringEntry(selectAlertString), Utilities.formatName(user.first_name, user.last_name))); builder.setMessage(String.format(getStringEntry(selectAlertString), Utilities.formatName(user.first_name, user.last_name)));
} else if (lower_part < 0) { } else if (lower_part < 0) {
TLRPC.Chat chat = MessagesController.Instance.chats.get(-lower_part); TLRPC.Chat chat = MessagesController.Instance.chats.get(-lower_part);
if (chat == null) {
return;
}
builder.setMessage(String.format(getStringEntry(selectAlertString), chat.title)); builder.setMessage(String.format(getStringEntry(selectAlertString), chat.title));
} }
} else { } else {
int chat_id = (int)(dialog_id >> 32); int chat_id = (int)(dialog_id >> 32);
TLRPC.EncryptedChat chat = MessagesController.Instance.encryptedChats.get(chat_id); TLRPC.EncryptedChat chat = MessagesController.Instance.encryptedChats.get(chat_id);
TLRPC.User user = MessagesController.Instance.users.get(chat.user_id); TLRPC.User user = MessagesController.Instance.users.get(chat.user_id);
if (user == null) {
return;
}
builder.setMessage(String.format(getStringEntry(selectAlertString), Utilities.formatName(user.first_name, user.last_name))); builder.setMessage(String.format(getStringEntry(selectAlertString), Utilities.formatName(user.first_name, user.last_name)));
} }
builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
...@@ -740,29 +727,14 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -740,29 +727,14 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
@Override @Override
public View getView(int i, View view, ViewGroup viewGroup) { public View getView(int i, View view, ViewGroup viewGroup) {
if (searching && searchWas) { if (searching && searchWas) {
int type = getItemViewType(i);
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new ChatOrUserCell(mContext);
if (type == 2) {
view = li.inflate(R.layout.messages_search_user_layout, viewGroup, false);
} else {
view = li.inflate(R.layout.messages_search_chat_layout, viewGroup, false);
}
View v = view.findViewById(R.id.settings_row_divider);
v.setVisibility(View.VISIBLE);
view.setPadding(Utilities.dp(11), 0, Utilities.dp(11), 0);
}
MessagesListSearchRowHolder holder = (MessagesListSearchRowHolder)view.getTag();
if (holder == null) {
holder = new MessagesListSearchRowHolder(view);
view.setTag(holder);
} }
TLRPC.User user = null; TLRPC.User user = null;
TLRPC.Chat chat = null; TLRPC.Chat chat = null;
TLRPC.EncryptedChat encryptedChat = null; TLRPC.EncryptedChat encryptedChat = null;
TLObject obj = searchResult.get(i); TLObject obj = searchResult.get(i);
CharSequence name = searchResultNames.get(i);
if (obj instanceof TLRPC.User) { if (obj instanceof TLRPC.User) {
user = MessagesController.Instance.users.get(((TLRPC.User)obj).id); user = MessagesController.Instance.users.get(((TLRPC.User)obj).id);
} else if (obj instanceof TLRPC.Chat) { } else if (obj instanceof TLRPC.Chat) {
...@@ -772,57 +744,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -772,57 +744,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
user = MessagesController.Instance.users.get(encryptedChat.user_id); user = MessagesController.Instance.users.get(encryptedChat.user_id);
} }
holder.nameTextView.setText(name); ((ChatOrUserCell)view).setData(user, chat, encryptedChat, searchResultNames.get(i), null);
if (encryptedChat != null) {
if (!isRTL) {
holder.nameTextView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_lock_green, 0, 0, 0);
} else {
holder.nameTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_green, 0);
}
holder.nameTextView.setCompoundDrawablePadding(Utilities.dp(4));
} else {
holder.nameTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
holder.nameTextView.setCompoundDrawablePadding(0);
}
TLRPC.FileLocation photo = null;
int placeHolderId = 0;
if (user != null) {
if (user.photo != null) {
photo = user.photo.photo_small;
}
placeHolderId = Utilities.getUserAvatarForId(user.id);
} else if (chat != null) {
if (chat.photo != null) {
photo = chat.photo.photo_small;
}
placeHolderId = Utilities.getGroupAvatarForId(chat.id);
}
holder.avatarImage.setImage(photo, "50_50", placeHolderId);
if (user != null) {
if (user.status == null) {
holder.messageTextView.setTextColor(0xff808080);
holder.messageTextView.setText(getStringEntry(R.string.Offline));
} else {
int currentTime = ConnectionsManager.Instance.getCurrentTime();
if (user.status.expires > currentTime || user.status.was_online > currentTime) {
holder.messageTextView.setTextColor(0xff316f9f);
holder.messageTextView.setText(getStringEntry(R.string.Online));
} else {
if (user.status.was_online <= 10000 && user.status.expires <= 10000) {
holder.messageTextView.setText(getStringEntry(R.string.Invisible));
} else {
int value = user.status.was_online;
if (value == 0) {
value = user.status.expires;
}
holder.messageTextView.setText(getStringEntry(R.string.LastSeen) + " " + Utilities.formatDateOnline(value));
}
holder.messageTextView.setTextColor(0xff808080);
}
}
}
return view; return view;
} }
...@@ -836,21 +758,13 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -836,21 +758,13 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
} }
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new DialogCell(mContext);
view = li.inflate(R.layout.messages_list_row, viewGroup, false);
}
MessagesListRowHolder holder = (MessagesListRowHolder)view.getTag();
if (holder == null) {
holder = new MessagesListRowHolder(view);
view.setTag(holder);
} }
if (serverOnly) { if (serverOnly) {
holder.dialog = MessagesController.Instance.dialogsServerOnly.get(i); ((DialogCell)view).setDialog(MessagesController.Instance.dialogsServerOnly.get(i));
} else { } else {
holder.dialog = MessagesController.Instance.dialogs.get(i); ((DialogCell)view).setDialog(MessagesController.Instance.dialogs.get(i));
} }
holder.update();
return view; return view;
} }
...@@ -865,15 +779,9 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -865,15 +779,9 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
return 3; return 3;
} }
} }
if (serverOnly) { if (serverOnly && i == MessagesController.Instance.dialogsServerOnly.size() || !serverOnly && i == MessagesController.Instance.dialogs.size()) {
if (i == MessagesController.Instance.dialogsServerOnly.size()) {
return 1;
}
} else {
if (i == MessagesController.Instance.dialogs.size()) {
return 1; return 1;
} }
}
return 0; return 0;
} }
...@@ -905,250 +813,4 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ...@@ -905,250 +813,4 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
return count == 0; return count == 0;
} }
} }
private class MessagesListSearchRowHolder {
public BackupImageView avatarImage;
public TextView messageTextView;
public TextView nameTextView;
public MessagesListSearchRowHolder(View view) {
messageTextView = (TextView)view.findViewById(R.id.messages_list_row_message);
nameTextView = (TextView)view.findViewById(R.id.messages_list_row_name);
avatarImage = (BackupImageView)view.findViewById(R.id.messages_list_row_avatar);
}
}
private class MessagesListRowHolder {
public ImageView errorImage;
public TextView messagesCountImage;
public BackupImageView avatarImage;
public TextView timeTextView;
public TextView messageTextView;
public TextView nameTextView;
public ImageView check1Image;
public ImageView check2Image;
public ImageView clockImage;
public TLRPC.TL_dialog dialog;
public MessagesListRowHolder(View view) {
messageTextView = (TextView)view.findViewById(R.id.messages_list_row_message);
nameTextView = (TextView)view.findViewById(R.id.messages_list_row_name);
if (nameTextView != null) {
Typeface typeface = Utilities.getTypeface("fonts/rmedium.ttf");
nameTextView.setTypeface(typeface);
}
timeTextView = (TextView)view.findViewById(R.id.messages_list_row_time);
avatarImage = (BackupImageView)view.findViewById(R.id.messages_list_row_avatar);
messagesCountImage = (TextView)view.findViewById(R.id.messages_list_row_badge);
errorImage = (ImageView)view.findViewById(R.id.messages_list_row_error);
check1Image = (ImageView)view.findViewById(R.id.messages_list_row_check_half);
check2Image = (ImageView)view.findViewById(R.id.messages_list_row_check);
clockImage = (ImageView)view.findViewById(R.id.messages_list_row_clock);
}
public void update() {
MessageObject message = MessagesController.Instance.dialogMessage.get(dialog.top_message);
TLRPC.User user = null;
TLRPC.Chat chat = null;
TLRPC.EncryptedChat encryptedChat = null;
int lower_id = (int)dialog.id;
if (lower_id != 0) {
if (lower_id < 0) {
chat = MessagesController.Instance.chats.get(-lower_id);
} else {
user = MessagesController.Instance.users.get(lower_id);
}
nameTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
nameTextView.setCompoundDrawablePadding(0);
} else {
encryptedChat = MessagesController.Instance.encryptedChats.get((int)(dialog.id >> 32));
if (encryptedChat != null) {
user = MessagesController.Instance.users.get(encryptedChat.user_id);
if (!isRTL) {
nameTextView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_lock_green, 0, 0, 0);
} else {
nameTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_green, 0);
}
nameTextView.setCompoundDrawablePadding(Utilities.dp(4));
} else {
Log.e("test", "tda");
}
}
if (chat != null) {
nameTextView.setText(chat.title);
nameTextView.setTextColor(0xff000000);
} else if (user != null) {
if (user.id != 333000 && MessagesController.Instance.contactsDict.get(user.id) == null) {
if (MessagesController.Instance.contactsDict.size() == 0 && MessagesController.Instance.loadingContacts) {
nameTextView.setTextColor(0xff000000);
nameTextView.setText(Utilities.formatName(user.first_name, user.last_name));
} else {
if (user.phone != null && user.phone.length() != 0) {
nameTextView.setTextColor(0xff000000);
nameTextView.setText(PhoneFormat.Instance.format("+" + user.phone));
} else {
nameTextView.setTextColor(0xff316f9f);
nameTextView.setText(Utilities.formatName(user.first_name, user.last_name));
}
}
if (encryptedChat != null) {
nameTextView.setTextColor(0xff00a60e);
}
} else {
if (encryptedChat != null) {
nameTextView.setTextColor(0xff00a60e);
} else {
nameTextView.setTextColor(0xff000000);
}
nameTextView.setText(Utilities.formatName(user.first_name, user.last_name));
}
}
TLRPC.FileLocation photo = null;
int placeHolderId = 0;
if (user != null) {
if (user.photo != null) {
photo = user.photo.photo_small;
}
placeHolderId = Utilities.getUserAvatarForId(user.id);
} else if (chat != null) {
if (chat.photo != null) {
photo = chat.photo.photo_small;
}
placeHolderId = Utilities.getGroupAvatarForId(chat.id);
}
CharSequence printingString = MessagesController.Instance.printingStrings.get(dialog.id);
avatarImage.setImage(photo, "50_50", placeHolderId);
if (message == null) {
if (printingString != null) {
messageTextView.setText(printingString);
messageTextView.setTextColor(0xff316f9f);
} else {
if (encryptedChat != null) {
messageTextView.setTextColor(0xff316f9f);
if (encryptedChat instanceof TLRPC.TL_encryptedChatRequested) {
messageTextView.setText(getStringEntry(R.string.EncryptionProcessing));
} else if (encryptedChat instanceof TLRPC.TL_encryptedChatWaiting) {
messageTextView.setText(String.format(getStringEntry(R.string.AwaitingEncryption), user.first_name));
} else if (encryptedChat instanceof TLRPC.TL_encryptedChatDiscarded) {
messageTextView.setText(getStringEntry(R.string.EncryptionRejected));
} else if (encryptedChat instanceof TLRPC.TL_encryptedChat) {
if (encryptedChat.admin_id == UserConfig.clientUserId) {
if (user != null) {
messageTextView.setText(String.format(getStringEntry(R.string.EncryptedChatStartedOutgoing), user.first_name));
}
} else {
if (user != null) {
messageTextView.setText(String.format(getStringEntry(R.string.EncryptedChatStartedIncoming), user.first_name));
}
}
}
} else {
messageTextView.setText("");
}
}
if (dialog.last_message_date != 0) {
timeTextView.setText(Utilities.stringForMessageListDate(dialog.last_message_date));
} else {
timeTextView.setText("");
}
messagesCountImage.setVisibility(View.GONE);
check1Image.setVisibility(View.GONE);
check2Image.setVisibility(View.GONE);
errorImage.setVisibility(View.GONE);
clockImage.setVisibility(View.GONE);
} else {
TLRPC.User fromUser = MessagesController.Instance.users.get(message.messageOwner.from_id);
if (dialog.last_message_date != 0) {
timeTextView.setText(Utilities.stringForMessageListDate(dialog.last_message_date));
} else {
timeTextView.setText(Utilities.stringForMessageListDate(message.messageOwner.date));
}
if (printingString != null) {
messageTextView.setTextColor(0xff316f9f);
messageTextView.setText(printingString);
} else {
if (message.messageOwner instanceof TLRPC.TL_messageService) {
messageTextView.setText(message.messageText);
messageTextView.setTextColor(0xff316f9f);
} else {
if (chat != null) {
String name = "";
if (message.messageOwner.from_id == UserConfig.clientUserId) {
name = getStringEntry(R.string.FromYou);
} else {
if (fromUser != null) {
if (fromUser.first_name.length() > 0) {
name = fromUser.first_name;
} else {
name = fromUser.last_name;
}
}
}
if (message.messageOwner.media != null && !(message.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) {
messageTextView.setTextColor(0xff316f9f);
messageTextView.setText(message.messageText);
} else {
messageTextView.setText(Emoji.replaceEmoji(Html.fromHtml(String.format("<font color=#316f9f>%s:</font> <font color=#808080>%s</font>", name, message.messageOwner.message))));
}
} else {
messageTextView.setText(message.messageText);
if (message.messageOwner.media != null && !(message.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) {
messageTextView.setTextColor(0xff316f9f);
} else {
messageTextView.setTextColor(0xff808080);
}
}
}
}
if (dialog.unread_count != 0) {
messagesCountImage.setVisibility(View.VISIBLE);
messagesCountImage.setText(String.format("%d", dialog.unread_count));
} else {
messagesCountImage.setVisibility(View.GONE);
}
if (message.messageOwner.id < 0 && message.messageOwner.send_state != MessagesController.MESSAGE_SEND_STATE_SENT) {
if (MessagesController.Instance.sendingMessages.get(message.messageOwner.id) == null) {
message.messageOwner.send_state = MessagesController.MESSAGE_SEND_STATE_SEND_ERROR;
}
}
if (message.messageOwner.from_id == UserConfig.clientUserId) {
if (message.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENDING) {
check1Image.setVisibility(View.GONE);
check2Image.setVisibility(View.GONE);
clockImage.setVisibility(View.VISIBLE);
errorImage.setVisibility(View.GONE);
} else if (message.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR) {
check1Image.setVisibility(View.GONE);
check2Image.setVisibility(View.GONE);
clockImage.setVisibility(View.GONE);
errorImage.setVisibility(View.VISIBLE);
messagesCountImage.setVisibility(View.GONE);
} else if (message.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENT) {
if (!message.messageOwner.unread) {
check1Image.setVisibility(View.VISIBLE);
check2Image.setVisibility(View.VISIBLE);
} else {
check1Image.setVisibility(View.GONE);
check2Image.setVisibility(View.VISIBLE);
}
clockImage.setVisibility(View.GONE);
errorImage.setVisibility(View.GONE);
}
} else {
check1Image.setVisibility(View.GONE);
check2Image.setVisibility(View.GONE);
errorImage.setVisibility(View.GONE);
clockImage.setVisibility(View.GONE);
}
}
}
}
} }
TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
View file @ 9814a6e9
...@@ -18,6 +18,7 @@ import android.graphics.Typeface; ...@@ -18,6 +18,7 @@ import android.graphics.Typeface;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
...@@ -28,6 +29,7 @@ import android.widget.ImageButton; ...@@ -28,6 +29,7 @@ import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import org.telegram.PhoneFormat.PhoneFormat; import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLObject; import org.telegram.TL.TLObject;
...@@ -35,11 +37,13 @@ import org.telegram.TL.TLRPC; ...@@ -35,11 +37,13 @@ import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.messenger.MessagesController; import org.telegram.messenger.MessagesController;
import org.telegram.messenger.MessagesStorage;
import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.RPCRequest; import org.telegram.messenger.RPCRequest;
import org.telegram.messenger.UserConfig; import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.objects.PhotoObject;
import org.telegram.ui.Views.AvatarUpdater; import org.telegram.ui.Views.AvatarUpdater;
import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.BackupImageView;
import org.telegram.ui.Views.BaseFragment; import org.telegram.ui.Views.BaseFragment;
...@@ -67,6 +71,12 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -67,6 +71,12 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
int logoutRow; int logoutRow;
int sendLogsRow; int sendLogsRow;
int rowCount; int rowCount;
int messagesSectionRow;
int sendByEnterRow;
int terminateSessionsRow;
int photoDownloadSection;
int photoDownloadChatRow;
int photoDownloadPrivateRow;
@Override @Override
public boolean onFragmentCreate() { public boolean onFragmentCreate() {
...@@ -83,7 +93,46 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -83,7 +93,46 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() { ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override @Override
public void run(TLObject response, TLRPC.TL_error error) { public void run(TLObject response, TLRPC.TL_error error) {
if (error == null) {
TLRPC.User user = MessagesController.Instance.users.get(UserConfig.clientUserId);
if (user == null) {
user = UserConfig.currentUser;
if (user == null) {
return;
}
MessagesController.Instance.users.put(user.id, user);
} else {
UserConfig.currentUser = user;
}
if (user == null) {
return;
}
TLRPC.TL_photos_photo photo = (TLRPC.TL_photos_photo)response;
ArrayList<TLRPC.PhotoSize> sizes = photo.photo.sizes;
TLRPC.PhotoSize smallSize = PhotoObject.getClosestPhotoSizeWithSize(sizes, 100, 100);
TLRPC.PhotoSize bigSize = PhotoObject.getClosestPhotoSizeWithSize(sizes, 1000, 1000);
user.photo = new TLRPC.TL_userProfilePhoto();
user.photo.photo_id = photo.photo.id;
if (smallSize != null) {
user.photo.photo_small = smallSize.location;
}
if (bigSize != null) {
user.photo.photo_big = bigSize.location;
} else if (smallSize != null) {
user.photo.photo_small = smallSize.location;
}
MessagesStorage.Instance.clearUserPhotos(user.id);
ArrayList<TLRPC.User> users = new ArrayList<TLRPC.User>();
users.add(user);
MessagesStorage.Instance.putUsersAndChats(users, null, false, true);
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
NotificationCenter.Instance.postNotificationName(MessagesController.updateInterfaces, MessagesController.UPDATE_MASK_ALL);
UserConfig.saveConfig(true);
}
});
}
} }
}, null, true, RPCRequest.RPCRequestClassGeneric); }, null, true, RPCRequest.RPCRequestClassGeneric);
} }
...@@ -96,11 +145,17 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -96,11 +145,17 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
numberSectionRow = rowCount++; numberSectionRow = rowCount++;
numberRow = rowCount++; numberRow = rowCount++;
settingsSectionRow = rowCount++; settingsSectionRow = rowCount++;
textSizeRow = rowCount++;
enableAnimationsRow = rowCount++; enableAnimationsRow = rowCount++;
notificationRow = rowCount++; notificationRow = rowCount++;
blockedRow = rowCount++; blockedRow = rowCount++;
backgroundRow = rowCount++; backgroundRow = rowCount++;
terminateSessionsRow = rowCount++;
photoDownloadSection = rowCount++;
photoDownloadChatRow = rowCount++;
photoDownloadPrivateRow = rowCount++;
messagesSectionRow = rowCount++;
textSizeRow = rowCount++;
sendByEnterRow = rowCount++;
supportSectionRow = rowCount++; supportSectionRow = rowCount++;
if (ConnectionsManager.DEBUG_VERSION) { if (ConnectionsManager.DEBUG_VERSION) {
sendLogsRow = rowCount++; sendLogsRow = rowCount++;
...@@ -140,7 +195,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -140,7 +195,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
builder.setItems(new CharSequence[]{String.format("%d", 12), String.format("%d", 13), String.format("%d", 14), String.format("%d", 15), String.format("%d", 16), String.format("%d", 17), String.format("%d", 18), String.format("%d", 19), String.format("%d", 20)}, new DialogInterface.OnClickListener() { builder.setItems(new CharSequence[]{String.format("%d", 12), String.format("%d", 13), String.format("%d", 14), String.format("%d", 15), String.format("%d", 16), String.format("%d", 17), String.format("%d", 18), String.format("%d", 19), String.format("%d", 20)}, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit(); SharedPreferences.Editor editor = preferences.edit();
editor.putInt("fons_size", 12 + which); editor.putInt("fons_size", 12 + which);
editor.commit(); editor.commit();
...@@ -152,7 +207,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -152,7 +207,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
builder.setNegativeButton(getStringEntry(R.string.Cancel), null); builder.setNegativeButton(getStringEntry(R.string.Cancel), null);
builder.show().setCanceledOnTouchOutside(true); builder.show().setCanceledOnTouchOutside(true);
} else if (i == enableAnimationsRow) { } else if (i == enableAnimationsRow) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean animations = preferences.getBoolean("view_animations", true); boolean animations = preferences.getBoolean("view_animations", true);
SharedPreferences.Editor editor = preferences.edit(); SharedPreferences.Editor editor = preferences.edit();
editor.putBoolean("view_animations", !animations); editor.putBoolean("view_animations", !animations);
...@@ -174,6 +229,66 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -174,6 +229,66 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
((ApplicationActivity)parentActivity).presentFragment(fragment, "chat" + Math.random(), false); ((ApplicationActivity)parentActivity).presentFragment(fragment, "chat" + Math.random(), false);
} else if (i == sendLogsRow) { } else if (i == sendLogsRow) {
sendLogs(); sendLogs();
} else if (i == sendByEnterRow) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean send = preferences.getBoolean("send_by_enter", false);
SharedPreferences.Editor editor = preferences.edit();
editor.putBoolean("send_by_enter", !send);
editor.commit();
if (listView != null) {
listView.invalidateViews();
}
} else if (i == terminateSessionsRow) {
AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
builder.setMessage(getStringEntry(R.string.AreYouSure));
builder.setTitle(getStringEntry(R.string.AppName));
builder.setPositiveButton(getStringEntry(R.string.OK), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
TLRPC.TL_auth_resetAuthorizations req = new TLRPC.TL_auth_resetAuthorizations();
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override
public void run(TLObject response, TLRPC.TL_error error) {
ActionBarActivity inflaterActivity = parentActivity;
if (inflaterActivity == null) {
inflaterActivity = (ActionBarActivity)getActivity();
}
if (inflaterActivity == null) {
return;
}
if (error == null && response instanceof TLRPC.TL_boolTrue) {
Toast toast = Toast.makeText(inflaterActivity, R.string.TerminateAllSessions, Toast.LENGTH_SHORT);
toast.show();
} else {
Toast toast = Toast.makeText(inflaterActivity, R.string.UnknownError, Toast.LENGTH_SHORT);
toast.show();
}
UserConfig.registeredForPush = false;
MessagesController.Instance.registerForPush(UserConfig.pushString);
}
}, null, true, RPCRequest.RPCRequestClassGeneric);
}
});
builder.setNegativeButton(getStringEntry(R.string.Cancel), null);
builder.show().setCanceledOnTouchOutside(true);
} else if (i == photoDownloadChatRow) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean value = preferences.getBoolean("photo_download_chat", true);
SharedPreferences.Editor editor = preferences.edit();
editor.putBoolean("photo_download_chat", !value);
editor.commit();
if (listView != null) {
listView.invalidateViews();
}
} else if (i == photoDownloadPrivateRow) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean value = preferences.getBoolean("photo_download_user", true);
SharedPreferences.Editor editor = preferences.edit();
editor.putBoolean("photo_download_user", !value);
editor.commit();
if (listView != null) {
listView.invalidateViews();
}
} }
// else if (i == 6) { // else if (i == 6) {
// UserConfig.saveIncomingPhotos = !UserConfig.saveIncomingPhotos; // UserConfig.saveIncomingPhotos = !UserConfig.saveIncomingPhotos;
...@@ -209,11 +324,14 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -209,11 +324,14 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public void didReceivedNotification(int id, Object... args) { public void didReceivedNotification(int id, Object... args) {
if (id == MessagesController.updateInterfaces) { if (id == MessagesController.updateInterfaces) {
int mask = (Integer)args[0];
if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0) {
if (listView != null) { if (listView != null) {
listView.invalidateViews(); listView.invalidateViews();
} }
} }
} }
}
@Override @Override
public void applySelfActionBar() { public void applySelfActionBar() {
...@@ -307,7 +425,9 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -307,7 +425,9 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
@Override @Override
public boolean isEnabled(int i) { public boolean isEnabled(int i) {
return i == textSizeRow || i == enableAnimationsRow || i == blockedRow || i == notificationRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow; return i == textSizeRow || i == enableAnimationsRow || i == blockedRow || i == notificationRow || i == backgroundRow ||
i == askQuestionRow || i == sendLogsRow || i == sendByEnterRow || i == terminateSessionsRow || i == photoDownloadPrivateRow ||
i == photoDownloadChatRow;
} }
@Override @Override
...@@ -405,7 +525,30 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -405,7 +525,30 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() { ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override @Override
public void run(TLObject response, TLRPC.TL_error error) { public void run(TLObject response, TLRPC.TL_error error) {
if (error == null) {
TLRPC.User user = MessagesController.Instance.users.get(UserConfig.clientUserId);
if (user == null) {
user = UserConfig.currentUser;
MessagesController.Instance.users.put(user.id, user);
} else {
UserConfig.currentUser = user;
}
if (user == null) {
return;
}
MessagesStorage.Instance.clearUserPhotos(user.id);
ArrayList<TLRPC.User> users = new ArrayList<TLRPC.User>();
users.add(user);
MessagesStorage.Instance.putUsersAndChats(users, null, false, true);
user.photo = (TLRPC.UserProfilePhoto)response;
Utilities.RunOnUIThread(new Runnable() {
@Override
public void run() {
NotificationCenter.Instance.postNotificationName(MessagesController.updateInterfaces, MessagesController.UPDATE_MASK_ALL);
UserConfig.saveConfig(true);
}
});
}
} }
}, null, true, RPCRequest.RPCRequestClassGeneric); }, null, true, RPCRequest.RPCRequestClassGeneric);
} }
...@@ -444,6 +587,10 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -444,6 +587,10 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
textView.setText(getStringEntry(R.string.SETTINGS)); textView.setText(getStringEntry(R.string.SETTINGS));
} else if (i == supportSectionRow) { } else if (i == supportSectionRow) {
textView.setText(getStringEntry(R.string.Support)); textView.setText(getStringEntry(R.string.Support));
} else if (i == messagesSectionRow) {
textView.setText(getStringEntry(R.string.MessagesSettings));
} else if (i == photoDownloadSection) {
textView.setText(getStringEntry(R.string.AutomaticPhotoDownload));
} }
} else if (type == 2) { } else if (type == 2) {
if (view == null) { if (view == null) {
...@@ -468,13 +615,16 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -468,13 +615,16 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
divider.setVisibility(backgroundRow != 0 ? View.VISIBLE : View.INVISIBLE); divider.setVisibility(backgroundRow != 0 ? View.VISIBLE : View.INVISIBLE);
} else if (i == backgroundRow) { } else if (i == backgroundRow) {
textView.setText(getStringEntry(R.string.ChatBackground)); textView.setText(getStringEntry(R.string.ChatBackground));
divider.setVisibility(View.INVISIBLE); divider.setVisibility(View.VISIBLE);
} else if (i == sendLogsRow) { } else if (i == sendLogsRow) {
textView.setText("Send Logs"); textView.setText("Send Logs");
divider.setVisibility(View.VISIBLE); divider.setVisibility(View.VISIBLE);
} else if (i == askQuestionRow) { } else if (i == askQuestionRow) {
textView.setText(getStringEntry(R.string.AskAQuestion)); textView.setText(getStringEntry(R.string.AskAQuestion));
divider.setVisibility(View.INVISIBLE); divider.setVisibility(View.INVISIBLE);
} else if (i == terminateSessionsRow) {
textView.setText(getStringEntry(R.string.TerminateAllSessions));
divider.setVisibility(View.INVISIBLE);
} }
} else if (type == 3) { } else if (type == 3) {
if (view == null) { if (view == null) {
...@@ -483,14 +633,40 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -483,14 +633,40 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
} }
TextView textView = (TextView)view.findViewById(R.id.settings_row_text); TextView textView = (TextView)view.findViewById(R.id.settings_row_text);
View divider = view.findViewById(R.id.settings_row_divider); View divider = view.findViewById(R.id.settings_row_divider);
ImageView checkButton = (ImageView)view.findViewById(R.id.settings_row_check_button);
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
if (i == enableAnimationsRow) { if (i == enableAnimationsRow) {
textView.setText(getStringEntry(R.string.EnableAnimations)); textView.setText(getStringEntry(R.string.EnableAnimations));
divider.setVisibility(View.VISIBLE); divider.setVisibility(View.VISIBLE);
boolean enabled = preferences.getBoolean("view_animations", true);
ImageView checkButton = (ImageView)view.findViewById(R.id.settings_row_check_button); if (enabled) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); checkButton.setImageResource(R.drawable.btn_check_on);
boolean animations = preferences.getBoolean("view_animations", true); } else {
if (animations) { checkButton.setImageResource(R.drawable.btn_check_off);
}
} else if (i == sendByEnterRow) {
textView.setText(getStringEntry(R.string.SendByEnter));
divider.setVisibility(View.INVISIBLE);
boolean enabled = preferences.getBoolean("send_by_enter", false);
if (enabled) {
checkButton.setImageResource(R.drawable.btn_check_on);
} else {
checkButton.setImageResource(R.drawable.btn_check_off);
}
} else if (i == photoDownloadChatRow) {
textView.setText(getStringEntry(R.string.AutomaticPhotoDownloadGroups));
divider.setVisibility(View.VISIBLE);
boolean enabled = preferences.getBoolean("photo_download_chat", true);
if (enabled) {
checkButton.setImageResource(R.drawable.btn_check_on);
} else {
checkButton.setImageResource(R.drawable.btn_check_off);
}
} else if (i == photoDownloadPrivateRow) {
textView.setText(getStringEntry(R.string.AutomaticPhotoDownloadPrivateChats));
divider.setVisibility(View.INVISIBLE);
boolean enabled = preferences.getBoolean("photo_download_user", true);
if (enabled) {
checkButton.setImageResource(R.drawable.btn_check_on); checkButton.setImageResource(R.drawable.btn_check_on);
} else { } else {
checkButton.setImageResource(R.drawable.btn_check_off); checkButton.setImageResource(R.drawable.btn_check_off);
...@@ -541,7 +717,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -541,7 +717,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
TextView detailTextView = (TextView)view.findViewById(R.id.settings_row_text_detail); TextView detailTextView = (TextView)view.findViewById(R.id.settings_row_text_detail);
View divider = view.findViewById(R.id.settings_row_divider); View divider = view.findViewById(R.id.settings_row_divider);
if (i == textSizeRow) { if (i == textSizeRow) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
int size = preferences.getInt("fons_size", 16); int size = preferences.getInt("fons_size", 16);
detailTextView.setText(String.format("%d", size)); detailTextView.setText(String.format("%d", size));
textView.setText(ApplicationLoader.applicationContext.getString(R.string.TextSize)); textView.setText(ApplicationLoader.applicationContext.getString(R.string.TextSize));
...@@ -556,13 +732,13 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter ...@@ -556,13 +732,13 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
public int getItemViewType(int i) { public int getItemViewType(int i) {
if (i == profileRow) { if (i == profileRow) {
return 0; return 0;
} else if (i == numberSectionRow || i == settingsSectionRow || i == supportSectionRow) { } else if (i == numberSectionRow || i == settingsSectionRow || i == supportSectionRow || i == messagesSectionRow || i == photoDownloadSection) {
return 1; return 1;
} else if (i == textSizeRow) { } else if (i == textSizeRow) {
return 5; return 5;
} else if (i == enableAnimationsRow) { } else if (i == enableAnimationsRow || i == sendByEnterRow || i == photoDownloadChatRow || i == photoDownloadPrivateRow) {
return 3; return 3;
} else if (i == numberRow || i == notificationRow || i == blockedRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow) { } else if (i == numberRow || i == notificationRow || i == blockedRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == terminateSessionsRow) {
return 2; return 2;
} else if (i == logoutRow) { } else if (i == logoutRow) {
return 4; return 4;
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsers.java
View file @ 9814a6e9
...@@ -13,7 +13,6 @@ import android.content.Context; ...@@ -13,7 +13,6 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
...@@ -34,6 +33,7 @@ import org.telegram.messenger.NotificationCenter; ...@@ -34,6 +33,7 @@ import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.RPCRequest; import org.telegram.messenger.RPCRequest;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
import org.telegram.ui.Cells.ChatOrUserCell;
import org.telegram.ui.Views.BaseFragment; import org.telegram.ui.Views.BaseFragment;
import org.telegram.ui.Views.OnSwipeTouchListener; import org.telegram.ui.Views.OnSwipeTouchListener;
...@@ -118,14 +118,10 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe ...@@ -118,14 +118,10 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe
if (i == 0) { if (i == 0) {
TLRPC.TL_contacts_unblock req = new TLRPC.TL_contacts_unblock(); TLRPC.TL_contacts_unblock req = new TLRPC.TL_contacts_unblock();
TLRPC.User user = MessagesController.Instance.users.get(selectedUserId); TLRPC.User user = MessagesController.Instance.users.get(selectedUserId);
if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) { if (user == null) {
req.id = new TLRPC.TL_inputUserForeign(); return;
req.id.user_id = selectedUserId;
req.id.access_hash = user.access_hash;
} else {
req.id = new TLRPC.TL_inputUserContact();
req.id.user_id = selectedUserId;
} }
req.id = MessagesController.getInputUser(user);
TLRPC.TL_contactBlocked blocked = blockedContactsDict.get(selectedUserId); TLRPC.TL_contactBlocked blocked = blockedContactsDict.get(selectedUserId);
blockedContactsDict.remove(selectedUserId); blockedContactsDict.remove(selectedUserId);
blockedContacts.remove(blocked); blockedContacts.remove(blocked);
...@@ -229,8 +225,22 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe ...@@ -229,8 +225,22 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe
@Override @Override
public void didReceivedNotification(int id, Object... args) { public void didReceivedNotification(int id, Object... args) {
if (id == MessagesController.updateInterfaces) { if (id == MessagesController.updateInterfaces) {
if (listView != null) { int mask = (Integer)args[0];
listView.invalidateViews(); if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0) {
updateVisibleRows(mask);
}
}
}
private void updateVisibleRows(int mask) {
if (listView == null) {
return;
}
int count = listView.getChildCount();
for (int a = 0; a < count; a++) {
View child = listView.getChildAt(a);
if (child instanceof ChatOrUserCell) {
((ChatOrUserCell) child).update(mask);
} }
} }
} }
...@@ -307,22 +317,14 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe ...@@ -307,22 +317,14 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe
} }
@Override @Override
public void didSelectContact(int user_id) { public void didSelectContact(TLRPC.User user) {
if (blockedContactsDict.containsKey(user_id)) { if (user == null || blockedContactsDict.containsKey(user.id)) {
return; return;
} }
TLRPC.TL_contacts_block req = new TLRPC.TL_contacts_block(); TLRPC.TL_contacts_block req = new TLRPC.TL_contacts_block();
TLRPC.User user = MessagesController.Instance.users.get(selectedUserId); req.id = MessagesController.getInputUser(user);
if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) {
req.id = new TLRPC.TL_inputUserForeign();
req.id.access_hash = user.access_hash;
req.id.user_id = user_id;
} else {
req.id = new TLRPC.TL_inputUserContact();
req.id.user_id = user_id;
}
TLRPC.TL_contactBlocked blocked = new TLRPC.TL_contactBlocked(); TLRPC.TL_contactBlocked blocked = new TLRPC.TL_contactBlocked();
blocked.user_id = user_id; blocked.user_id = user.id;
blocked.date = (int)(System.currentTimeMillis() / 1000); blocked.date = (int)(System.currentTimeMillis() / 1000);
blockedContactsDict.put(blocked.user_id, blocked); blockedContactsDict.put(blocked.user_id, blocked);
blockedContacts.add(blocked); blockedContacts.add(blocked);
...@@ -380,41 +382,13 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe ...@@ -380,41 +382,13 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe
int type = getItemViewType(i); int type = getItemViewType(i);
if (type == 0) { if (type == 0) {
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); view = new ChatOrUserCell(mContext);
view = li.inflate(R.layout.messages_search_user_layout, viewGroup, false); ((ChatOrUserCell)view).useBoldFont = true;
} ((ChatOrUserCell)view).usePadding = false;
ContactsActivity.ContactListRowHolder holder = (ContactsActivity.ContactListRowHolder)view.getTag(); ((ChatOrUserCell)view).useSeparator = true;
if (holder == null) {
holder = new ContactsActivity.ContactListRowHolder(view);
view.setTag(holder);
} }
View divider = view.findViewById(R.id.settings_row_divider);
divider.setVisibility(View.VISIBLE);
TLRPC.User user = MessagesController.Instance.users.get(blockedContacts.get(i).user_id); TLRPC.User user = MessagesController.Instance.users.get(blockedContacts.get(i).user_id);
((ChatOrUserCell)view).setData(user, null, null, null, user.phone != null && user.phone.length() != 0 ? PhoneFormat.Instance.format("+" + user.phone) : "Unknown");
TLRPC.FileLocation photo = null;
if (user.first_name.length() != 0 && user.last_name.length() != 0) {
holder.nameTextView.setText(Html.fromHtml(user.first_name + " <b>" + user.last_name + "</b>"));
} else if (user.first_name.length() != 0) {
holder.nameTextView.setText(Html.fromHtml("<b>" + user.first_name + "</b>"));
} else {
holder.nameTextView.setText(Html.fromHtml("<b>" + user.last_name + "</b>"));
}
if (user.photo != null) {
photo = user.photo.photo_small;
}
int placeHolderId = Utilities.getUserAvatarForId(user.id);
holder.avatarImage.setImage(photo, "50_50", placeHolderId);
holder.messageTextView.setTextColor(0xff808080);
if (user.phone != null && user.phone.length() != 0) {
holder.messageTextView.setText(PhoneFormat.Instance.format("+" + user.phone));
} else {
holder.messageTextView.setText("Unknown");
}
} else if (type == 1) { } else if (type == 1) {
if (view == null) { if (view == null) {
LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeNameActivity.java
View file @ 9814a6e9
...@@ -82,7 +82,7 @@ public class SettingsChangeNameActivity extends BaseFragment { ...@@ -82,7 +82,7 @@ public class SettingsChangeNameActivity extends BaseFragment {
} }
}); });
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean animations = preferences.getBoolean("view_animations", true); boolean animations = preferences.getBoolean("view_animations", true);
if (!animations) { if (!animations) {
firstNameField.requestFocus(); firstNameField.requestFocus();
...@@ -171,6 +171,9 @@ public class SettingsChangeNameActivity extends BaseFragment { ...@@ -171,6 +171,9 @@ public class SettingsChangeNameActivity extends BaseFragment {
private void saveName() { private void saveName() {
TLRPC.TL_account_updateProfile req = new TLRPC.TL_account_updateProfile(); TLRPC.TL_account_updateProfile req = new TLRPC.TL_account_updateProfile();
if (UserConfig.currentUser == null || lastNameField.getText() == null || firstNameField.getText() == null) {
return;
}
UserConfig.currentUser.first_name = req.first_name = firstNameField.getText().toString(); UserConfig.currentUser.first_name = req.first_name = firstNameField.getText().toString();
UserConfig.currentUser.last_name = req.last_name = lastNameField.getText().toString(); UserConfig.currentUser.last_name = req.last_name = lastNameField.getText().toString();
TLRPC.User user = MessagesController.Instance.users.get(UserConfig.clientUserId); TLRPC.User user = MessagesController.Instance.users.get(UserConfig.clientUserId);
...@@ -179,7 +182,7 @@ public class SettingsChangeNameActivity extends BaseFragment { ...@@ -179,7 +182,7 @@ public class SettingsChangeNameActivity extends BaseFragment {
user.last_name = req.last_name; user.last_name = req.last_name;
} }
UserConfig.saveConfig(true); UserConfig.saveConfig(true);
NotificationCenter.Instance.postNotificationName(MessagesController.updateInterfaces, MessagesController.UPDATE_MASK_ALL); NotificationCenter.Instance.postNotificationName(MessagesController.updateInterfaces, MessagesController.UPDATE_MASK_NAME);
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() { ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override @Override
public void run(TLObject response, TLRPC.TL_error error) { public void run(TLObject response, TLRPC.TL_error error) {
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java
View file @ 9814a6e9
...@@ -34,6 +34,7 @@ import org.telegram.TL.TLObject; ...@@ -34,6 +34,7 @@ import org.telegram.TL.TLObject;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.RPCRequest; import org.telegram.messenger.RPCRequest;
import org.telegram.messenger.Utilities; import org.telegram.messenger.Utilities;
...@@ -138,7 +139,7 @@ public class SettingsNotificationsActivity extends BaseFragment { ...@@ -138,7 +139,7 @@ public class SettingsNotificationsActivity extends BaseFragment {
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} else if (i == 15) { } else if (i == 17) {
if (reseting) { if (reseting) {
return; return;
} }
...@@ -150,6 +151,7 @@ public class SettingsNotificationsActivity extends BaseFragment { ...@@ -150,6 +151,7 @@ public class SettingsNotificationsActivity extends BaseFragment {
Utilities.RunOnUIThread(new Runnable() { Utilities.RunOnUIThread(new Runnable() {
@Override @Override
public void run() { public void run() {
MessagesController.Instance.enableJoined = true;
ActionBarActivity inflaterActivity = parentActivity; ActionBarActivity inflaterActivity = parentActivity;
if (inflaterActivity == null) { if (inflaterActivity == null) {
inflaterActivity = (ActionBarActivity)getActivity(); inflaterActivity = (ActionBarActivity)getActivity();
...@@ -190,6 +192,14 @@ public class SettingsNotificationsActivity extends BaseFragment { ...@@ -190,6 +192,14 @@ public class SettingsNotificationsActivity extends BaseFragment {
editor.putBoolean("EnableInAppPreview", !enabled); editor.putBoolean("EnableInAppPreview", !enabled);
editor.commit(); editor.commit();
listView.invalidateViews(); listView.invalidateViews();
} else if (i == 15) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
boolean enabled = preferences.getBoolean("EnableContactJoined", true);
MessagesController.Instance.enableJoined = !enabled;
editor.putBoolean("EnableContactJoined", !enabled);
editor.commit();
listView.invalidateViews();
} }
} }
}); });
...@@ -318,12 +328,15 @@ public class SettingsNotificationsActivity extends BaseFragment { ...@@ -318,12 +328,15 @@ public class SettingsNotificationsActivity extends BaseFragment {
public boolean isEnabled(int i) { public boolean isEnabled(int i) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
boolean enabledAll = preferences.getBoolean("EnableAll", true); boolean enabledAll = preferences.getBoolean("EnableAll", true);
return !(i != 1 && !enabledAll && i != 13) && (i > 0 && i < 5 || i > 5 && i < 10 || i > 10 && i < 14 || i == 15); if (i == 17 || i == 15) {
return true;
}
return !(i != 1 && !enabledAll && i != 13) && (i > 0 && i < 5 || i > 5 && i < 10 || i > 10 && i < 14);
} }
@Override @Override
public int getCount() { public int getCount() {
return 16; return 18;
} }
@Override @Override
...@@ -357,6 +370,8 @@ public class SettingsNotificationsActivity extends BaseFragment { ...@@ -357,6 +370,8 @@ public class SettingsNotificationsActivity extends BaseFragment {
} else if (i == 10) { } else if (i == 10) {
textView.setText(getStringEntry(R.string.InAppNotifications)); textView.setText(getStringEntry(R.string.InAppNotifications));
} else if (i == 14) { } else if (i == 14) {
textView.setText(getStringEntry(R.string.Events));
} else if (i == 16) {
textView.setText(getStringEntry(R.string.Reset)); textView.setText(getStringEntry(R.string.Reset));
} }
} if (type == 1) { } if (type == 1) {
...@@ -408,13 +423,17 @@ public class SettingsNotificationsActivity extends BaseFragment { ...@@ -408,13 +423,17 @@ public class SettingsNotificationsActivity extends BaseFragment {
enabled = preferences.getBoolean("EnableInAppPreview", true); enabled = preferences.getBoolean("EnableInAppPreview", true);
textView.setText(getStringEntry(R.string.InAppPreview)); textView.setText(getStringEntry(R.string.InAppPreview));
divider.setVisibility(View.INVISIBLE); divider.setVisibility(View.INVISIBLE);
} else if (i == 15) {
enabled = preferences.getBoolean("EnableContactJoined", true);
textView.setText(getStringEntry(R.string.ContactJoined));
divider.setVisibility(View.INVISIBLE);
} }
if (enabled) { if (enabled) {
checkButton.setImageResource(R.drawable.btn_check_on); checkButton.setImageResource(R.drawable.btn_check_on);
} else { } else {
checkButton.setImageResource(R.drawable.btn_check_off); checkButton.setImageResource(R.drawable.btn_check_off);
} }
if (i != 1 && !enabledAll) { if (i != 1 && !enabledAll && i != 15) {
view.setEnabled(false); view.setEnabled(false);
if(android.os.Build.VERSION.SDK_INT >= 11) { if(android.os.Build.VERSION.SDK_INT >= 11) {
checkButton.setAlpha(0.3f); checkButton.setAlpha(0.3f);
...@@ -455,12 +474,12 @@ public class SettingsNotificationsActivity extends BaseFragment { ...@@ -455,12 +474,12 @@ public class SettingsNotificationsActivity extends BaseFragment {
} }
textView.setText(getStringEntry(R.string.Sound)); textView.setText(getStringEntry(R.string.Sound));
divider.setVisibility(View.INVISIBLE); divider.setVisibility(View.INVISIBLE);
} else if (i == 15) { } else if (i == 17) {
textView.setText(getStringEntry(R.string.ResetAllNotifications)); textView.setText(getStringEntry(R.string.ResetAllNotifications));
textViewDetail.setText(getStringEntry(R.string.UndoAllCustom)); textViewDetail.setText(getStringEntry(R.string.UndoAllCustom));
divider.setVisibility(View.INVISIBLE); divider.setVisibility(View.INVISIBLE);
} }
if (i != 15 && !enabledAll) { if (i != 17 && !enabledAll) {
view.setEnabled(false); view.setEnabled(false);
if(android.os.Build.VERSION.SDK_INT >= 11) { if(android.os.Build.VERSION.SDK_INT >= 11) {
textView.setAlpha(0.3f); textView.setAlpha(0.3f);
...@@ -482,9 +501,9 @@ public class SettingsNotificationsActivity extends BaseFragment { ...@@ -482,9 +501,9 @@ public class SettingsNotificationsActivity extends BaseFragment {
@Override @Override
public int getItemViewType(int i) { public int getItemViewType(int i) {
if (i == 0 || i == 5 || i == 10 || i == 14) { if (i == 0 || i == 5 || i == 10 || i == 14 || i == 16) {
return 0; return 0;
} else if (i > 0 && i < 4 || i > 5 && i < 9 || i > 10 && i < 14) { } else if (i > 0 && i < 4 || i > 5 && i < 9 || i > 10 && i < 14 || i == 15) {
return 1; return 1;
} else { } else {
return 2; return 2;
......
TMessagesProj/src/main/java/org/telegram/ui/SettingsWallpapersActivity.java
View file @ 9814a6e9
...@@ -73,7 +73,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica ...@@ -73,7 +73,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica
NotificationCenter.Instance.addObserver(this, FileLoader.FileLoadProgressChanged); NotificationCenter.Instance.addObserver(this, FileLoader.FileLoadProgressChanged);
NotificationCenter.Instance.addObserver(this, MessagesStorage.wallpapersDidLoaded); NotificationCenter.Instance.addObserver(this, MessagesStorage.wallpapersDidLoaded);
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
selectedBackground = preferences.getInt("selectedBackground", 1000001); selectedBackground = preferences.getInt("selectedBackground", 1000001);
selectedColor = preferences.getInt("selectedColor", 0); selectedColor = preferences.getInt("selectedColor", 0);
MessagesStorage.Instance.getWallpapers(); MessagesStorage.Instance.getWallpapers();
...@@ -165,7 +165,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica ...@@ -165,7 +165,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica
} }
if (done) { if (done) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit(); SharedPreferences.Editor editor = preferences.edit();
editor.putInt("selectedBackground", selectedBackground); editor.putInt("selectedBackground", selectedBackground);
editor.putInt("selectedColor", selectedColor); editor.putInt("selectedColor", selectedColor);
......
TMessagesProj/src/main/java/org/telegram/ui/UserProfileActivity.java
View file @ 9814a6e9
...@@ -21,6 +21,7 @@ import android.net.Uri; ...@@ -21,6 +21,7 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
...@@ -39,6 +40,7 @@ import org.telegram.PhoneFormat.PhoneFormat; ...@@ -39,6 +40,7 @@ import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.TL.TLObject; import org.telegram.TL.TLObject;
import org.telegram.TL.TLRPC; import org.telegram.TL.TLRPC;
import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.ContactsController;
import org.telegram.messenger.FileLog; import org.telegram.messenger.FileLog;
import org.telegram.messenger.MessagesController; import org.telegram.messenger.MessagesController;
import org.telegram.messenger.MessagesStorage; import org.telegram.messenger.MessagesStorage;
...@@ -51,6 +53,8 @@ import org.telegram.ui.Views.BaseFragment; ...@@ -51,6 +53,8 @@ import org.telegram.ui.Views.BaseFragment;
import org.telegram.ui.Views.IdenticonView; import org.telegram.ui.Views.IdenticonView;
import org.telegram.ui.Views.OnSwipeTouchListener; import org.telegram.ui.Views.OnSwipeTouchListener;
import java.util.ArrayList;
public class UserProfileActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, MessagesActivity.MessagesActivityDelegate { public class UserProfileActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, MessagesActivity.MessagesActivityDelegate {
private ListView listView; private ListView listView;
private ListAdapter listAdapter; private ListAdapter listAdapter;
...@@ -104,7 +108,7 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen ...@@ -104,7 +108,7 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
@Override @Override
public void onClick(View view) { public void onClick(View view) {
creatingChat = true; creatingChat = true;
MessagesController.Instance.startSecretChat(parentActivity, user_id); MessagesController.Instance.startSecretChat(parentActivity, MessagesController.Instance.users.get(user_id));
} }
}); });
if (dialog_id == 0) { if (dialog_id == 0) {
...@@ -282,9 +286,12 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen ...@@ -282,9 +286,12 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
public void didReceivedNotification(int id, Object... args) { public void didReceivedNotification(int id, Object... args) {
if (id == MessagesController.updateInterfaces) { if (id == MessagesController.updateInterfaces) {
int mask = (Integer)args[0];
if ((mask & MessagesController.UPDATE_MASK_AVATAR) != 0 || (mask & MessagesController.UPDATE_MASK_NAME) != 0) {
if (listView != null) { if (listView != null) {
listView.invalidateViews(); listView.invalidateViews();
} }
}
} else if (id == MessagesController.contactsDidLoaded) { } else if (id == MessagesController.contactsDidLoaded) {
if (parentActivity != null) { if (parentActivity != null) {
parentActivity.supportInvalidateOptionsMenu(); parentActivity.supportInvalidateOptionsMenu();
...@@ -409,16 +416,12 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen ...@@ -409,16 +416,12 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
finishFragment(); finishFragment();
break; break;
case R.id.block_contact: { case R.id.block_contact: {
TLRPC.TL_contacts_block req = new TLRPC.TL_contacts_block();
TLRPC.User user = MessagesController.Instance.users.get(user_id); TLRPC.User user = MessagesController.Instance.users.get(user_id);
if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) { if (user == null) {
req.id = new TLRPC.TL_inputUserForeign(); break;
req.id.access_hash = user.access_hash;
req.id.user_id = user_id;
} else {
req.id = new TLRPC.TL_inputUserContact();
req.id.user_id = user_id;
} }
TLRPC.TL_contacts_block req = new TLRPC.TL_contacts_block();
req.id = MessagesController.getInputUser(user);
TLRPC.TL_contactBlocked blocked = new TLRPC.TL_contactBlocked(); TLRPC.TL_contactBlocked blocked = new TLRPC.TL_contactBlocked();
blocked.user_id = user_id; blocked.user_id = user_id;
blocked.date = (int)(System.currentTimeMillis() / 1000); blocked.date = (int)(System.currentTimeMillis() / 1000);
...@@ -449,14 +452,51 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen ...@@ -449,14 +452,51 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
((ApplicationActivity)parentActivity).presentFragment(fragment, "chat_select", false); ((ApplicationActivity)parentActivity).presentFragment(fragment, "chat_select", false);
break; break;
} }
case R.id.edit_contact: {
ContactAddActivity fragment = new ContactAddActivity();
Bundle args = new Bundle();
args.putInt("user_id", user_id);
fragment.setArguments(args);
((ApplicationActivity)parentActivity).presentFragment(fragment, "add_contact_" + user_id, false);
break;
}
case R.id.delete_contact: {
final TLRPC.User user = MessagesController.Instance.users.get(user_id);
if (user == null) {
break;
}
AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
builder.setMessage(getStringEntry(R.string.AreYouSure));
builder.setTitle(getStringEntry(R.string.AppName));
builder.setPositiveButton(getStringEntry(R.string.OK), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
TLRPC.TL_auth_resetAuthorizations req = new TLRPC.TL_auth_resetAuthorizations();
ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() {
@Override
public void run(TLObject response, TLRPC.TL_error error) {
ArrayList<TLRPC.User> arrayList = new ArrayList<TLRPC.User>();
arrayList.add(user);
ContactsController.Instance.deleteContact(arrayList);
}
}, null, true, RPCRequest.RPCRequestClassGeneric);
}
});
builder.setNegativeButton(getStringEntry(R.string.Cancel), null);
builder.show().setCanceledOnTouchOutside(true);
break;
}
} }
return true; return true;
} }
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
if (MessagesController.Instance.contactsDict.get(user_id) == null) { if (ContactsController.Instance.contactsDict.get(user_id) == null) {
TLRPC.User user = MessagesController.Instance.users.get(user_id); TLRPC.User user = MessagesController.Instance.users.get(user_id);
if (user == null) {
return;
}
if (user.phone != null && user.phone.length() != 0) { if (user.phone != null && user.phone.length() != 0) {
inflater.inflate(R.menu.user_profile_menu, menu); inflater.inflate(R.menu.user_profile_menu, menu);
} else { } else {
...@@ -608,7 +648,7 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen ...@@ -608,7 +648,7 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
if (value == 0) { if (value == 0) {
value = user.status.expires; value = user.status.expires;
} }
onlineText.setText(String.format("%s %s", getStringEntry(R.string.LastSeen), Utilities.formatDateOnline(value))); onlineText.setText(Utilities.formatDateOnline(value));
} }
} }
} }
...@@ -661,12 +701,19 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen ...@@ -661,12 +701,19 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
} else if (i == 0) { } else if (i == 0) {
ActionBarActivity inflaterActivity = parentActivity;
if (inflaterActivity == null) {
inflaterActivity = (ActionBarActivity)getActivity();
}
if (inflaterActivity == null) {
return;
}
int sdk = android.os.Build.VERSION.SDK_INT; int sdk = android.os.Build.VERSION.SDK_INT;
if(sdk < android.os.Build.VERSION_CODES.HONEYCOMB) { if(sdk < android.os.Build.VERSION_CODES.HONEYCOMB) {
android.text.ClipboardManager clipboard = (android.text.ClipboardManager)parentActivity.getSystemService(Context.CLIPBOARD_SERVICE); android.text.ClipboardManager clipboard = (android.text.ClipboardManager)inflaterActivity.getSystemService(Context.CLIPBOARD_SERVICE);
clipboard.setText(selectedPhone); clipboard.setText(selectedPhone);
} else { } else {
android.content.ClipboardManager clipboard = (android.content.ClipboardManager)parentActivity.getSystemService(Context.CLIPBOARD_SERVICE); android.content.ClipboardManager clipboard = (android.content.ClipboardManager)inflaterActivity.getSystemService(Context.CLIPBOARD_SERVICE);
android.content.ClipData clip = android.content.ClipData.newPlainText("label", selectedPhone); android.content.ClipData clip = android.content.ClipData.newPlainText("label", selectedPhone);
clipboard.setPrimaryClip(clip); clipboard.setPrimaryClip(clip);
} }
......
TMessagesProj/src/main/java/org/telegram/ui/Views/ImageReceiver.java 0 → 100644
View file @ 9814a6e9
/*
* This is the source code of Telegram for Android v. 1.3.x.
* It is licensed under GNU GPL v. 2 or later.
* You should have received a copy of the license in this archive (see LICENSE).
*
* Copyright Nikolai Kudashov, 2013.
*/
package org.telegram.ui.Views;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.view.View;
import org.telegram.TL.TLRPC;
import org.telegram.messenger.FileLoader;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.Utilities;
import java.lang.ref.WeakReference;
public class ImageReceiver {
private TLRPC.FileLocation last_path = null;
private String last_httpUrl = null;
private String last_filter = null;
private Drawable last_placeholder = null;
private int last_size = 0;
private String currentPath = null;
private boolean isPlaceholder = false;
private Drawable currentImage = null;
public Integer TAG = null;
public WeakReference<View> parentView = null;
public int imageX = 0, imageY = 0, imageW = 0, imageH = 0;
public void setImage(TLRPC.FileLocation path, String filter, Drawable placeholder) {
setImage(path, null, filter, placeholder, 0);
}
public void setImage(TLRPC.FileLocation path, String filter, Drawable placeholder, int size) {
setImage(path, null, filter, placeholder, size);
}
public void setImage(String path, String filter, Drawable placeholder) {
setImage(null, path, filter, placeholder, 0);
}
public void setImage(TLRPC.FileLocation path, String httpUrl, String filter, Drawable placeholder, int size) {
if ((path == null && httpUrl == null) || (path != null && !(path instanceof TLRPC.TL_fileLocation) && !(path instanceof TLRPC.TL_fileEncryptedLocation))) {
recycleBitmap(null);
currentPath = null;
isPlaceholder = true;
last_path = null;
last_httpUrl = null;
last_filter = null;
last_placeholder = placeholder;
last_size = 0;
currentImage = null;
FileLoader.Instance.cancelLoadingForImageView(this);
return;
}
String key;
if (path != null) {
key = path.volume_id + "_" + path.local_id;
} else {
key = Utilities.MD5(httpUrl);
}
if (filter != null) {
key += "@" + filter;
}
Bitmap img;
if (currentPath != null) {
if (currentPath.equals(key)) {
return;
} else {
img = FileLoader.Instance.getImageFromMemory(path, httpUrl, this, filter, true);
recycleBitmap(img);
}
} else {
img = FileLoader.Instance.getImageFromMemory(path, httpUrl, this, filter, true);
}
currentPath = key;
last_path = path;
last_httpUrl = httpUrl;
last_filter = filter;
last_placeholder = placeholder;
last_size = size;
if (img == null) {
isPlaceholder = true;
FileLoader.Instance.loadImage(path, httpUrl, this, filter, true, size);
} else {
setImageBitmap(img, currentPath);
}
}
public void setImageBitmap(Bitmap bitmap, String imgKey) {
if (currentPath == null || !imgKey.equals(currentPath)) {
return;
}
isPlaceholder = false;
FileLoader.Instance.incrementUseCount(currentPath);
currentImage = new BitmapDrawable(null, bitmap);
if (parentView.get() != null) {
if (imageW != 0) {
parentView.get().invalidate(imageX, imageY, imageX + imageW, imageY + imageH);
} else {
parentView.get().invalidate();
}
}
}
public void clearImage() {
recycleBitmap(null);
}
private void recycleBitmap(Bitmap newBitmap) {
if (currentImage == null || isPlaceholder) {
return;
}
if (currentImage instanceof BitmapDrawable) {
Bitmap bitmap = ((BitmapDrawable)currentImage).getBitmap();
if (bitmap != null && bitmap != newBitmap) {
if (currentPath != null) {
boolean canDelete = FileLoader.Instance.decrementUseCount(currentPath);
if (!FileLoader.Instance.isInCache(currentPath)) {
if (FileLoader.Instance.runtimeHack != null) {
FileLoader.Instance.runtimeHack.trackAlloc(bitmap.getRowBytes() * bitmap.getHeight());
}
if (canDelete) {
currentImage = null;
if (Build.VERSION.SDK_INT < 11) {
bitmap.recycle();
}
}
} else {
currentImage = null;
}
}
}
}
}
public void draw(Canvas canvas, int x, int y, int w, int h) {
try {
if (currentImage != null) {
currentImage.setBounds(x, y, x + w, y + h);
currentImage.draw(canvas);
} else if (last_placeholder != null) {
last_placeholder.setBounds(x, y, x + w, y + h);
last_placeholder.draw(canvas);
}
} catch (Exception e) {
if (currentPath != null) {
FileLoader.Instance.removeImage(currentPath);
currentPath = null;
}
setImage(last_path, last_httpUrl, last_filter, last_placeholder, last_size);
FileLog.e("tmessages", e);
}
}
@Override
protected void finalize() throws Throwable {
recycleBitmap(null);
super.finalize();
}
}
TMessagesProj/src/main/java/org/telegram/ui/Views/NotificationView.java
View file @ 9814a6e9
...@@ -32,7 +32,6 @@ import org.telegram.messenger.Utilities; ...@@ -32,7 +32,6 @@ import org.telegram.messenger.Utilities;
import org.telegram.objects.MessageObject; import org.telegram.objects.MessageObject;
import org.telegram.ui.ApplicationLoader; import org.telegram.ui.ApplicationLoader;
import java.util.Locale;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
...@@ -52,7 +51,7 @@ public class NotificationView extends LinearLayout { ...@@ -52,7 +51,7 @@ public class NotificationView extends LinearLayout {
private int currentUserId = 0; private int currentUserId = 0;
private int currentEncId = 0; private int currentEncId = 0;
private boolean isVisible; private boolean isVisible;
private boolean isRTL = false; private final Integer timerSync = 1;
public NotificationView(Context context) { public NotificationView(Context context) {
super(context); super(context);
...@@ -78,10 +77,12 @@ public class NotificationView extends LinearLayout { ...@@ -78,10 +77,12 @@ public class NotificationView extends LinearLayout {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
try { try {
synchronized (timerSync) {
if (hideTimer != null) { if (hideTimer != null) {
hideTimer.cancel(); hideTimer.cancel();
hideTimer = null; hideTimer = null;
} }
}
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
...@@ -89,20 +90,16 @@ public class NotificationView extends LinearLayout { ...@@ -89,20 +90,16 @@ public class NotificationView extends LinearLayout {
} }
}); });
Locale locale = Locale.getDefault();
String lang = locale.getLanguage();
if (lang != null && lang.toLowerCase().equals("ar")) {
isRTL = true;
}
this.setOnClickListener(new OnClickListener() { this.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
try { try {
synchronized (timerSync) {
if (hideTimer != null) { if (hideTimer != null) {
hideTimer.cancel(); hideTimer.cancel();
hideTimer = null; hideTimer = null;
} }
}
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
...@@ -211,10 +208,12 @@ public class NotificationView extends LinearLayout { ...@@ -211,10 +208,12 @@ public class NotificationView extends LinearLayout {
avatarImage.setImage(photo, "50_50", Utilities.getUserAvatarForId(user.id)); avatarImage.setImage(photo, "50_50", Utilities.getUserAvatarForId(user.id));
try { try {
synchronized (timerSync) {
if (hideTimer != null) { if (hideTimer != null) {
hideTimer.cancel(); hideTimer.cancel();
hideTimer = null; hideTimer = null;
} }
}
hideTimer = new Timer(); hideTimer = new Timer();
hideTimer.schedule(new TimerTask() { hideTimer.schedule(new TimerTask() {
@Override @Override
...@@ -226,8 +225,12 @@ public class NotificationView extends LinearLayout { ...@@ -226,8 +225,12 @@ public class NotificationView extends LinearLayout {
} }
}); });
try { try {
synchronized (timerSync) {
if (hideTimer != null) {
hideTimer.cancel(); hideTimer.cancel();
hideTimer = null; hideTimer = null;
}
}
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
...@@ -251,10 +254,12 @@ public class NotificationView extends LinearLayout { ...@@ -251,10 +254,12 @@ public class NotificationView extends LinearLayout {
startAnimation(animHide); startAnimation(animHide);
} else { } else {
try { try {
synchronized (timerSync) {
if (hideTimer != null) { if (hideTimer != null) {
hideTimer.cancel(); hideTimer.cancel();
hideTimer = null; hideTimer = null;
} }
}
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
} }
...@@ -300,7 +305,7 @@ public class NotificationView extends LinearLayout { ...@@ -300,7 +305,7 @@ public class NotificationView extends LinearLayout {
messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14); messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
nameTextView.setPadding(0, Utilities.dp(2), 0, 0); nameTextView.setPadding(0, Utilities.dp(2), 0, 0);
messageTextView.setPadding(0, Utilities.dp(18), 0, 0); messageTextView.setPadding(0, Utilities.dp(18), 0, 0);
if (isRTL) { if (Utilities.isRTL) {
params1.setMargins(Utilities.dp(40), 0, height + Utilities.dp(6), 0); params1.setMargins(Utilities.dp(40), 0, height + Utilities.dp(6), 0);
} else { } else {
params1.setMargins(height + Utilities.dp(6), 0, Utilities.dp(40), 0); params1.setMargins(height + Utilities.dp(6), 0, Utilities.dp(40), 0);
...@@ -310,7 +315,7 @@ public class NotificationView extends LinearLayout { ...@@ -310,7 +315,7 @@ public class NotificationView extends LinearLayout {
messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
nameTextView.setPadding(0, Utilities.dp(4), 0, 0); nameTextView.setPadding(0, Utilities.dp(4), 0, 0);
messageTextView.setPadding(0, Utilities.dp(24), 0, 0); messageTextView.setPadding(0, Utilities.dp(24), 0, 0);
if (isRTL) { if (Utilities.isRTL) {
params1.setMargins(Utilities.dp(40), 0, height + Utilities.dp(8), 0); params1.setMargins(Utilities.dp(40), 0, height + Utilities.dp(8), 0);
} else { } else {
params1.setMargins(height + Utilities.dp(8), 0, Utilities.dp(40), 0); params1.setMargins(height + Utilities.dp(8), 0, Utilities.dp(40), 0);
......
TMessagesProj/src/main/java/org/telegram/ui/Views/PagerSlidingTabStrip.java
View file @ 9814a6e9
...@@ -256,7 +256,7 @@ public class PagerSlidingTabStrip extends HorizontalScrollView { ...@@ -256,7 +256,7 @@ public class PagerSlidingTabStrip extends HorizontalScrollView {
}); });
tabsContainer.addView(tab); tabsContainer.addView(tab);
tab.setSelected(position == currentPosition);
} }
private void updateExpanded() { private void updateExpanded() {
...@@ -309,21 +309,6 @@ public class PagerSlidingTabStrip extends HorizontalScrollView { ...@@ -309,21 +309,6 @@ public class PagerSlidingTabStrip extends HorizontalScrollView {
int myWidth = getMeasuredWidth(); int myWidth = getMeasuredWidth();
tabsContainer.measure(MeasureSpec.EXACTLY | myWidth, heightMeasureSpec); tabsContainer.measure(MeasureSpec.EXACTLY | myWidth, heightMeasureSpec);
/*int childWidth = 0;
for (int i = 0; i < tabCount; i++) {
childWidth += tabsContainer.getChildAt(i).getMeasuredWidth();
}
if (!checkedTabWidths && childWidth > 0 && myWidth > 0) {
if (childWidth <= myWidth) {
for (int i = 0; i < tabCount; i++) {
tabsContainer.getChildAt(i).setLayoutParams(expandedTabLayoutParams);
}
}
checkedTabWidths = true;
}*/
} }
private void scrollToChild(int position, int offset) { private void scrollToChild(int position, int offset) {
......
TMessagesProj/src/main/java/org/telegram/ui/Views/TightTextView.java
View file @ 9814a6e9
...@@ -94,6 +94,12 @@ public class TightTextView extends TextView { ...@@ -94,6 +94,12 @@ public class TightTextView extends TextView {
} }
} catch (Exception e) { } catch (Exception e) {
FileLog.e("tmessages", e); FileLog.e("tmessages", e);
try {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} catch (Exception e2) {
setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec));
FileLog.e("tmessages", e2);
}
} }
} }
......
TMessagesProj/src/main/res/drawable-xhdpi/ic_lock_green.png 100644 → 100755
View replaced file @ 1a4d0786 View file @ 9814a6e9
TMessagesProj/src/main/res/drawable-xhdpi/ic_lock_green.png

343 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_lock_green.png

296 Bytes | W: | H:

TMessagesProj/src/main/res/drawable-xhdpi/ic_lock_green.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_lock_green.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_lock_green.png
TMessagesProj/src/main/res/drawable-xhdpi/ic_lock_green.png
  • 2-up
  • Swipe
  • Onion skin
TMessagesProj/src/main/res/drawable/messages_list_divider.xml 0 → 100644
View file @ 9814a6e9
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="11dp"
android:insetRight="11dp">
<shape android:shape="rectangle">
<solid android:color="@color/divider"/>
</shape>
</inset>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/photo_download_cancel_states.xml 0 → 100644
View file @ 9814a6e9
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/photocancel_pressed"
android:state_pressed="true" />
<item android:drawable="@drawable/photocancel" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/drawable/photo_download_states.xml 0 → 100644
View file @ 9814a6e9
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/photoload_pressed"
android:state_pressed="true" />
<item android:drawable="@drawable/photoload" />
</selector>
\ No newline at end of file
TMessagesProj/src/main/res/layout-ar/contact_add_layout.xml
View file @ 9814a6e9
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:layout_gravity="top"> android:layout_gravity="top">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
...@@ -97,7 +97,8 @@ ...@@ -97,7 +97,8 @@
android:paddingRight="15dp" android:paddingRight="15dp"
android:gravity="right" android:gravity="right"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
android:textColor="#000000"/> android:textColor="#000000"
android:layout_marginBottom="16dp"/>
</LinearLayout> </LinearLayout>
......
TMessagesProj/src/main/res/layout-ar/messages_list.xml
View file @ 9814a6e9
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:clipToPadding="false" android:clipToPadding="false"
android:fadingEdge="none" android:fadingEdge="none"
android:divider="@drawable/messages_list_divider"
android:dividerHeight="1px"
android:fadingEdgeLength="0dp" android:fadingEdgeLength="0dp"
android:verticalScrollbarPosition="left"/> android:verticalScrollbarPosition="left"/>
...@@ -37,6 +39,7 @@ ...@@ -37,6 +39,7 @@
android:textColor="#959595" android:textColor="#959595"
android:text="@string/NoChats" android:text="@string/NoChats"
android:textSize="24dp" android:textSize="24dp"
android:gravity="center"
android:id="@+id/list_empty_view_text1"/> android:id="@+id/list_empty_view_text1"/>
<TextView android:layout_width="wrap_content" <TextView android:layout_width="wrap_content"
......
TMessagesProj/src/main/res/layout-ar/messages_list_row.xml deleted 100644 → 0
View file @ 1a4d0786
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="70dp"
android:paddingTop="8dp"
android:paddingLeft="11dp"
android:paddingRight="11dp"
android:layout_gravity="top">
<org.telegram.ui.Views.BackupImageView
android:layout_width="54dp"
android:layout_height="54dp"
android:id="@+id/messages_list_row_avatar"
android:contentDescription=""
android:layout_gravity="right"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name_layout"
android:orientation="horizontal"
android:layout_marginRight="66dp"
android:layout_gravity="top">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_time"
android:textSize="14dp"
android:layout_marginTop="-2dp"
android:textColor="#9e9e9e"
android:lines="1"/>
<FrameLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginLeft="2dp"
android:layout_gravity="top">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/msg_clock"
android:id="@+id/messages_list_row_clock"
android:visibility="gone"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/dialogs_check"
android:id="@+id/messages_list_row_check"
android:visibility="gone"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/dialogs_halfcheck"
android:paddingLeft="5dp"
android:id="@+id/messages_list_row_check_half"
android:visibility="gone"/>
</FrameLayout>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name"
android:textSize="19dp"
android:textColor="#222222"
android:layout_marginLeft="3dp"
android:ellipsize="end"
android:layout_weight="1"
android:singleLine="false"
android:scrollHorizontally="true"
android:gravity="right"
android:maxLines="1"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="24dp"
android:orientation="horizontal"
android:layout_marginTop="28dp"
android:layout_marginRight="66dp"
android:layout_gravity="top">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/dialogs_warning"
android:layout_marginRight="8dp"
android:layout_gravity="center"
android:visibility="gone"
android:id="@+id/messages_list_row_error"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_badge"
android:textSize="13dp"
android:gravity="center"
android:lines="1"
android:layout_gravity="center"
android:textColor="#ffffff"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:background="@drawable/dialogs_badge"
android:visibility="visible"
android:layout_marginLeft="8dp"/>
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_message"
android:textSize="16dp"
android:lines="1"
android:ellipsize="end"
android:textColor="#808080"
android:gravity="right"
android:layout_gravity="right"
android:layout_marginTop="2dp"/>
</FrameLayout>
</LinearLayout>
<View android:background="@color/divider"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:id="@+id/settings_row_divider"/>
</FrameLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout-ar/messages_search_chat_layout.xml deleted 100644 → 0
View file @ 1a4d0786
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_gravity="top">
<org.telegram.ui.Views.BackupImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/messages_list_row_avatar"
android:contentDescription=""
android:layout_marginTop="7dp"
android:layout_gravity="top|right"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name"
android:textSize="18dp"
android:layout_marginRight="61dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#333333"
android:gravity="right"
android:layout_gravity="center_vertical|right"/>
<View
android:background="@color/divider"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:id="@+id/settings_row_divider"/>
</FrameLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout-ar/messages_search_user_layout.xml deleted 100644 → 0
View file @ 1a4d0786
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_gravity="top">
<org.telegram.ui.Views.BackupImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/messages_list_row_avatar"
android:contentDescription=""
android:layout_marginTop="7dp"
android:layout_gravity="top|right"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name"
android:textSize="18dp"
android:layout_marginRight="61dp"
android:ellipsize="end"
android:layout_marginTop="10dp"
android:maxLines="1"
android:gravity="right"
android:textColor="#333333"
android:layout_gravity="top|right"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_message"
android:textSize="15dp"
android:maxLines="1"
android:ellipsize="end"
android:textColor="#999999"
android:layout_marginRight="61dp"
android:layout_marginTop="34dp"
android:gravity="right"
android:layout_gravity="top|right"/>
<View
android:background="@color/divider"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:id="@+id/settings_row_divider"
android:visibility="gone"/>
</FrameLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout-ar/settings_row_check_layout.xml
View file @ 9814a6e9
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
android:id="@+id/settings_row_text" android:id="@+id/settings_row_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginLeft="8dp" android:layout_marginLeft="104dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:layout_gravity="top|right"/> android:layout_gravity="top|right"/>
......
TMessagesProj/src/main/res/layout-ar/settings_row_check_notify_layout.xml
View file @ 9814a6e9
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
android:id="@+id/settings_row_text" android:id="@+id/settings_row_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginLeft="8dp" android:layout_marginLeft="104dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:layout_gravity="top|right"/> android:layout_gravity="top|right"/>
......
TMessagesProj/src/main/res/layout/chat_group_incoming_location_layout.xml
View file @ 9814a6e9
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
android:id="@+id/chat_time_layout" android:id="@+id/chat_time_layout"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom" android:layout_gravity="right|bottom"
......
TMessagesProj/src/main/res/layout/chat_group_incoming_photo_layout.xml
View file @ 9814a6e9
...@@ -36,17 +36,63 @@ ...@@ -36,17 +36,63 @@
android:minWidth="100dp" android:minWidth="100dp"
android:id="@+id/chat_photo_image"/> android:id="@+id/chat_photo_image"/>
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_height="40dp"
android:layout_width="40dp"
android:id="@+id/chat_view_action_layout"
android:layout_gravity="center"
android:visibility="visible">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:scaleType="centerInside"
android:id="@+id/chat_view_action_cancel_button"
android:src="@drawable/photo_download_states"
android:layout_gravity="center"
android:clickable="true"/>
</org.telegram.ui.Views.FrameLayoutFixed>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="16dp"
android:orientation="horizontal"
android:layout_marginLeft="10dp"
android:layout_marginBottom="10dp"
android:layout_marginRight="10dp"
android:layout_gravity="right|bottom"
android:gravity="right">
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_width="0dp"
android:layout_height="16dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="1dp"
android:layout_marginRight="4dp"
android:background="@drawable/phototime"
android:id="@+id/photo_progress"
android:layout_weight="1">
<ProgressBar
android:layout_width="fill_parent"
android:layout_height="3dp"
android:layout_gravity="right|center_vertical"
android:progressDrawable="@drawable/photo_progress_chat"
style="?android:attr/progressBarStyleHorizontal"
android:progress="50"
android:id="@+id/chat_view_action_progress"
android:max="100"/>
</org.telegram.ui.Views.FrameLayoutFixed>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="16dp" android:layout_height="16dp"
android:id="@+id/chat_time_layout" android:id="@+id/chat_time_layout"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom"
android:background="@drawable/phototime"> android:background="@drawable/phototime">
<TextView <TextView
...@@ -60,23 +106,8 @@ ...@@ -60,23 +106,8 @@
</LinearLayout> </LinearLayout>
</org.telegram.ui.Views.FrameLayoutFixed> </LinearLayout>
<TextView </org.telegram.ui.Views.FrameLayoutFixed>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ViewPhoto"
android:textColor="#54759e"
android:background="@drawable/chat_incoming_media_states"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:textStyle="bold"
android:id="@+id/chat_view_action_button"
android:textSize="14dp"
android:layout_gravity="center"
android:descendantFocusability="blocksDescendants"
android:clickable="true"
android:gravity="center"
android:layout_marginLeft="10dp"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/chat_group_incoming_video_layout.xml
View file @ 9814a6e9
...@@ -72,8 +72,6 @@ ...@@ -72,8 +72,6 @@
android:id="@+id/chat_time_layout" android:id="@+id/chat_time_layout"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom" android:layout_gravity="right|bottom"
......
TMessagesProj/src/main/res/layout/chat_incoming_location_layout.xml
View file @ 9814a6e9
...@@ -33,8 +33,6 @@ ...@@ -33,8 +33,6 @@
android:id="@+id/chat_time_layout" android:id="@+id/chat_time_layout"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom" android:layout_gravity="right|bottom"
......
TMessagesProj/src/main/res/layout/chat_incoming_photo_layout.xml
View file @ 9814a6e9
...@@ -26,17 +26,63 @@ ...@@ -26,17 +26,63 @@
android:minWidth="100dp" android:minWidth="100dp"
android:id="@+id/chat_photo_image"/> android:id="@+id/chat_photo_image"/>
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_height="40dp"
android:layout_width="40dp"
android:id="@+id/chat_view_action_layout"
android:layout_gravity="center"
android:visibility="visible">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:scaleType="centerInside"
android:id="@+id/chat_view_action_cancel_button"
android:src="@drawable/photo_download_states"
android:layout_gravity="center"
android:clickable="true"/>
</org.telegram.ui.Views.FrameLayoutFixed>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="16dp"
android:orientation="horizontal"
android:layout_marginLeft="10dp"
android:layout_marginBottom="10dp"
android:layout_marginRight="10dp"
android:layout_gravity="right|bottom"
android:gravity="right">
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_width="0dp"
android:layout_height="16dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="1dp"
android:layout_marginRight="4dp"
android:background="@drawable/phototime"
android:id="@+id/photo_progress"
android:layout_weight="1">
<ProgressBar
android:layout_width="fill_parent"
android:layout_height="3dp"
android:layout_gravity="right|center_vertical"
android:progressDrawable="@drawable/photo_progress_chat"
style="?android:attr/progressBarStyleHorizontal"
android:progress="50"
android:id="@+id/chat_view_action_progress"
android:max="100"/>
</org.telegram.ui.Views.FrameLayoutFixed>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="16dp" android:layout_height="16dp"
android:id="@+id/chat_time_layout" android:id="@+id/chat_time_layout"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom"
android:background="@drawable/phototime"> android:background="@drawable/phototime">
<TextView <TextView
...@@ -50,23 +96,8 @@ ...@@ -50,23 +96,8 @@
</LinearLayout> </LinearLayout>
</org.telegram.ui.Views.FrameLayoutFixed> </LinearLayout>
<TextView </org.telegram.ui.Views.FrameLayoutFixed>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ViewPhoto"
android:textColor="#54759e"
android:background="@drawable/chat_incoming_media_states"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:gravity="center"
android:layout_gravity="center"
android:textStyle="bold"
android:id="@+id/chat_view_action_button"
android:textSize="14dp"
android:layout_marginLeft="10dp"
android:descendantFocusability="blocksDescendants"
android:clickable="true"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/chat_incoming_video_layout.xml
View file @ 9814a6e9
...@@ -63,8 +63,6 @@ ...@@ -63,8 +63,6 @@
android:id="@+id/chat_time_layout" android:id="@+id/chat_time_layout"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom" android:layout_gravity="right|bottom"
......
TMessagesProj/src/main/res/layout/chat_outgoing_location_layout.xml
View file @ 9814a6e9
...@@ -51,8 +51,6 @@ ...@@ -51,8 +51,6 @@
android:id="@+id/chat_time_layout" android:id="@+id/chat_time_layout"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom" android:layout_gravity="right|bottom"
......
TMessagesProj/src/main/res/layout/chat_outgoing_photo_layout.xml
View file @ 9814a6e9
...@@ -10,23 +10,61 @@ ...@@ -10,23 +10,61 @@
android:paddingTop="1dp"> android:paddingTop="1dp">
<org.telegram.ui.Views.FrameLayoutFixed <org.telegram.ui.Views.FrameLayoutFixed
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="140dp" android:layout_marginRight="9dp"
android:layout_marginRight="10dp" android:id="@+id/chat_bubble_layout"
android:addStatesFromChildren="true">
<org.telegram.ui.Views.BackupImageView
android:layout_height="100dp"
android:layout_width="100dp"
android:layout_margin="6dp"
android:layout_gravity="top|left"
android:scaleType="centerCrop"
android:minHeight="100dp"
android:minWidth="100dp"
android:id="@+id/chat_photo_image"/>
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_height="40dp"
android:layout_width="40dp"
android:id="@+id/chat_view_action_layout" android:id="@+id/chat_view_action_layout"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="gone"> android:visibility="visible">
<ImageView <ImageView
android:layout_width="30dp" android:layout_width="40dp"
android:layout_height="30dp" android:layout_height="40dp"
android:scaleType="centerInside" android:scaleType="centerInside"
android:layout_marginLeft="4dp"
android:id="@+id/chat_view_action_cancel_button" android:id="@+id/chat_view_action_cancel_button"
android:src="@drawable/ic_msg_btn_cross_custom" android:src="@drawable/photo_download_cancel_states"
android:layout_gravity="left|center" android:layout_gravity="center"
android:clickable="true"/> android:clickable="true"/>
</org.telegram.ui.Views.FrameLayoutFixed>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="16dp"
android:orientation="horizontal"
android:layout_marginLeft="10dp"
android:layout_marginBottom="10dp"
android:layout_marginRight="10dp"
android:layout_gravity="right|bottom"
android:gravity="right">
<org.telegram.ui.Views.FrameLayoutFixed
android:layout_width="0dp"
android:layout_height="16dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="1dp"
android:layout_marginRight="4dp"
android:background="@drawable/phototime"
android:id="@+id/photo_progress"
android:layout_weight="1">
<ProgressBar <ProgressBar
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="3dp" android:layout_height="3dp"
...@@ -34,59 +72,17 @@ ...@@ -34,59 +72,17 @@
android:progressDrawable="@drawable/photo_progress_chat" android:progressDrawable="@drawable/photo_progress_chat"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:progress="50" android:progress="50"
android:layout_marginLeft="36dp"
android:layout_marginRight="12dp"
android:id="@+id/chat_view_action_progress" android:id="@+id/chat_view_action_progress"
android:max="100"/> android:max="100"/>
</org.telegram.ui.Views.FrameLayoutFixed> </org.telegram.ui.Views.FrameLayoutFixed>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ViewPhoto"
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:textStyle="bold"
android:layout_gravity="center"
android:visibility="gone"/>
<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: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|left"
android:scaleType="centerCrop"
android:minHeight="100dp"
android:minWidth="100dp"
android:id="@+id/chat_photo_image"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="16dp" android:layout_height="16dp"
android:id="@+id/chat_time_layout" android:id="@+id/chat_time_layout"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom"
android:background="@drawable/phototime"> android:background="@drawable/phototime">
<TextView <TextView
...@@ -102,7 +98,7 @@ ...@@ -102,7 +98,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/msg_check_w" android:src="@drawable/msg_check_w"
android:layout_marginTop="1dp" android:layout_marginTop="2dp"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:layout_marginRight="-8dp" android:layout_marginRight="-8dp"
android:id="@+id/chat_row_check" android:id="@+id/chat_row_check"
...@@ -112,7 +108,7 @@ ...@@ -112,7 +108,7 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="1dp" android:layout_marginTop="2dp"
android:id="@+id/chat_row_halfcheck" android:id="@+id/chat_row_halfcheck"
android:visibility="visible" android:visibility="visible"
android:src="@drawable/msg_halfcheck_w" android:src="@drawable/msg_halfcheck_w"
...@@ -120,6 +116,8 @@ ...@@ -120,6 +116,8 @@
</LinearLayout> </LinearLayout>
</LinearLayout>
</org.telegram.ui.Views.FrameLayoutFixed> </org.telegram.ui.Views.FrameLayoutFixed>
</LinearLayout> </LinearLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/chat_outgoing_video_layout.xml
View file @ 9814a6e9
...@@ -113,8 +113,6 @@ ...@@ -113,8 +113,6 @@
android:id="@+id/chat_time_layout" android:id="@+id/chat_time_layout"
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:paddingRight="3dp" android:paddingRight="3dp"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_gravity="right|bottom" android:layout_gravity="right|bottom"
......
TMessagesProj/src/main/res/layout/contact_add_layout.xml
View file @ 9814a6e9
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:layout_gravity="top"> android:layout_gravity="top">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<LinearLayout <LinearLayout
android:gravity="center_vertical" android:gravity="center_vertical"
...@@ -90,7 +90,8 @@ ...@@ -90,7 +90,8 @@
android:paddingLeft="15dp" android:paddingLeft="15dp"
android:paddingRight="15dp" android:paddingRight="15dp"
android:textCursorDrawable="@null" android:textCursorDrawable="@null"
android:textColor="#000000"/> android:textColor="#000000"
android:layout_marginBottom="16dp"/>
</LinearLayout> </LinearLayout>
......
TMessagesProj/src/main/res/layout/messages_list.xml
View file @ 9814a6e9
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
android:clipToPadding="false" android:clipToPadding="false"
android:fadingEdge="none" android:fadingEdge="none"
android:fadingEdgeLength="0dp" android:fadingEdgeLength="0dp"
android:divider="@null" android:divider="@drawable/messages_list_divider"
android:dividerHeight="0dp" android:dividerHeight="1px"
android:animationCache="false"/> android:animationCache="false"/>
<TextView android:layout_width="match_parent" <TextView android:layout_width="match_parent"
...@@ -34,10 +34,12 @@ ...@@ -34,10 +34,12 @@
android:gravity="center" android:gravity="center"
android:visibility="gone"> android:visibility="gone">
<TextView android:layout_width="wrap_content" <TextView
android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:textColor="#959595" android:textColor="#959595"
android:text="@string/NoChats" android:text="@string/NoChats"
android:gravity="center"
android:textSize="24dp" android:textSize="24dp"
android:id="@+id/list_empty_view_text1"/> android:id="@+id/list_empty_view_text1"/>
......
TMessagesProj/src/main/res/layout/messages_list_row.xml deleted 100644 → 0
View file @ 1a4d0786
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="70dp"
android:paddingTop="8dp"
android:paddingLeft="11dp"
android:paddingRight="11dp"
android:layout_gravity="top">
<org.telegram.ui.Views.BackupImageView
android:layout_width="54dp"
android:layout_height="54dp"
android:id="@+id/messages_list_row_avatar"
android:contentDescription=""/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name_layout"
android:orientation="horizontal"
android:layout_marginLeft="66dp"
android:layout_gravity="top">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name"
android:textSize="19dp"
android:layout_marginRight="3dp"
android:ellipsize="end"
android:layout_weight="1"
android:singleLine="false"
android:scrollHorizontally="true"
android:gravity="left"
android:textColor="#222222"
android:maxLines="1"/>
<FrameLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginRight="2dp"
android:layout_gravity="top">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/msg_clock"
android:id="@+id/messages_list_row_clock"
android:visibility="gone"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/dialogs_check"
android:id="@+id/messages_list_row_check"
android:visibility="gone"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/dialogs_halfcheck"
android:paddingLeft="5dp"
android:id="@+id/messages_list_row_check_half"
android:visibility="gone"/>
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_time"
android:textSize="14dp"
android:layout_marginTop="-2dp"
android:textColor="#9e9e9e"
android:lines="1"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="24dp"
android:orientation="horizontal"
android:layout_marginTop="28dp"
android:layout_marginLeft="66dp"
android:layout_gravity="top">
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_message"
android:textSize="16dp"
android:lines="1"
android:ellipsize="end"
android:textColor="#808080"
android:gravity="left"
android:layout_marginTop="2dp"/>
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_badge"
android:textSize="13dp"
android:gravity="center"
android:lines="1"
android:layout_gravity="center"
android:textColor="#ffffff"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:background="@drawable/dialogs_badge"
android:visibility="visible"
android:layout_marginLeft="8dp"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/dialogs_warning"
android:layout_marginLeft="8dp"
android:layout_gravity="center"
android:visibility="gone"
android:id="@+id/messages_list_row_error"/>
</LinearLayout>
<View android:background="@color/divider"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:id="@+id/settings_row_divider"/>
</FrameLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/messages_search_chat_layout.xml deleted 100644 → 0
View file @ 1a4d0786
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_gravity="top">
<org.telegram.ui.Views.BackupImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/messages_list_row_avatar"
android:contentDescription=""
android:layout_marginTop="7dp"
android:layout_gravity="top"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name"
android:textSize="18dp"
android:layout_marginLeft="61dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#333333"
android:layout_gravity="center_vertical"/>
<View
android:background="@color/divider"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:id="@+id/settings_row_divider"/>
</FrameLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/messages_search_user_layout.xml deleted 100644 → 0
View file @ 1a4d0786
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_gravity="top">
<org.telegram.ui.Views.BackupImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:id="@+id/messages_list_row_avatar"
android:contentDescription=""
android:layout_marginTop="7dp"
android:layout_gravity="top"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_name"
android:textSize="18dp"
android:layout_marginLeft="61dp"
android:ellipsize="end"
android:textColor="#333333"
android:layout_marginTop="10dp"
android:maxLines="1"
android:layout_gravity="top"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/messages_list_row_message"
android:textSize="15dp"
android:maxLines="1"
android:ellipsize="end"
android:textColor="#999999"
android:layout_marginLeft="61dp"
android:layout_marginTop="34dp"
android:layout_gravity="top"/>
<View
android:background="@color/divider"
android:layout_width="fill_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:id="@+id/settings_row_divider"
android:visibility="gone"/>
</FrameLayout>
\ No newline at end of file
TMessagesProj/src/main/res/layout/settings_row_check_layout.xml
View file @ 9814a6e9
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="104dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_gravity="top"/> android:layout_gravity="top"/>
......
TMessagesProj/src/main/res/layout/settings_row_check_notify_layout.xml
View file @ 9814a6e9
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="104dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_gravity="top"/> android:layout_gravity="top"/>
......
TMessagesProj/src/main/res/menu/messages_list_menu.xml
View file @ 9814a6e9
...@@ -15,29 +15,24 @@ ...@@ -15,29 +15,24 @@
android:title="@string/NewMessages" android:title="@string/NewMessages"
sabd:showAsAction="always"/> sabd:showAsAction="always"/>
<item
android:id="@+id/chat_menu_attach"
android:icon="@drawable/ic_ab_other"
sabd:showAsAction="always">
<menu>
<item <item
android:id="@+id/messages_list_menu_new_chat" android:id="@+id/messages_list_menu_new_chat"
android:title="@string/NewGroup"/> android:title="@string/NewGroup"
sabd:showAsAction="never"/>
<item <item
android:id="@+id/messages_list_menu_new_secret_chat" android:id="@+id/messages_list_menu_new_secret_chat"
android:title="@string/NewSecretChat"/> android:title="@string/NewSecretChat"
sabd:showAsAction="never"/>
<item <item
android:id="@+id/messages_list_menu_contacts" android:id="@+id/messages_list_menu_contacts"
android:title="@string/Contacts"/> android:title="@string/Contacts"
sabd:showAsAction="never"/>
<item <item
android:id="@+id/messages_list_menu_settings" android:id="@+id/messages_list_menu_settings"
android:title="@string/Settings"/> android:title="@string/Settings"
</menu> sabd:showAsAction="never"/>
</item>
</menu> </menu>
\ No newline at end of file
TMessagesProj/src/main/res/menu/user_profile_contact_menu.xml
View file @ 9814a6e9
<menu <menu
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<!--<item android:id="@+id/edit_contact"-->
<!--android:title="@string/Edit"/>-->
<item <item
android:id="@+id/share_contact" android:id="@+id/share_contact"
...@@ -11,4 +9,10 @@ ...@@ -11,4 +9,10 @@
android:id="@+id/block_contact" android:id="@+id/block_contact"
android:title="@string/BlockContact"/> android:title="@string/BlockContact"/>
<item android:id="@+id/edit_contact"
android:title="@string/EditContact"/>
<item android:id="@+id/delete_contact"
android:title="@string/DeleteContact"/>
</menu> </menu>
\ No newline at end of file
TMessagesProj/src/main/res/values-ar/strings.xml
View file @ 9814a6e9
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--Translation by Khalid Alaraifi-->
<resources> <resources>
<string name="AppName">Telegram</string> <string name="AppName">Telegram</string>
...@@ -46,6 +49,8 @@ ...@@ -46,6 +49,8 @@
<string name="EncryptedChatStartedIncoming">لقد قمت بالدخول للمحادثة السرية.</string> <string name="EncryptedChatStartedIncoming">لقد قمت بالدخول للمحادثة السرية.</string>
<string name="ClearHistory">مسح سجل التاريخ</string> <string name="ClearHistory">مسح سجل التاريخ</string>
<string name="DeleteChat">حذف وخروج</string> <string name="DeleteChat">حذف وخروج</string>
<string name="HiddenName">الاسم مخفي</string>
<string name="SelectChat">اختر محادثة</string>
<!--documents view--> <!--documents view-->
<string name="SelectFile">اختر ملف</string> <string name="SelectFile">اختر ملف</string>
...@@ -107,6 +112,7 @@ ...@@ -107,6 +112,7 @@
<string name="MessageLifetimeChanged">%1$s قام بتعيين عداد التدمير الذاتي إلى to %2$s</string> <string name="MessageLifetimeChanged">%1$s قام بتعيين عداد التدمير الذاتي إلى to %2$s</string>
<string name="MessageLifetimeChangedOutgoing">لقد قمت بتعيين التدمير الذاتي إلى %1$s</string> <string name="MessageLifetimeChangedOutgoing">لقد قمت بتعيين التدمير الذاتي إلى %1$s</string>
<string name="MessageLifetimeRemoved">%1$s قام بإيقاف عداد التدمير الذاتي</string> <string name="MessageLifetimeRemoved">%1$s قام بإيقاف عداد التدمير الذاتي</string>
<string name="MessageLifetimeYouRemoved">لقد قمت بتعطيل عداد التدمير الذاتي</string>
<string name="MessageLifetime2s">ثانيتان</string> <string name="MessageLifetime2s">ثانيتان</string>
<string name="MessageLifetime5s">٥ ثوانٍ</string> <string name="MessageLifetime5s">٥ ثوانٍ</string>
<string name="MessageLifetime1m">دقيقة</string> <string name="MessageLifetime1m">دقيقة</string>
...@@ -138,7 +144,7 @@ ...@@ -138,7 +144,7 @@
<string name="NotificationGroupKickYou">%1$s قام بإخراجك من المجموعة %2$s</string> <string name="NotificationGroupKickYou">%1$s قام بإخراجك من المجموعة %2$s</string>
<string name="NotificationGroupLeftMember">%1$s قام بمغادرة المجموعة %2$s</string> <string name="NotificationGroupLeftMember">%1$s قام بمغادرة المجموعة %2$s</string>
<string name="NotificationContactJoined">%1$s قام بالتسجيل في تيليجرام!</string> <string name="NotificationContactJoined">%1$s قام بالتسجيل في تيليجرام!</string>
<string name="NotificationUnrecognizedDevice">لقد تم تسجيل الدخول لحسابك من جهاز غير معروف من نوع %1$s, الموقع: %2$s</string> <string name="NotificationUnrecognizedDevice">%1$s,\nتم تسجيل الدخول لحسابك من جهاز جديد يوم %2$s\n\nالجهاز: %3$s\nالموقع: %4$s\n\nإذا لم يكن أنت من سجل الدخول، يمكنك الذهاب للإعدادات ثم تسجيل الخروج من كافة الأجهزة الأخرى.\n\nشكرًا,\nفريق عمل تيليجرام</string>
<string name="NotificationContactNewPhoto">%1$s قام بتغيير صورته الشخصية</string> <string name="NotificationContactNewPhoto">%1$s قام بتغيير صورته الشخصية</string>
<!--contacts view--> <!--contacts view-->
...@@ -151,6 +157,7 @@ ...@@ -151,6 +157,7 @@
<string name="Online">متصل</string> <string name="Online">متصل</string>
<string name="Offline">غير متصل</string> <string name="Offline">غير متصل</string>
<string name="LastSeen">آخر ظهور</string> <string name="LastSeen">آخر ظهور</string>
<string name="LastSeenDate">آخر ظهور</string>
<string name="InviteFriends">قم بدعوة صديق</string> <string name="InviteFriends">قم بدعوة صديق</string>
<!--group create view--> <!--group create view-->
...@@ -173,9 +180,11 @@ ...@@ -173,9 +180,11 @@
<string name="KickFromGroup">إخراج من المجموعة</string> <string name="KickFromGroup">إخراج من المجموعة</string>
<!--contact info view--> <!--contact info view-->
<string name="ShareContact">أرسل جهة الاتصال</string> <string name="ShareContact">مشاركة</string>
<string name="AddContact">إضافة جهة الاتصال</string> <string name="AddContact">إضافة</string>
<string name="BlockContact">حظر جهة الاتصال</string> <string name="BlockContact">حظر</string>
<string name="EditContact">تعديل</string>
<string name="DeleteContact">حذف</string>
<string name="PhoneHome">الهاتف المنزلي</string> <string name="PhoneHome">الهاتف المنزلي</string>
<string name="PhoneMobile">الهاتف المحمول</string> <string name="PhoneMobile">الهاتف المحمول</string>
<string name="PhoneWork">هاتف العمل</string> <string name="PhoneWork">هاتف العمل</string>
...@@ -229,6 +238,14 @@ ...@@ -229,6 +238,14 @@
<string name="Default">افتراضي</string> <string name="Default">افتراضي</string>
<string name="Support">الدعم</string> <string name="Support">الدعم</string>
<string name="ChatBackground">خلفية الدردشة</string> <string name="ChatBackground">خلفية الدردشة</string>
<string name="MessagesSettings">الرسائل</string>
<string name="SendByEnter">أرسل بزر الإدخال</string>
<string name="TerminateAllSessions">سجل الخروج من كافة الأجهزة الأخرى</string>
<string name="AutomaticPhotoDownload">تنزيل الصور تلقائيًا</string>
<string name="AutomaticPhotoDownloadGroups">المجموعات</string>
<string name="AutomaticPhotoDownloadPrivateChats">المحادثات</string>
<string name="Events">الأحداث</string>
<string name="ContactJoined">عندما يشترك صديق في تيليجرام</string>
<!--media view--> <!--media view-->
<string name="NoMedia">لا توجد وسائط بعد</string> <string name="NoMedia">لا توجد وسائط بعد</string>
...@@ -279,6 +296,15 @@ ...@@ -279,6 +296,15 @@
<string name="ActionChangedPhoto">تم تغيير صورة المجموعة من قِبَل un1</string> <string name="ActionChangedPhoto">تم تغيير صورة المجموعة من قِبَل un1</string>
<string name="ActionChangedTitle">un1 قام بتغيير اسم المجموعة إلى un2</string> <string name="ActionChangedTitle">un1 قام بتغيير اسم المجموعة إلى un2</string>
<string name="ActionCreateGroup">تم إنشاء مجموعة جديدة من قِبَل un1</string> <string name="ActionCreateGroup">تم إنشاء مجموعة جديدة من قِبَل un1</string>
<string name="ActionYouKickUser">لقد قمت بإخراج un2</string>
<string name="ActionYouLeftUser">لقد قمت بمغادرة المجموعة</string>
<string name="ActionYouAddUser">لقد قمت بإضافة un2</string>
<string name="ActionYouRemovedPhoto">لقد قمت بإزالة صورة المجموعة</string>
<string name="ActionYouChangedPhoto">لقد قمت بتغيير صورة المجموعة</string>
<string name="ActionYouChangedTitle">لقد قمت بتغيير اسم المجموعة إلى un2</string>
<string name="ActionYouCreateGroup">لقد قمت بإنشاء المجموعة</string>
<string name="ActionKickUserYou">un1 قام بإخراجك</string>
<string name="ActionAddUserYou">un1 قام بإضافتك</string>
<string name="UnsuppotedMedia">نسخة تيليجرام التي تستخدمها لا تدعم هذه الرسالة</string> <string name="UnsuppotedMedia">نسخة تيليجرام التي تستخدمها لا تدعم هذه الرسالة</string>
<string name="AttachPhoto">صورة</string> <string name="AttachPhoto">صورة</string>
<string name="AttachVideo">مقطع مرئي</string> <string name="AttachVideo">مقطع مرئي</string>
...@@ -297,7 +323,7 @@ ...@@ -297,7 +323,7 @@
<string name="InvalidLastName">اسم العائلة غير صحيح</string> <string name="InvalidLastName">اسم العائلة غير صحيح</string>
<string name="Loading">جاري التحميل ...</string> <string name="Loading">جاري التحميل ...</string>
<string name="NoPlayerInstalled">ليس لديك أي مشغل مقاطع مرئية، يرجى تنزيل أية مشغل</string> <string name="NoPlayerInstalled">ليس لديك أي مشغل مقاطع مرئية، يرجى تنزيل أية مشغل</string>
<string name="NoHandleAppInstalled">لا يوجد لديك تطبيق يمكنه فته هذا المستند، يرجى تنزيل تطبيق يمكنه للإستمرار</string> <string name="NoHandleAppInstalled">لا يوجد لديك تطبيق يمكنه فتح \'%1$s\'، يرجى تنزيل تطبيق مناسب للإستمرار</string>
<string name="InviteUser">هذا المستخدم ليس لديه تيليجرام بعد ، هل ترغب في دعوته الآن؟</string> <string name="InviteUser">هذا المستخدم ليس لديه تيليجرام بعد ، هل ترغب في دعوته الآن؟</string>
<string name="AreYouSure">هل أنت متأكد؟</string> <string name="AreYouSure">هل أنت متأكد؟</string>
<string name="DeleteChatQuestion">هل تريد حذف هذه الدردشة؟</string> <string name="DeleteChatQuestion">هل تريد حذف هذه الدردشة؟</string>
......
TMessagesProj/src/main/res/values-es/strings.xml 0 → 100644
View file @ 9814a6e9
<?xml version="1.0" encoding="utf-8"?>
<!--Translation by Borja Campina, Edited by Victor Espinoza-->
<resources>
<string name="AppName">Telegram</string>
<!--signin view-->
<string name="YourPhone">Tu teléfono</string>
<string name="StartText">Por favor, confirma tu código de país\ne introduce tu número.</string>
<string name="ChooseCountry">Elige un país</string>
<string name="WrongCountry">Código de país incorrecto</string>
<!--code enter view-->
<string name="YourCode">Tu código</string>
<string name="SentSmsCode">Hemos enviado un SMS con un código de activación a tu teléfono</string>
<string name="CallText">Te llamaremos en</string>
<string name="Calling">Llamándote...</string>
<string name="Code">Código</string>
<string name="WrongNumber">¿Número incorrecto?</string>
<!--signup view-->
<string name="YourName">Tu nombre</string>
<string name="RegisterText">Ingresa tu nombre y apellidos</string>
<!--<string name="RegisterText">Ingresa tu nombre y foto</string>-->
<string name="FirstName">Nombre (requerido)</string>
<string name="LastName">Apellido/s (opcional)</string>
<string name="CancelRegistration">Cancelar registro</string>
<!--chats view-->
<string name="Chats">Chats</string>
<string name="Search">Buscar</string>
<string name="NewMessages">Mensajes nuevos</string>
<string name="Settings">Ajustes</string>
<string name="Contacts">Contactos</string>
<string name="NewGroup">Nuevo grupo</string>
<string name="Yesterday">ayer</string>
<string name="NoResult">Sin resultados</string>
<string name="NoChats">No tienes conversaciones todavía...</string>
<string name="NoChatsHelp">Empieza a chatear presionando el\nbotón de componer en la esquina superior\nderecha o ve a la sección de Contactos.</string>
<string name="WaitingForNetwork">Esperando red...</string>
<string name="Connecting">Conectando...</string>
<string name="Updating">Actualizando...</string>
<string name="NewSecretChat">Nuevo chat secreto</string>
<string name="AwaitingEncryption">Esperando que %s se conecte...</string>
<string name="EncryptionRejected">Chat secreto cancelado</string>
<string name="EncryptionProcessing">Intercambiando claves de cifrado...</string>
<string name="EncryptedChatStartedOutgoing">%s se unió a tu chat secreto.</string>
<string name="EncryptedChatStartedIncoming">Te has unido al chat secreto.</string>
<string name="ClearHistory">Limpiar historial</string>
<string name="DeleteChat">Eliminar y salir</string>
<string name="HiddenName">Nombre oculto</string>
<string name="SelectChat">Selecciona el chat</string>
<!--documents view-->
<string name="SelectFile">Seleccionar archivo</string>
<string name="FreeOfTotal">%1$s de %2$s libres</string>
<string name="UnknownError">Error desconocido</string>
<string name="AccessError">Error de acceso</string>
<string name="NoFiles">No hay archivos aún...</string>
<string name="FileUploadLimit">El tamaño del archivo no debe superar los %1$s</string>
<string name="NotMounted">Almacenamiento no montado</string>
<string name="UsbActive">Transferencia USB activa</string>
<string name="InternalStorage">Almacenamiento Interno</string>
<string name="ExternalStorage">Almacenamiento Externo</string>
<string name="SystemRoot">Raíz del Sistema</string>
<string name="SdCard">Tarjeta SD</string>
<!--chat view-->
<string name="Invisible">invisible</string>
<string name="Typing">escribiendo...</string>
<string name="Attach">Adjuntar</string>
<string name="IsTyping">está escribiendo...</string>
<string name="AreTyping">están escribiendo...</string>
<string name="AndMoreTyping">y %d personas más</string>
<string name="GotAQuestion">¿Tienes una pregunta\nsobre Telegram?</string>
<string name="ChatTakePhoto">Hacer foto</string>
<string name="ChatGallery">Galería</string>
<string name="ChatLocation">Ubicación</string>
<string name="ChatVideo">Vídeo</string>
<string name="ChatDocument">Archivo</string>
<string name="NoMessages">No hay mensajes aún...</string>
<string name="ViewPhoto">Ver foto</string>
<string name="ViewLocation">Ver ubicación</string>
<string name="ViewVideo">Reproducir vídeo</string>
<string name="ForwardedMessage">Mensaje reenviado</string>
<string name="From">De</string>
<string name="NoRecent">No hay recientes</string>
<string name="Members">miembros</string>
<string name="Message">Mensaje</string>
<string name="TypeMessage">Escribe un mensaje</string>
<string name="DOWNLOAD">Descargar</string>
<string name="Selected">Elegidos:</string>
<string name="ShareMyContactInfo">COMPARTIR MI INFORMACIÓN DE CONTACTO</string>
<string name="AddToContacts">AÑADIR A CONTACTOS</string>
<string name="EncryptedPlaceholderTitleIncoming">%s te ha invitado a un chat secreto.</string>
<string name="EncryptedPlaceholderTitleOutgoing">Has invitado a %s a un chat secreto.</string>
<string name="EncryptedDescriptionTitle">Los Chats Secretos:</string>
<string name="EncryptedDescription1">Usan cifrado de móvil-a-móvil</string>
<string name="EncryptedDescription2">No dejan rastro en nuestros servidores</string>
<string name="EncryptedDescription3">Tienen autodestrucción de mensajes</string>
<string name="EncryptedDescription4">No permiten reenvíos de mensajes</string>
<string name="OneNewMessage">%1$d nuevo mensaje</string>
<string name="FewNewMessages">%1$d nuevos mensajes</string>
<string name="YouWereKicked">Has sido expulsado de este grupo</string>
<string name="YouLeft">Has abandonado este grupo</string>
<string name="DeleteThisGroup">Eliminar este grupo</string>
<!--notification-->
<string name="EncryptedChatRequested">Chat secreto solicitado</string>
<string name="EncryptedChatAccepted">Chat secreto iniciado</string>
<string name="MessageLifetimeChanged">%1$s activó la autodestrucción en %2$s</string>
<string name="MessageLifetimeChangedOutgoing">Activaste la autodestrucción en %1$s</string>
<string name="MessageLifetimeRemoved">%1$s desactivó la autodestrucción</string>
<string name="MessageLifetimeYouRemoved">Desactivaste la autodestrucción</string>
<string name="MessageLifetime2s">2 segundos</string>
<string name="MessageLifetime5s">5 segundos</string>
<string name="MessageLifetime1m">1 minuto</string>
<string name="MessageLifetime1h">1 hora</string>
<string name="MessageLifetime1d">1 día</string>
<string name="MessageLifetime1w">1 semana</string>
<string name="YouHaveNewMessage">Tienes un nuevo mensaje</string>
<string name="NotificationMessageText">%1$s: %2$s</string>
<string name="NotificationMessageNoText">%1$s te envió un mensaje</string>
<string name="NotificationMessagePhoto">%1$s te envió una foto</string>
<string name="NotificationMessageVideo">%1$s te envió un vídeo</string>
<string name="NotificationMessageContact">%1$s compartió un contacto contigo</string>
<string name="NotificationMessageMap">%1$s te envió un mapa</string>
<string name="NotificationMessageDocument">%1$s te envió un archivo</string>
<string name="NotificationMessageAudio">%1$s te envió un audio</string>
<string name="NotificationMessageGroupText">%1$s @ %2$s: %3$s</string>
<string name="NotificationMessageGroupNoText">%1$s envió un mensaje al grupo %2$s</string>
<string name="NotificationMessageGroupPhoto">%1$s envió una foto al grupo %2$s</string>
<string name="NotificationMessageGroupVideo">%1$s envió un vídeo al grupo %2$s</string>
<string name="NotificationMessageGroupContact">%1$s compartió un contacto en el grupo %2$s</string>
<string name="NotificationMessageGroupMap">%1$s envió un mapa al grupo %2$s</string>
<string name="NotificationMessageGroupDocument">%1$s envió un archivo al grupo %2$s</string>
<string name="NotificationMessageGroupAudio">%1$s envió un audio al grupo %2$s</string>
<string name="NotificationInvitedToGroup">%1$s te ha invitado al grupo %2$s</string>
<string name="NotificationEditedGroupName">%1$s cambió el nombre del grupo %2$s</string>
<string name="NotificationEditedGroupPhoto">%1$s cambió la foto del grupo %2$s</string>
<string name="NotificationGroupAddMember">%1$s invitó a %3$s al grupo %2$s</string>
<string name="NotificationGroupKickMember">%1$s expulsó a %3$s del grupo %2$s</string>
<string name="NotificationGroupKickYou">%1$s te ha expulsado del grupo %2$s</string>
<string name="NotificationGroupLeftMember">%1$s abandonó el grupo %2$s</string>
<string name="NotificationContactJoined">¡%1$s se unió a Telegram!</string>
<string name="NotificationUnrecognizedDevice">%1$s,\nHemos detectado una conexión a tu cuenta desde un nuevo dispositivo el %2$s\n\nDispositivo: %3$s\nUbicación: %4$s\n\nSi no eras tú, puedes ir a Ajustes - Cerrar todas las otras sesiones.\n\nGracias,\nEl equipo de Telegram</string>
<string name="NotificationContactNewPhoto">%1$s actualizó su foto de perfil</string>
<!--contacts view-->
<string name="SelectContact">Seleccionar contacto</string>
<string name="NoContacts">No hay contactos aún</string>
<string name="InviteText">Hey, cambiémonos a Telegram: http://telegram.org/dl2</string>
<string name="TodayAt">hoy a las</string>
<string name="YesterdayAt">ayer a las</string>
<string name="OtherAt">a las</string>
<string name="Online">en línea</string>
<string name="Offline">desconectado</string>
<string name="LastSeen">últ. vez</string>
<string name="LastSeenDate">últ. vez el</string>
<string name="InviteFriends">Invitar a amigos</string>
<!--group create view-->
<string name="SendMessageTo">Enviar mensaje a...</string>
<string name="EnterGroupNamePlaceholder">El nombre del grupo</string>
<string name="MEMBER">MIEMBRO</string>
<string name="GroupName">Nombre del grupo</string>
<string name="MEMBERS">MIEMBROS</string>
<string name="AllContacts">TODOS LOS CONTACTOS</string>
<!--group info view-->
<string name="EnterGroupNameTitle">INGRESA EL NOMBRE DEL GRUPO</string>
<string name="SharedMedia">Multimedia compartida</string>
<string name="GroupInfo">Información del grupo</string>
<string name="SHAREDMEDIA">MULTIMEDIA COMPARTIDA</string>
<string name="SETTINGS">AJUSTES</string>
<string name="AddMember">Añadir miembro</string>
<string name="DeleteAndExit">Eliminar y salir del grupo</string>
<string name="Notifications">Notificaciones</string>
<string name="KickFromGroup">Expulsar del grupo</string>
<!--contact info view-->
<string name="ShareContact">Compartir</string>
<string name="AddContact">Añadir</string>
<string name="BlockContact">Bloquear</string>
<string name="EditContact">Editar</string>
<string name="DeleteContact">Eliminar</string>
<string name="PhoneHome">CASA</string>
<string name="PhoneMobile">MÓVIL</string>
<string name="PhoneWork">TRABAJO</string>
<string name="PhoneOther">OTRO</string>
<string name="PhoneMain">PRINCIPAL</string>
<string name="ContactInfo">Información del contacto</string>
<string name="PHONE">TELÉFONO</string>
<string name="StartEncryptedChat">Iniciar chat secreto</string>
<string name="CreateEncryptedChatError">Ocurrió un error.</string>
<string name="CreateEncryptedChatOutdatedError">No podemos crear un chat secreto con %1$s.\n\n%2$s está usando una versión antigua de Telegram y debe actualizarla primero.</string>
<string name="SecretTitle">Chat secreto</string>
<string name="EncryptionKey">Clave de cifrado</string>
<string name="MessageLifetime">Autodestrucción</string>
<string name="ShortMessageLifetimeForever">Apagado</string>
<string name="ShortMessageLifetime2s">2s</string>
<string name="ShortMessageLifetime5s">5s</string>
<string name="ShortMessageLifetime1m">1m</string>
<string name="ShortMessageLifetime1h">1h</string>
<string name="ShortMessageLifetime1d">1d</string>
<string name="ShortMessageLifetime1w">1sem</string>
<string name="EncryptionKeyDescription">Esta imagen es una visualización de la clave de cifrado para el chat secreto con <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>.<![CDATA[<br><br>]]>Si esta imagen se visualiza de la misma manera en el teléfono de <![CDATA[<b>]]>%2$s<![CDATA[</b>]]>, tu chat es seguro en un 200%%.<![CDATA[<br><br>]]>Aprende más en telegram.org</string>
<!--settings view-->
<string name="ResetNotificationsText">Restablecer todas las notificaciones</string>
<string name="TextSize">Tamaño del texto</string>
<string name="AskAQuestion">Haz una pregunta</string>
<string name="EnableAnimations">Activar animaciones</string>
<string name="Unblock">Desbloquear</string>
<string name="UnblockText">Mantén pulsado un usuario para desbloquearlo</string>
<string name="NoBlocked">No hay usuarios bloqueados aún</string>
<string name="YourPhoneNumber">TU NÚMERO DE TELÉFONO</string>
<string name="MessageNotifications">NOTIFICACIONES DE MENSAJES</string>
<string name="Alert">Alerta</string>
<string name="MessagePreview">Vista previa del mensaje</string>
<string name="GroupNotifications">NOTIFICACIONES DE GRUPO</string>
<string name="Sound">Sonido</string>
<string name="InAppNotifications">NOTIFICACIONES EN LA APP</string>
<string name="InAppSounds">Sonidos en la app</string>
<string name="InAppVibrate">Vibración en la app</string>
<string name="Vibrate">Vibración</string>
<string name="InAppPreview">Vista previa en la app</string>
<string name="Reset">RESTABLECER</string>
<string name="ResetAllNotifications">Restablecer todas las notificaciones</string>
<string name="UndoAllCustom">Deshacer todas las notificaciones personalizadas para todos tus usuarios y grupos</string>
<string name="NotificationsAndSounds">Notificaciones y sonidos</string>
<string name="BlockedUsers">Usuarios bloqueados</string>
<string name="SaveIncomingPhotos">Guardar fotos entrantes</string>
<string name="LogOut">Cerrar sesión</string>
<string name="YourFirstNameAndLastName">TU NOMBRE Y APELLIDOS</string>
<string name="NoSound">Sin sonido</string>
<string name="Default">Por defecto</string>
<string name="Support">SOPORTE</string>
<string name="ChatBackground">Fondo de chat</string>
<string name="MessagesSettings">MENSAJES</string>
<string name="SendByEnter">Enviar con enter</string>
<string name="TerminateAllSessions">Cerrar todas las otras sesiones</string>
<string name="AutomaticPhotoDownload">DESCARGA AUTOMÁTICA DE FOTOS</string>
<string name="AutomaticPhotoDownloadGroups">Grupos</string>
<string name="AutomaticPhotoDownloadPrivateChats">Chats</string>
<string name="Events">EVENTOS</string>
<string name="ContactJoined">Un contacto se unió a Telegram</string>
<!--media view-->
<string name="NoMedia">No hay fotos ni vídeos compartidos aún</string>
<string name="CancelDownload">Cancelar descarga</string>
<!--map view-->
<string name="MyLocation">Mi ubicación</string>
<string name="Map">Mapa</string>
<string name="Satellite">Satélite</string>
<string name="Hybrid">Híbrido</string>
<string name="MetersAway">m de distancia</string>
<string name="KMetersAway">km de distancia</string>
<string name="SendLocation">Enviar ubicación</string>
<string name="ShareLocation">Compartir ubicación</string>
<!--photo gallery view-->
<string name="ShowAllMedia">Mostrar todas las fotos y vídeos</string>
<string name="SaveToGallery">Guardar en galería</string>
<string name="Of">de</string>
<string name="Gallery">Galería</string>
<!--button titles-->
<string name="Next">Siguiente</string>
<string name="Back">Atrás</string>
<string name="Done">Hecho</string>
<string name="Open">Abrir</string>
<string name="Cancel">Cancelar</string>
<string name="Add">Añadir</string>
<string name="Edit">Editar</string>
<string name="Send">Enviar</string>
<string name="Call">Llamar</string>
<string name="Copy">Copiar</string>
<string name="Delete">Eliminar</string>
<string name="Forward">Reenviar</string>
<string name="Retry">Reintentar</string>
<string name="FromCamera">Desde la cámara</string>
<string name="FromGalley">Desde la galería</string>
<string name="DeletePhoto">Eliminar foto</string>
<string name="OpenPhoto">Abrir foto</string>
<string name="Set">Establecer</string>
<string name="OK">OK</string>
<!--messages-->
<string name="ActionKickUser">un1 expulsó a un2</string>
<string name="ActionLeftUser">un1 dejó el grupo</string>
<string name="ActionAddUser">un1 agregó a un2</string>
<string name="ActionRemovedPhoto">un1 eliminó la foto del grupo</string>
<string name="ActionChangedPhoto">un1 cambió la foto del grupo</string>
<string name="ActionChangedTitle">un1 cambió el nombre del grupo a un2</string>
<string name="ActionCreateGroup">un1 creó el grupo</string>
<string name="ActionYouKickUser">Expulsaste a un2</string>
<string name="ActionYouLeftUser">Abandonaste el grupo</string>
<string name="ActionYouAddUser">Añadiste a un2</string>
<string name="ActionYouRemovedPhoto">Quitaste la foto de grupo</string>
<string name="ActionYouChangedPhoto">Cambiaste la foto de grupo</string>
<string name="ActionYouChangedTitle">Cambiaste el nombre de grupo a un2</string>
<string name="ActionYouCreateGroup">Creaste el grupo</string>
<string name="ActionKickUserYou">un1 te expulsó</string>
<string name="ActionAddUserYou">un1 te añadió</string>
<string name="UnsuppotedMedia">Este mensaje no está soportado en tu versión de Telegram.</string>
<string name="AttachPhoto">Foto</string>
<string name="AttachVideo">Vídeo</string>
<string name="AttachLocation">Ubicación</string>
<string name="AttachContact">Contacto</string>
<string name="AttachDocument">Archivo</string>
<string name="AttachAudio">Audio</string>
<string name="FromYou">Tú</string>
<!--Alert messages-->
<string name="InvalidPhoneNumber">Número de teléfono inválido</string>
<string name="CodeExpired">Código expirado. Por favor, vuelve a iniciar sesión.</string>
<string name="FloodWait">Demasiados intentos. Por favor, prueba de nuevo más tarde.</string>
<string name="InvalidCode">Código inválido</string>
<string name="InvalidFirstName">Nombre inválido</string>
<string name="InvalidLastName">Apellido/s inválido/s</string>
<string name="Loading">Cargando...</string>
<string name="NoPlayerInstalled">No tienes reproductor de vídeo. Por favor, instala uno para continuar.</string>
<string name="NoHandleAppInstalled">No tienes una aplicación que pueda manejar el tipo mime \'%1$s\'. Por favor, instala una para continuar</string>
<string name="InviteUser">Este usuario no tiene Telegram aún. ¿Enviarle una invitación?</string>
<string name="AreYouSure">¿Estás seguro?</string>
<string name="AddContactQ">¿Añadir contacto?</string>
<string name="AddToTheGroup">¿Añadir a %1$s al grupo?</string>
<string name="ForwardMessagesTo">¿Reenviar mensajes a %1$s?</string>
<string name="DeleteChatQuestion">¿Eliminar este chat?</string>
<!--Intro view-->
<string name="Page1Title">Telegram</string>
<string name="Page2Title">Rápida</string>
<string name="Page3Title">Gratis</string>
<string name="Page4Title">Segura</string>
<string name="Page5Title">Poderosa</string>
<string name="Page6Title">Basada en la nube</string>
<string name="Page7Title">Privada</string>
<string name="Page1Message">Bienvenidos a la era de la mensajería rápida y segura.</string>
<string name="Page2Message"><![CDATA[<b>Telegram</b>]]> entrega mensajes más rápido que<![CDATA[<br/>]]>cualquier otra aplicación.</string>
<string name="Page3Message"><![CDATA[<b>Telegram</b>]]> es gratis para siempre. Sin publicidad.<![CDATA[<br/>]]>Sin cuotas de suscripción.</string>
<string name="Page4Message"><![CDATA[<b>Telegram</b>]]> mantiene tus mensajes<![CDATA[<br/>]]>a salvo del ataque de hackers.</string>
<string name="Page5Message"><![CDATA[<b>Telegram</b>]]> no tiene límites en el tamaño de tus<![CDATA[<br/>]]>chats y archivos.</string>
<string name="Page6Message"><![CDATA[<b>Telegram</b>]]> te permite acceder a tus mensajes<![CDATA[<br/>]]>desde múltiples dispositivos.</string>
<string name="Page7Message">Los mensajes de <![CDATA[<b>Telegram</b>]]> están fuertemente<![CDATA[<br/>]]>cifrados y se pueden autodestruir.</string>
<string name="StartMessaging">Empieza a conversar</string>
<!--Don't change this! Not for localization!-->
<string name="CacheTag">CACHE_TAG</string>
</resources>
\ No newline at end of file
TMessagesProj/src/main/res/values/strings.xml
View file @ 9814a6e9
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- -->
<resources> <resources>
<string name="AppName">Telegram</string> <string name="AppName">Telegram</string>
...@@ -46,6 +49,8 @@ ...@@ -46,6 +49,8 @@
<string name="EncryptedChatStartedIncoming">You joined the secret chat.</string> <string name="EncryptedChatStartedIncoming">You joined the secret chat.</string>
<string name="ClearHistory">Clear History</string> <string name="ClearHistory">Clear History</string>
<string name="DeleteChat">Delete and Exit</string> <string name="DeleteChat">Delete and Exit</string>
<string name="HiddenName">Hidden Name</string>
<string name="SelectChat">Select Chat</string>
<!--documents view--> <!--documents view-->
<string name="SelectFile">Select File</string> <string name="SelectFile">Select File</string>
...@@ -69,7 +74,7 @@ ...@@ -69,7 +74,7 @@
<string name="AreTyping">are typing...</string> <string name="AreTyping">are typing...</string>
<string name="AndMoreTyping">and %d more people</string> <string name="AndMoreTyping">and %d more people</string>
<string name="GotAQuestion">Got a question\nabout Telegram?</string> <string name="GotAQuestion">Got a question\nabout Telegram?</string>
<string name="ChatTakePhoto">Take a photo</string> <string name="ChatTakePhoto">Take photo</string>
<string name="ChatGallery">Gallery</string> <string name="ChatGallery">Gallery</string>
<string name="ChatLocation">Location</string> <string name="ChatLocation">Location</string>
<string name="ChatVideo">Video</string> <string name="ChatVideo">Video</string>
...@@ -107,6 +112,7 @@ ...@@ -107,6 +112,7 @@
<string name="MessageLifetimeChanged">%1$s set the self-destruct timer to %2$s</string> <string name="MessageLifetimeChanged">%1$s set the self-destruct timer to %2$s</string>
<string name="MessageLifetimeChangedOutgoing">You set the self-destruct timer to %1$s</string> <string name="MessageLifetimeChangedOutgoing">You set the self-destruct timer to %1$s</string>
<string name="MessageLifetimeRemoved">%1$s disabled the self-destruct timer</string> <string name="MessageLifetimeRemoved">%1$s disabled the self-destruct timer</string>
<string name="MessageLifetimeYouRemoved">You disabled the self-destruct timer</string>
<string name="MessageLifetime2s">2 seconds</string> <string name="MessageLifetime2s">2 seconds</string>
<string name="MessageLifetime5s">5 seconds</string> <string name="MessageLifetime5s">5 seconds</string>
<string name="MessageLifetime1m">1 minute</string> <string name="MessageLifetime1m">1 minute</string>
...@@ -137,8 +143,8 @@ ...@@ -137,8 +143,8 @@
<string name="NotificationGroupKickMember">%1$s kicked %3$s from the group %2$s</string> <string name="NotificationGroupKickMember">%1$s kicked %3$s from the group %2$s</string>
<string name="NotificationGroupKickYou">%1$s kicked you from the group %2$s</string> <string name="NotificationGroupKickYou">%1$s kicked you from the group %2$s</string>
<string name="NotificationGroupLeftMember">%1$s has left the group %2$s</string> <string name="NotificationGroupLeftMember">%1$s has left the group %2$s</string>
<string name="NotificationContactJoined">%1$s joined the Telegram!</string> <string name="NotificationContactJoined">%1$s joined Telegram!</string>
<string name="NotificationUnrecognizedDevice">New login from unrecognized device %1$s, location: %2$s</string> <string name="NotificationUnrecognizedDevice">%1$s,\nWe detected a login into your account from a new device on %2$s\n\nDevice: %3$s\nLocation: %4$s\n\nIf this wasn’t you, you can go to Settings – Terminate all sessions.\n\nThanks,\nThe Telegram Team</string>
<string name="NotificationContactNewPhoto">%1$s updated profile photo</string> <string name="NotificationContactNewPhoto">%1$s updated profile photo</string>
<!--contacts view--> <!--contacts view-->
...@@ -151,6 +157,7 @@ ...@@ -151,6 +157,7 @@
<string name="Online">online</string> <string name="Online">online</string>
<string name="Offline">offline</string> <string name="Offline">offline</string>
<string name="LastSeen">last seen</string> <string name="LastSeen">last seen</string>
<string name="LastSeenDate">last seen</string>
<string name="InviteFriends">Invite Friends</string> <string name="InviteFriends">Invite Friends</string>
<!--group create view--> <!--group create view-->
...@@ -173,9 +180,11 @@ ...@@ -173,9 +180,11 @@
<string name="KickFromGroup">Kick from group</string> <string name="KickFromGroup">Kick from group</string>
<!--contact info view--> <!--contact info view-->
<string name="ShareContact">Share Contact</string> <string name="ShareContact">Share</string>
<string name="AddContact">Add Contact</string> <string name="AddContact">Add</string>
<string name="BlockContact">Block Contact</string> <string name="BlockContact">Block</string>
<string name="EditContact">Edit</string>
<string name="DeleteContact">Delete</string>
<string name="PhoneHome">HOME</string> <string name="PhoneHome">HOME</string>
<string name="PhoneMobile">MOBILE</string> <string name="PhoneMobile">MOBILE</string>
<string name="PhoneWork">WORK</string> <string name="PhoneWork">WORK</string>
...@@ -229,6 +238,14 @@ ...@@ -229,6 +238,14 @@
<string name="Default">Default</string> <string name="Default">Default</string>
<string name="Support">SUPPORT</string> <string name="Support">SUPPORT</string>
<string name="ChatBackground">Chat Background</string> <string name="ChatBackground">Chat Background</string>
<string name="MessagesSettings">MESSAGES</string>
<string name="SendByEnter">Send by Enter</string>
<string name="TerminateAllSessions">Terminate All Other Sessions</string>
<string name="AutomaticPhotoDownload">AUTOMATIC PHOTO DOWNLOAD</string>
<string name="AutomaticPhotoDownloadGroups">Groups</string>
<string name="AutomaticPhotoDownloadPrivateChats">Private Chats</string>
<string name="Events">EVENTS</string>
<string name="ContactJoined">Contact joined Telegram</string>
<!--media view--> <!--media view-->
<string name="NoMedia">No shared media yet</string> <string name="NoMedia">No shared media yet</string>
...@@ -279,6 +296,15 @@ ...@@ -279,6 +296,15 @@
<string name="ActionChangedPhoto">un1 changed group photo</string> <string name="ActionChangedPhoto">un1 changed group photo</string>
<string name="ActionChangedTitle">un1 changed group name to un2</string> <string name="ActionChangedTitle">un1 changed group name to un2</string>
<string name="ActionCreateGroup">un1 created the group</string> <string name="ActionCreateGroup">un1 created the group</string>
<string name="ActionYouKickUser">You kicked un2</string>
<string name="ActionYouLeftUser">You left group</string>
<string name="ActionYouAddUser">You added un2</string>
<string name="ActionYouRemovedPhoto">You removed group photo</string>
<string name="ActionYouChangedPhoto">You changed group photo</string>
<string name="ActionYouChangedTitle">You changed group name to un2</string>
<string name="ActionYouCreateGroup">You created the group</string>
<string name="ActionKickUserYou">un1 kicked you</string>
<string name="ActionAddUserYou">un1 added you</string>
<string name="UnsuppotedMedia">This message is not supported on your version of Telegram.</string> <string name="UnsuppotedMedia">This message is not supported on your version of Telegram.</string>
<string name="AttachPhoto">Photo</string> <string name="AttachPhoto">Photo</string>
<string name="AttachVideo">Video</string> <string name="AttachVideo">Video</string>
......
gradle/wrapper/gradle-wrapper.properties
View file @ 9814a6e9
# #Fri Jan 24 13:44:30 MSK 2014
#Thu Jul 18 15:19:16 MSK 2013
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
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