Rename package

OG-C · Nov 7, 2019 · c449b34 · c449b34
1 parent adc1502
commit c449b34
Show file tree

Hide file tree

Showing 64 changed files with 236 additions and 266 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# ShadowsocksRR
-A ShadowsocksRR client for Android, written in Java.
+# shadowsocksr
+A shadowsocksr client for Android, written in Java.
 
 
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion rootProject.compileSdkVersion
     defaultConfig {
-        applicationId "com.github.shadowsocksr_hmbsbige"
+        applicationId "com.bige0.shadowsocksr"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.sdkVersion
         versionCode rootProject.versionCode

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.github.shadowsocks">
+    package="com.bige0.shadowsocksr">
 
     <application
-        android:name=".ShadowsocksApplication"
+        android:name="com.bige0.shadowsocksr.ShadowsocksApplication"
         android:allowBackup="true"
         android:banner="@drawable/ic_start_connected"
         android:hardwareAccelerated="true"
@@ -16,7 +16,7 @@
         android:usesCleartextTraffic="true">
 
         <activity
-            android:name=".Shadowsocks"
+            android:name="com.bige0.shadowsocksr.Shadowsocks"
             android:label="@string/app_name"
             android:launchMode="singleTask">
             <intent-filter>
@@ -34,30 +34,30 @@
                 android:resource="@xml/shortcuts" />
         </activity>
         <activity
-            android:name=".ShadowsocksRunnerActivity"
+            android:name="com.bige0.shadowsocksr.ShadowsocksRunnerActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <activity
-            android:name=".ProfileManagerActivity"
+            android:name="com.bige0.shadowsocksr.ProfileManagerActivity"
             android:excludeFromRecents="true"
             android:label="@string/profiles"
             android:launchMode="singleTask"
-            android:parentActivityName=".Shadowsocks">
+            android:parentActivityName="com.bige0.shadowsocksr.Shadowsocks">
             <intent-filter>
-                <action android:name="com.github.shadowsocks.ProfileManagerActivity" />
+                <action android:name="com.bige0.shadowsocksr.ProfileManagerActivity" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="com.github.shadowsocks.intent.action.SORT" />
+                <action android:name="com.bige0.shadowsocksr.intent.action.SORT" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="com.github.shadowsocks.intent.action.SCAN" />
+                <action android:name="com.bige0.shadowsocksr.intent.action.SCAN" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -93,38 +93,38 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ScannerActivity"
+            android:name="com.bige0.shadowsocksr.ScannerActivity"
             android:excludeFromRecents="true"
             android:label="@string/add_profile_methods_scan_qr_code"
-            android:parentActivityName=".ProfileManagerActivity" />
+            android:parentActivityName="com.bige0.shadowsocksr.ProfileManagerActivity" />
         <activity
-            android:name=".AppManager"
+            android:name="com.bige0.shadowsocksr.AppManager"
             android:excludeFromRecents="true"
             android:label="@string/proxied_apps"
             android:launchMode="singleTask"
-            android:parentActivityName=".Shadowsocks" />
+            android:parentActivityName="com.bige0.shadowsocksr.Shadowsocks" />
         <activity
-            android:name=".TaskerActivity"
+            android:name="com.bige0.shadowsocksr.TaskerActivity"
             android:icon="@mipmap/ic_launcher">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".ShadowsocksQuickSwitchActivity"
+            android:name="com.bige0.shadowsocksr.ShadowsocksQuickSwitchActivity"
             android:excludeFromRecents="true"
             android:label="@string/quick_switch"
             android:launchMode="singleInstance"
             android:taskAffinity=""
             android:theme="@style/PopupTheme.QuickSwitch">
             <intent-filter>
-                <action android:name="com.github.shadowsocks.QUICK_SWITCH" />
+                <action android:name="com.bige0.shadowsocksr.QUICK_SWITCH" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".QuickToggleShortcut"
+            android:name="com.bige0.shadowsocksr.QuickToggleShortcut"
             android:excludeFromRecents="true"
             android:label="@string/quick_toggle"
             android:launchMode="singleTask"
@@ -140,7 +140,7 @@
             android:value="@integer/google_play_services_version" />
 
         <receiver
-            android:name=".BootReceiver"
+            android:name="com.bige0.shadowsocksr.BootReceiver"
             android:directBootAware="true"
             android:enabled="false">
             <intent-filter>
@@ -149,7 +149,7 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".TaskerReceiver"
+            android:name="com.bige0.shadowsocksr.TaskerReceiver"
             tools:ignore="ExportedReceiver">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
@@ -164,10 +164,10 @@
             android:process=":bg" />
 
         <service
-            android:name=".ShadowsocksRunnerService"
+            android:name="com.bige0.shadowsocksr.ShadowsocksRunnerService"
             android:exported="false" />
         <service
-            android:name=".ShadowsocksVpnService"
+            android:name="com.bige0.shadowsocksr.ShadowsocksVpnService"
             android:exported="false"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_VPN_SERVICE"
@@ -177,7 +177,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".ShadowsocksTileService"
+            android:name="com.bige0.shadowsocksr.ShadowsocksTileService"
             android:icon="@drawable/ic_start_connected"
             android:label="@string/quick_toggle"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"

diff --git a/...shadowsocks/aidl/IShadowsocksService.aidl → ...hadowsocksr/aidl/IShadowsocksService.aidl b/...shadowsocks/aidl/IShadowsocksService.aidl → ...hadowsocksr/aidl/IShadowsocksService.aidl
@@ -1,6 +1,6 @@
-package com.github.shadowsocks.aidl;
+package com.bige0.shadowsocksr.aidl;
 
-import com.github.shadowsocks.aidl.IShadowsocksServiceCallback;
+import com.bige0.shadowsocksr.aidl.IShadowsocksServiceCallback;
 
 interface IShadowsocksService {
   int getState();

diff --git a/...cks/aidl/IShadowsocksServiceCallback.aidl → ...ksr/aidl/IShadowsocksServiceCallback.aidl b/...cks/aidl/IShadowsocksServiceCallback.aidl → ...ksr/aidl/IShadowsocksServiceCallback.aidl
@@ -1,4 +1,4 @@
-package com.github.shadowsocks.aidl;
+package com.bige0.shadowsocksr.aidl;
 
 interface IShadowsocksServiceCallback {
   oneway void stateChanged(int state, String profileName, String msg);

diff --git a/...java/com/github/shadowsocks/AppManager.kt → ...java/com/bige0/shadowsocksr/AppManager.kt b/...java/com/github/shadowsocks/AppManager.kt → ...java/com/bige0/shadowsocksr/AppManager.kt
@@ -1,4 +1,4 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.*
 import android.app.*
@@ -11,8 +11,8 @@ import android.widget.*
 import androidx.appcompat.app.*
 import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.*
-import com.github.shadowsocks.database.*
-import com.github.shadowsocks.utils.*
+import com.bige0.shadowsocksr.database.*
+import com.bige0.shadowsocksr.utils.*
 import java.util.*
 import java.util.concurrent.atomic.*
 

diff --git a/...ava/com/github/shadowsocks/BaseService.kt → ...ava/com/bige0/shadowsocksr/BaseService.kt b/...ava/com/github/shadowsocks/BaseService.kt → ...ava/com/bige0/shadowsocksr/BaseService.kt
@@ -1,11 +1,11 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.app.*
 import android.content.*
 import android.os.*
-import com.github.shadowsocks.aidl.*
-import com.github.shadowsocks.database.*
-import com.github.shadowsocks.utils.*
+import com.bige0.shadowsocksr.aidl.*
+import com.bige0.shadowsocksr.database.*
+import com.bige0.shadowsocksr.utils.*
 import okhttp3.*
 import java.io.*
 import java.net.*
@@ -297,7 +297,7 @@ abstract class BaseService : Service()
 	private fun updateTrafficTotal(tx: Long, rx: Long)
 	{
 		// avoid race conditions without locking
-		val profile = this.profile
+		val profile = profile
 		if (profile != null)
 		{
 			val p = ShadowsocksApplication.app.profileManager.getProfile(profile.id)
@@ -352,7 +352,7 @@ abstract class BaseService : Service()
 		return START_NOT_STICKY
 	}
 
-	protected fun changeState(s: Int, msg: String? = null)
+	private fun changeState(s: Int, msg: String? = null)
 	{
 		val handler = Handler(Looper.getMainLooper())
 		handler.post {

diff --git a/.../com/github/shadowsocks/BaseVpnService.kt → .../com/bige0/shadowsocksr/BaseVpnService.kt b/.../com/github/shadowsocks/BaseVpnService.kt → .../com/bige0/shadowsocksr/BaseVpnService.kt
@@ -1,12 +1,12 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.app.*
 import android.content.*
 import android.net.*
 import android.os.*
-import com.github.shadowsocks.aidl.*
-import com.github.shadowsocks.database.*
-import com.github.shadowsocks.utils.*
+import com.bige0.shadowsocksr.aidl.*
+import com.bige0.shadowsocksr.database.*
+import com.bige0.shadowsocksr.utils.*
 import okhttp3.*
 import java.io.*
 import java.net.*
@@ -330,7 +330,7 @@ abstract class BaseVpnService : VpnService()
 	private fun updateTrafficTotal(tx: Long, rx: Long)
 	{
 		// avoid race conditions without locking
-		val profile = this.profile
+		val profile = profile
 		if (profile != null)
 		{
 			val p = ShadowsocksApplication.app.profileManager.getProfile(profile.id)

diff --git a/...va/com/github/shadowsocks/BootReceiver.kt → ...va/com/bige0/shadowsocksr/BootReceiver.kt b/...va/com/github/shadowsocks/BootReceiver.kt → ...va/com/bige0/shadowsocksr/BootReceiver.kt
@@ -1,11 +1,11 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.content.*
 import android.content.pm.*
 import android.os.*
 import androidx.core.content.*
-import com.github.shadowsocks.ShadowsocksApplication.Companion.app
-import com.github.shadowsocks.utils.*
+import com.bige0.shadowsocksr.ShadowsocksApplication.Companion.app
+import com.bige0.shadowsocksr.utils.*
 
 class BootReceiver : BroadcastReceiver()
 {

diff --git a/.../com/github/shadowsocks/GuardedProcess.kt → .../com/bige0/shadowsocksr/GuardedProcess.kt b/.../com/github/shadowsocks/GuardedProcess.kt → .../com/bige0/shadowsocksr/GuardedProcess.kt
@@ -1,9 +1,8 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.util.*
-import com.github.shadowsocks.utils.*
+import com.bige0.shadowsocksr.utils.*
 import java.io.*
-import java.lang.System
 import java.util.concurrent.*
 
 class GuardedProcess(private val cmd: List<String>)

diff --git a/...hub/shadowsocks/ProfileManagerActivity.kt → ...e0/shadowsocksr/ProfileManagerActivity.kt b/...hub/shadowsocks/ProfileManagerActivity.kt → ...e0/shadowsocksr/ProfileManagerActivity.kt
@@ -1,4 +1,4 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.annotation.*
 import android.app.*
@@ -20,14 +20,14 @@ import androidx.appcompat.widget.*
 import androidx.appcompat.widget.Toolbar
 import androidx.core.app.TaskStackBuilder
 import androidx.recyclerview.widget.*
+import com.bige0.shadowsocksr.aidl.*
+import com.bige0.shadowsocksr.database.*
+import com.bige0.shadowsocksr.network.ping.*
+import com.bige0.shadowsocksr.network.request.*
+import com.bige0.shadowsocksr.network.ssrsub.*
+import com.bige0.shadowsocksr.utils.*
+import com.bige0.shadowsocksr.widget.*
 import com.github.clans.fab.*
-import com.github.shadowsocks.aidl.*
-import com.github.shadowsocks.database.*
-import com.github.shadowsocks.network.ping.*
-import com.github.shadowsocks.network.request.*
-import com.github.shadowsocks.network.ssrsub.*
-import com.github.shadowsocks.utils.*
-import com.github.shadowsocks.widget.*
 import com.google.android.material.snackbar.*
 import net.glxn.qrgen.android.*
 import java.nio.charset.*

diff --git a/...github/shadowsocks/QuickToggleShortcut.kt → ...bige0/shadowsocksr/QuickToggleShortcut.kt b/...github/shadowsocks/QuickToggleShortcut.kt → ...bige0/shadowsocksr/QuickToggleShortcut.kt
@@ -1,4 +1,4 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.app.*
 import android.content.*
@@ -7,7 +7,7 @@ import android.os.*
 import androidx.core.content.*
 import androidx.core.content.pm.*
 import androidx.core.graphics.drawable.*
-import com.github.shadowsocks.utils.*
+import com.bige0.shadowsocksr.utils.*
 
 class QuickToggleShortcut : Activity()
 {

diff --git a/...com/github/shadowsocks/ScannerActivity.kt → ...com/bige0/shadowsocksr/ScannerActivity.kt b/...com/github/shadowsocks/ScannerActivity.kt → ...com/bige0/shadowsocksr/ScannerActivity.kt
@@ -1,4 +1,4 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.*
 import android.app.TaskStackBuilder
@@ -9,7 +9,7 @@ import androidx.appcompat.app.*
 import androidx.appcompat.widget.*
 import androidx.core.app.*
 import androidx.core.content.*
-import com.github.shadowsocks.utils.*
+import com.bige0.shadowsocksr.utils.*
 import com.google.zxing.*
 import me.dm7.barcodescanner.zxing.*
 

diff --git a/...github/shadowsocks/ServiceBoundContext.kt → ...bige0/shadowsocksr/ServiceBoundContext.kt b/...github/shadowsocks/ServiceBoundContext.kt → ...bige0/shadowsocksr/ServiceBoundContext.kt
@@ -1,9 +1,9 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.content.*
 import android.os.*
-import com.github.shadowsocks.aidl.*
-import com.github.shadowsocks.utils.*
+import com.bige0.shadowsocksr.aidl.*
+import com.bige0.shadowsocksr.utils.*
 
 open class ServiceBoundContext(base: Context) : ContextWrapper(base), IBinder.DeathRecipient
 {

diff --git a/...github/shadowsocks/ServiceBoundService.kt → ...bige0/shadowsocksr/ServiceBoundService.kt b/...github/shadowsocks/ServiceBoundService.kt → ...bige0/shadowsocksr/ServiceBoundService.kt
@@ -1,10 +1,10 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.app.*
 import android.content.*
 import android.os.*
-import com.github.shadowsocks.aidl.*
-import com.github.shadowsocks.utils.*
+import com.bige0.shadowsocksr.aidl.*
+import com.bige0.shadowsocksr.utils.*
 
 abstract class ServiceBoundService : Service(), IBinder.DeathRecipient
 {

diff --git a/...ava/com/github/shadowsocks/Shadowsocks.kt → ...ava/com/bige0/shadowsocksr/Shadowsocks.kt b/...ava/com/github/shadowsocks/Shadowsocks.kt → ...ava/com/bige0/shadowsocksr/Shadowsocks.kt
@@ -1,4 +1,4 @@
-package com.github.shadowsocks
+package com.bige0.shadowsocksr
 
 import android.annotation.*
 import android.app.*
@@ -12,12 +12,12 @@ import android.widget.*
 import androidx.appcompat.app.*
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.*
+import com.bige0.shadowsocksr.aidl.*
+import com.bige0.shadowsocksr.database.*
+import com.bige0.shadowsocksr.job.*
+import com.bige0.shadowsocksr.network.request.*
+import com.bige0.shadowsocksr.utils.*
 import com.github.jorgecastilloprz.*
-import com.github.shadowsocks.aidl.*
-import com.github.shadowsocks.database.*
-import com.github.shadowsocks.job.*
-import com.github.shadowsocks.network.request.*
-import com.github.shadowsocks.utils.*
 import com.google.android.material.floatingactionbutton.*
 import com.google.android.material.snackbar.*
 import java.util.*