fix help and release pkg

Author: isayan

Readme-ja.md

@@ -14,8 +14,8 @@ TunProxyアプリを起動すると以下の画面が起動します。
 
 ![Tun Proxy](images/TunProxy.png)
 
-* Proxy address (host:port)
-  * 接続先のプロキシサーバを **IPアドレス:ポート番号** の形式で指定します。
+* Proxy address (ipv4:port)
+  * 接続先のプロキシサーバを **IPv4アドレス:ポート番号** の形式で指定します。
      IPアドレスはIPv4形式で記載する必要があります。
 
 * [Start] ボタン
@@ -59,12 +59,18 @@ Disallowed Application と Allowed Application の２つのモードがありま
 
 プリケーションリストは、画面上部のメニューアイコン(![Menu](images/Menu.png))からソートできます。
 
-* アプリ名で並べ替え
+* sort by app name
   * アプリケーション名でアプリケーションリストを並べ替えます。
 
-* パッケージ名で並べ替え
+* sort by package name
   * パッケージ名でアプリケーションリストを並べ替えます。
 
+* order by asc
+  * 昇順にソートします
+
+* order by desc
+  * 降順にソートします
+
 ### MITM (SSL 復号化)
 
 TunProxyはSSL復号化を実行しません。TunProxyは透過プロキシのように機能します。
@@ -109,5 +115,5 @@ SSLを復号化するには、ローカルプロキシツールのRoot証明書
 
 ## 開発環境
 
-* JRE(JDK) 1.8以上(Oracle JRE) (http://www.oracle.com/technetwork/java/javase/downloads/index.html)
-* AndroidStudio 3.4.2 (https://developer.android.com/studio/index.html)
+* JRE(JDK) 1.8以上(Open JDK)
+* AndroidStudio 3.6.1 (https://developer.android.com/studio/index.html)

Readme.md

@@ -3,17 +3,17 @@ Android HTTP traffic Proxy setting tool
 
 Language/[Japanese](https://github.com/raise-isayan/TunProxy/blob/master/Readme-ja.md)
 
-This tool is a proxy setting tool using Android VPNService.
-It is possible to acquire only HTTP traffic from the specified application.
+This tool is a proxy configuration tool that takes advantage of Android VPNService feature. 
+Only the communication from the specified application can be acquired.
 
 ## how to use
 
 When you start the TunProxy application, the following screen will be launched.
 
 ![Tun Proxy](images/TunProxy.png)
 
-* Proxy address (host:port)
-  * Specify the destination proxy server in the format **IP address:port number**.
+* Proxy address (ipv4:port)
+  * Specify the destination proxy server in the format **IPv4 address:port number**.
     The IP address must be described in IPv4 format.
 
 * [Start] button
@@ -63,6 +63,12 @@ The application list can be sorted from the menu icon  (![Menu](images/Menu.png)
 * sort by package name
   * Sort application list by package name
 
+* order by asc
+  * Sorting in ascending order
+
+* order by desc
+  * Sorting in descending order
+
 ### MITM (SSL decrypt)
 
 TunProxy does not perform SSL decryption. TunProxy acts like a transparent proxy.
@@ -105,5 +111,5 @@ Most of the code was created based on the following applications for creating ap
 
 ## Development environment
 
-* JRE(JDK) 1.8以上(Oracle JRE) (http://www.oracle.com/technetwork/java/javase/downloads/index.html)
-* AndroidStudio 3.4.2 (https://developer.android.com/studio/index.html)
+* JRE(JDK) 1.8以上(Open JDK)
+* AndroidStudio 3.6.1 (https://developer.android.com/studio/index.html)

android_app/app/build.gradle

@@ -8,13 +8,13 @@ android {
         applicationId "tun.proxy"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 100220
+        versionCode 100230
         versionName VERSION_NAME
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++11 -fvisibility=hidden "
-                abiFilters 'armeabi-v7a','arm64-v8a'
+                abiFilters 'armeabi-v7a','arm64-v8a', 'x86'
                 arguments "-DCMAKE_VERBOSE_MAKEFILE=1 -DANDROID_FUNCTION_LEVEL_LINKING=ON"
             }
         }
@@ -35,6 +35,7 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }
     lintOptions {
@@ -66,6 +67,10 @@ dependencies {
 
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.vectordrawable:vectordrawable:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.navigation:navigation-fragment:2.0.0'

android_app/app/release/app-release.aab

@@ -107,6 +107,8 @@ public boolean onPreferenceChange(Preference preference, Object value) {
                     // Set the summary to reflect the new value.
                     preference.setSummary(index >= 0 ? listPreference.getEntries()[index] : null);
 
+                    MyApplication.VPNMode mode =  MyApplication.VPNMode.values()[index];
+                    MyApplication.getInstance().storeVPNMode(mode);
                 }
                 return true;
                 }
@@ -413,6 +415,7 @@ private Set<String> getAllSelectedPackageSet() {
         }
 
         private void storeSelectedPackageSet(final Set<String> set) {
+            MyApplication.getInstance().storeVPNMode(this.mode);
             MyApplication.getInstance().storeVPNApplication(this.mode, set);
         }
 

android_app/app/src/main/java/tun/proxy/SettingsActivity.java

@@ -19,7 +19,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 APP_NAME=TunProxy
-VERSION_NAME=1.2.2
+VERSION_NAME=1.2.3
 
 productKeyStore=../changeit.jks
 productKeyAlias=key0