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

Update to 6.1.1 (1947)

Browse source
This commit is contained in:
DrKLO 2020-05-01 13:16:27 +03:00
parent 5a2a813dc0
commit f120800a7f
4 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TMessagesProj/build.gradle
View file

@ -286,7 +286,7 @@ android {
} }
} }
defaultConfig.versionCode = 1946 defaultConfig.versionCode = 1947
def tgVoipDexFileName = "libtgvoip.dex" def tgVoipDexFileName = "libtgvoip.dex"
def tgVoipDexClasses = ["AudioRecordJNI", "AudioTrackJNI", "NativeTgVoipDelegate", "NativeTgVoipInstance", "TgVoipNativeLoader", "Resampler", "VLog"] def tgVoipDexClasses = ["AudioRecordJNI", "AudioTrackJNI", "NativeTgVoipDelegate", "NativeTgVoipInstance", "TgVoipNativeLoader", "Resampler", "VLog"]

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

@ -19,7 +19,7 @@ public class BuildVars {
public static boolean USE_CLOUD_STRINGS = true; public static boolean USE_CLOUD_STRINGS = true;
public static boolean CHECK_UPDATES = true; public static boolean CHECK_UPDATES = true;
public static boolean TON_WALLET_STANDALONE = false; public static boolean TON_WALLET_STANDALONE = false;
public static int BUILD_VERSION = 1946; public static int BUILD_VERSION = 1947;
public static String BUILD_VERSION_STRING = "6.1.0"; public static String BUILD_VERSION_STRING = "6.1.0";
public static int APP_ID = 4; public static int APP_ID = 4;
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103"; public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";

18
TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPollLayout.java
View file

@ -418,14 +418,16 @@ public class ChatAttachAlertPollLayout extends ChatAttachAlert.AttachAlertLayout
params.put("answers", Utilities.bytesToHex(serializedData.toByteArray())); params.put("answers", Utilities.bytesToHex(serializedData.toByteArray()));
poll.results = new TLRPC.TL_pollResults(); poll.results = new TLRPC.TL_pollResults();
CharSequence solution = getFixedString(solutionString); CharSequence solution = getFixedString(solutionString);
poll.results.solution = solution.toString(); if (solution != null) {
CharSequence[] message = new CharSequence[]{solution}; poll.results.solution = solution.toString();
ArrayList<TLRPC.MessageEntity> entities = MediaDataController.getInstance(parentAlert.currentAccount).getEntities(message, true); CharSequence[] message = new CharSequence[]{solution};
if (entities != null && !entities.isEmpty()) { ArrayList<TLRPC.MessageEntity> entities = MediaDataController.getInstance(parentAlert.currentAccount).getEntities(message, true);
poll.results.solution_entities = entities; if (entities != null && !entities.isEmpty()) {
} poll.results.solution_entities = entities;
if (!TextUtils.isEmpty(poll.results.solution)) { }
poll.results.flags |= 16; if (!TextUtils.isEmpty(poll.results.solution)) {
poll.results.flags |= 16;
}
} }
ChatActivity chatActivity = (ChatActivity) parentAlert.baseFragment; ChatActivity chatActivity = (ChatActivity) parentAlert.baseFragment;
if (chatActivity.isInScheduleMode()) { if (chatActivity.isInScheduleMode()) {

18
TMessagesProj/src/main/java/org/telegram/ui/PollCreateActivity.java
View file

@ -229,14 +229,16 @@ public class PollCreateActivity extends BaseFragment {
params.put("answers", Utilities.bytesToHex(serializedData.toByteArray())); params.put("answers", Utilities.bytesToHex(serializedData.toByteArray()));
poll.results = new TLRPC.TL_pollResults(); poll.results = new TLRPC.TL_pollResults();
CharSequence solution = ChatAttachAlertPollLayout.getFixedString(solutionString); CharSequence solution = ChatAttachAlertPollLayout.getFixedString(solutionString);
poll.results.solution = solution.toString(); if (solution != null) {
CharSequence[] message = new CharSequence[]{solution}; poll.results.solution = solution.toString();
ArrayList<TLRPC.MessageEntity> entities = getMediaDataController().getEntities(message, true); CharSequence[] message = new CharSequence[]{solution};
if (entities != null && !entities.isEmpty()) { ArrayList<TLRPC.MessageEntity> entities = getMediaDataController().getEntities(message, true);
poll.results.solution_entities = entities; if (entities != null && !entities.isEmpty()) {
} poll.results.solution_entities = entities;
if (!TextUtils.isEmpty(poll.results.solution)) { }
poll.results.flags |= 16; if (!TextUtils.isEmpty(poll.results.solution)) {
poll.results.flags |= 16;
}
} }
if (parentFragment.isInScheduleMode()) { if (parentFragment.isInScheduleMode()) {
AlertsCreator.createScheduleDatePickerDialog(getParentActivity(), parentFragment.getDialogId(), (notify, scheduleDate) -> { AlertsCreator.createScheduleDatePickerDialog(getParentActivity(), parentFragment.getDialogId(), (notify, scheduleDate) -> {