Commit e5ca4722 authored by Max Lv's avatar Max Lv

Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

parents a5014a62 26f87584
...@@ -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:
......
...@@ -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
[![Build Status](https://secure.travis-ci.org/madeye/shadowsocks-android.png)](http://travis-ci.org/madeye/shadowsocks-android) [![Build Status](https://secure.travis-ci.org/shadowsocks/shadowsocks-android.png)](http://travis-ci.org/shadowsocks/shadowsocks-android)
[Nightly Builds](http://buildbot.sinaapp.com) [Nightly Builds](http://buildbot.sinaapp.com)
......
<?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>
This diff is collapsed.
...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment