From 18f91daf25c3304571e935fd07865b570c5daff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Mon, 10 Aug 2020 10:20:22 +0000 Subject: [PATCH] Refinds --- TMessagesProj/build.gradle | 10 ++++----- .../org/telegram/messenger/SharedConfig.java | 4 ++-- .../org/telegram/ui/ProxyListActivity.java | 4 +--- .../settings/NekoGeneralSettingsActivity.java | 5 +++++ bin/init_release.sh | 21 +++++++++++++++++-- bin/native_libs.sh | 19 ++++++++++++++++- bin/publish_repo_apks.sh | 15 +------------ bin/release.sh | 6 ------ bin/tag.sh | 4 ---- bin/update_libs.sh | 6 ++++++ ss-rust/build.gradle.kts | 2 +- 11 files changed, 58 insertions(+), 38 deletions(-) delete mode 100755 bin/release.sh delete mode 100755 bin/tag.sh diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 170c622e4..a67c74f1a 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -def verName = "6.3.0.0-rc03" -def verCode = 61 +def verName = "6.3.0.0" +def verCode = 62 def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json") @@ -47,8 +47,8 @@ configurations { compile.exclude module: 'support-v4' } -def okHttpVersion = '4.8.0' -def fcmVersion = '20.2.3' +def okHttpVersion = '4.8.1' +def fcmVersion = '20.2.4' def crashlyticsVersion = '17.1.1' def playCoreVersion = '1.8.0' @@ -112,7 +112,6 @@ dependencies { implementation 'org.tukaani:xz:1.8' implementation project(":openpgp-api") - compileOnly files('libs/libv2ray.aar') compileOnly "com.google.firebase:firebase-messaging:$fcmVersion" @@ -286,6 +285,7 @@ android { foss { initWith release + matchingFallbacks = ['debug'] } } diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java b/TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java index 04257f300..d3f7e4fe3 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java @@ -640,9 +640,9 @@ public class SharedConfig { } - if (Build.VERSION.SDK_INT < 23) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - throw new RuntimeException(LocaleController.getString("MinApi23Required", R.string.MinApi23Required)); + throw new RuntimeException(LocaleController.getString("MinApi21Required", R.string.MinApi21Required)); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java index 9d3ec14b7..2bb76bf3e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java @@ -664,10 +664,8 @@ public class ProxyListActivity extends BaseFragment implements NotificationCente if (!BuildVars.isMini) { addItem.addSubItem(menu_add_input_vmess, LocaleController.getString("AddProxyVmess", R.string.AddProxyVmess)).setOnClickListener((v) -> presentFragment(new VmessSettingsActivity())); - if (Build.VERSION.SDK_INT > 23) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { addItem.addSubItem(menu_add_input_ss, LocaleController.getString("AddProxySS", R.string.AddProxySS)).setOnClickListener((v) -> presentFragment(new ShadowsocksSettingsActivity())); - } - if (Build.VERSION.SDK_INT >= 21) { addItem.addSubItem(menu_add_input_ssr, LocaleController.getString("AddProxySSR", R.string.AddProxySSR)).setOnClickListener((v) -> presentFragment(new ShadowsocksRSettingsActivity())); } // addItem.addSubItem(menu_add_input_rb, LocaleController.getString("AddProxyRB", R.string.AddProxyRB)).setOnClickListener((v) -> presentFragment(new RelayBatonSettingsActivity())); diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java index 22c4af703..d0b00085f 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java @@ -521,6 +521,11 @@ public class NekoGeneralSettingsActivity extends BaseFragment { requestKey(new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID)); + } else if (position == autoPauseVideoRow) { + NekoConfig.toggleAutoPauseVideo(); + if (view instanceof TextCheckCell) { + ((TextCheckCell) view).setChecked(NekoConfig.autoPauseVideo); + } } }); diff --git a/bin/init_release.sh b/bin/init_release.sh index cb767df4b..5f0bb9b22 100755 --- a/bin/init_release.sh +++ b/bin/init_release.sh @@ -3,10 +3,12 @@ function assemble() { ./gradlew TMessagesProj:assembleFullRelease \ + TMessagesProj:assembleFullAppleEmojiRelease \ + TMessagesProj:assembleFullTwitterEmojiRelease \ + TMessagesProj:assembleFullFacebookEmojiRelease \ TMessagesProj:assembleFullReleaseNoGcm \ TMessagesProj:assembleMiniRelease \ TMessagesProj:assembleMiniReleaseNoGcm \ - TMessagesProj:assembleMiniNoEmojiRelease \ TMessagesProj:assembleMiniNoEmojiReleaseNoGcm return $? @@ -17,4 +19,19 @@ function assemble() { # TMessagesProj:assembleReleaseNoGcm assemble && -assemble \ No newline at end of file +assemble && + +rm -rf build/apks && +mkdir -p build/apks && +find TMessagesProj/build/outputs/apk -name "*.apk" -exec cp {} build/apks \; && +cp build/update.json build/apks && +cd build/apks && +rm *universal* && +xz *.apk && +export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" && +git init && +git config --global user.name "世界" && +git config --global user.email "i@nekox.me" && +git remote add origin "git@github.com:NekoX-Dev/Resources.git" && +git add . --all && +git commit -m "Update" \ No newline at end of file diff --git a/bin/native_libs.sh b/bin/native_libs.sh index 65b25747a..c384e9e57 100755 --- a/bin/native_libs.sh +++ b/bin/native_libs.sh @@ -4,7 +4,7 @@ if [ ! -x "$(command -v go)" ]; then # if [ ! -x "$(command -v gvm)" ]; then # -# apt install -y bison +# apt install -y bison binutils gcc make # # bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) # @@ -42,6 +42,23 @@ if [ ! -x "$(command -v cmake)" ]; then fi +if [ -z "$ANDROID_HOME" ]; then + + if [ -d "$HOME/Android/Sdk" ]; then + + export ANDROID_HOME=$HOME/Android/Sdk + + else + + echo "E: ANDROID_HOME not found." + + exit 1 + + fi + + +fi + if [ -f "$ANDROID_HOME/ndk-bundle/source.properties" ]; then export NDK=$ANDROID_HOME/ndk-bundle diff --git a/bin/publish_repo_apks.sh b/bin/publish_repo_apks.sh index 583d58853..01abe4d41 100755 --- a/bin/publish_repo_apks.sh +++ b/bin/publish_repo_apks.sh @@ -1,18 +1,5 @@ #!/usr/bin/env bash -rm -rf build/apks && -mkdir -p build/apks && -find TMessagesProj/build/outputs/apk -name "*.apk" -exec cp {} build/apks \; && -cp build/update.json build/apks && -cd build/apks && -rm *universal* && -xz *.apk && -export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" && -git init && -git config --global user.name "世界" && -git config --global user.email "i@nekox.me" && -git remote add origin "git@github.com:NekoX-Dev/Resources.git" && -git add . --all && -git commit -m "Update" && +cd git push origin master -f && rm -rf build/apks \ No newline at end of file diff --git a/bin/release.sh b/bin/release.sh deleted file mode 100755 index 04789a647..000000000 --- a/bin/release.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -./bin/init_release.sh && -./bin/publish_release_apks.sh "$1" && -./bin/publish_repo_apks.sh && -./bin/publish_play.sh \ No newline at end of file diff --git a/bin/tag.sh b/bin/tag.sh deleted file mode 100755 index 95e0830aa..000000000 --- a/bin/tag.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -git tag "$1" -f && -git push origin "$1" -f \ No newline at end of file diff --git a/bin/update_libs.sh b/bin/update_libs.sh index 4410fe193..bfa92cd7f 100755 --- a/bin/update_libs.sh +++ b/bin/update_libs.sh @@ -33,6 +33,12 @@ if [ ! -x "$(command -v rustc)" ]; then fi +if [ -z "$ANDROID_HOME" ]; then + if [ -d "$HOME/Android/Sdk" ]; then + export ANDROID_HOME="$HOME/Android/Sdk" + fi +fi + if [ ! -f "$ANDROID_HOME/ndk-bundle/source.properties" ]; then export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.3.6528147 diff --git a/ss-rust/build.gradle.kts b/ss-rust/build.gradle.kts index 825b56486..ce6ecf3c6 100644 --- a/ss-rust/build.gradle.kts +++ b/ss-rust/build.gradle.kts @@ -11,7 +11,7 @@ android { compileSdkVersion(30) defaultConfig { - minSdkVersion(23) + minSdkVersion(21) targetSdkVersion(30) } buildToolsVersion = "30.0.1"