update

build.gradle

@@ -14,8 +14,8 @@ buildscript {
         junitVersion = '4.13'
         androidTestVersion = '1.2.0'
         androidEspressoVersion = '3.2.0'
-        versionCode = 5000700
-        versionName = '5.0.6.7-nightly'
+        versionCode = 5000708
+        versionName = '5.0.6.8-nightly'
         resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW']
     }
 

core/build.gradle

@@ -55,7 +55,7 @@ def roomVersion = '2.2.3'
 def workVersion = '2.3.1'
 dependencies {
     api project(':plugin')
-    implementation project(':v2ray-plugin')
+    implementation project(':ssvpn-v2ray')
     api 'androidx.fragment:fragment-ktx:1.2.1'
     api "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
     api "androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion"

core/src/main/java/com/github/shadowsocks/plugin/PluginList.kt

@@ -34,8 +34,13 @@ class PluginList : ArrayList<Plugin>() {
     val lookup = mutableMapOf<String, Plugin>().apply {
         for (plugin in this@PluginList) {
             fun check(old: Plugin?) = check(old == null || old === plugin)
+            remove(plugin.id)
             check(put(plugin.id, plugin))
-            for (alias in plugin.idAliases) check(put(alias, plugin))
+
+            for (alias in plugin.idAliases) {
+                remove(alias)
+                check(put(alias, plugin))
+            }
         }
     }
 }

core/src/main/java/com/github/shadowsocks/plugin/PluginManager.kt

@@ -145,7 +145,7 @@ object PluginManager {
                         PackageManager.MATCH_DIRECT_BOOT_UNAWARE or PackageManager.MATCH_DIRECT_BOOT_AWARE
         )
         if (providers.isEmpty()) return null
-        val provider = providers.single().providerInfo
+        val provider = providers.first().providerInfo
         val options = configuration.getOptions { provider.loadString(PluginContract.METADATA_KEY_DEFAULT_CONFIG) }
         var failure: Throwable? = null
         try {

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.0.6.7 -m "release v5.0.6.7"
+git tag -a v5.0.6.8 -m "release v5.0.6.8"
 git push origin --tags
 pause

mobile/build.gradle

@@ -30,14 +30,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs rootProject.resConfigs
     }
-    signingConfigs {
-        release {
-            storeFile file("/root/java/andorid-key/ssr.key")
-            storePassword System.console().readLine("\nKeystore password: ")
-            keyAlias 'ssr'
-            keyPassword System.console().readLIne("\nKey password: ")
-        }
-    }
     buildTypes {
         debug {
             pseudoLocalesEnabled true
@@ -46,7 +38,6 @@ android {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
-            signingConfig signingConfigs.release
         }
     }
     compileOptions {

mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt

@@ -720,7 +720,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
                     Core.switchProfile(profilesAdapter.profiles[k].id)
                     activity?.runOnUiThread() {
                         layoutManager.scrollToPositionWithOffset(k, 0)
-                        layoutManager.stackFromEnd = true
+                        //layoutManager.stackFromEnd = true
                         profilesAdapter.refreshId(old)
                         profilesAdapter.refreshId(profilesAdapter.profiles[k].id)
                     }

settings.gradle

@@ -1 +1,2 @@
-include ':mobile', ':core', ':plugin', ':v2ray-plugin'
+include ':ssvpn-v2ray'
+include ':mobile', ':core', ':plugin'

ssvpn-v2ray/build.gradle

@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('ssvpn-v2ray-release.aar'))