rename package name

FAQ.md

@@ -70,5 +70,5 @@ Scala on Android已经停止维护多年，本项目基于最新SS Android客户
 
 ## 下载地址
 
-* [GitHub](https://github.com/shadowsocksRb/shadowsocksRb-android/releases)
-* [Telegram](https://t.me/ShadowsocksRb)
+* [GitHub](https://github.com/ShadowsocksR-Live/ssrdroid/releases)
+

README.md

@@ -17,8 +17,8 @@
 #### 獲取源碼
 
 ```shell script
-git clone --recurse-submodules https://github.com/ssrlive/ssrDroid3.git
-cd ssrDroid3
+git clone --recursive https://github.com/ShadowsocksR-Live/ssrDroid.git
+cd ssrDroid
 ```
 
 #### 編譯
@@ -46,7 +46,7 @@ GPLv3
     <li>tun2socks: <a href="https://github.com/shadowsocks/badvpn/blob/shadowsocks-android/COPYING">BSD</a></li>
     <li>pcre: <a href="https://android.googlesource.com/platform/external/pcre/+/master/dist2/LICENCE">BSD</a></li>
     <li>libancillary: <a href="https://github.com/shadowsocks/libancillary/blob/shadowsocks-android/COPYING">BSD</a></li>
-    <li>shadowsocksr-libev: <a href="https://github.com/shadowsocksRb/shadowsocksr-libev/blob/master/LICENSE">GPLv3</a></li>
+    <li>ssr-libev: <a href="https://github.com/ssrlive/ssr-libev/blob/master/LICENSE">GPLv3</a></li>
     <li>libsodium: <a href="https://github.com/jedisct1/libsodium/blob/master/LICENSE">ISC</a></li>
 </ul>
 

build.gradle

@@ -1,4 +1,5 @@
 ext {
+    appBinaryName = "ssrdroid"
     javaVersion = JavaVersion.VERSION_1_8
     ndkVersion = '24.0.8215888'
     minSdkVersion = 21

core/build.gradle

@@ -6,6 +6,7 @@ plugins {
 }
 
 android {
+    namespace 'com.github.shadowsocks.core'
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
     ndkVersion rootProject.ndkVersion

core/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.github.shadowsocks.core"
     android:installLocation="internalOnly">
 
     <permission

core/src/main/java/com/crashlytics/android/Crashlytics.kt

@@ -6,7 +6,7 @@ import com.github.shadowsocks.core.BuildConfig
 class Crashlytics {
     companion object {
         fun logException(throwable: Throwable) {
-            Log.e("shadowsocksRb", "Crashlytics logException:", throwable)
+            Log.e("ssrDroidJava", "Crashlytics logException:", throwable)
         }
 
         fun log(priority: Int, tag: String, msg: String?) {

core/src/main/java/com/github/shadowsocks/acl/AclSyncer.kt

@@ -52,7 +52,7 @@ class AclSyncer(context: Context, workerParams: WorkerParameters) : CoroutineWor
 
     override suspend fun doWork(): Result = try {
         val route = inputData.getString(KEY_ROUTE)!!
-        val connection = URL("https://raw.githubusercontent.com/shadowsocksrb/shadowsocks-android/master/core/src/main/assets/acl/$route.acl").openConnection() as HttpURLConnection
+        val connection = URL("https://raw.githubusercontent.com/ShadowsocksR-Live/ssrdroid/master/core/src/main/assets/acl/$route.acl").openConnection() as HttpURLConnection
         val acl = connection.useCancellable { inputStream.bufferedReader().use { it.readText() } }
         Acl.getFile(route).printWriter().use { it.write(acl) }
         Result.success()

core/src/main/java/com/github/shadowsocks/utils/Utils.kt

@@ -169,7 +169,7 @@ fun Context.getBitmap(id: Int): Bitmap {
 }
 
 fun HttpURLConnection.setUA(): HttpURLConnection {
-    setRequestProperty("User-Agent", "ShadowsocksRb (https://github.com/ShadowsocksRb)")
+    setRequestProperty("User-Agent", "ssrDroid (https://github.com/ShadowsocksR-Live)")
     setRequestProperty("X-Forwarded-For", "127.0.0.1")
     return this
 }

core/src/main/java/com/github/shadowsocks/work/UpdateCheck.kt

@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit
 class UpdateCheck(context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) {
     companion object {
 
-        const val url = "https://raw.githubusercontent.com/shadowsocksRb/shadowsocksRb-android/master/update.json"
+        const val url = "https://raw.githubusercontent.com/ShadowsocksR-Live/ssrdroid/master/update.json"
 
         fun enqueue() {
             if (Build.VERSION.SDK_INT >= 24 && !Core.user.isUserUnlocked) return

core/src/main/res/values-zh-rCN/strings.xml

@@ -98,9 +98,9 @@
     <string name="profiles">"配置文件"</string>
     <string name="settings">"设置选项"</string>
     <string name="faq">"常见问题"</string>
-    <string name="faq_url">https://github.com/shadowsocksRb/shadowsocksRb-android/blob/master/FAQ.md</string>
+    <string name="faq_url">https://github.com/ShadowsocksR-Live/ssrdroid/blob/master/FAQ.md</string>
     <string name="about">"关于"</string>
-    <string name="about_title">"ShadowsocksRb %s"</string>
+    <string name="about_title">"ssrDroid %s"</string>
     <string name="edit">"编辑"</string>
     <string name="share">"分享"</string>
     <string name="add_profile">"添加配置文件"</string>

core/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <string name="app_name">ShadowsocksRb</string>
+  <string name="app_name">ssrDroid</string>
   <string name="quick_toggle">Toggle</string>
   <string name="send_email">Send email</string>
 
@@ -99,7 +99,7 @@
   <string name="profiles">Profiles</string>
   <string name="settings">Settings</string>
   <string name="faq">FAQ</string>
-  <string name="faq_url">https://github.com/shadowsocksRb/shadowsocksRb-android/blob/master/FAQ.md</string>
+  <string name="faq_url">https://github.com/ShadowsocksR-Live/ssrdroid/blob/master/FAQ.md</string>
   <string name="about">About</string>
   <string name="about_title">Shadowsocks %s</string>
   <string name="edit">Edit</string>

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mobile/build.gradle

@@ -5,11 +5,12 @@ plugins {
 }
 
 android {
+    namespace 'com.github.shadowsocks'
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
     ndkVersion rootProject.ndkVersion
     defaultConfig {
-        applicationId "io.github.shadowsocksrb"
+        applicationId "com.ssrlive.ssrdroid"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.sdkVersion
         versionCode rootProject.versionCode
@@ -32,11 +33,21 @@ android {
                         '-Xmultifile-parts-inherit',
                 ]
             }
+            applicationVariants.all { variant ->
+                variant.outputs.all {
+                    outputFileName = "${appBinaryName}_${variant.buildType.name}_${defaultConfig.versionName}.apk"
+                }
+            }
         }
         debug {
             applicationIdSuffix '.debug'
             versionNameSuffix '-debug'
             resValue 'string', 'applicationId', defaultConfig.applicationId + applicationIdSuffix
+            applicationVariants.all { variant ->
+                variant.outputs.all {
+                    outputFileName = "${appBinaryName}_${variant.buildType.name}_${defaultConfig.versionName}.apk"
+                }
+            }
         }
     }
     signingConfigs {

mobile/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.github.shadowsocks">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"

mobile/src/main/res/layout/navigation_header.xml

@@ -17,7 +17,7 @@
               android:layout_centerVertical="true"
               android:fontFamily="@font/iceland"
               android:gravity="center"
-              android:text="shadowsocksRb"
+              android:text="ssrDroid"
               android:textColor="@android:color/white"
               android:textSize="32sp"
               tools:ignore="HardcodedText"/>

mobile/src/main/res/raw/about.html

@@ -25,7 +25,7 @@ <h3>Open Source Licenses</h3>
             <li>tun2socks: <a href="https://github.com/shadowsocks/badvpn/blob/shadowsocks-android/COPYING">BSD</a>&nbsp;</li>
             <li>pcre: <a href="https://android.googlesource.com/platform/external/pcre/+/master/dist2/LICENCE">BSD</a>&nbsp;</li>
             <li>libancillary: <a href="https://github.com/shadowsocks/libancillary/blob/shadowsocks-android/COPYING">BSD</a>&nbsp;</li>
-            <li>shadowsocksr-libev: <a href="https://github.com/shadowsocksRb/shadowsocksr-libev/blob/master/LICENSE">GPLv3</a>&nbsp;</li>
+            <li>ssr-libev: <a href="https://github.com/ssrlive/ssr-libev/blob/master/LICENSE">GPLv3</a>&nbsp;</li>
             <li>libsodium: <a href="https://github.com/jedisct1/libsodium/blob/master/LICENSE">ISC</a>&nbsp;</li>
         </ul>
         <ul>

plugin/build.gradle

@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+    namespace 'com.github.shadowsocks.plugin'
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
     ndkVersion rootProject.ndkVersion

plugin/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.github.shadowsocks.plugin">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:theme="@style/Theme.Shadowsocks">
     </application>

settings.gradle

@@ -5,7 +5,7 @@ pluginManagement {
         mavenCentral()
     }
     plugins {
-        def agp = '7.1.3'
+        def agp = '7.2.0'
         def kotlin = '1.5.21'
         id 'com.android.application' version agp
         id 'com.android.library' version agp

update.json

@@ -2,5 +2,5 @@
   "version": "408",
   "title": "检测到新版本",
   "text": "请尽快更新",
-  "uri": "https://github.com/shadowsocksRb/shadowsocksRb-android/releases/latest"
+  "uri": "https://github.com/ShadowsocksR-Live/ssrdroid/releases/latest"
 }