update

bannedbook · Jun 22, 2020 · 442abea · 442abea
1 parent e49b461
commit 442abea
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,8 +14,8 @@ buildscript {
         junitVersion = '4.13'
         androidTestVersion = '1.2.0'
         androidEspressoVersion = '3.2.0'
-        versionCode = 5000948
-        versionName = '5.1.18-nightly'
+        versionCode = 5000958
+        versionName = '5.1.19-nightly'
         resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW']
     }
 

diff --git a/gitupdate.bat b/gitupdate.bat
@@ -3,6 +3,6 @@ git pull origin master
 git add -A
 git commit -m "update"
 git push origin master
-git tag -a v5.1.18 -m "release v5.1.18"
+git tag -a v5.1.19 -m "release v5.1.19"
 git push origin --tags
 pause
diff --git a/obfs/src/main/AndroidManifest.xml b/obfs/src/main/AndroidManifest.xml
@@ -7,10 +7,10 @@
                   android:exported="false"
                   android:authorities="${applicationId}.ObfsBinaryProvider">
             <intent-filter>
-                <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
+                <action android:name="free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
+                <action android:name="free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN"/>
                 <data android:scheme="plugin"
                       android:host="com.github.shadowsocks"
                       android:pathPrefix="/obfs-local"/>

diff --git a/plugin/README.md b/plugin/README.md
@@ -87,10 +87,10 @@ Then add it to your manifest:
                   android:directBootAware="true"
                   android:authorities="$FULLY_QUALIFIED_NAME_OF_YOUR_CONTENTPROVIDER">
             <intent-filter>
-                <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
+                <action android:name="free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
+                <action android:name="free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN"/>
                 <data android:scheme="plugin"
                       android:host="com.github.shadowsocks"
                       android:path="/$PLUGIN_ID"/>

diff --git a/plugin/doc.md b/plugin/doc.md
@@ -127,10 +127,10 @@ Every native mode plugin MUST have a content provider to provide the native exec
 
 * MUST have `android:label` and `android:icon`; (may be inherited from parent `application`)
 * SHOULD have `android:directBootAware="true"` with proper support if possible;
-* MUST have an intent filter with action `com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN`;
+* MUST have an intent filter with action `free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN`;
   (used for discovering plugins)
 * MUST have meta-data `com.github.shadowsocks.plugin.id` with string value `$PLUGIN_ID` or a string resource;
-* MUST have an intent filter with action `com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN` and
+* MUST have an intent filter with action `free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN` and
   data `plugin://com.github.shadowsocks/$PLUGIN_ID`; (used for configuring plugin)
 * CAN have meta-data `com.github.shadowsocks.plugin.default_config` with string value or a string resource, default is empty;
 * MUST implement `query` that returns the file list which MUST include `$PLUGIN_ID` when having
@@ -159,10 +159,10 @@ This corresponds to `com.github.shadowsocks.plugin.NativePluginProvider` in the
                   android:authorities="$FULLY_QUALIFIED_NAME_OF_YOUR_CONTENTPROVIDER"
                   tools:ignore="ExportedContentProvider">
             <intent-filter>
-                <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
+                <action android:name="free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
+                <action android:name="free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN"/>
                 <data android:scheme="plugin"
                       android:host="com.github.shadowsocks"
                       android:path="/$PLUGIN_ID"/>
@@ -249,7 +249,7 @@ To implement plugin ID aliasing, you:
 
 * MUST define meta-data `com.github.shadowsocks.plugin.id.aliases` in your plugin content provider with `android:value="alias"`,
   or use `android:resources` to specify a string resource or string array resource for multiple aliases.
-* MUST be able to be matched by `com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN` when invoked on alias.
+* MUST be able to be matched by `free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN` when invoked on alias.
   To do this, you SHOULD use multiple `intent-filter` and use a different `android:path` for each alias.
   Alternatively, you MAY also use a single `intent-filter` and use `android:pathPattern` to match all your aliases at once.
   You MUST NOT use `android:pathPrefix` or allow `android:pathPattern` to match undeclared plugin ID/alias as it might create a conflict with other plugins.
@@ -264,13 +264,13 @@ For example:
         <provider>
             ...
             <intent-filter>
-                <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
+                <action android:name="free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN"/>
                 <data android:scheme="plugin"
                       android:host="com.github.shadowsocks"
                       android:path="/$PLUGIN_ID"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"/>
+                <action android:name="free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN"/>
                 <data android:scheme="plugin"
                       android:host="com.github.shadowsocks"
                       android:path="/$PLUGIN_ALIAS"/>

diff --git a/plugin/src/main/java/com/github/shadowsocks/plugin/NativePluginProvider.kt b/plugin/src/main/java/com/github/shadowsocks/plugin/NativePluginProvider.kt
@@ -41,7 +41,6 @@ import androidx.core.os.bundleOf
  *        &lt;provider android:name="com.github.shadowsocks.$PLUGIN_ID.BinaryProvider"
  *                     android:authorities="com.github.shadowsocks.plugin.$PLUGIN_ID.BinaryProvider"&gt;
  *            &lt;intent-filter&gt;
- *                &lt;category android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN" /&gt;
  *            &lt;/intent-filter&gt;
  *        &lt;/provider&gt;
  *        ...

diff --git a/plugin/src/main/java/com/github/shadowsocks/plugin/PluginContract.kt b/plugin/src/main/java/com/github/shadowsocks/plugin/PluginContract.kt
@@ -28,10 +28,8 @@ package com.github.shadowsocks.plugin
 object PluginContract {
     /**
      * ContentProvider Action: Used for NativePluginProvider.
-     *
-     * Constant Value: "com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"
      */
-    const val ACTION_NATIVE_PLUGIN = "com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN"
+    const val ACTION_NATIVE_PLUGIN = "free.v2ray.proxy.VPN.ACTION_NATIVE_PLUGIN"
 
     /**
      * Activity Action: Used for ConfigurationActivity.