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
e5ca4722
Commit
e5ca4722
authored
Jan 08, 2013
by
Max Lv
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:shadowsocks/shadowsocks-android
parents
a5014a62
26f87584
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
96 additions
and
166 deletions
+96
-166
.travis.yml
.travis.yml
+1
-1
README.md
README.md
+1
-1
res/layout/layout_progress_bar.xml
res/layout/layout_progress_bar.xml
+0
-17
res/values/strings.xml
res/values/strings.xml
+89
-140
src/com/github/shadowsocks/Shadowsocks.java
src/com/github/shadowsocks/Shadowsocks.java
+5
-7
No files found.
.travis.yml
View file @
e5ca4722
...
@@ -2,7 +2,7 @@ language: java
...
@@ -2,7 +2,7 @@ language: java
before_install
:
before_install
:
-
wget http://dl.google.com/android/android-sdk_r21-linux.tgz
-
wget http://dl.google.com/android/android-sdk_r21-linux.tgz
-
tar -zxf android-sdk_r21-linux.tgz
-
tar -zxf android-sdk_r21-linux.tgz
-
export ANDROID_HOME=~/builds/
madeye
/shadowsocks-android/android-sdk-linux
-
export ANDROID_HOME=~/builds/
shadowsocks
/shadowsocks-android/android-sdk-linux
-
export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-
export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-
android update sdk --filter tools,platform-tools,android-16,addon-google_apis-google-16,extra-android-support,extra-google-admob_ads_sdk,extra-google-analytics_sdk,extra-google-gcm,extra-google-play_apk_expansion,extra-google-play_billing,extra-google-play_licensing --no-ui --force --no-https -a
-
android update sdk --filter tools,platform-tools,android-16,addon-google_apis-google-16,extra-android-support,extra-google-admob_ads_sdk,extra-google-analytics_sdk,extra-google-gcm,extra-google-play_apk_expansion,extra-google-play_billing,extra-google-play_licensing --no-ui --force --no-https -a
install
:
install
:
...
...
README.md
View file @
e5ca4722
...
@@ -4,7 +4,7 @@ A shadowsocks client for Android, powered by amazing nodejs/golang/libev.
...
@@ -4,7 +4,7 @@ A shadowsocks client for Android, powered by amazing nodejs/golang/libev.
## TRAVIS CI STATUS
## TRAVIS CI STATUS
[

](http://travis-ci.org/madeye
/shadowsocks-android)
[

](http://travis-ci.org/shadowsocks
/shadowsocks-android)
[
Nightly Builds
](
http://buildbot.sinaapp.com
)
[
Nightly Builds
](
http://buildbot.sinaapp.com
)
...
...
res/layout/layout_progress_bar.xml
deleted
100644 → 0
View file @
a5014a62
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:orientation=
"horizontal"
android:layout_width=
"fill_parent"
android:layout_height=
"fill_parent"
>
<ImageView
android:id=
"@+id/image"
android:layout_width=
"wrap_content"
android:layout_height=
"fill_parent"
android:layout_marginLeft=
"10dp"
android:layout_marginRight=
"10dp"
android:src=
"@drawable/ic_launcher"
/>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<TextView
android:id=
"@+id/down_tv"
android:layout_width=
"wrap_content"
android:layout_height=
"fill_parent"
android:textSize=
"14sp"
android:paddingBottom=
"4dp"
android:text=
"@string/downloading"
/>
<ProgressBar
android:id=
"@+id/pb"
android:layout_width=
"200dp"
android:layout_height=
"wrap_content"
style=
"?android:attr/progressBarStyleHorizontal"
/>
</LinearLayout>
</LinearLayout>
res/values/strings.xml
View file @
e5ca4722
This diff is collapsed.
Click to expand it.
src/com/github/shadowsocks/Shadowsocks.java
View file @
e5ca4722
...
@@ -176,12 +176,10 @@ public class Shadowsocks extends PreferenceActivity implements
...
@@ -176,12 +176,10 @@ public class Shadowsocks extends PreferenceActivity implements
isBypassAppsCheck
=
(
CheckBoxPreference
)
findPreference
(
"isBypassApps"
);
isBypassAppsCheck
=
(
CheckBoxPreference
)
findPreference
(
"isBypassApps"
);
isRunningCheck
=
(
CheckBoxPreference
)
findPreference
(
"isRunning"
);
isRunningCheck
=
(
CheckBoxPreference
)
findPreference
(
"isRunning"
);
if
(
mProgressDialog
==
null
)
if
(
mProgressDialog
==
null
)
{
mProgressDialog
=
ProgressDialog
.
show
(
this
,
""
,
mProgressDialog
=
ProgressDialog
.
show
(
this
,
""
,
getString
(
R
.
string
.
initializing
),
true
,
true
);
getString
(
R
.
string
.
initializing
),
true
,
true
);
}
final
SharedPreferences
settings
=
PreferenceManager
.
getDefaultSharedPreferences
(
this
);
new
Thread
()
{
new
Thread
()
{
@Override
@Override
...
@@ -197,14 +195,14 @@ public class Shadowsocks extends PreferenceActivity implements
...
@@ -197,14 +195,14 @@ public class Shadowsocks extends PreferenceActivity implements
versionName
=
"NONE"
;
versionName
=
"NONE"
;
}
}
if
(!
settings
.
getBoolean
(
versionName
,
false
))
{
final
SharedPreferences
settings
=
PreferenceManager
.
getDefaultSharedPreferences
(
Shadowsocks
.
this
);
if
(!
settings
.
getBoolean
(
versionName
,
false
))
{
Editor
edit
=
settings
.
edit
();
Editor
edit
=
settings
.
edit
();
edit
.
putBoolean
(
versionName
,
true
);
edit
.
putBoolean
(
versionName
,
true
);
edit
.
commit
();
edit
.
commit
();
reset
();
reset
();
}
}
handler
.
sendEmptyMessage
(
MSG_INITIAL_FINISH
);
handler
.
sendEmptyMessage
(
MSG_INITIAL_FINISH
);
...
...
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