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
3c3e5317
Commit
3c3e5317
authored
Jan 09, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add backup entry for custom rules
Refine #1069.
parent
1f6d6bbd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
src/main/scala/com/github/shadowsocks/ShadowsocksBackupAgent.scala
...scala/com/github/shadowsocks/ShadowsocksBackupAgent.scala
+3
-1
src/main/scala/com/github/shadowsocks/acl/Acl.scala
src/main/scala/com/github/shadowsocks/acl/Acl.scala
+4
-4
No files found.
src/main/scala/com/github/shadowsocks/ShadowsocksBackupAgent.scala
View file @
3c3e5317
...
...
@@ -21,6 +21,7 @@
package
com.github.shadowsocks
import
android.app.backup.
{
BackupAgentHelper
,
FileBackupHelper
,
SharedPreferencesBackupHelper
}
import
com.github.shadowsocks.acl.Acl
import
com.github.shadowsocks.database.DBHelper
class
ShadowsocksBackupAgent
extends
BackupAgentHelper
{
...
...
@@ -38,6 +39,7 @@ class ShadowsocksBackupAgent extends BackupAgentHelper {
override
def
onCreate
()
{
val
helper
=
new
SharedPreferencesBackupHelper
(
this
,
PREFS_DISPLAY
)
addHelper
(
MY_PREFS_BACKUP_KEY
,
helper
)
addHelper
(
DATABASE
,
new
FileBackupHelper
(
this
,
"../databases/"
+
DBHelper
.
PROFILE
))
addHelper
(
DATABASE
,
new
FileBackupHelper
(
this
,
"../databases/"
+
DBHelper
.
PROFILE
,
"../"
+
Acl
.
CUSTOM_RULES
+
".acl"
))
}
}
src/main/scala/com/github/shadowsocks/acl/Acl.scala
View file @
3c3e5317
...
...
@@ -51,15 +51,15 @@ class Acl {
bypass
=
other
.
bypass
this
}
def
fromSource
(
value
:
Source
)
:
Acl
=
{
def
fromSource
(
value
:
Source
,
defaultBypass
:
Boolean
=
false
)
:
Acl
=
{
bypassHostnames
.
clear
()
proxyHostnames
.
clear
()
this
.
subnets
.
clear
()
bypass
=
false
bypass
=
defaultBypass
lazy
val
bypassSubnets
=
new
mutable
.
SortedList
[
Subnet
]()
lazy
val
proxySubnets
=
new
mutable
.
SortedList
[
Subnet
]()
var
hostnames
:
mutable.SortedList
[
String
]
=
bypassHostnames
var
subnets
:
mutable.SortedList
[
Subnet
]
=
bypassSubnets
var
hostnames
:
mutable.SortedList
[
String
]
=
if
(
defaultBypass
)
proxyHostnames
else
bypassHostnames
var
subnets
:
mutable.SortedList
[
Subnet
]
=
if
(
defaultBypass
)
proxySubnets
else
bypassSubnets
for
(
line
<-
value
.
getLines
())
(
line
.
indexOf
(
'#'
)
match
{
case
-
1
=>
line
case
index
=>
line
.
substring
(
0
,
index
)
// trim comments
...
...
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