Fix build

This commit is contained in:
世界 2021-03-13 01:25:23 +08:00
parent 9c10d75bdf
commit 2fc53585d9
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
4 changed files with 7 additions and 6 deletions

View File

@ -14,7 +14,7 @@ NekoX is an **free and open source** third-party Telegram client, based on Teleg
## NekoX Changes ## NekoX Changes
- Most of Nekogram's features - Most of Nekogram's features
- Max account limit set to 16 - Unlimited login accounts
- OpenCC Chinese Convert - OpenCC Chinese Convert
- Built-in VMess, Shadowsocks, SSR, Trojan-GFW proxies support - Built-in VMess, Shadowsocks, SSR, Trojan-GFW proxies support
- Built-in public proxy list / Proxy subscription support - Built-in public proxy list / Proxy subscription support

View File

@ -3,8 +3,8 @@ import cn.hutool.core.util.RuntimeUtil
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
def verName = "7.5.0-rc06" def verName = "7.5.0-rc07"
def verCode = 200 + 3 * 5 def verCode = 200 + 3 * 6
if (System.getenv("DEBUG_BUILD") == "true") { if (System.getenv("DEBUG_BUILD") == "true") {
verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1)") verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1)")

View File

@ -40,6 +40,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.collection.ConcurrentHashSet;
@ -143,7 +144,7 @@ public class SharedConfig {
public static int distanceSystemType; public static int distanceSystemType;
public static ConcurrentHashSet<Integer> activeAccounts; public static CopyOnWriteArraySet<Integer> activeAccounts;
public static int loginingAccount = -1; public static int loginingAccount = -1;
static { static {
@ -1044,7 +1045,7 @@ public class SharedConfig {
disableVoiceAudioEffects = preferences.getBoolean("disableVoiceAudioEffects", false); disableVoiceAudioEffects = preferences.getBoolean("disableVoiceAudioEffects", false);
preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
showNotificationsForAllAccounts = preferences.getBoolean("AllAccounts", true); showNotificationsForAllAccounts = preferences.getBoolean("AllAccounts", true);
activeAccounts = Arrays.stream(preferences.getString("active_accounts", "").split(",")).filter(StrUtil::isNotBlank).map(Integer::parseInt).collect(Collectors.toCollection(ConcurrentHashSet::new)); activeAccounts = Arrays.stream(preferences.getString("active_accounts", "").split(",")).filter(StrUtil::isNotBlank).map(Integer::parseInt).collect(Collectors.toCollection(CopyOnWriteArraySet::new));
if (!preferences.contains("accounts_loaded")) { if (!preferences.contains("accounts_loaded")) {
int maxAccounts; int maxAccounts;

View File

@ -1,7 +1,7 @@
NekoX is an third-party Telegram client, based on Telegram-FOSS with features added. NekoX is an third-party Telegram client, based on Telegram-FOSS with features added.
- Most of Nekogram's features - Most of Nekogram's features
- Max account limit set to 16 - Unlimited login accounts
- OpenCC Chinese Convert - OpenCC Chinese Convert
- Built-in VMess, Shadowsocks, SSR, Trojan-GFW proxies support - Built-in VMess, Shadowsocks, SSR, Trojan-GFW proxies support
- Built-in public proxy list / Proxy subscription support - Built-in public proxy list / Proxy subscription support