fix: build 10.9.1

This commit is contained in:
xtaodada 2024-03-09 15:27:50 +08:00
parent bb58571d03
commit 69090bc7de
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
5 changed files with 11 additions and 10 deletions

View File

@ -359,6 +359,7 @@ dependencies {
compileOnly "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
compileOnly "com.google.android.play:core:$playCoreVersion"
implementation 'com.google.android.gms:play-services-vision:20.1.3'
debugImplementation 'com.google.android.gms:play-services-maps:18.1.0'
debugImplementation 'com.google.android.gms:play-services-location:20.0.0'
releaseImplementation 'com.google.android.gms:play-services-maps:18.1.0'
@ -405,7 +406,7 @@ android {
excludes += ['/fabric/**', '/META-INF/*.version', '/META-INF/*.kotlin_module', '/META-INF/native-image/**', '/builddef.lst', '/*.txt', '/DebugProbesKt.bin', '/okhttp3/internal/publicsuffix/NOTICE']
}
def lib = "libtmessages.47.so"
def lib = "libtmessages.*.so"
pickFirst "lib/x86/$lib"
pickFirst "lib/x86_64/$lib"
pickFirst "lib/armeabi-v7a/$lib"

View File

@ -554,9 +554,11 @@ inline int registerNativeMethods(JNIEnv *env, const char *className, JNINativeMe
extern "C" int registerNativeTgNetFunctions(JavaVM *vm, JNIEnv *env) {
java = vm;
if (!registerNativeMethods(env, NativeByteBufferClassPathName, NativeByteBufferMethods,
sizeof(NativeByteBufferMethods) /
sizeof(NativeByteBufferMethods[0]))) {
if (!registerNativeMethods(env, NativeByteBufferClassPathName, NativeByteBufferMethods, sizeof(NativeByteBufferMethods) / sizeof(NativeByteBufferMethods[0]))) {
return JNI_FALSE;
}
if (!registerNativeMethods(env, ConnectionsManagerClassPathName, ConnectionsManagerMethods, sizeof(ConnectionsManagerMethods) / sizeof(ConnectionsManagerMethods[0]))) {
return JNI_FALSE;
}

View File

@ -1501,6 +1501,7 @@ public class FilterCreateActivity extends BaseFragment {
case VIEW_TYPE_EDIT: {
PollEditTextCell cell = (PollEditTextCell) holder.itemView;
cell.setIcon(FolderIconHelper.getTabIcon(newFilterEmoticon), newFilterEmoticon);
break;
}
case VIEW_TYPE_HEADER_COLOR_PREVIEW: {
folderTagsHeader = (HeaderCellColorPreview) holder.itemView;

View File

@ -8725,9 +8725,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
infoStartRow = rowCount;
infoHeaderRow = rowCount++;
if (username != null) {
usernameRow = rowCount++;
}
if (user != null && !user.restriction_reason.isEmpty()) {
restrictionReasonRow = rowCount++;
}

View File

@ -252,7 +252,7 @@ public class MessageHelper extends BaseController {
if (progress != null) uDismiss(progress);
return;
}
AndroidUtilities.runOnUIThread(() -> getMessagesController().deleteMessages(ids, random_ids, null, dialog_id, true, false));
AndroidUtilities.runOnUIThread(() -> getMessagesController().deleteMessages(ids, random_ids, null, dialog_id, 0, true, 0));
if (progress != null) uUpdate(progress, ">> " + indey);
deleteUserChannelHistoryWithSearch(progress, dialog_id, user, lastMessageId, indey);
} else {
@ -324,7 +324,7 @@ public class MessageHelper extends BaseController {
deleteUserChannelHistory(chat, userId, 0);
}
if (!msgIds.isEmpty()) {
getMessagesController().deleteMessages(msgIds, random_ids, null, dialog_id, true, false);
getMessagesController().deleteMessages(msgIds, random_ids, null, dialog_id, 0, true, 0);
}
deleteChannelHistory(dialog_id, chat, lastMessageId);
@ -671,7 +671,7 @@ public class MessageHelper extends BaseController {
}
Runnable deleteAction = () -> {
for (ArrayList<Integer> list : lists) {
getMessagesController().deleteMessages(list, null, null, dialogId, true, false);
getMessagesController().deleteMessages(list, null, null, dialogId, 0, true, 0);
}
};
AndroidUtilities.runOnUIThread(callback != null ? () -> callback.run(messageIds.size(), deleteAction) : deleteAction);