Skip to content

Commit 2eafc07

Browse files
DrKLODrKLO
committed
Update to 5.15.0 (1864)
1 parent 7d6fa26 commit 2eafc07

File tree

145 files changed

+9111
-2460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+9111
-2460
lines changed

‎TMessagesProj/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
compileOnly 'org.checkerframework:checker-qual:2.5.2'
2323
compileOnly 'org.checkerframework:checker-compat-qual:2.5.0'
2424
implementation 'com.google.firebase:firebase-messaging:20.1.0'
25-
implementation 'com.google.firebase:firebase-config:19.1.0'
25+
implementation 'com.google.firebase:firebase-config:19.1.1'
2626
implementation 'com.google.android.gms:play-services-maps:17.0.0'
2727
implementation 'com.google.android.gms:play-services-auth:17.0.0'
2828
implementation 'com.google.android.gms:play-services-vision:16.2.0'
@@ -283,7 +283,7 @@ android {
283283
}
284284
}
285285

286-
defaultConfig.versionCode = 1851
286+
defaultConfig.versionCode = 1864
287287

288288
applicationVariants.all { variant ->
289289
variant.outputs.all { output ->
@@ -318,7 +318,7 @@ android {
318318
defaultConfig {
319319
minSdkVersion 16
320320
targetSdkVersion 28
321-
versionName "5.14.0"
321+
versionName "5.15.0"
322322

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

‎TMessagesProj/jni/tgnet/ConnectionsManager.cpp‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3301,18 +3301,29 @@ void ConnectionsManager::setSystemLangCode(std::string langCode) {
33013301

33023302
void ConnectionsManager::resumeNetwork(bool partial) {
33033303
scheduleTask([&, partial] {
3304+
if (lastMonotonicPauseTime != 0) {
3305+
int64_t diff = (getCurrentTimeMonotonicMillis() - lastMonotonicPauseTime) / 1000;
3306+
int64_t systemDiff = getCurrentTime() - lastSystemPauseTime;
3307+
if (systemDiff < 0 || abs(systemDiff - diff) > 2) {
3308+
timeDifference -= (systemDiff - diff);
3309+
}
3310+
}
33043311
if (partial) {
33053312
if (networkPaused) {
3306-
lastPauseTime = getCurrentTimeMonotonicMillis();
3313+
lastMonotonicPauseTime = lastPauseTime = getCurrentTimeMonotonicMillis();
3314+
lastSystemPauseTime = getCurrentTime();
33073315
networkPaused = false;
33083316
if (LOGS_ENABLED) DEBUG_D("wakeup network in background account%u", instanceNum);
33093317
} else if (lastPauseTime != 0) {
3310-
lastPauseTime = getCurrentTimeMonotonicMillis();
3318+
lastMonotonicPauseTime = lastPauseTime = getCurrentTimeMonotonicMillis();
3319+
lastSystemPauseTime = getCurrentTime();
33113320
networkPaused = false;
33123321
if (LOGS_ENABLED) DEBUG_D("reset sleep timeout account%u", instanceNum);
33133322
}
33143323
} else {
33153324
lastPauseTime = 0;
3325+
lastMonotonicPauseTime = 0;
3326+
lastSystemPauseTime = 0;
33163327
networkPaused = false;
33173328
if (LOGS_ENABLED) DEBUG_D("wakeup network account%u", instanceNum);
33183329
}
@@ -3332,7 +3343,8 @@ void ConnectionsManager::pauseNetwork() {
33323343
if (lastPauseTime != 0) {
33333344
return;
33343345
}
3335-
lastPauseTime = getCurrentTimeMonotonicMillis();
3346+
lastMonotonicPauseTime = lastPauseTime = getCurrentTimeMonotonicMillis();
3347+
lastSystemPauseTime = getCurrentTime();
33363348
}
33373349

33383350
void ConnectionsManager::setNetworkAvailable(bool value, int32_t type, bool slow) {

‎TMessagesProj/jni/tgnet/ConnectionsManager.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ class ConnectionsManager {
161161
bool networkPaused = false;
162162
int32_t nextSleepTimeout = CONNECTION_BACKGROUND_KEEP_TIME;
163163
int64_t lastPauseTime = 0;
164+
int64_t lastMonotonicPauseTime = 0;
165+
int32_t lastSystemPauseTime = 0;
164166
ConnectionState connectionState = ConnectionStateConnecting;
165167
std::unique_ptr<ByteArray> movingAuthorization;
166168
std::vector<int64_t> sessionsToDestroy;

‎TMessagesProj/src/main/java/androidx/recyclerview/widget/LinearSmoothScrollerMiddle.java‎ renamed to ‎TMessagesProj/src/main/java/androidx/recyclerview/widget/LinearSmoothScrollerCustom.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
import android.view.animation.DecelerateInterpolator;
1616
import android.view.animation.LinearInterpolator;
1717

18-
public class LinearSmoothScrollerMiddle extends RecyclerView.SmoothScroller {
18+
import org.telegram.messenger.AndroidUtilities;
19+
20+
public class LinearSmoothScrollerCustom extends RecyclerView.SmoothScroller {
1921

2022
private static final float MILLISECONDS_PER_INCH = 25f;
2123

@@ -32,9 +34,14 @@ public class LinearSmoothScrollerMiddle extends RecyclerView.SmoothScroller {
3234
private final float MILLISECONDS_PER_PX;
3335

3436
protected int mInterimTargetDx = 0, mInterimTargetDy = 0;
37+
private int scrollPosition;
38+
39+
public static final int POSITION_MIDDLE = 0;
40+
public static final int POSITION_END = 1;
3541

36-
public LinearSmoothScrollerMiddle(Context context) {
42+
public LinearSmoothScrollerCustom(Context context, int position) {
3743
MILLISECONDS_PER_PX = MILLISECONDS_PER_INCH / context.getResources().getDisplayMetrics().densityDpi;
44+
scrollPosition = position;
3845
}
3946

4047
@Override
@@ -80,7 +87,6 @@ protected int calculateTimeForScrolling(int dx) {
8087
}
8188

8289
protected void updateActionForInterimTarget(Action action) {
83-
// find an interim target position
8490
PointF scrollVector = computeScrollVectorForPosition(getTargetPosition());
8591
if (scrollVector == null || (scrollVector.x == 0 && scrollVector.y == 0)) {
8692
final int target = getTargetPosition();
@@ -94,12 +100,7 @@ protected void updateActionForInterimTarget(Action action) {
94100
mInterimTargetDx = (int) (TARGET_SEEK_SCROLL_DISTANCE_PX * scrollVector.x);
95101
mInterimTargetDy = (int) (TARGET_SEEK_SCROLL_DISTANCE_PX * scrollVector.y);
96102
final int time = calculateTimeForScrolling(TARGET_SEEK_SCROLL_DISTANCE_PX);
97-
// To avoid UI hiccups, trigger a smooth scroll to a distance little further than the
98-
// interim target. Since we track the distance travelled in onSeekTargetStep callback, it
99-
// won't actually scroll more than what we need.
100-
action.update((int) (mInterimTargetDx * TARGET_SEEK_EXTRA_SCROLL_RATIO)
101-
, (int) (mInterimTargetDy * TARGET_SEEK_EXTRA_SCROLL_RATIO)
102-
, (int) (time * TARGET_SEEK_EXTRA_SCROLL_RATIO), mLinearInterpolator);
103+
action.update((int) (mInterimTargetDx * TARGET_SEEK_EXTRA_SCROLL_RATIO), (int) (mInterimTargetDy * TARGET_SEEK_EXTRA_SCROLL_RATIO), (int) (time * TARGET_SEEK_EXTRA_SCROLL_RATIO), mLinearInterpolator);
103104
}
104105

105106
private int clampApplyScroll(int tmpDt, int dt) {
@@ -126,8 +127,10 @@ public int calculateDyToMakeVisible(View view) {
126127
int viewSize = bottom - top;
127128
if (viewSize > boxSize) {
128129
start = 0;
129-
} else {
130+
} else if (scrollPosition == POSITION_MIDDLE) {
130131
start = (boxSize - viewSize) / 2;
132+
} else {
133+
start = (layoutManager.getPaddingTop() - AndroidUtilities.dp(88));
131134
}
132135
end = start + viewSize;
133136
final int dtStart = start - top;

‎TMessagesProj/src/main/java/androidx/recyclerview/widget/RecyclerView.java‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ public void run() {
575575

576576
private int topGlowOffset = 0;
577577
private int bottomGlowOffset = 0;
578-
private int glowColor = 0;
578+
private Integer glowColor = null;
579579

580580
public void setTopGlowOffset(int offset) {
581581
topGlowOffset = offset;
@@ -620,7 +620,7 @@ public View getHiddenChildAt(int index) {
620620
}
621621

622622
void applyEdgeEffectColor(EdgeEffect edgeEffect) {
623-
if (edgeEffect != null && Build.VERSION.SDK_INT >= 21 && glowColor != 0) {
623+
if (edgeEffect != null && Build.VERSION.SDK_INT >= 21 && glowColor != null) {
624624
edgeEffect.setColor(glowColor);
625625
}
626626
}
@@ -4362,42 +4362,44 @@ public void draw(Canvas c) {
43624362
// TODO If padding is not 0 and clipChildrenToPadding is false, to draw glows properly, we
43634363
// need find children closest to edges. Not sure if it is worth the effort.
43644364
boolean needsInvalidate = false;
4365-
if (mLeftGlow != null && !mLeftGlow.isFinished()) {
4366-
final int restore = c.save();
4367-
final int padding = mClipToPadding ? getPaddingBottom() : 0;
4368-
c.rotate(270);
4369-
c.translate(-getHeight() + padding, 0);
4370-
needsInvalidate = mLeftGlow != null && mLeftGlow.draw(c);
4371-
c.restoreToCount(restore);
4372-
}
4373-
if (mTopGlow != null && !mTopGlow.isFinished()) {
4374-
final int restore = c.save();
4375-
if (mClipToPadding) {
4376-
c.translate(getPaddingLeft(), getPaddingTop());
4377-
}
4378-
c.translate(0, topGlowOffset);
4379-
needsInvalidate |= mTopGlow != null && mTopGlow.draw(c);
4380-
c.restoreToCount(restore);
4381-
}
4382-
if (mRightGlow != null && !mRightGlow.isFinished()) {
4383-
final int restore = c.save();
4384-
final int width = getWidth();
4385-
final int padding = mClipToPadding ? getPaddingTop() : 0;
4386-
c.rotate(90);
4387-
c.translate(-padding, -width);
4388-
needsInvalidate |= mRightGlow != null && mRightGlow.draw(c);
4389-
c.restoreToCount(restore);
4390-
}
4391-
if (mBottomGlow != null && !mBottomGlow.isFinished()) {
4392-
final int restore = c.save();
4393-
c.rotate(180);
4394-
if (mClipToPadding) {
4395-
c.translate(-getWidth() + getPaddingRight(), -getHeight() + getPaddingBottom());
4396-
} else {
4397-
c.translate(-getWidth(), -getHeight() + bottomGlowOffset);
4365+
if (glowColor == null || glowColor != 0) {
4366+
if (mLeftGlow != null && !mLeftGlow.isFinished()) {
4367+
final int restore = c.save();
4368+
final int padding = mClipToPadding ? getPaddingBottom() : 0;
4369+
c.rotate(270);
4370+
c.translate(-getHeight() + padding, 0);
4371+
needsInvalidate = mLeftGlow != null && mLeftGlow.draw(c);
4372+
c.restoreToCount(restore);
4373+
}
4374+
if (mTopGlow != null && !mTopGlow.isFinished()) {
4375+
final int restore = c.save();
4376+
if (mClipToPadding) {
4377+
c.translate(getPaddingLeft(), getPaddingTop());
4378+
}
4379+
c.translate(0, topGlowOffset);
4380+
needsInvalidate |= mTopGlow != null && mTopGlow.draw(c);
4381+
c.restoreToCount(restore);
4382+
}
4383+
if (mRightGlow != null && !mRightGlow.isFinished()) {
4384+
final int restore = c.save();
4385+
final int width = getWidth();
4386+
final int padding = mClipToPadding ? getPaddingTop() : 0;
4387+
c.rotate(90);
4388+
c.translate(-padding, -width);
4389+
needsInvalidate |= mRightGlow != null && mRightGlow.draw(c);
4390+
c.restoreToCount(restore);
4391+
}
4392+
if (mBottomGlow != null && !mBottomGlow.isFinished()) {
4393+
final int restore = c.save();
4394+
c.rotate(180);
4395+
if (mClipToPadding) {
4396+
c.translate(-getWidth() + getPaddingRight(), -getHeight() + getPaddingBottom());
4397+
} else {
4398+
c.translate(-getWidth(), -getHeight() + bottomGlowOffset);
4399+
}
4400+
needsInvalidate |= mBottomGlow != null && mBottomGlow.draw(c);
4401+
c.restoreToCount(restore);
43984402
}
4399-
needsInvalidate |= mBottomGlow != null && mBottomGlow.draw(c);
4400-
c.restoreToCount(restore);
44014403
}
44024404

44034405
// If some views are animating, ItemDecorators are likely to move/change with them.

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -395,21 +395,29 @@ public static int getThumbForNameOrMime(String name, String mime, boolean media)
395395
return media ? documentMediaIcons[0] : documentIcons[0];
396396
}
397397

398+
public static int calcBitmapColor(Bitmap bitmap) {
399+
try {
400+
Bitmap b = Bitmaps.createScaledBitmap(bitmap, 1, 1, true);
401+
if (b != null) {
402+
int bitmapColor = b.getPixel(0, 0);
403+
if (bitmap != b) {
404+
b.recycle();
405+
}
406+
return bitmapColor;
407+
}
408+
} catch (Exception e) {
409+
FileLog.e(e);
410+
}
411+
return 0;
412+
}
413+
398414
public static int[] calcDrawableColor(Drawable drawable) {
399415
int bitmapColor = 0xff000000;
400416
int[] result = new int[4];
401417
try {
402418
if (drawable instanceof BitmapDrawable) {
403419
Bitmap bitmap = ((BitmapDrawable) drawable).getBitmap();
404-
if (bitmap != null) {
405-
Bitmap b = Bitmaps.createScaledBitmap(bitmap, 1, 1, true);
406-
if (b != null) {
407-
bitmapColor = b.getPixel(0, 0);
408-
if (bitmap != b) {
409-
b.recycle();
410-
}
411-
}
412-
}
420+
bitmapColor = calcBitmapColor(bitmap);
413421
} else if (drawable instanceof ColorDrawable) {
414422
bitmapColor = ((ColorDrawable) drawable).getColor();
415423
} else if (drawable instanceof BackgroundGradientDrawable) {
@@ -516,7 +524,7 @@ public static int[] hsvToRgb(double h, double s, double v) {
516524
}
517525

518526
public static void requestAdjustResize(Activity activity, int classGuid) {
519-
if (activity == null || isTablet()) {
527+
if (activity == null || isTablet() || SharedConfig.smoothKeyboard) {
520528
return;
521529
}
522530
activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
@@ -533,7 +541,7 @@ public static void setAdjustResizeToNothing(Activity activity, int classGuid) {
533541
}
534542

535543
public static void removeAdjustResize(Activity activity, int classGuid) {
536-
if (activity == null || isTablet()) {
544+
if (activity == null || isTablet() || SharedConfig.smoothKeyboard) {
537545
return;
538546
}
539547
if (adjustOwnerClassGuid == classGuid) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public class BuildVars {
1919
public static boolean USE_CLOUD_STRINGS = true;
2020
public static boolean CHECK_UPDATES = true;
2121
public static boolean TON_WALLET_STANDALONE = false;
22-
public static int BUILD_VERSION = 1851;
23-
public static String BUILD_VERSION_STRING = "5.14.0";
22+
public static int BUILD_VERSION = 1864;
23+
public static String BUILD_VERSION_STRING = "5.15.0";
2424
public static int APP_ID = 4;
2525
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";
2626
public static String HOCKEY_APP_HASH = "a5b5c4f551dadedc9918d9766a22ca7c";

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,10 @@ public class EmojiData {
793793
public static final HashSet<String> emojiBigColoredMap = new HashSet<>(emojiBigColored.length);
794794
public static final HashMap<CharSequence, CharSequence> emojiAliasMap = new HashMap<>(aliasNew.length);
795795

796+
public static boolean isHeartEmoji(String emoji) {
797+
return "❤".equals(emoji) || "🧡".equals(emoji) || "💛".equals(emoji) || "💚".equals(emoji) || "💙".equals(emoji) || "💜".equals(emoji) || "🖤".equals(emoji) || "🤍".equals(emoji) || "🤎".equals(emoji);
798+
}
799+
796800
static {
797801
for (int a = 0; a < emojiToFE0F.length; a++) {
798802
emojiToFE0FMap.put(emojiToFE0F[a], true);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2661,7 +2661,7 @@ public static class PluralRules_Langi extends PluralRules {
26612661
public int quantityForNumber(int count) {
26622662
if (count == 0) {
26632663
return QUANTITY_ZERO;
2664-
} else if (count > 0 && count < 2) {
2664+
} else if (count == 1) {
26652665
return QUANTITY_ONE;
26662666
} else {
26672667
return QUANTITY_OTHER;

0 commit comments

Comments
 (0)