From 40b1a23d513c533234b4b39e23aeaa722412dd63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sat, 25 Apr 2020 16:36:33 +0800 Subject: [PATCH] [RELEASE] 6.1.0.0 --- README.md | 14 ++------------ TMessagesProj/build.gradle | 4 ++-- .../main/java/tw/nekomimi/nekogram/VmessLoader.kt | 9 ++++++--- Update.md | 4 ++-- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 995018823..f3a42d0eb 100644 --- a/README.md +++ b/README.md @@ -10,12 +10,6 @@ NekoX is an open source third-party Telegram android app. - FAQ: https://telegra.ph/NekoX-FAQ-03-31 - FAQ (Chinese): https://telegra.ph/NekoX-%E5%B8%B8%E8%A6%8B%E5%95%8F%E9%A1%8C-03-31 -## API, Protocol documentation - -Telegram API manuals: https://core.telegram.org/api - -MTProto protocol manuals: https://core.telegram.org/mtproto - ## Compilation Guide ### Specify APP_ID and APP_HASH @@ -57,7 +51,7 @@ Available variant list: ## Localization -Join project at https://neko.crowdin.com/nekogram and https://nekox.crowdin.com/nekox. +Join project at https://nekox.crowdin.com/nekox and https://neko.crowdin.com/ . ## Credits @@ -68,8 +62,4 @@ Join project at https://neko.crowdin.com/nekogram and https://nekox.crowdin.com/
  • AndroidLibV2rayLite: LGPLv3
  • shadowsocks-libev: GPLv3
  • shadowsocksRb-android: GPLv3
    • - - -## :) - -[关于 "NekoX 举报 Nekogram" 的声明](https://telegra.ph/page-04-12) \ No newline at end of file + \ No newline at end of file diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 553da4f73..49b8fc2fd 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -62,8 +62,8 @@ android { minSdkVersion 16 targetSdkVersion 28 - versionName "6.1.0.0" - versionCode = 24 + versionName "6.1.0.0-rc1" + versionCode = 25 vectorDrawables.generatedDensities = ['mdpi', 'hdpi', 'xhdpi', 'xxhdpi'] diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt index 71fd6a773..5bf816fca 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt @@ -17,6 +17,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl import org.telegram.messenger.FileLog import org.telegram.messenger.LocaleController import org.telegram.messenger.R +import kotlin.concurrent.thread import kotlin.random.Random class VmessLoader { @@ -414,11 +415,13 @@ class VmessLoader { fun stop() { - runCatching { + thread { - point.isRunning = false + runCatching { - point.stopLoop() + point.stopLoop() + + } } diff --git a/Update.md b/Update.md index 909713945..79014bae2 100644 --- a/Update.md +++ b/Update.md @@ -1,6 +1,6 @@ # Updates -In case there is an update to the newest version which is not published here or on F-Droid yet, either: +In case there is an update to the newest version which is not published here, either: - [Upstream](https://github.com/DrKLO/Telegram) didn't release the source code. - Find a way to annoy them on Github, [official Twitter](https://twitter.com/telegram), [Durov's Twitter](https://twitter.com/durov), etc until they do. - The source code was released, but not yet merged here. - - This will inevitably happen, but maybe you can help! + - This will inevitably happen, but maybe you can help! \ No newline at end of file