From 360cdc6184c6dc5bb8f0f1961830464ebc03034a Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 4 Feb 2020 09:50:41 +0800
Subject: [PATCH 1/4] Add alias v2ray-plugin

Fixes #18.
---
 app/src/main/AndroidManifest.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d4a1ff4..0162450 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,10 +20,18 @@
                 <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
                 <data android:scheme="plugin"
                       android:host="com.github.shadowsocks"
-                      android:pathPrefix="/v2ray"/>
+                      android:path="/v2ray"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
+                <data android:scheme="plugin"
+                      android:host="com.github.shadowsocks"
+                      android:path="/v2ray-plugin"/>
             </intent-filter>
             <meta-data android:name="com.github.shadowsocks.plugin.id"
                        android:value="v2ray"/>
+            <meta-data android:name="com.github.shadowsocks.plugin.id.aliases"
+                       android:value="v2ray-plugin"/>
             <meta-data android:name="com.github.shadowsocks.plugin.executable_path"
                        android:value="libv2ray.so"/>
         </provider>

From d1163dc939a5165dbd0a8cd36991fd8dde1f2405 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 4 Feb 2020 23:41:52 -0500
Subject: [PATCH 2/4] Make v2ray-plugin as default ID

---
 app/src/main/AndroidManifest.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0162450..699524f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,9 +29,9 @@
                       android:path="/v2ray-plugin"/>
             </intent-filter>
             <meta-data android:name="com.github.shadowsocks.plugin.id"
-                       android:value="v2ray"/>
-            <meta-data android:name="com.github.shadowsocks.plugin.id.aliases"
                        android:value="v2ray-plugin"/>
+            <meta-data android:name="com.github.shadowsocks.plugin.id.aliases"
+                       android:value="v2ray"/>
             <meta-data android:name="com.github.shadowsocks.plugin.executable_path"
                        android:value="libv2ray.so"/>
         </provider>
@@ -42,7 +42,7 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <data android:scheme="plugin"
                       android:host="com.github.shadowsocks"
-                      android:path="/v2ray"/>
+                      android:path="/v2ray-plugin"/>
             </intent-filter>
         </activity>
     </application>

From a862b32a2b71cbb9a11533e0613d529c20faac11 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Thu, 6 Feb 2020 14:29:24 +0800
Subject: [PATCH 3/4] bump version

---
 app/build.gradle             | 2 +-
 app/src/main/go/v2ray-plugin | 2 +-
 build.gradle                 | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 81a6717..7b1344d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,7 @@ tasks.whenTaskAdded { task ->
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.preference:preference:1.1.0'
-    implementation 'com.github.shadowsocks:plugin:1.3.3'
+    implementation 'com.github.shadowsocks:plugin:1.3.4'
     implementation 'com.takisoft.preferencex:preferencex-simplemenu:1.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
     testImplementation 'junit:junit:4.13'
diff --git a/app/src/main/go/v2ray-plugin b/app/src/main/go/v2ray-plugin
index ca36119..59b8f4f 160000
--- a/app/src/main/go/v2ray-plugin
+++ b/app/src/main/go/v2ray-plugin
@@ -1 +1 @@
-Subproject commit ca361195f584f3904c9440ac012bd4e8611f7b52
+Subproject commit 59b8f4fc46c7be399dad0620121a89efa656dc9c
diff --git a/build.gradle b/build.gradle
index 3009a20..acca36d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        mavenLocal()
     }
 }
 

From 0f664a1e69ed7ec0f6ef125c6379039a60d679f1 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 6 Feb 2020 23:22:15 -0500
Subject: [PATCH 4/4] Fix build I guess

---
 app/build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 7b1344d..f009af0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,15 @@ def getCurrentFlavor() {
     }
 }
 
+def javaVersion = JavaVersion.VERSION_1_8
+
 android {
     compileSdkVersion 29
+    compileOptions {
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
+    }
+    kotlinOptions.jvmTarget = javaVersion
     defaultConfig {
         applicationId "com.github.shadowsocks.plugin.v2ray"
         minSdkVersion rootProject.minSdkVersion