Icon for group chats in messages list
(DEBUG) Option in settings to switch to test datacenters Update some images
@ -82,7 +82,7 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 8
|
minSdkVersion 8
|
||||||
targetSdkVersion 19
|
targetSdkVersion 19
|
||||||
versionCode 211
|
versionCode 212
|
||||||
versionName "1.4.8"
|
versionName "1.4.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -53,8 +53,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
|
|||||||
public int currentDatacenterId;
|
public int currentDatacenterId;
|
||||||
public int movingToDatacenterId;
|
public int movingToDatacenterId;
|
||||||
private long lastOutgoingMessageId = 0;
|
private long lastOutgoingMessageId = 0;
|
||||||
private int useDifferentBackend = 0;
|
private int isTestBackend = 0;
|
||||||
private final int SESSION_VERSION = 2;
|
|
||||||
public int timeDifference = 0;
|
public int timeDifference = 0;
|
||||||
public int currentPingTime;
|
public int currentPingTime;
|
||||||
private int lastDestroySessionRequestTime;
|
private int lastDestroySessionRequestTime;
|
||||||
@ -228,7 +227,30 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void loadSession() {
|
public void switchBackend() {
|
||||||
|
Utilities.stageQueue.postRunnable(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
if (isTestBackend == 0) {
|
||||||
|
isTestBackend = 1;
|
||||||
|
} else {
|
||||||
|
isTestBackend = 0;
|
||||||
|
}
|
||||||
|
datacenters.clear();
|
||||||
|
fillDatacenters();
|
||||||
|
saveSession();
|
||||||
|
Utilities.stageQueue.postRunnable(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
UserConfig.clearConfig();
|
||||||
|
System.exit(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void loadSession() {
|
||||||
Utilities.stageQueue.postRunnable(new Runnable() {
|
Utilities.stageQueue.postRunnable(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@ -236,10 +258,8 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
|
|||||||
if (configFile.exists()) {
|
if (configFile.exists()) {
|
||||||
try {
|
try {
|
||||||
SerializedData data = new SerializedData(configFile);
|
SerializedData data = new SerializedData(configFile);
|
||||||
int datacenterSetId = data.readInt32();
|
isTestBackend = data.readInt32();
|
||||||
int version = data.readInt32();
|
int version = data.readInt32();
|
||||||
|
|
||||||
if (datacenterSetId == useDifferentBackend && version == SESSION_VERSION) {
|
|
||||||
sessionsToDestroy.clear();
|
sessionsToDestroy.clear();
|
||||||
int count = data.readInt32();
|
int count = data.readInt32();
|
||||||
for (int a = 0; a < count; a++) {
|
for (int a = 0; a < count; a++) {
|
||||||
@ -252,16 +272,12 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
|
|||||||
datacenters.put(datacenter.datacenterId, datacenter);
|
datacenters.put(datacenter.datacenterId, datacenter);
|
||||||
}
|
}
|
||||||
currentDatacenterId = data.readInt32();
|
currentDatacenterId = data.readInt32();
|
||||||
} else {
|
|
||||||
UserConfig.clearConfig();
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
UserConfig.clearConfig();
|
UserConfig.clearConfig();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("dataconfig", Context.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("dataconfig", Context.MODE_PRIVATE);
|
||||||
int datacenterSetId = preferences.getInt("datacenterSetId", 0);
|
isTestBackend = preferences.getInt("datacenterSetId", 0);
|
||||||
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);
|
lastDcUpdateTime = preferences.getInt("lastDcUpdateTime", 0);
|
||||||
@ -299,7 +315,6 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
|
|||||||
FileLog.e("tmessages", e);
|
FileLog.e("tmessages", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (currentDatacenterId != 0 && UserConfig.clientActivated) {
|
if (currentDatacenterId != 0 && UserConfig.clientActivated) {
|
||||||
Datacenter datacenter = datacenterWithId(currentDatacenterId);
|
Datacenter datacenter = datacenterWithId(currentDatacenterId);
|
||||||
@ -310,8 +325,24 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fillDatacenters();
|
||||||
|
|
||||||
|
for (Datacenter datacenter : datacenters.values()) {
|
||||||
|
datacenter.authSessionId = getNewSessionId();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (datacenters.size() != 0 && currentDatacenterId == 0) {
|
||||||
|
currentDatacenterId = 1;
|
||||||
|
saveSession();
|
||||||
|
}
|
||||||
|
movingToDatacenterId = DEFAULT_DATACENTER_ID;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void fillDatacenters() {
|
||||||
if (datacenters.size() == 0) {
|
if (datacenters.size() == 0) {
|
||||||
if (useDifferentBackend == 0) {
|
if (isTestBackend == 0) {
|
||||||
Datacenter datacenter = new Datacenter();
|
Datacenter datacenter = new Datacenter();
|
||||||
datacenter.datacenterId = 1;
|
datacenter.datacenterId = 1;
|
||||||
datacenter.addAddressAndPort("173.240.5.1", 443);
|
datacenter.addAddressAndPort("173.240.5.1", 443);
|
||||||
@ -373,28 +404,16 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
|
|||||||
datacenter.addAddressAndPort("116.51.22.2", 443);
|
datacenter.addAddressAndPort("116.51.22.2", 443);
|
||||||
datacenters.put(datacenter.datacenterId, datacenter);
|
datacenters.put(datacenter.datacenterId, datacenter);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Datacenter datacenter : datacenters.values()) {
|
|
||||||
datacenter.authSessionId = getNewSessionId();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (datacenters.size() != 0 && currentDatacenterId == 0) {
|
private void saveSession() {
|
||||||
currentDatacenterId = 1;
|
|
||||||
saveSession();
|
|
||||||
}
|
|
||||||
movingToDatacenterId = DEFAULT_DATACENTER_ID;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
void saveSession() {
|
|
||||||
Utilities.stageQueue.postRunnable(new Runnable() {
|
Utilities.stageQueue.postRunnable(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("dataconfig", Context.MODE_PRIVATE);
|
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("dataconfig", Context.MODE_PRIVATE);
|
||||||
SharedPreferences.Editor editor = preferences.edit();
|
SharedPreferences.Editor editor = preferences.edit();
|
||||||
editor.putInt("datacenterSetId", useDifferentBackend);
|
editor.putInt("datacenterSetId", isTestBackend);
|
||||||
Datacenter currentDatacenter = datacenterWithId(currentDatacenterId);
|
Datacenter currentDatacenter = datacenterWithId(currentDatacenterId);
|
||||||
if (currentDatacenter != null) {
|
if (currentDatacenter != null) {
|
||||||
editor.putInt("currentDatacenterId", currentDatacenterId);
|
editor.putInt("currentDatacenterId", currentDatacenterId);
|
||||||
|
@ -22,7 +22,6 @@ import org.telegram.PhoneFormat.PhoneFormat;
|
|||||||
import org.telegram.messenger.LocaleController;
|
import org.telegram.messenger.LocaleController;
|
||||||
import org.telegram.messenger.TLRPC;
|
import org.telegram.messenger.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.R;
|
import org.telegram.messenger.R;
|
||||||
import org.telegram.messenger.UserConfig;
|
import org.telegram.messenger.UserConfig;
|
||||||
@ -296,28 +295,17 @@ public class ChatOrUserCell extends BaseCell {
|
|||||||
if (chat != null) {
|
if (chat != null) {
|
||||||
nameString2 = chat.title;
|
nameString2 = chat.title;
|
||||||
} else if (user != null) {
|
} else if (user != null) {
|
||||||
if (user.id / 1000 != 333 && ContactsController.getInstance().contactsDict.get(user.id) == null) {
|
|
||||||
if (ContactsController.getInstance().contactsDict.size() == 0 && ContactsController.getInstance().loadingContacts) {
|
|
||||||
nameString2 = Utilities.formatName(user.first_name, user.last_name);
|
nameString2 = Utilities.formatName(user.first_name, user.last_name);
|
||||||
} else {
|
|
||||||
if (user.phone != null && user.phone.length() != 0) {
|
|
||||||
nameString2 = PhoneFormat.getInstance().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", " ");
|
nameString = nameString2.replace("\n", " ");
|
||||||
}
|
}
|
||||||
if (nameString.length() == 0) {
|
if (nameString.length() == 0) {
|
||||||
if (user.phone != null && user.phone.length() != 0) {
|
if (user.phone != null && user.phone.length() != 0) {
|
||||||
nameString = PhoneFormat.getInstance().format("+" + user.phone);
|
nameString = PhoneFormat.getInstance().format("+" + user.phone);
|
||||||
}
|
} else {
|
||||||
nameString = LocaleController.getString("HiddenName", R.string.HiddenName);
|
nameString = LocaleController.getString("HiddenName", R.string.HiddenName);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (encryptedChat != null) {
|
if (encryptedChat != null) {
|
||||||
currentNamePaint = nameEncryptedPaint;
|
currentNamePaint = nameEncryptedPaint;
|
||||||
} else {
|
} else {
|
||||||
|
@ -47,6 +47,7 @@ public class DialogCell extends BaseCell {
|
|||||||
private static Drawable errorDrawable;
|
private static Drawable errorDrawable;
|
||||||
private static Drawable lockDrawable;
|
private static Drawable lockDrawable;
|
||||||
private static Drawable countDrawable;
|
private static Drawable countDrawable;
|
||||||
|
private static Drawable groupDrawable;
|
||||||
|
|
||||||
private TLRPC.TL_dialog currentDialog;
|
private TLRPC.TL_dialog currentDialog;
|
||||||
private ImageReceiver avatarImage;
|
private ImageReceiver avatarImage;
|
||||||
@ -127,6 +128,10 @@ public class DialogCell extends BaseCell {
|
|||||||
countDrawable = getResources().getDrawable(R.drawable.dialogs_badge);
|
countDrawable = getResources().getDrawable(R.drawable.dialogs_badge);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (groupDrawable == null) {
|
||||||
|
groupDrawable = getResources().getDrawable(R.drawable.grouplist);
|
||||||
|
}
|
||||||
|
|
||||||
if (avatarImage == null) {
|
if (avatarImage == null) {
|
||||||
avatarImage = new ImageReceiver();
|
avatarImage = new ImageReceiver();
|
||||||
avatarImage.parentView = new WeakReference<View>(this);
|
avatarImage.parentView = new WeakReference<View>(this);
|
||||||
@ -260,6 +265,9 @@ public class DialogCell extends BaseCell {
|
|||||||
if (cellLayout.drawNameLock) {
|
if (cellLayout.drawNameLock) {
|
||||||
setDrawableBounds(lockDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
|
setDrawableBounds(lockDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
|
||||||
lockDrawable.draw(canvas);
|
lockDrawable.draw(canvas);
|
||||||
|
} else if (cellLayout.drawNameGroup) {
|
||||||
|
setDrawableBounds(groupDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
|
||||||
|
groupDrawable.draw(canvas);
|
||||||
}
|
}
|
||||||
|
|
||||||
canvas.save();
|
canvas.save();
|
||||||
@ -313,8 +321,9 @@ public class DialogCell extends BaseCell {
|
|||||||
private int nameWidth;
|
private int nameWidth;
|
||||||
private StaticLayout nameLayout;
|
private StaticLayout nameLayout;
|
||||||
private boolean drawNameLock;
|
private boolean drawNameLock;
|
||||||
|
private boolean drawNameGroup;
|
||||||
private int nameLockLeft;
|
private int nameLockLeft;
|
||||||
private int nameLockTop = Utilities.dp(13);
|
private int nameLockTop;
|
||||||
|
|
||||||
private int timeLeft;
|
private int timeLeft;
|
||||||
private int timeTop = Utilities.dp(13);
|
private int timeTop = Utilities.dp(13);
|
||||||
@ -359,6 +368,8 @@ public class DialogCell extends BaseCell {
|
|||||||
|
|
||||||
if (encryptedChat != null) {
|
if (encryptedChat != null) {
|
||||||
drawNameLock = true;
|
drawNameLock = true;
|
||||||
|
drawNameGroup = false;
|
||||||
|
nameLockTop = Utilities.dp(13);
|
||||||
if (!LocaleController.isRTL) {
|
if (!LocaleController.isRTL) {
|
||||||
nameLockLeft = Utilities.dp(77);
|
nameLockLeft = Utilities.dp(77);
|
||||||
nameLeft = Utilities.dp(81) + lockDrawable.getIntrinsicWidth();
|
nameLeft = Utilities.dp(81) + lockDrawable.getIntrinsicWidth();
|
||||||
@ -368,12 +379,25 @@ public class DialogCell extends BaseCell {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
drawNameLock = false;
|
drawNameLock = false;
|
||||||
|
if (chat != null) {
|
||||||
|
drawNameGroup = true;
|
||||||
|
nameLockTop = Utilities.dp(14);
|
||||||
|
if (!LocaleController.isRTL) {
|
||||||
|
nameLockLeft = Utilities.dp(77);
|
||||||
|
nameLeft = Utilities.dp(81) + groupDrawable.getIntrinsicWidth();
|
||||||
|
} else {
|
||||||
|
nameLockLeft = width - Utilities.dp(77) - groupDrawable.getIntrinsicWidth();
|
||||||
|
nameLeft = Utilities.dp(14);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
drawNameGroup = false;
|
||||||
if (!LocaleController.isRTL) {
|
if (!LocaleController.isRTL) {
|
||||||
nameLeft = Utilities.dp(77);
|
nameLeft = Utilities.dp(77);
|
||||||
} else {
|
} else {
|
||||||
nameLeft = Utilities.dp(14);
|
nameLeft = Utilities.dp(14);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (message == null) {
|
if (message == null) {
|
||||||
if (printingString != null) {
|
if (printingString != null) {
|
||||||
@ -547,6 +571,8 @@ public class DialogCell extends BaseCell {
|
|||||||
}
|
}
|
||||||
if (drawNameLock) {
|
if (drawNameLock) {
|
||||||
nameWidth -= Utilities.dp(4) + lockDrawable.getIntrinsicWidth();
|
nameWidth -= Utilities.dp(4) + lockDrawable.getIntrinsicWidth();
|
||||||
|
} else if (drawNameGroup) {
|
||||||
|
nameWidth -= Utilities.dp(4) + groupDrawable.getIntrinsicWidth();
|
||||||
}
|
}
|
||||||
if (drawClock) {
|
if (drawClock) {
|
||||||
int w = clockDrawable.getIntrinsicWidth() + Utilities.dp(2);
|
int w = clockDrawable.getIntrinsicWidth() + Utilities.dp(2);
|
||||||
|
@ -263,11 +263,8 @@ public class LanguageSelectActivity extends BaseFragment {
|
|||||||
searching = false;
|
searching = false;
|
||||||
searchWas = false;
|
searchWas = false;
|
||||||
if (listView != null) {
|
if (listView != null) {
|
||||||
listView.setEmptyView(emptyTextView);
|
|
||||||
emptyTextView.setVisibility(View.GONE);
|
emptyTextView.setVisibility(View.GONE);
|
||||||
}
|
listView.setAdapter(listAdapter);
|
||||||
if (listAdapter != null) {
|
|
||||||
listAdapter.notifyDataSetChanged();
|
|
||||||
}
|
}
|
||||||
((LaunchActivity)parentActivity).fixBackButton();
|
((LaunchActivity)parentActivity).fixBackButton();
|
||||||
return true;
|
return true;
|
||||||
|
@ -77,6 +77,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
|
|||||||
private int logoutRow;
|
private int logoutRow;
|
||||||
private int sendLogsRow;
|
private int sendLogsRow;
|
||||||
private int clearLogsRow;
|
private int clearLogsRow;
|
||||||
|
private int switchBackendButtonRow;
|
||||||
private int rowCount;
|
private int rowCount;
|
||||||
private int messagesSectionRow;
|
private int messagesSectionRow;
|
||||||
private int sendByEnterRow;
|
private int sendByEnterRow;
|
||||||
@ -175,6 +176,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
|
|||||||
if (BuildVars.DEBUG_VERSION) {
|
if (BuildVars.DEBUG_VERSION) {
|
||||||
sendLogsRow = rowCount++;
|
sendLogsRow = rowCount++;
|
||||||
clearLogsRow = rowCount++;
|
clearLogsRow = rowCount++;
|
||||||
|
switchBackendButtonRow = rowCount++;
|
||||||
}
|
}
|
||||||
askQuestionRow = rowCount++;
|
askQuestionRow = rowCount++;
|
||||||
logoutRow = rowCount++;
|
logoutRow = rowCount++;
|
||||||
@ -408,6 +410,18 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
|
|||||||
}
|
}
|
||||||
} else if (i == languageRow) {
|
} else if (i == languageRow) {
|
||||||
((LaunchActivity)parentActivity).presentFragment(new LanguageSelectActivity(), "settings_wallpapers", false);
|
((LaunchActivity)parentActivity).presentFragment(new LanguageSelectActivity(), "settings_wallpapers", false);
|
||||||
|
} else if (i == switchBackendButtonRow) {
|
||||||
|
AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
|
||||||
|
builder.setMessage(LocaleController.getString("AreYouSure", R.string.AreYouSure));
|
||||||
|
builder.setTitle(LocaleController.getString("AppName", R.string.AppName));
|
||||||
|
builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(DialogInterface dialogInterface, int i) {
|
||||||
|
ConnectionsManager.getInstance().switchBackend();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
|
||||||
|
builder.show().setCanceledOnTouchOutside(true);
|
||||||
}
|
}
|
||||||
// else if (i == 6) {
|
// else if (i == 6) {
|
||||||
// UserConfig.saveIncomingPhotos = !UserConfig.saveIncomingPhotos;
|
// UserConfig.saveIncomingPhotos = !UserConfig.saveIncomingPhotos;
|
||||||
@ -542,7 +556,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
|
|||||||
public boolean isEnabled(int i) {
|
public boolean isEnabled(int i) {
|
||||||
return i == textSizeRow || i == enableAnimationsRow || i == blockedRow || i == notificationRow || i == backgroundRow ||
|
return i == textSizeRow || i == enableAnimationsRow || i == blockedRow || i == notificationRow || i == backgroundRow ||
|
||||||
i == askQuestionRow || i == sendLogsRow || i == sendByEnterRow || i == terminateSessionsRow || i == photoDownloadPrivateRow ||
|
i == askQuestionRow || i == sendLogsRow || i == sendByEnterRow || i == terminateSessionsRow || i == photoDownloadPrivateRow ||
|
||||||
i == photoDownloadChatRow || i == clearLogsRow || i == audioDownloadChatRow || i == audioDownloadPrivateRow || i == languageRow;
|
i == photoDownloadChatRow || i == clearLogsRow || i == audioDownloadChatRow || i == audioDownloadPrivateRow || i == languageRow ||
|
||||||
|
i == switchBackendButtonRow;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -748,6 +763,9 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
|
|||||||
} else if (i == terminateSessionsRow) {
|
} else if (i == terminateSessionsRow) {
|
||||||
textView.setText(LocaleController.getString("TerminateAllSessions", R.string.TerminateAllSessions));
|
textView.setText(LocaleController.getString("TerminateAllSessions", R.string.TerminateAllSessions));
|
||||||
divider.setVisibility(View.INVISIBLE);
|
divider.setVisibility(View.INVISIBLE);
|
||||||
|
} else if (i == switchBackendButtonRow) {
|
||||||
|
textView.setText("Switch Backend");
|
||||||
|
divider.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
} else if (type == 3) {
|
} else if (type == 3) {
|
||||||
if (view == null) {
|
if (view == null) {
|
||||||
@ -883,7 +901,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
|
|||||||
return 5;
|
return 5;
|
||||||
} else if (i == enableAnimationsRow || i == sendByEnterRow || i == photoDownloadChatRow || i == photoDownloadPrivateRow || i == audioDownloadChatRow || i == audioDownloadPrivateRow) {
|
} else if (i == enableAnimationsRow || i == sendByEnterRow || i == photoDownloadChatRow || i == photoDownloadPrivateRow || i == audioDownloadChatRow || i == audioDownloadPrivateRow) {
|
||||||
return 3;
|
return 3;
|
||||||
} else if (i == numberRow || i == notificationRow || i == blockedRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == terminateSessionsRow || i == clearLogsRow) {
|
} else if (i == numberRow || i == notificationRow || i == blockedRow || i == backgroundRow || i == askQuestionRow || i == sendLogsRow || i == terminateSessionsRow || i == clearLogsRow || i == switchBackendButtonRow) {
|
||||||
return 2;
|
return 2;
|
||||||
} else if (i == logoutRow) {
|
} else if (i == logoutRow) {
|
||||||
return 4;
|
return 4;
|
||||||
|
BIN
TMessagesProj/src/main/res/drawable-hdpi/grouplist.png
Executable file
After Width: | Height: | Size: 552 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.6 KiB |
BIN
TMessagesProj/src/main/res/drawable-hdpi/photogif.png
Executable file
After Width: | Height: | Size: 2.6 KiB |
BIN
TMessagesProj/src/main/res/drawable-hdpi/photogif_pressed.png
Executable file
After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 952 B After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 967 B After Width: | Height: | Size: 2.5 KiB |
BIN
TMessagesProj/src/main/res/drawable-ldpi/grouplist.png
Executable file
After Width: | Height: | Size: 301 B |
Before Width: | Height: | Size: 709 B After Width: | Height: | Size: 806 B |
Before Width: | Height: | Size: 715 B After Width: | Height: | Size: 805 B |
BIN
TMessagesProj/src/main/res/drawable-ldpi/photogif.png
Executable file
After Width: | Height: | Size: 838 B |
BIN
TMessagesProj/src/main/res/drawable-ldpi/photogif_pressed.png
Executable file
After Width: | Height: | Size: 857 B |
Before Width: | Height: | Size: 464 B After Width: | Height: | Size: 564 B |
Before Width: | Height: | Size: 475 B After Width: | Height: | Size: 591 B |
BIN
TMessagesProj/src/main/res/drawable-mdpi/grouplist.png
Executable file
After Width: | Height: | Size: 377 B |
Before Width: | Height: | Size: 812 B After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 848 B After Width: | Height: | Size: 1.8 KiB |
BIN
TMessagesProj/src/main/res/drawable-mdpi/photogif.png
Executable file
After Width: | Height: | Size: 1.8 KiB |
BIN
TMessagesProj/src/main/res/drawable-mdpi/photogif_pressed.png
Executable file
After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 722 B After Width: | Height: | Size: 1.7 KiB |
BIN
TMessagesProj/src/main/res/drawable-xhdpi/grouplist.png
Executable file
After Width: | Height: | Size: 598 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 3.4 KiB |
BIN
TMessagesProj/src/main/res/drawable-xhdpi/photogif.png
Executable file
After Width: | Height: | Size: 3.4 KiB |
BIN
TMessagesProj/src/main/res/drawable-xhdpi/photogif_pressed.png
Executable file
After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 3.3 KiB |
BIN
TMessagesProj/src/main/res/drawable-xxhdpi/grouplist.png
Executable file
After Width: | Height: | Size: 877 B |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 5.1 KiB |
BIN
TMessagesProj/src/main/res/drawable-xxhdpi/photogif.png
Executable file
After Width: | Height: | Size: 5.2 KiB |
BIN
TMessagesProj/src/main/res/drawable-xxhdpi/photogif_pressed.png
Executable file
After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 5.1 KiB |
@ -37,15 +37,15 @@
|
|||||||
android:id="@+id/chat_photo_image"/>
|
android:id="@+id/chat_photo_image"/>
|
||||||
|
|
||||||
<org.telegram.ui.Views.FrameLayoutFixed
|
<org.telegram.ui.Views.FrameLayoutFixed
|
||||||
android:layout_height="40dp"
|
android:layout_height="44dp"
|
||||||
android:layout_width="40dp"
|
android:layout_width="44dp"
|
||||||
android:id="@+id/chat_view_action_layout"
|
android:id="@+id/chat_view_action_layout"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:visibility="visible">
|
android:visibility="visible">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="40dp"
|
android:layout_width="44dp"
|
||||||
android:layout_height="40dp"
|
android:layout_height="44dp"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
android:id="@+id/chat_view_action_cancel_button"
|
android:id="@+id/chat_view_action_cancel_button"
|
||||||
android:src="@drawable/photo_download_states"
|
android:src="@drawable/photo_download_states"
|
||||||
|
@ -27,15 +27,15 @@
|
|||||||
android:id="@+id/chat_photo_image"/>
|
android:id="@+id/chat_photo_image"/>
|
||||||
|
|
||||||
<org.telegram.ui.Views.FrameLayoutFixed
|
<org.telegram.ui.Views.FrameLayoutFixed
|
||||||
android:layout_height="40dp"
|
android:layout_height="44dp"
|
||||||
android:layout_width="40dp"
|
android:layout_width="44dp"
|
||||||
android:id="@+id/chat_view_action_layout"
|
android:id="@+id/chat_view_action_layout"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:visibility="visible">
|
android:visibility="visible">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="40dp"
|
android:layout_width="44dp"
|
||||||
android:layout_height="40dp"
|
android:layout_height="44dp"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
android:id="@+id/chat_view_action_cancel_button"
|
android:id="@+id/chat_view_action_cancel_button"
|
||||||
android:src="@drawable/photo_download_states"
|
android:src="@drawable/photo_download_states"
|
||||||
|
@ -151,7 +151,7 @@
|
|||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:maxLines="4"
|
android:maxLines="4"
|
||||||
android:minHeight="48dp"
|
android:minHeight="48dp"
|
||||||
android:textSize="18dp"
|
android:textSize="18sp"
|
||||||
android:textColorHint="#909090"
|
android:textColorHint="#909090"
|
||||||
android:ems="10"
|
android:ems="10"
|
||||||
android:imeOptions="flagNoExtractUi"
|
android:imeOptions="flagNoExtractUi"
|
||||||
|
@ -27,15 +27,15 @@
|
|||||||
android:id="@+id/chat_photo_image"/>
|
android:id="@+id/chat_photo_image"/>
|
||||||
|
|
||||||
<org.telegram.ui.Views.FrameLayoutFixed
|
<org.telegram.ui.Views.FrameLayoutFixed
|
||||||
android:layout_height="40dp"
|
android:layout_height="44dp"
|
||||||
android:layout_width="40dp"
|
android:layout_width="44dp"
|
||||||
android:id="@+id/chat_view_action_layout"
|
android:id="@+id/chat_view_action_layout"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:visibility="visible">
|
android:visibility="visible">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="40dp"
|
android:layout_width="44dp"
|
||||||
android:layout_height="40dp"
|
android:layout_height="44dp"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
android:id="@+id/chat_view_action_cancel_button"
|
android:id="@+id/chat_view_action_cancel_button"
|
||||||
android:src="@drawable/photo_download_cancel_states"
|
android:src="@drawable/photo_download_cancel_states"
|
||||||
|