Skip to content

Commit

Permalink
update to 8.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@xaxtix
xaxtix committed Aug 14, 2022
1 parent 172335d commit 43fe75b
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 23 deletions.
4 changes: 2 additions & 2 deletions TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public class BuildVars {
public static boolean USE_CLOUD_STRINGS = true;
public static boolean CHECK_UPDATES = true;
public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29;
public static int BUILD_VERSION = 2756;
public static String BUILD_VERSION_STRING = "8.9.2";
public static int BUILD_VERSION = 2757;
public static String BUILD_VERSION_STRING = "8.9.3";
public static int APP_ID = 4;
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";

Expand Down
7 changes: 6 additions & 1 deletion TMessagesProj/src/main/java/org/telegram/messenger/GoogleLocationProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ public ILocationRequest onCreateLocationRequest() {

@Override
public void getLastLocation(Consumer<Location> callback) {
locationProviderClient.getLastLocation().addOnCompleteListener(task -> callback.accept(task.getResult()));
locationProviderClient.getLastLocation().addOnCompleteListener(task -> {
if (task.getException() != null) {
return;
}
callback.accept(task.getResult());
});
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6682,7 +6682,7 @@ public void getEmojiSuggestions(String[] langCodes, String keyword, boolean full
}
});
String aliasFinal = alias;
if (allowAnimated) {
if (allowAnimated && SharedConfig.suggestAnimatedEmoji) {
fillWithAnimatedEmoji(result, null, () -> {
if (sync != null) {
callback.run(result, aliasFinal);
Expand Down
2 changes: 2 additions & 0 deletions TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3883,6 +3883,7 @@ private void reloadDialogsReadValue(ArrayList<TLRPC.Dialog> dialogs, long did) {
TLRPC.TL_updateReadChannelInbox update = new TLRPC.TL_updateReadChannelInbox();
update.channel_id = dialog.peer.channel_id;
update.max_id = dialog.read_inbox_max_id;
update.still_unread_count = dialog.unread_count;
arrayList.add(update);
} else {
TLRPC.TL_updateReadHistoryInbox update = new TLRPC.TL_updateReadHistoryInbox();
Expand Down Expand Up @@ -4026,6 +4027,7 @@ public void loadFullChat(long chatId, int classGuid, boolean force) {
TLRPC.TL_updateReadChannelInbox update = new TLRPC.TL_updateReadChannelInbox();
update.channel_id = chatId;
update.max_id = res.full_chat.read_inbox_max_id;
update.still_unread_count = res.full_chat.unread_count;
arrayList.add(update);
processUpdateArray(arrayList, null, null, false, 0);
}
Expand Down
6 changes: 3 additions & 3 deletions TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5755,7 +5755,7 @@ private void updateDialogsWithReadMessagesInternal(ArrayList<Integer> messages,
int messageId = inbox.get(key);
boolean canCountByMessageId = true;

if (stillUnreadMessagesCount != null && stillUnreadMessagesCount.get(key, -1) != -1) {
if (stillUnreadMessagesCount != null && stillUnreadMessagesCount.get(key, -2) != -2) {
SQLiteCursor checkHolesCursor = database.queryFinalized(String.format(Locale.US, "SELECT start, end FROM messages_holes WHERE uid = %d AND end > %d", key, messageId));
while (checkHolesCursor.next()) {
canCountByMessageId = false;
Expand All @@ -5771,8 +5771,8 @@ private void updateDialogsWithReadMessagesInternal(ArrayList<Integer> messages,
}
cursor.dispose();
} else {
int unread = stillUnreadMessagesCount.get(key);
if (unread > 0) {
int unread = stillUnreadMessagesCount.get(key, -1);
if (unread >= 0) {
dialogsToUpdate.put(key, unread);
}
}
Expand Down
1 change: 1 addition & 0 deletions TMessagesProj/src/main/java/org/telegram/messenger/PushListenerController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ public static void processRemoteMessage(@PushType int pushType, String data, lon
TLRPC.TL_updateReadChannelInbox update = new TLRPC.TL_updateReadChannelInbox();
update.channel_id = channel_id;
update.max_id = max_id;
update.still_unread_count = -1;
updates.add(update);
} else {
TLRPC.TL_updateReadHistoryInbox update = new TLRPC.TL_updateReadHistoryInbox();
Expand Down
13 changes: 10 additions & 3 deletions TMessagesProj/src/main/java/org/telegram/ui/Components/AnimatedFileDrawable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import android.graphics.drawable.Animatable;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.util.Log;
import android.view.View;

import org.telegram.messenger.AndroidUtilities;
Expand All @@ -34,7 +33,6 @@
import org.telegram.messenger.ImageReceiver;
import org.telegram.messenger.utils.BitmapsCache;
import org.telegram.tgnet.TLRPC;
import org.telegram.ui.ActionBar.Theme;

import java.io.File;
import java.util.ArrayList;
Expand Down Expand Up @@ -971,6 +969,8 @@ public File getFilePath() {
long cacheGenerateTimestamp;
Bitmap generatingCacheBitmap;
long cacheGenerateNativePtr;
int tryCount;
int lastMetadata;

@Override
public void prepareForGenerateCache() {
Expand All @@ -994,9 +994,16 @@ public int getNextFrame(Bitmap bitmap) {
generatingCacheBitmap = Bitmap.createBitmap(metaData[0], metaData[1], Bitmap.Config.ARGB_8888);
}
getVideoFrame(cacheGenerateNativePtr, generatingCacheBitmap, metaData, generatingCacheBitmap.getRowBytes(), false, startTime, endTime);
if (cacheGenerateTimestamp != 0 && metaData[3] == 0 || cacheGenerateTimestamp > metaData[3]) {
if (cacheGenerateTimestamp != 0 && (metaData[3] == 0 || cacheGenerateTimestamp > metaData[3])) {
return 0;
}
if (lastMetadata == metaData[3]) {
tryCount++;
if (tryCount > 5) {
return 0;
}
}
lastMetadata = metaData[3];
bitmap.eraseColor(Color.TRANSPARENT);
canvas.save();
float s = (float) renderingWidth / generatingCacheBitmap.getWidth();
Expand Down
4 changes: 1 addition & 3 deletions TMessagesProj/src/main/java/org/telegram/ui/Components/RLottieDrawable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import android.os.Looper;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
import android.view.HapticFeedbackConstants;
import android.view.View;

Expand All @@ -34,7 +33,6 @@
import org.telegram.messenger.R;
import org.telegram.messenger.Utilities;
import org.telegram.messenger.utils.BitmapsCache;
import org.telegram.ui.ActionBar.Theme;

import java.io.File;
import java.io.FileInputStream;
Expand Down Expand Up @@ -892,7 +890,7 @@ protected boolean scheduleNextGetFrame(boolean allowGroupedUpdateLocal) {
return false;
}
if (generatingCache) {
// return false;
return false;
}
if (!newColorUpdates.isEmpty()) {
pendingColorUpdates.putAll(newColorUpdates);
Expand Down
25 changes: 15 additions & 10 deletions TMessagesProj_AppHuawei/src/main/java/org/telegram/messenger/HuaweiLocationProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,22 @@ public void init(Context context) {

@Override
public ILocationRequest onCreateLocationRequest() {
return new GoogleLocationRequest(LocationRequest.create());
return new HuaweiLocationRequest(LocationRequest.create());
}

@Override
public void getLastLocation(Consumer<Location> callback) {
locationProviderClient.getLastLocation().addOnCompleteListener(task -> callback.accept(task.getResult()));
locationProviderClient.getLastLocation().addOnCompleteListener(task -> {
if (task.getException() != null) {
return;
}
callback.accept(task.getResult());
});
}

@Override
public void requestLocationUpdates(ILocationRequest request, ILocationListener locationListener) {
locationProviderClient.requestLocationUpdates(((GoogleLocationRequest) request).request, new LocationCallback() {
locationProviderClient.requestLocationUpdates(((HuaweiLocationRequest) request).request, new LocationCallback() {
@Override
public void onLocationResult(@NonNull LocationResult locationResult) {
locationListener.onLocationChanged(locationResult.getLastLocation());
Expand All @@ -62,7 +67,7 @@ public void onLocationResult(@NonNull LocationResult locationResult) {

@Override
public void checkLocationSettings(ILocationRequest request, Consumer<Integer> callback) {
LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder().addLocationRequest(((GoogleLocationRequest) request).request);
LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder().addLocationRequest(((HuaweiLocationRequest) request).request);

settingsClient.checkLocationSettings(builder.build()).addOnCompleteListener(task -> {
try {
Expand All @@ -83,7 +88,7 @@ public void checkLocationSettings(ILocationRequest request, Consumer<Integer> ca

@Override
public IMapApiClient onCreateLocationServicesAPI(Context context, IAPIConnectionCallbacks connectionCallbacks, IAPIOnConnectionFailedListener failedListener) {
return new GoogleApiClientImpl(new HuaweiApiClient.Builder(ApplicationLoader.applicationContext)
return new HuaweiApiClientImpl(new HuaweiApiClient.Builder(ApplicationLoader.applicationContext)
.addConnectionCallbacks(new HuaweiApiClient.ConnectionCallbacks() {
@Override
public void onConnected() {
Expand All @@ -101,13 +106,13 @@ public void onConnectionSuspended(int i) {

@Override
public boolean checkServices() {
return PushListenerController.GooglePushListenerServiceProvider.INSTANCE.hasServices();
return HuaweiPushListenerProvider.INSTANCE.hasServices();
}

public final static class GoogleLocationRequest implements ILocationRequest {
public final static class HuaweiLocationRequest implements ILocationRequest {
private LocationRequest request;

private GoogleLocationRequest(LocationRequest request) {
private HuaweiLocationRequest(LocationRequest request) {
this.request = request;
}

Expand Down Expand Up @@ -143,10 +148,10 @@ public void setFastestInterval(long interval) {
}
}

public final static class GoogleApiClientImpl implements IMapApiClient {
public final static class HuaweiApiClientImpl implements IMapApiClient {
private HuaweiApiClient apiClient;

private GoogleApiClientImpl(HuaweiApiClient apiClient) {
private HuaweiApiClientImpl(HuaweiApiClient apiClient) {
this.apiClient = apiClient;
}

Expand Down

0 comments on commit 43fe75b

Please sign in to comment.