Merge branch 'release/0.3.0'

Author: lparam

CHANGES.md

@@ -1,3 +1,10 @@
+v1.3.0 (2015-10-9)
+-----------
+* Feature: Support ACL
+* Feature: Add App Manager
+* Change: Adjust Route policy
+
+
 v1.2.2 (2015-9-16)
 -----------
 * Hotfix: crypto initialization

app/build.gradle

@@ -8,14 +8,14 @@ if(file('../sign.gradle').exists()) {
 }
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
     defaultConfig {
         applicationId "io.github.xsocks"
         minSdkVersion 18
-        targetSdkVersion 22
-        versionCode 120
-        versionName '1.2.2'
+        targetSdkVersion 23
+        versionCode 130
+        versionName '1.3.0'
     }
     lintOptions {
         abortOnError true
@@ -30,7 +30,7 @@ android {
             }
             zipAlignEnabled true
             minifyEnabled true
-            shrinkResources true
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         applicationVariants.all { variant ->
@@ -66,15 +66,17 @@ def appendVersionNameVersionCode(variant, output, defaultConfig) {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:design:23.0.1'
+    compile 'com.android.support:support-annotations:23.0.1'
     compile 'io.reactivex:rxjava:1.0.14'
     compile 'io.reactivex:rxandroid:1.0.1'
     compile 'io.reactivex:rxjava-async-util:0.21.0'
+    compile 'com.trello:rxlifecycle:0.3.0'
+    compile 'com.trello:rxlifecycle-components:0.3.0'
     compile('com.mikepenz.materialdrawer:library:2.9.7@aar') {
         transitive = true
     }
-    compile 'com.nispok:snackbar:2.10.8'
-    compile 'commons-net:commons-net:3.3'
     compile 'dnsjava:dnsjava:2.1.7'
     compile 'com.google.code.gson:gson:2.3.1'
+    compile 'com.nostra13.universalimageloader:universal-image-loader:1.8.4'
 }

app/proguard-rules.pro

@@ -1,4 +1,3 @@
-
 # retrolambda
 -dontwarn java.lang.invoke.*
 
@@ -7,12 +6,23 @@
 
 # rxjava
 -dontwarn rx.internal.util.unsafe.*
-
-# snackbar
--dontwarn com.nispok.snackbar.*
+-keep class rx.internal.util.unsafe.** { *; }
 
 # materialdrawer
 -dontwarn com.mikepenz.materialdrawer.*
 
 # iconics
--dontwarn com.mikepenz.iconics.*
+-dontwarn com.mikepenz.iconics.*
+
+# gson
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class sun.misc.Unsafe { *; }
+-keep class com.google.gson.** { *; }
+
+# universal-image-loader
+-dontwarn com.nostra13.universalimageloader.**
+-keep class com.nostra13.universalimageloader.** { *; }
+
+# xsocks
+-keep class io.github.xsocks.model.** { *; }

app/src/main/AndroidManifest.xml

@@ -12,15 +12,15 @@
         android:required="false" />
 
     <application
-        android:name="io.github.xsocks.XsocksApplication"
+        android:name=".XsocksApplication"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
 
         <activity
-            android:name="io.github.xsocks.ui.MainActivity"
+            android:name=".ui.MainActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask" >
             <intent-filter>
@@ -30,18 +30,28 @@
         </activity>
 
         <activity
-            android:name="io.github.xsocks.ui.AboutActivity"
+            android:name=".ui.AppManagerActivity"
+            android:label="@string/title_activity_app_manager"
+            android:parentActivityName=".ui.MainActivity">
+            <intent-filter>
+                <action android:name="io.github.xsocks.ui.AppManagerActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".ui.AboutActivity"
             android:label="@string/about" >
         </activity>
 
         <activity
-            android:name="io.github.xsocks.ui.XsocksRunnerActivity"
+            android:name=".ui.XsocksRunnerActivity"
             android:launchMode="singleTask"
             android:theme="@android:style/Theme.NoDisplay" >
         </activity>
 
         <service
-            android:name="io.github.xsocks.service.XsocksVpnService"
+            android:name=".service.XsocksVpnService"
             android:enabled="true"
             android:exported="false"
             android:label="@string/app_name"
@@ -51,7 +61,7 @@
             </intent-filter>
         </service>
 
-        <receiver android:name="io.github.xsocks.XsocksReceiver" >
+        <receiver android:name=".XsocksReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="io.github.xsocks.ACTION_UPDATE_STATE" />

app/src/main/java/io/github/xsocks/model/Profile.java

@@ -19,7 +19,7 @@ public class Profile {
     private String route = "all";
     @SerializedName("global")
     private boolean global = true;
-    @SerializedName("bypass")
+    @SerializedName("route_bypass")
     private boolean bypass = false;
     @SerializedName("udpdns")
     private boolean udpdns = false;

app/src/main/java/io/github/xsocks/model/ProxiedApp.java

@@ -0,0 +1,35 @@
+package io.github.xsocks.model;
+
+public class ProxiedApp {
+    private int uid;
+    private String name;
+    private String packageName;
+    private boolean proxied;
+
+    public ProxiedApp(int uid, String name, String packageName, boolean proxied) {
+        this.uid = uid;
+        this.name = name;
+        this.packageName = packageName;
+        this.proxied = proxied;
+    }
+
+    public int getId() {
+        return uid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public boolean getProxied() {
+        return proxied;
+    }
+
+    public void setProxied(boolean proxied) {
+        this.proxied = proxied;
+    }
+}