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
a10889bb
Commit
a10889bb
authored
Nov 21, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a bug
parent
800e85dc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
9 deletions
+7
-9
src/main/AndroidManifest.xml
src/main/AndroidManifest.xml
+0
-2
src/main/res/xml/tracker.xml
src/main/res/xml/tracker.xml
+6
-1
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+0
-5
src/main/scala/com/github/shadowsocks/preferences/SummaryListPreference.scala
...ithub/shadowsocks/preferences/SummaryListPreference.scala
+1
-1
No files found.
src/main/AndroidManifest.xml
View file @
a10889bb
...
@@ -5,10 +5,8 @@
...
@@ -5,10 +5,8 @@
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.WAKE_LOCK"
/>
<uses-permission
android:name=
"android.permission.RECEIVE_BOOT_COMPLETED"
/>
<uses-permission
android:name=
"android.permission.RECEIVE_BOOT_COMPLETED"
/>
<uses-permission
android:name=
"android.permission.ACCESS_SUPERUSER"
/>
<uses-permission
android:name=
"android.permission.ACCESS_SUPERUSER"
/>
<uses-permission
android:name=
"android.permission.WRITE_SETTINGS"
/>
<uses-feature
<uses-feature
android:name=
"android.hardware.touchscreen"
android:name=
"android.hardware.touchscreen"
...
...
src/main/res/xml/tracker.xml
View file @
a10889bb
...
@@ -6,13 +6,18 @@
...
@@ -6,13 +6,18 @@
<!-- Enable automatic Activity measurement -->
<!-- Enable automatic Activity measurement -->
<bool
name=
"ga_autoActivityTracking"
>
true
</bool>
<bool
name=
"ga_autoActivityTracking"
>
true
</bool>
<!-- Enable exception reports -->
<bool
name=
"ga_reportUncaughtExceptions"
>
true
</bool>
<!-- The screen names that will appear in reports -->
<!-- The screen names that will appear in reports -->
<screenName
name=
"com.google.android.gms.analytics.samples.mobileplayground.ScreenviewFragment"
>
<screenName
name=
"com.google.android.gms.analytics.samples.mobileplayground.ScreenviewFragment"
>
Shadowsocks ScreenView
Shadowsocks ScreenView
</screenName>
</screenName>
<screenName
name=
"com.google.android.gms.analytics.samples.mobileplayground.EcommerceFragment"
>
<screenName
name=
"com.google.android.gms.analytics.samples.mobileplayground.EcommerceFragment"
>
Shadowsocks EcommerceView
Shadowsocks EcommerceView
</screenName>
</screenName>
<!-- The following value should be replaced with correct property id. -->
<!-- The following value should be replaced with correct property id. -->
<string
name=
"ga_trackingId"
>
UA-37082941-1
</string>
<string
name=
"ga_trackingId"
>
UA-37082941-1
</string>
</resources>
</resources>
\ No newline at end of file
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
a10889bb
...
@@ -128,11 +128,6 @@ object Shadowsocks {
...
@@ -128,11 +128,6 @@ object Shadowsocks {
// Helper functions
// Helper functions
def
updateListPreference
(
pref
:
Preference
,
value
:
String
)
{
def
updateListPreference
(
pref
:
Preference
,
value
:
String
)
{
pref
.
asInstanceOf
[
ListPreference
].
setValue
(
value
)
pref
.
asInstanceOf
[
ListPreference
].
setValue
(
value
)
val
entry
=
pref
.
asInstanceOf
[
ListPreference
].
getEntry
if
(
entry
!=
null
)
pref
.
setSummary
(
entry
)
else
pref
.
setSummary
(
value
)
}
}
def
updatePasswordEditTextPreference
(
pref
:
Preference
,
value
:
String
)
{
def
updatePasswordEditTextPreference
(
pref
:
Preference
,
value
:
String
)
{
...
...
src/main/scala/com/github/shadowsocks/preferences/SummaryListPreference.scala
View file @
a10889bb
...
@@ -56,7 +56,7 @@ class SummaryListPreference(context: Context, attrs: AttributeSet)
...
@@ -56,7 +56,7 @@ class SummaryListPreference(context: Context, attrs: AttributeSet)
}
}
override
def
setSummary
(
summary
:
CharSequence
)
{
override
def
setSummary
(
summary
:
CharSequence
)
{
if
(
summary
.
toString
.
isEmpty
)
{
if
(
summary
==
null
||
summary
.
toString
.
isEmpty
)
{
super
.
setSummary
(
""
)
super
.
setSummary
(
""
)
}
else
{
}
else
{
super
.
setSummary
(
summary
)
super
.
setSummary
(
summary
)
...
...
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