Skip to content

Commit 5fa5549

Browse files
dkaraushdkaraush
committed
update to 10.14.5 (4945)
1 parent a982429 commit 5fa5549

27 files changed

+266
-123
lines changed

‎TMessagesProj/build.gradle‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,3 +214,23 @@ def getProps(String propName) {
214214
}
215215
}
216216
apply plugin: 'com.google.gms.google-services'
217+
218+
task checkVisibility {
219+
doFirst {
220+
def isPrivateBuild = project.gradle.startParameter.taskNames.find { it.contains("HA_private") }
221+
def isPublicAllowed = !project.hasProperty("IS_PRIVATE") || !project.property("IS_PRIVATE").toBoolean()
222+
if (!isPrivateBuild && !isPublicAllowed) {
223+
throw new GradleException("Building public version of private code!")
224+
}
225+
}
226+
doLast {
227+
if (project.gradle.startParameter.taskNames.find { it.contains("HA_public") }) {
228+
def privateBuild = file("${projectDir}_AppHockeyApp/afat/HA_private/app.apk")
229+
if (privateBuild.exists()) {
230+
privateBuild.delete()
231+
}
232+
}
233+
}
234+
}
235+
236+
preBuild.dependsOn checkVisibility

‎TMessagesProj/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,6 @@
8787
<action android:name="android.intent.action.VIEW"/>
8888
<data android:scheme="ton"/>
8989
</intent>
90-
91-
<package android:name="com.android.chrome" />
92-
<package android:name="org.mozilla.firefox" />
93-
<package android:name="com.microsoft.emmx" />
94-
<package android:name="com.opera.browser" />
95-
<package android:name="com.opera.mini.native" />
96-
<package android:name="com.brave.browser" />
97-
<package android:name="com.duckduckgo.mobile.android" />
98-
<package android:name="com.sec.android.app.sbrowser" />
99-
<package android:name="com.vivaldi.browser" />
100-
<package android:name="com.kiwibrowser.browser" />
101-
<package android:name="com.UCMobile.intl" />
102-
<package android:name="org.torproject.torbrowser" />
10390
</queries>
10491

10592
<application

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

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import android.content.pm.PackageManager;
2828
import android.content.pm.Signature;
2929
import android.content.res.AssetFileDescriptor;
30-
import android.content.res.AssetManager;
3130
import android.content.res.Configuration;
3231
import android.database.Cursor;
3332
import android.graphics.Bitmap;
@@ -36,18 +35,13 @@
3635
import android.graphics.Color;
3736
import android.graphics.ColorMatrix;
3837
import android.graphics.Matrix;
39-
import android.graphics.Paint;
4038
import android.graphics.Point;
4139
import android.graphics.Rect;
4240
import android.graphics.RectF;
4341
import android.graphics.Typeface;
4442
import android.graphics.drawable.BitmapDrawable;
4543
import android.graphics.drawable.ColorDrawable;
4644
import android.graphics.drawable.Drawable;
47-
import android.graphics.fonts.Font;
48-
import android.graphics.fonts.FontFamily;
49-
import android.graphics.fonts.FontStyle;
50-
import android.graphics.fonts.SystemFonts;
5145
import android.net.Uri;
5246
import android.os.Build;
5347
import android.os.Bundle;
@@ -79,7 +73,6 @@
7973
import android.text.style.URLSpan;
8074
import android.text.util.Linkify;
8175
import android.util.DisplayMetrics;
82-
import android.util.Log;
8376
import android.util.Pair;
8477
import android.util.StateSet;
8578
import android.util.TypedValue;
@@ -101,7 +94,6 @@
10194
import android.view.accessibility.AccessibilityEvent;
10295
import android.view.accessibility.AccessibilityManager;
10396
import android.view.animation.AccelerateInterpolator;
104-
import android.view.animation.Animation;
10597
import android.view.animation.DecelerateInterpolator;
10698
import android.view.animation.Interpolator;
10799
import android.view.animation.OvershootInterpolator;
@@ -122,9 +114,7 @@
122114
import androidx.core.content.ContextCompat;
123115
import androidx.core.content.FileProvider;
124116
import androidx.core.graphics.ColorUtils;
125-
import androidx.core.graphics.TypefaceCompatUtil;
126117
import androidx.core.math.MathUtils;
127-
import androidx.core.provider.FontRequest;
128118
import androidx.core.widget.NestedScrollView;
129119
import androidx.dynamicanimation.animation.DynamicAnimation;
130120
import androidx.dynamicanimation.animation.SpringAnimation;
@@ -3875,7 +3865,7 @@ public static void openDocument(MessageObject message, Activity activity, BaseFr
38753865
}
38763866
}
38773867

3878-
public static boolean openForView(File f, String fileName, String mimeType, final Activity activity, Theme.ResourcesProvider resourcesProvider) {
3868+
public static boolean openForView(File f, String fileName, String mimeType, final Activity activity, Theme.ResourcesProvider resourcesProvider, boolean restrict) {
38793869
if (f != null && f.exists()) {
38803870
String realMimeType = null;
38813871
Intent intent = new Intent(Intent.ACTION_VIEW);
@@ -3884,6 +3874,10 @@ public static boolean openForView(File f, String fileName, String mimeType, fina
38843874
int idx = fileName.lastIndexOf('.');
38853875
if (idx != -1) {
38863876
String ext = fileName.substring(idx + 1);
3877+
int h = ext.toLowerCase().hashCode();
3878+
if (restrict && (h == 0x17a1c || h == 0x3107ab || h == 0x19a1b || h == 0xe55 || h == 0x18417)) {
3879+
return true;
3880+
}
38873881
realMimeType = myMime.getMimeTypeFromExtension(ext.toLowerCase());
38883882
if (realMimeType == null) {
38893883
realMimeType = mimeType;
@@ -3892,9 +3886,12 @@ public static boolean openForView(File f, String fileName, String mimeType, fina
38923886
}
38933887
}
38943888
}
3895-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && realMimeType != null && realMimeType.equals("application/vnd.android.package-archive") && !ApplicationLoader.applicationContext.getPackageManager().canRequestPackageInstalls()) {
3896-
AlertsCreator.createApkRestrictedDialog(activity, resourcesProvider).show();
3897-
return true;
3889+
if (realMimeType != null && realMimeType.equals("application/vnd.android.package-archive")) {
3890+
if (restrict) return true;
3891+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !ApplicationLoader.applicationContext.getPackageManager().canRequestPackageInstalls()) {
3892+
AlertsCreator.createApkRestrictedDialog(activity, resourcesProvider).show();
3893+
return true;
3894+
}
38983895
}
38993896
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
39003897
intent.setDataAndType(FileProvider.getUriForFile(activity, ApplicationLoader.getApplicationId() + ".provider", f), realMimeType != null ? realMimeType : "text/plain");
@@ -3920,7 +3917,7 @@ public static boolean openForView(File f, String fileName, String mimeType, fina
39203917
return false;
39213918
}
39223919

3923-
public static boolean openForView(MessageObject message, Activity activity, Theme.ResourcesProvider resourcesProvider) {
3920+
public static boolean openForView(MessageObject message, Activity activity, Theme.ResourcesProvider resourcesProvider, boolean restrict) {
39243921
File f = null;
39253922
if (message.messageOwner.attachPath != null && message.messageOwner.attachPath.length() != 0) {
39263923
f = new File(message.messageOwner.attachPath);
@@ -3929,13 +3926,13 @@ public static boolean openForView(MessageObject message, Activity activity, Them
39293926
f = FileLoader.getInstance(message.currentAccount).getPathToMessage(message.messageOwner);
39303927
}
39313928
String mimeType = message.type == MessageObject.TYPE_FILE || message.type == MessageObject.TYPE_TEXT ? message.getMimeType() : null;
3932-
return openForView(f, message.getFileName(), mimeType, activity, resourcesProvider);
3929+
return openForView(f, message.getFileName(), mimeType, activity, resourcesProvider, restrict);
39333930
}
39343931

39353932
public static boolean openForView(TLRPC.Document document, boolean forceCache, Activity activity) {
39363933
String fileName = FileLoader.getAttachFileName(document);
39373934
File f = FileLoader.getInstance(UserConfig.selectedAccount).getPathToAttach(document, true);
3938-
return openForView(f, fileName, document.mime_type, activity, null);
3935+
return openForView(f, fileName, document.mime_type, activity, null, false);
39393936
}
39403937

39413938
public static SpannableStringBuilder formatSpannableSimple(CharSequence format, CharSequence... cs) {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,8 +1461,10 @@ public static String formatPluralStringComma(String key, int plural, char symbol
14611461
value = BuildVars.USE_CLOUD_STRINGS ? getInstance().localeValues.get(key + "_other") : null;
14621462
}
14631463
if (value == null) {
1464-
int resourceId = ApplicationLoader.applicationContext.getResources().getIdentifier(param, "string", ApplicationLoader.applicationContext.getPackageName());
1465-
value = ApplicationLoader.applicationContext.getString(resourceId);
1464+
try {
1465+
int resourceId = ApplicationLoader.applicationContext.getResources().getIdentifier(param, "string", ApplicationLoader.applicationContext.getPackageName());
1466+
value = ApplicationLoader.applicationContext.getString(resourceId);
1467+
} catch (Exception e2) {}
14661468
}
14671469
if (value == null) {
14681470
int resourceId = ApplicationLoader.applicationContext.getResources().getIdentifier(key + "_other", "string", ApplicationLoader.applicationContext.getPackageName());

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8410,6 +8410,7 @@ public static boolean isVideoDocument(TLRPC.Document document) {
84108410
}
84118411
boolean isAnimated = false;
84128412
boolean isVideo = false;
8413+
String filename = null;
84138414
int width = 0;
84148415
int height = 0;
84158416
for (int a = 0; a < document.attributes.size(); a++) {
@@ -8423,6 +8424,20 @@ public static boolean isVideoDocument(TLRPC.Document document) {
84238424
height = attribute.h;
84248425
} else if (attribute instanceof TLRPC.TL_documentAttributeAnimated) {
84258426
isAnimated = true;
8427+
} else if (attribute instanceof TLRPC.TL_documentAttributeFilename) {
8428+
filename = attribute.file_name;
8429+
}
8430+
}
8431+
if (filename != null) {
8432+
int index = filename.lastIndexOf(".");
8433+
if (index >= 0) {
8434+
String ext = filename.substring(index + 1);
8435+
switch (ext.toLowerCase().hashCode()) {
8436+
case 0x17a1c: case 0x3107ab: case 0x19a1b:
8437+
case 0xe55: case 0x18417: case 0x184fe:
8438+
case 0x18181:
8439+
return false;
8440+
}
84268441
}
84278442
}
84288443
if (isAnimated && (width > 1280 || height > 1280)) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19922,13 +19922,13 @@ public boolean checkCanOpenChat(Bundle bundle, BaseFragment fragment, MessageObj
1992219922
@Override
1992319923
public void onMessagesLoaded(boolean fromCache) {
1992419924
progress.end();
19925-
fragment.presentFragment(new ChatActivity(bundle), true);
19925+
fragment.presentFragment(new ChatActivity(bundle));
1992619926
}
1992719927

1992819928
@Override
1992919929
public void onError() {
1993019930
progress.end();
19931-
fragment.presentFragment(new ChatActivity(bundle), true);
19931+
fragment.presentFragment(new ChatActivity(bundle));
1993219932
}
1993319933
}));
1993419934
return false;

‎TMessagesProj/src/main/java/org/telegram/messenger/browser/Browser.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949

5050
import java.lang.ref.WeakReference;
5151
import java.net.URLEncoder;
52+
import java.util.Collections;
5253
import java.util.List;
5354
import java.util.regex.Matcher;
5455

@@ -253,11 +254,9 @@ public static void openUrl(final Context context, Uri uri, boolean _allowCustom,
253254
boolean[] forceBrowser = new boolean[]{false};
254255
boolean internalUri = isInternalUri(uri, forceBrowser);
255256
String browserPackage = getBrowserPackageName(browser);
256-
if (isBrowserPackageInstalled(context, browserPackage, uri)) {
257+
if (browserPackage != null) {
257258
tryTelegraph = false;
258259
_allowCustom = false;
259-
} else {
260-
browserPackage = null;
261260
}
262261
final boolean allowCustom = _allowCustom;
263262
if (tryTelegraph) {
@@ -431,7 +430,16 @@ public static void openUrl(final Context context, Uri uri, boolean _allowCustom,
431430
intent.putExtra(LaunchActivity.EXTRA_FORCE_NOT_INTERNAL_APPS, forceNotInternalForApps);
432431
((LaunchActivity) context).onNewIntent(intent, inCaseLoading);
433432
} else {
434-
context.startActivity(intent);
433+
try {
434+
context.startActivity(intent);
435+
} catch (Exception e2) {
436+
if (browserPackage != null) {
437+
intent.setPackage(browserPackage = null);
438+
context.startActivity(intent);
439+
} else {
440+
FileLog.e(e2);
441+
}
442+
}
435443
}
436444
} catch (Exception e) {
437445
FileLog.e(e);
@@ -588,14 +596,6 @@ public static String getBrowserPackageName(String browser) {
588596
return null;
589597
}
590598

591-
public static boolean isBrowserPackageInstalled(Context context, String packageName, Uri uri) {
592-
if (packageName == null) return false;
593-
PackageManager packageManager = context.getPackageManager();
594-
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
595-
intent.setPackage(packageName);
596-
return packageManager.resolveActivity(intent, 0) != null;
597-
}
598-
599599
public static String replaceHostname(Uri originalUri, String newHostname) {
600600
String scheme = originalUri.getScheme();
601601
String userInfo = originalUri.getUserInfo();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ private void openItem(CacheModel.FileInfo fileInfo, CacheCell cacheCell) {
332332
photoEntries.add(new MediaController.PhotoEntry(0, 0, 0, fileInfo.file.getPath(), 0, fileInfo.type == TYPE_VIDEOS, 0, 0, 0));
333333
PhotoViewer.getInstance().openPhotoForSelect(photoEntries, 0, PhotoViewer.SELECT_TYPE_NO_SELECT, false, placeProvider, null);
334334
} else {
335-
AndroidUtilities.openForView(fileInfo.file, fileInfo.file.getName(), null, parentFragment.getParentActivity(), null);
335+
AndroidUtilities.openForView(fileInfo.file, fileInfo.file.getName(), null, parentFragment.getParentActivity(), null, false);
336336
}
337337
}
338338
if (cacheCell.type == TYPE_MUSIC) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19466,7 +19466,7 @@ private void drawCaptionLayout(Canvas canvas, MessageObject.TextLayoutBlocks cap
1946619466
buttonX -= AndroidUtilities.dp(10);
1946719467
}
1946819468
commentButtonRect.set(
19469-
buttonX - AndroidUtilities.dp((currentMessageObject == null || !currentMessageObject.isOut()) && !drawPinnedBottom && currentPosition == null && (currentMessageObject == null || currentMessageObject.type != MessageObject.TYPE_POLL || pollInstantViewTouchesBottom) ? 6 : 0),
19469+
buttonX - AndroidUtilities.dp((currentMessageObject == null || !currentMessageObject.isOutOwner()) && !drawPinnedBottom && currentPosition == null && (currentMessageObject == null || currentMessageObject.type != MessageObject.TYPE_POLL || pollInstantViewTouchesBottom) ? 6 : 0),
1947019470
(int) buttonY,
1947119471
endX - AndroidUtilities.dp(14),
1947219472
layoutHeight - AndroidUtilities.dp(h) + 1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3164,7 +3164,7 @@ public void didPressImage(ChatMessageCell cell, float x, float y) {
31643164
}
31653165
}
31663166
try {
3167-
AndroidUtilities.openForView(message, getParentActivity(), null);
3167+
AndroidUtilities.openForView(message, getParentActivity(), null, false);
31683168
} catch (Exception e) {
31693169
alertUserOpenError(message);
31703170
}

0 commit comments

Comments
 (0)