lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refinds

This commit is contained in:
世界 2020-08-10 10:20:22 +00:00
parent abe7ed624c
commit 18f91daf25
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
11 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TMessagesProj/build.gradle
View File

@ -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']
}
}

4
TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
View File

@ -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));
}

4
TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java
View File

@ -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()));

5
TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
View File

@ -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);
}
}
});

21
bin/init_release.sh
View File

@ -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
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"

19
bin/native_libs.sh
View File

@ -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

15
bin/publish_repo_apks.sh
View File

@ -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

6
bin/release.sh
View File

@ -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

4
bin/tag.sh
View File

@ -1,4 +0,0 @@
#!/bin/bash
git tag "$1" -f &&
git push origin "$1" -f

6
bin/update_libs.sh
View File

@ -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

2
ss-rust/build.gradle.kts
View File

@ -11,7 +11,7 @@ android {
compileSdkVersion(30)
defaultConfig {
minSdkVersion(23)
minSdkVersion(21)
targetSdkVersion(30)
}
buildToolsVersion = "30.0.1"