Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
9fc1a4e0
Commit
9fc1a4e0
authored
Dec 05, 2017
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the release build
parent
9bf2b4bb
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
26 deletions
+48
-26
core/build.gradle
core/build.gradle
+0
-6
mobile/build.gradle
mobile/build.gradle
+16
-0
mobile/proguard-rules.pro
mobile/proguard-rules.pro
+13
-2
mobile/src/main/java/com/github/shadowsocks/QuickToggleShortcut.kt
...c/main/java/com/github/shadowsocks/QuickToggleShortcut.kt
+1
-2
mobile/src/main/java/com/github/shadowsocks/bg/LocalDnsService.kt
...rc/main/java/com/github/shadowsocks/bg/LocalDnsService.kt
+18
-16
No files found.
core/build.gradle
View file @
9fc1a4e0
...
@@ -37,12 +37,6 @@ task goBuild(type: Exec) {
...
@@ -37,12 +37,6 @@ task goBuild(type: Exec) {
args
"-c"
,
"src/overture/make.bash "
+
minSdkVersion
args
"-c"
,
"src/overture/make.bash "
+
minSdkVersion
}
}
tasks
.
whenTaskAdded
{
task
->
if
(
task
.
name
==
'generateJsonModelDebug'
)
{
task
.
dependsOn
(
goBuild
)
}
}
dependencies
{
dependencies
{
api
project
(
':plugin'
)
api
project
(
':plugin'
)
testImplementation
"junit:junit:$junitVersion"
testImplementation
"junit:junit:$junitVersion"
...
...
mobile/build.gradle
View file @
9fc1a4e0
...
@@ -38,11 +38,15 @@ android {
...
@@ -38,11 +38,15 @@ android {
vectorDrawables
.
useSupportLibrary
true
vectorDrawables
.
useSupportLibrary
true
resConfigs
"fa"
,
"ja"
,
"ko"
,
"ru"
,
"zh-rCN"
,
"zh-rTW"
resConfigs
"fa"
,
"ja"
,
"ko"
,
"ru"
,
"zh-rCN"
,
"zh-rTW"
}
}
signingConfigs
{
release
}
buildTypes
{
buildTypes
{
release
{
release
{
shrinkResources
true
shrinkResources
true
minifyEnabled
true
minifyEnabled
true
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
signingConfig
signingConfigs
.
release
}
}
}
}
lintOptions
{
lintOptions
{
...
@@ -53,6 +57,18 @@ android {
...
@@ -53,6 +57,18 @@ android {
sourceSets
.
main
.
jniLibs
.
srcDirs
+=
new
File
(
project
(
':core'
).
projectDir
,
"src/main/jni/overture"
)
sourceSets
.
main
.
jniLibs
.
srcDirs
+=
new
File
(
project
(
':core'
).
projectDir
,
"src/main/jni/overture"
)
}
}
def
propsFile
=
rootProject
.
file
(
'local.properties'
)
if
(
propsFile
.
exists
())
{
def
props
=
new
Properties
()
props
.
load
(
new
FileInputStream
(
propsFile
))
android
.
signingConfigs
.
release
.
storeFile
=
file
(
props
[
'storeFile'
])
android
.
signingConfigs
.
release
.
storePassword
=
props
[
'storePassword'
]
android
.
signingConfigs
.
release
.
keyAlias
=
props
[
'keyAlias'
]
android
.
signingConfigs
.
release
.
keyPassword
=
props
[
'keyPassword'
]
}
else
{
android
.
buildTypes
.
release
.
signingConfig
=
null
}
dependencies
{
dependencies
{
implementation
project
(
':core'
)
implementation
project
(
':core'
)
implementation
"com.android.support:customtabs:$supportLibraryVersion"
implementation
"com.android.support:customtabs:$supportLibraryVersion"
...
...
mobile/proguard-rules.pro
View file @
9fc1a4e0
...
@@ -20,14 +20,25 @@
...
@@ -20,14 +20,25 @@
#
hide
the
original
source
file
name
.
#
hide
the
original
source
file
name
.
#-
renamesourcefileattribute
SourceFile
#-
renamesourcefileattribute
SourceFile
-
dontwarn
com
.
google
.
android
.
gms
.
internal
.
**
-
keepattributes
*
DatabaseField
*
-
keepattributes
*
DatabaseTable
*
-
keepattributes
*
SerializedName
*
-
keep
class
com
.
j256
.
**
-
keepclassmembers
class
com
.
j256
.
**
{
*
;
}
-
keep
enum
com
.
j256
.
**
-
keepclassmembers
enum
com
.
j256
.
**
{
*
;
}
-
keep
interface
com
.
j256
.
**
-
keepclassmembers
interface
com
.
j256
.
**
{
*
;
}
-
keep
class
com
.
github
.
shadowsocks
.
**
{
*
;
}
-
dontwarn
com
.
j256
.
ormlite
.
**
-
dontwarn
com
.
j256
.
ormlite
.
**
-
dontwarn
com
.
google
.
android
.
gms
.
internal
.
**
-
dontwarn
okhttp3
.
**
-
dontwarn
okhttp3
.
**
-
dontwarn
okio
.
**
-
dontwarn
okio
.
**
-
dontwarn
org
.
xbill
.
**
-
dontwarn
org
.
xbill
.
**
-
keep
class
com
.
github
.
shadowsocks
.
JniHelper
{
*
;
}
-
dontwarn
com
.
evernote
.
android
.
job
.
gcm
.
**
-
dontwarn
com
.
evernote
.
android
.
job
.
gcm
.
**
-
dontwarn
com
.
evernote
.
android
.
job
.
util
.
GcmAvailableHelper
-
dontwarn
com
.
evernote
.
android
.
job
.
util
.
GcmAvailableHelper
-
keep
public
class
com
.
evernote
.
android
.
job
.
v21
.
PlatformJobService
-
keep
public
class
com
.
evernote
.
android
.
job
.
v21
.
PlatformJobService
-
keep
public
class
com
.
evernote
.
android
.
job
.
v14
.
PlatformAlarmService
-
keep
public
class
com
.
evernote
.
android
.
job
.
v14
.
PlatformAlarmService
-
keep
public
class
com
.
evernote
.
android
.
job
.
v14
.
PlatformAlarmReceiver
-
keep
public
class
com
.
evernote
.
android
.
job
.
v14
.
PlatformAlarmReceiver
...
...
mobile/src/main/java/com/github/shadowsocks/QuickToggleShortcut.kt
View file @
9fc1a4e0
...
@@ -29,12 +29,11 @@ import android.os.PersistableBundle
...
@@ -29,12 +29,11 @@ import android.os.PersistableBundle
import
android.support.v4.content.pm.ShortcutInfoCompat
import
android.support.v4.content.pm.ShortcutInfoCompat
import
android.support.v4.content.pm.ShortcutManagerCompat
import
android.support.v4.content.pm.ShortcutManagerCompat
import
android.support.v4.graphics.drawable.IconCompat
import
android.support.v4.graphics.drawable.IconCompat
import
android.support.v7.app.AppCompatActivity
import
com.github.shadowsocks.App.Companion.app
import
com.github.shadowsocks.App.Companion.app
import
com.github.shadowsocks.aidl.IShadowsocksService
import
com.github.shadowsocks.aidl.IShadowsocksService
import
com.github.shadowsocks.bg.BaseService
import
com.github.shadowsocks.bg.BaseService
class
QuickToggleShortcut
:
A
ppCompatA
ctivity
(),
ShadowsocksConnection
.
Interface
{
class
QuickToggleShortcut
:
Activity
(),
ShadowsocksConnection
.
Interface
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?,
persistentState
:
PersistableBundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?,
persistentState
:
PersistableBundle
?)
{
super
.
onCreate
(
savedInstanceState
,
persistentState
)
super
.
onCreate
(
savedInstanceState
,
persistentState
)
if
(
intent
.
action
==
Intent
.
ACTION_CREATE_SHORTCUT
)
{
if
(
intent
.
action
==
Intent
.
ACTION_CREATE_SHORTCUT
)
{
...
...
mobile/src/main/java/com/github/shadowsocks/bg/LocalDnsService.kt
View file @
9fc1a4e0
...
@@ -46,15 +46,7 @@ object LocalDnsService {
...
@@ -46,15 +46,7 @@ object LocalDnsService {
super
.
startNativeProcesses
()
super
.
startNativeProcesses
()
val
profile
=
data
.
profile
!!
val
profile
=
data
.
profile
!!
fun
buildOvertureConfig
(
file
:
String
):
String
{
fun
makeDns
(
name
:
String
,
address
:
String
,
edns
:
Boolean
=
true
):
JSONObject
{
val
config
=
JSONObject
()
.
put
(
"BindAddress"
,
"127.0.0.1:"
+
DataStore
.
portLocalDns
)
.
put
(
"RedirectIPv6Record"
,
true
)
.
put
(
"DomainBase64Decode"
,
true
)
.
put
(
"HostsFile"
,
"hosts"
)
.
put
(
"MinimumTTL"
,
3600
)
.
put
(
"CacheSize"
,
4096
)
fun
makeDns
(
name
:
String
,
address
:
String
,
edns
:
Boolean
=
true
)
=
{
val
dns
=
JSONObject
()
val
dns
=
JSONObject
()
.
put
(
"Name"
,
name
)
.
put
(
"Name"
,
name
)
.
put
(
"Address"
,
(
when
(
address
.
parseNumericAddress
())
{
.
put
(
"Address"
,
(
when
(
address
.
parseNumericAddress
())
{
...
@@ -67,10 +59,20 @@ object LocalDnsService {
...
@@ -67,10 +59,20 @@ object LocalDnsService {
.
put
(
"Protocol"
,
"tcp"
)
.
put
(
"Protocol"
,
"tcp"
)
.
put
(
"Socks5Address"
,
"127.0.0.1:"
+
DataStore
.
portProxy
)
.
put
(
"Socks5Address"
,
"127.0.0.1:"
+
DataStore
.
portProxy
)
else
dns
.
put
(
"Protocol"
,
"udp"
)
else
dns
.
put
(
"Protocol"
,
"udp"
)
dns
return
dns
}
}
fun
buildOvertureConfig
(
file
:
String
):
String
{
val
config
=
JSONObject
()
.
put
(
"BindAddress"
,
"127.0.0.1:"
+
DataStore
.
portLocalDns
)
.
put
(
"RedirectIPv6Record"
,
true
)
.
put
(
"DomainBase64Decode"
,
true
)
.
put
(
"HostsFile"
,
"hosts"
)
.
put
(
"MinimumTTL"
,
3600
)
.
put
(
"CacheSize"
,
4096
)
val
remoteDns
=
JSONArray
(
profile
.
remoteDns
.
split
(
","
)
val
remoteDns
=
JSONArray
(
profile
.
remoteDns
.
split
(
","
)
.
mapIndexed
{
i
,
dns
->
makeDns
(
"UserDef-"
+
i
,
dns
.
trim
())
()
})
.
mapIndexed
{
i
,
dns
->
makeDns
(
"UserDef-"
+
i
,
dns
.
trim
())
})
val
localDns
=
JSONArray
(
arrayOf
(
val
localDns
=
JSONArray
(
arrayOf
(
makeDns
(
"Primary-1"
,
"119.29.29.29"
,
false
),
makeDns
(
"Primary-1"
,
"119.29.29.29"
,
false
),
makeDns
(
"Primary-2"
,
"114.114.114.114"
,
false
)
makeDns
(
"Primary-2"
,
"114.114.114.114"
,
false
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment