Skip to content

Commit 23b70a3

Browse files
xaxtixxaxtix
committed
Update to 8.2.7
1 parent 3b97164 commit 23b70a3

13 files changed

+72
-21
lines changed

‎TMessagesProj/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ android {
299299
}
300300
}
301301

302-
defaultConfig.versionCode = 2462
302+
defaultConfig.versionCode = 2470
303303

304304
applicationVariants.all { variant ->
305305
variant.outputs.all { output ->
@@ -318,7 +318,7 @@ android {
318318
defaultConfig {
319319
minSdkVersion 16
320320
targetSdkVersion 30
321-
versionName "8.2.1"
321+
versionName "8.2.7"
322322

323323
vectorDrawables.generatedDensities = ['mdpi', 'hdpi', 'xhdpi', 'xxhdpi']
324324

‎TMessagesProj/src/main/AndroidManifest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<uses-permission android:name="android.permission.MANAGE_OWN_CALLS"/>
5050
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
5151
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
52+
<uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
5253

5354
<uses-permission android:name="com.sec.android.provider.badge.permission.READ"/>
5455
<uses-permission android:name="com.sec.android.provider.badge.permission.WRITE"/>
@@ -66,6 +67,7 @@
6667
<uses-permission android:name="com.oppo.launcher.permission.WRITE_SETTINGS"/>
6768
<uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_READ"/>
6869
<uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_WRITE"/>
70+
<!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" /> -->
6971

7072
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="replace" />
7173

‎TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public class BuildVars {
2020
public static boolean USE_CLOUD_STRINGS = true;
2121
public static boolean CHECK_UPDATES = true;
2222
public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29;
23-
public static int BUILD_VERSION = 2466;
24-
public static String BUILD_VERSION_STRING = "8.2.3";
23+
public static int BUILD_VERSION = 2470;
24+
public static String BUILD_VERSION_STRING = "8.2.7";
2525
public static int APP_ID = 4;
2626
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";
2727

‎TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java

+12-3
Original file line numberDiff line numberDiff line change
@@ -3926,27 +3926,36 @@ public static void saveFile(String fullPath, Context context, final int type, fi
39263926
boolean result = true;
39273927
if (Build.VERSION.SDK_INT >= 29) {
39283928
try {
3929+
int selectedType = type;
39293930
ContentValues contentValues = new ContentValues();
39303931
String extension = MimeTypeMap.getFileExtensionFromUrl(sourceFile.getAbsolutePath());
39313932
String mimeType = null;
39323933
if (extension != null) {
39333934
mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
39343935
}
39353936
Uri uriToInsert = null;
3936-
if (type == 0) {
3937+
if ((type == 0 || type == 1) && mimeType != null) {
3938+
if (mimeType.startsWith("image")) {
3939+
selectedType = 0;
3940+
}
3941+
if (mimeType.startsWith("video")) {
3942+
selectedType = 1;
3943+
}
3944+
}
3945+
if (selectedType == 0) {
39373946
uriToInsert = MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY);
39383947
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
39393948
File dirDest = new File(Environment.DIRECTORY_PICTURES, "Telegram");
39403949
contentValues.put(MediaStore.MediaColumns.RELATIVE_PATH, dirDest + File.separator);
39413950
}
39423951
contentValues.put(MediaStore.Images.Media.DISPLAY_NAME, AndroidUtilities.generateFileName(0, extension));
39433952
contentValues.put(MediaStore.Images.Media.MIME_TYPE, mimeType);
3944-
} else if (type == 1) {
3953+
} else if (selectedType == 1) {
39453954
File dirDest = new File(Environment.DIRECTORY_MOVIES, "Telegram");
39463955
contentValues.put(MediaStore.MediaColumns.RELATIVE_PATH, dirDest + File.separator);
39473956
uriToInsert = MediaStore.Video.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY);
39483957
contentValues.put(MediaStore.Video.Media.DISPLAY_NAME, AndroidUtilities.generateFileName(1, extension));
3949-
} else if (type == 2) {
3958+
} else if (selectedType == 2) {
39503959
File dirDest = new File(Environment.DIRECTORY_DOWNLOADS, "Telegram");
39513960
contentValues.put(MediaStore.MediaColumns.RELATIVE_PATH, dirDest + File.separator);
39523961
uriToInsert = MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY);

‎TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java

-1
Original file line numberDiff line numberDiff line change
@@ -5967,7 +5967,6 @@ public void checkMediaExistance() {
59675967
attachPathExists = f.exists();
59685968
}
59695969
if (!attachPathExists) {
5970-
59715970
File file = FileLoader.getPathToMessage(messageOwner);
59725971
if (type == 3 && needDrawBluredPreview()) {
59735972
mediaExists = new File(file.getAbsolutePath() + ".enc").exists();

‎TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java

+14-3
Original file line numberDiff line numberDiff line change
@@ -1865,7 +1865,11 @@ private boolean checkPhotoImageMotionEvent(MotionEvent event) {
18651865
}
18661866
}
18671867
if (currentMessageObject.type == 12) {
1868-
TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(currentMessageObject.messageOwner.media.user_id);
1868+
long uid = currentMessageObject.messageOwner.media.user_id;
1869+
TLRPC.User user = null;
1870+
if (uid != 0) {
1871+
user = MessagesController.getInstance(currentAccount).getUser(uid);
1872+
}
18691873
if (user == null) {
18701874
imagePressed = false;
18711875
result = false;
@@ -2673,7 +2677,11 @@ private void didClickedImage() {
26732677
didPressButton(true, false);
26742678
}
26752679
} else if (currentMessageObject.type == 12) {
2676-
TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(currentMessageObject.messageOwner.media.user_id);
2680+
long uid = currentMessageObject.messageOwner.media.user_id;
2681+
TLRPC.User user = null;
2682+
if (uid != 0) {
2683+
user = MessagesController.getInstance(currentAccount).getUser(uid);
2684+
}
26772685
delegate.didPressUserAvatar(this, user, lastTouchX, lastTouchY);
26782686
} else if (currentMessageObject.type == MessageObject.TYPE_ROUND_VIDEO) {
26792687
if (buttonState != -1) {
@@ -4419,7 +4427,10 @@ private void setMessageContent(MessageObject messageObject, MessageObject.Groupe
44194427
availableTimeWidth = backgroundWidth - AndroidUtilities.dp(31);
44204428

44214429
long uid = messageObject.messageOwner.media.user_id;
4422-
TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(uid);
4430+
TLRPC.User user = null;
4431+
if (uid != 0) {
4432+
user = MessagesController.getInstance(currentAccount).getUser(uid);
4433+
}
44234434

44244435
int maxWidth = getMaxNameWidth() - AndroidUtilities.dp(80);
44254436
if (maxWidth < 0) {

‎TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedPhotoVideoCell2.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.android.exoplayer2.util.Log;
2525

2626
import org.telegram.messenger.AndroidUtilities;
27+
import org.telegram.messenger.ApplicationLoader;
2728
import org.telegram.messenger.DownloadController;
2829
import org.telegram.messenger.FileLoader;
2930
import org.telegram.messenger.ImageLocation;
@@ -166,7 +167,8 @@ public void setMessageObject(MessageObject messageObject, int parentColumnsCount
166167
if (messageObject.strippedThumb != null) {
167168
imageReceiver.setImage(null, null, null, null, messageObject.strippedThumb, 0, null, messageObject, 0);
168169
} else {
169-
imageReceiver.clearImage();
170+
TLRPC.PhotoSize currentPhotoObjectThumb = FileLoader.getClosestPhotoSizeWithSize(messageObject.photoThumbs, 50);
171+
imageReceiver.setImage(null, null, ImageLocation.getForObject(currentPhotoObjectThumb, messageObject.photoThumbsObject), "b", null, 0, null, messageObject, 0);
170172
}
171173
}
172174
} else {

‎TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,11 @@ public void onAutoDeleteHistory(int ttl, int action) {
12151215
}
12161216
options.add(9);
12171217
} else if (type == 8) {
1218-
TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(selectedObject.messageOwner.media.user_id);
1218+
long uid = selectedObject.messageOwner.media.user_id;
1219+
TLRPC.User user = null;
1220+
if (uid != 0) {
1221+
user = MessagesController.getInstance(currentAccount).getUser(uid);
1222+
}
12191223
if (user != null && user.id != UserConfig.getInstance(currentAccount).getClientUserId() && ContactsController.getInstance(currentAccount).contactsDict.get(user.id) == null) {
12201224
items.add(LocaleController.getString("AddContactTitle", R.string.AddContactTitle));
12211225
options.add(15);

‎TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java

+16-3
Original file line numberDiff line numberDiff line change
@@ -19797,7 +19797,11 @@ private void createMenu(View v, boolean single, boolean listView, float x, float
1979719797
}
1979819798
}
1979919799
} else if (type == 8) {
19800-
TLRPC.User user = getMessagesController().getUser(selectedObject.messageOwner.media.user_id);
19800+
long uid = selectedObject.messageOwner.media.user_id;
19801+
TLRPC.User user = null;
19802+
if (uid != 0) {
19803+
user = MessagesController.getInstance(currentAccount).getUser(uid);
19804+
}
1980119805
if (user != null && user.id != getUserConfig().getClientUserId() && getContactsController().contactsDict.get(user.id) == null) {
1980219806
items.add(LocaleController.getString("AddContactTitle", R.string.AddContactTitle));
1980319807
options.add(15);
@@ -19925,7 +19929,11 @@ private void createMenu(View v, boolean single, boolean listView, float x, float
1992519929
options.add(9);
1992619930
icons.add(R.drawable.msg_sticker);
1992719931
} else if (type == 8) {
19928-
TLRPC.User user = getMessagesController().getUser(selectedObject.messageOwner.media.user_id);
19932+
long uid = selectedObject.messageOwner.media.user_id;
19933+
TLRPC.User user = null;
19934+
if (uid != 0) {
19935+
user = MessagesController.getInstance(currentAccount).getUser(uid);
19936+
}
1992919937
if (user != null && user.id != getUserConfig().getClientUserId() && getContactsController().contactsDict.get(user.id) == null) {
1993019938
items.add(LocaleController.getString("AddContactTitle", R.string.AddContactTitle));
1993119939
options.add(15);
@@ -23154,7 +23162,12 @@ public void didPressInstantButton(ChatMessageCell cell, int type) {
2315423162
ArticleViewer.getInstance().open(messageObject);
2315523163
}
2315623164
} else if (type == 5) {
23157-
openVCard(getMessagesController().getUser(messageObject.messageOwner.media.user_id), messageObject.messageOwner.media.vcard, messageObject.messageOwner.media.first_name, messageObject.messageOwner.media.last_name);
23165+
long uid = messageObject.messageOwner.media.user_id;
23166+
TLRPC.User user = null;
23167+
if (uid != 0) {
23168+
user = MessagesController.getInstance(currentAccount).getUser(uid);
23169+
}
23170+
openVCard(user, messageObject.messageOwner.media.vcard, messageObject.messageOwner.media.first_name, messageObject.messageOwner.media.last_name);
2315823171
} else {
2315923172
if (messageObject.isSponsored()) {
2316023173
Bundle args = new Bundle();

‎TMessagesProj/src/main/java/org/telegram/ui/Components/JoinGroupAlert.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public JoinGroupAlert(final Context context, TLRPC.ChatInvite invite, String gro
173173
layout.titleTextView.setText(LocaleController.getString("RequestToJoinSent", R.string.RequestToJoinSent));
174174
String subTitle = isChannel
175175
? LocaleController.getString("RequestToJoinChannelSentDescription", R.string.RequestToJoinChannelSentDescription)
176-
: LocaleController.getString("RequestToJoinSentDescription", R.string.RequestToJoinGroupSentDescription);
176+
: LocaleController.getString("RequestToJoinGroupSentDescription", R.string.RequestToJoinGroupSentDescription);
177177
layout.subtitleTextView.setText(subTitle);
178178
Bulletin.make(fragment, layout, Bulletin.DURATION_LONG).show();
179179
});

‎TMessagesProj/src/main/java/org/telegram/ui/Components/Paint/RenderView.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import android.view.TextureView;
1010
import android.view.View;
1111

12+
import com.google.android.exoplayer2.util.Log;
13+
1214
import javax.microedition.khronos.egl.EGL10;
1315
import javax.microedition.khronos.egl.EGLConfig;
1416
import javax.microedition.khronos.egl.EGLContext;
@@ -64,7 +66,6 @@ public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int hei
6466
if (surface == null || internal != null) {
6567
return;
6668
}
67-
6869
internal = new CanvasInternal(surface);
6970
internal.setBufferSize(width, height);
7071
updateTransform();
@@ -263,7 +264,7 @@ private class CanvasInternal extends DispatchQueue {
263264
private EGLContext eglContext;
264265
private EGLSurface eglSurface;
265266
private boolean initialized;
266-
private boolean ready;
267+
private volatile boolean ready;
267268

268269
private int bufferWidth;
269270
private int bufferHeight;
@@ -438,7 +439,7 @@ public void run() {
438439
}
439440

440441
if (!ready) {
441-
queue.postRunnable(() -> ready = true, 200);
442+
ready = true;
442443
}
443444
}
444445
};

‎TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ public boolean onFragmentCreate() {
8181
phone = getArguments().getString("phone");
8282
addContact = getArguments().getBoolean("addContact", false);
8383
needAddException = MessagesController.getNotificationsSettings(currentAccount).getBoolean("dialog_bar_exception" + user_id, false);
84-
TLRPC.User user = getMessagesController().getUser(user_id);
84+
TLRPC.User user = null;
85+
if (user_id != 0) {
86+
user = getMessagesController().getUser(user_id);
87+
}
8588
return user != null && super.onFragmentCreate();
8689
}
8790

‎TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java

+7
Original file line numberDiff line numberDiff line change
@@ -1595,10 +1595,14 @@ public void onNextPressed() {
15951595
boolean allowCall = true;
15961596
boolean allowCancelCall = true;
15971597
boolean allowReadCallLog = true;
1598+
boolean allowReadPhoneNumbers = true;
15981599
if (Build.VERSION.SDK_INT >= 23 && simcardAvailable) {
15991600
allowCall = getParentActivity().checkSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED;
16001601
allowCancelCall = getParentActivity().checkSelfPermission(Manifest.permission.CALL_PHONE) == PackageManager.PERMISSION_GRANTED;
16011602
allowReadCallLog = Build.VERSION.SDK_INT < 28 || getParentActivity().checkSelfPermission(Manifest.permission.READ_CALL_LOG) == PackageManager.PERMISSION_GRANTED;
1603+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
1604+
allowReadPhoneNumbers = getParentActivity().checkSelfPermission(Manifest.permission.READ_PHONE_NUMBERS) == PackageManager.PERMISSION_GRANTED;
1605+
}
16021606
if (checkPermissions) {
16031607
permissionsItems.clear();
16041608
if (!allowCall) {
@@ -1610,6 +1614,9 @@ public void onNextPressed() {
16101614
if (!allowReadCallLog) {
16111615
permissionsItems.add(Manifest.permission.READ_CALL_LOG);
16121616
}
1617+
if (!allowReadPhoneNumbers) {
1618+
permissionsItems.add(Manifest.permission.READ_PHONE_NUMBERS);
1619+
}
16131620
boolean ok = true;
16141621
if (!permissionsItems.isEmpty()) {
16151622
SharedPreferences preferences = MessagesController.getGlobalMainSettings();

0 commit comments

Comments
 (0)