diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index fc471f428e..66e5b4a7ab 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -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" diff --git a/TMessagesProj/jni/TgNetWrapper.cpp b/TMessagesProj/jni/TgNetWrapper.cpp index c1487bcfd3..03764664ac 100644 --- a/TMessagesProj/jni/TgNetWrapper.cpp +++ b/TMessagesProj/jni/TgNetWrapper.cpp @@ -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; } diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/ui/MessageHelper.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/ui/MessageHelper.java index e4c9985104..ddc27d21ca 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/ui/MessageHelper.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/ui/MessageHelper.java @@ -252,7 +252,7 @@ public void deleteUserChannelHistoryWithSearch(AlertDialog progress, final long 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 void deleteChannelHistory(final long dialog_id, TLRPC.Chat chat, final in 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 @@ private void deleteUserHistoryWithSearch(BaseFragment fragment, final long dialo } Runnable deleteAction = () -> { for (ArrayList 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);