From 1772122d5fda4c3d7e1b0dd5d8c7a4fc4ae4eae5 Mon Sep 17 00:00:00 2001 From: bannedbook Date: Thu, 6 Feb 2020 18:55:01 +0800 Subject: [PATCH] update --- build.gradle | 4 +-- core/src/main/AndroidManifest.xml | 2 +- .../main/java/com/github/shadowsocks/Core.kt | 3 +- .../github/shadowsocks/bg/ProxyInstance.kt | 30 ------------------- .../github/shadowsocks/database/Profile.kt | 4 +-- .../github/shadowsocks/work/UpdateCheck.kt | 4 +-- gitupdate.bat | 2 +- 7 files changed, 9 insertions(+), 40 deletions(-) diff --git a/build.gradle b/build.gradle index 37aaec9..8e4eb47 100644 --- a/build.gradle +++ b/build.gradle @@ -14,8 +14,8 @@ buildscript { junitVersion = '4.13' androidTestVersion = '1.2.0' androidEspressoVersion = '3.2.0' - versionCode = 5000350 - versionName = '5.0.3-nightly' + versionCode = 5000351 + versionName = '5.0.3.1-nightly' resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW'] } diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index 4571b0b..bf63732 100644 --- a/core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -33,7 +33,7 @@ + android:value="AEdPqrEAAAAIENnFBzugt9171NjZ_etNgRcwZ93KmEl3HN8tXQ"/> = 24 && DataStore.directBootAware && diff --git a/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt b/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt index f43f991..5bd7a0a 100644 --- a/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt +++ b/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt @@ -52,36 +52,6 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro private var scheduleConfigUpdate = false suspend fun init(service: BaseService.Interface, hosts: HostsFile) { - if (profile.isSponsored) { - scheduleConfigUpdate = true - val mdg = MessageDigest.getInstance("SHA-1") - mdg.update(Core.packageInfo.signaturesCompat.first().toByteArray()) - val (config, success) = RemoteConfig.fetch() - scheduleConfigUpdate = !success - val conn = withContext(Dispatchers.IO) { - // Network.openConnection might use networking, see https://issuetracker.google.com/issues/135242093 - service.openConnection(URL(config.getString("proxy_url"))) as HttpURLConnection - } - conn.requestMethod = "POST" - conn.doOutput = true - - val proxies = conn.useCancellable { - try { - outputStream.bufferedWriter().use { - it.write("sig=" + Base64.encodeToString(mdg.digest(), Base64.DEFAULT)) - } - inputStream.bufferedReader().readText() - } catch (e: IOException) { - throw BaseService.ExpectedExceptionWrapper(e) - } - }.split('|').toMutableList() - proxies.shuffle() - val proxy = proxies.first().split(':') - profile.host = proxy[0].trim() - profile.remotePort = proxy[1].trim().toInt() - profile.password = proxy[2].trim() - profile.method = proxy[3].trim() - } // it's hard to resolve DNS on a specific interface so we'll do it here if (profile.host.parseNumericAddress() == null) { diff --git a/core/src/main/java/com/github/shadowsocks/database/Profile.kt b/core/src/main/java/com/github/shadowsocks/database/Profile.kt index 5b1bdb2..fa15323 100644 --- a/core/src/main/java/com/github/shadowsocks/database/Profile.kt +++ b/core/src/main/java/com/github/shadowsocks/database/Profile.kt @@ -60,8 +60,8 @@ data class Profile( var password: String = "u1rRWTssNv0p", var method: String = "aes-256-cfb", - var route: String = "all", - var remoteDns: String = "dns.google", + var route: String = "bypass-lan-china", + var remoteDns: String = "1.1.1.1", var proxyApps: Boolean = false, var bypass: Boolean = false, var udpdns: Boolean = false, diff --git a/core/src/main/java/com/github/shadowsocks/work/UpdateCheck.kt b/core/src/main/java/com/github/shadowsocks/work/UpdateCheck.kt index bbd91a8..71eeb05 100644 --- a/core/src/main/java/com/github/shadowsocks/work/UpdateCheck.kt +++ b/core/src/main/java/com/github/shadowsocks/work/UpdateCheck.kt @@ -24,9 +24,7 @@ import java.util.concurrent.TimeUnit class UpdateCheck(context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) { companion object { - const val url ="" //google play 发布，禁止自主更新 - //const val url = "https://raw.githubusercontent.com/bannedbook/SpeedUp.VPN/master/update.json" - + const val url ="https://raw.githubusercontent.com/bannedbook/ssvpn/master/update.json" //google play 发布，禁止自主更新 fun enqueue() = WorkManager.getInstance(Core.deviceStorage).enqueueUniquePeriodicWork( "UpdateCheck", ExistingPeriodicWorkPolicy.KEEP, PeriodicWorkRequestBuilder(1, TimeUnit.DAYS).run { diff --git a/gitupdate.bat b/gitupdate.bat index a5c824a..0070ceb 100644 --- a/gitupdate.bat +++ b/gitupdate.bat @@ -3,6 +3,6 @@ git pull origin master git add -A git commit -m "update" git push origin master -git tag -a v5.0.3 -m "release v5.0.3" +git tag -a v5.0.3.1 -m "release v5.0.3.1" git push origin --tags pause \ No newline at end of file