Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
c2bf045b
Commit
c2bf045b
authored
May 19, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #2209
parent
93423cd8
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
63 additions
and
14 deletions
+63
-14
build.gradle
build.gradle
+1
-0
core/build.gradle
core/build.gradle
+6
-0
core/src/main/AndroidManifest.xml
core/src/main/AndroidManifest.xml
+1
-2
core/src/main/java/com/github/shadowsocks/utils/SingleInstanceActivity.kt
...va/com/github/shadowsocks/utils/SingleInstanceActivity.kt
+25
-0
mobile/build.gradle
mobile/build.gradle
+4
-0
mobile/src/main/AndroidManifest.xml
mobile/src/main/AndroidManifest.xml
+5
-9
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
+2
-0
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+2
-0
mobile/src/main/java/com/github/shadowsocks/ProfileConfigActivity.kt
...main/java/com/github/shadowsocks/ProfileConfigActivity.kt
+2
-0
mobile/src/main/java/com/github/shadowsocks/UdpFallbackProfileActivity.kt
...java/com/github/shadowsocks/UdpFallbackProfileActivity.kt
+3
-1
plugin/build.gradle
plugin/build.gradle
+5
-0
tv/build.gradle
tv/build.gradle
+4
-0
tv/src/main/AndroidManifest.xml
tv/src/main/AndroidManifest.xml
+1
-2
tv/src/main/java/com/github/shadowsocks/tv/MainActivity.kt
tv/src/main/java/com/github/shadowsocks/tv/MainActivity.kt
+2
-0
No files found.
build.gradle
View file @
c2bf045b
...
@@ -4,6 +4,7 @@ apply plugin: 'com.github.ben-manes.versions'
...
@@ -4,6 +4,7 @@ apply plugin: 'com.github.ben-manes.versions'
buildscript
{
buildscript
{
ext
{
ext
{
javaVersion
=
JavaVersion
.
VERSION_1_8
kotlinVersion
=
'1.3.31'
kotlinVersion
=
'1.3.31'
minSdkVersion
=
21
minSdkVersion
=
21
sdkVersion
=
28
sdkVersion
=
28
...
...
core/build.gradle
View file @
c2bf045b
...
@@ -28,6 +28,11 @@ android {
...
@@ -28,6 +28,11 @@ android {
}
}
}
}
compileOptions
{
sourceCompatibility
javaVersion
targetCompatibility
javaVersion
}
externalNativeBuild
{
externalNativeBuild
{
ndkBuild
{
ndkBuild
{
path
'src/main/jni/Android.mk'
path
'src/main/jni/Android.mk'
...
@@ -47,6 +52,7 @@ def lifecycleVersion = '2.0.0'
...
@@ -47,6 +52,7 @@ def lifecycleVersion = '2.0.0'
def
roomVersion
=
'2.0.0'
def
roomVersion
=
'2.0.0'
dependencies
{
dependencies
{
api
project
(
':plugin'
)
api
project
(
':plugin'
)
api
"androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
api
"androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
api
"androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
api
"androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
api
"androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
api
'androidx.preference:preference:1.1.0-alpha05'
api
'androidx.preference:preference:1.1.0-alpha05'
...
...
core/src/main/AndroidManifest.xml
View file @
c2bf045b
...
@@ -59,8 +59,7 @@
...
@@ -59,8 +59,7 @@
android:name=
"com.github.shadowsocks.VpnRequestActivity"
android:name=
"com.github.shadowsocks.VpnRequestActivity"
android:theme=
"@style/Theme.AppCompat.Translucent"
android:theme=
"@style/Theme.AppCompat.Translucent"
android:excludeFromRecents=
"true"
android:excludeFromRecents=
"true"
android:taskAffinity=
""
android:taskAffinity=
""
/>
android:launchMode=
"singleTask"
/>
<receiver
android:name=
"com.github.shadowsocks.BootReceiver"
<receiver
android:name=
"com.github.shadowsocks.BootReceiver"
android:process=
":bg"
android:process=
":bg"
...
...
core/src/main/java/com/github/shadowsocks/utils/SingleInstanceActivity.kt
0 → 100644
View file @
c2bf045b
package
com.github.shadowsocks.utils
import
androidx.activity.ComponentActivity
import
androidx.lifecycle.DefaultLifecycleObserver
import
androidx.lifecycle.LifecycleOwner
import
java.util.*
import
java.util.concurrent.ConcurrentHashMap
/**
* See also: https://stackoverflow.com/a/30821062/2245107
*/
object
SingleInstanceActivity
:
DefaultLifecycleObserver
{
private
val
active
=
Collections
.
newSetFromMap
(
ConcurrentHashMap
<
Class
<
LifecycleOwner
>,
Boolean
>())
fun
register
(
activity
:
ComponentActivity
)
=
if
(
active
.
add
(
activity
.
javaClass
))
apply
{
activity
.
lifecycle
.
addObserver
(
this
)
}
else
{
activity
.
finish
()
null
}
override
fun
onDestroy
(
owner
:
LifecycleOwner
)
{
check
(
active
.
remove
(
owner
.
javaClass
))
{
"Double destroy?"
}
}
}
mobile/build.gradle
View file @
c2bf045b
...
@@ -39,6 +39,10 @@ android {
...
@@ -39,6 +39,10 @@ android {
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
}
}
}
}
compileOptions
{
sourceCompatibility
javaVersion
targetCompatibility
javaVersion
}
packagingOptions
.
exclude
'**/*.kotlin_*'
packagingOptions
.
exclude
'**/*.kotlin_*'
splits
{
splits
{
abi
{
abi
{
...
...
mobile/src/main/AndroidManifest.xml
View file @
c2bf045b
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
android:name=
".MainActivity"
android:name=
".MainActivity"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:theme=
"@style/Theme.Shadowsocks.Navigation"
android:theme=
"@style/Theme.Shadowsocks.Navigation"
android:launchMode=
"singleT
ask
"
>
android:launchMode=
"singleT
op
"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
...
@@ -48,22 +48,19 @@
...
@@ -48,22 +48,19 @@
<activity
<activity
android:name=
".ProfileConfigActivity"
android:name=
".ProfileConfigActivity"
android:excludeFromRecents=
"true"
android:excludeFromRecents=
"true"
android:label=
"@string/profile_config"
android:label=
"@string/profile_config"
/>
android:launchMode=
"singleTask"
/>
<activity
<activity
android:name=
".AppManager"
android:name=
".AppManager"
android:label=
"@string/proxied_apps"
android:label=
"@string/proxied_apps"
android:parentActivityName=
".ProfileConfigActivity"
android:parentActivityName=
".ProfileConfigActivity"
android:excludeFromRecents=
"true"
android:excludeFromRecents=
"true"
/>
android:launchMode=
"singleTask"
/>
<activity
<activity
android:name=
".UdpFallbackProfileActivity"
android:name=
".UdpFallbackProfileActivity"
android:label=
"@string/udp_fallback"
android:label=
"@string/udp_fallback"
android:parentActivityName=
".ProfileConfigActivity"
android:parentActivityName=
".ProfileConfigActivity"
android:excludeFromRecents=
"true"
android:excludeFromRecents=
"true"
/>
android:launchMode=
"singleTask"
/>
<activity
<activity
android:name=
".ScannerActivity"
android:name=
".ScannerActivity"
...
@@ -84,8 +81,7 @@
...
@@ -84,8 +81,7 @@
android:theme=
"@android:style/Theme.Translucent.NoTitleBar"
android:theme=
"@android:style/Theme.Translucent.NoTitleBar"
android:excludeFromRecents=
"true"
android:excludeFromRecents=
"true"
android:taskAffinity=
""
android:taskAffinity=
""
android:process=
":bg"
android:process=
":bg"
>
android:launchMode=
"singleTask"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.CREATE_SHORTCUT"
/>
<action
android:name=
"android.intent.action.CREATE_SHORTCUT"
/>
</intent-filter>
</intent-filter>
...
...
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
View file @
c2bf045b
...
@@ -49,6 +49,7 @@ import com.github.shadowsocks.database.ProfileManager
...
@@ -49,6 +49,7 @@ import com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.utils.DirectBoot
import
com.github.shadowsocks.utils.DirectBoot
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.SingleInstanceActivity
import
com.google.android.material.snackbar.Snackbar
import
com.google.android.material.snackbar.Snackbar
import
kotlinx.android.synthetic.main.layout_apps.*
import
kotlinx.android.synthetic.main.layout_apps.*
import
kotlinx.android.synthetic.main.layout_apps_item.view.*
import
kotlinx.android.synthetic.main.layout_apps_item.view.*
...
@@ -208,6 +209,7 @@ class AppManager : AppCompatActivity() {
...
@@ -208,6 +209,7 @@ class AppManager : AppCompatActivity() {
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
SingleInstanceActivity
.
register
(
this
)
?:
return
setContentView
(
R
.
layout
.
layout_apps
)
setContentView
(
R
.
layout
.
layout_apps
)
setSupportActionBar
(
toolbar
)
setSupportActionBar
(
toolbar
)
supportActionBar
!!
.
setDisplayHomeAsUpEnabled
(
true
)
supportActionBar
!!
.
setDisplayHomeAsUpEnabled
(
true
)
...
...
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
View file @
c2bf045b
...
@@ -58,6 +58,7 @@ import com.github.shadowsocks.plugin.Empty
...
@@ -58,6 +58,7 @@ import com.github.shadowsocks.plugin.Empty
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.preference.OnPreferenceDataStoreChangeListener
import
com.github.shadowsocks.preference.OnPreferenceDataStoreChangeListener
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.SingleInstanceActivity
import
com.github.shadowsocks.widget.ServiceButton
import
com.github.shadowsocks.widget.ServiceButton
import
com.github.shadowsocks.widget.StatsBar
import
com.github.shadowsocks.widget.StatsBar
import
com.google.android.material.navigation.NavigationView
import
com.google.android.material.navigation.NavigationView
...
@@ -167,6 +168,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
...
@@ -167,6 +168,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
SingleInstanceActivity
.
register
(
this
)
?:
return
setContentView
(
R
.
layout
.
layout_main
)
setContentView
(
R
.
layout
.
layout_main
)
stats
=
findViewById
(
R
.
id
.
stats
)
stats
=
findViewById
(
R
.
id
.
stats
)
stats
.
setOnClickListener
{
if
(
state
==
BaseService
.
State
.
Connected
)
stats
.
testConnection
()
}
stats
.
setOnClickListener
{
if
(
state
==
BaseService
.
State
.
Connected
)
stats
.
testConnection
()
}
...
...
mobile/src/main/java/com/github/shadowsocks/ProfileConfigActivity.kt
View file @
c2bf045b
...
@@ -32,6 +32,7 @@ import com.github.shadowsocks.plugin.AlertDialogFragment
...
@@ -32,6 +32,7 @@ import com.github.shadowsocks.plugin.AlertDialogFragment
import
com.github.shadowsocks.plugin.Empty
import
com.github.shadowsocks.plugin.Empty
import
com.github.shadowsocks.plugin.PluginContract
import
com.github.shadowsocks.plugin.PluginContract
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.utils.SingleInstanceActivity
class
ProfileConfigActivity
:
AppCompatActivity
()
{
class
ProfileConfigActivity
:
AppCompatActivity
()
{
companion
object
{
companion
object
{
...
@@ -51,6 +52,7 @@ class ProfileConfigActivity : AppCompatActivity() {
...
@@ -51,6 +52,7 @@ class ProfileConfigActivity : AppCompatActivity() {
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
SingleInstanceActivity
.
register
(
this
)
?:
return
setContentView
(
R
.
layout
.
layout_profile_config
)
setContentView
(
R
.
layout
.
layout_profile_config
)
setSupportActionBar
(
findViewById
(
R
.
id
.
toolbar
))
setSupportActionBar
(
findViewById
(
R
.
id
.
toolbar
))
supportActionBar
!!
.
apply
{
supportActionBar
!!
.
apply
{
...
...
mobile/src/main/java/com/github/shadowsocks/UdpFallbackProfileActivity.kt
View file @
c2bf045b
...
@@ -35,6 +35,7 @@ import com.github.shadowsocks.database.Profile
...
@@ -35,6 +35,7 @@ import com.github.shadowsocks.database.Profile
import
com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.plugin.PluginConfiguration
import
com.github.shadowsocks.plugin.PluginConfiguration
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.utils.SingleInstanceActivity
import
com.github.shadowsocks.utils.resolveResourceId
import
com.github.shadowsocks.utils.resolveResourceId
class
UdpFallbackProfileActivity
:
AppCompatActivity
()
{
class
UdpFallbackProfileActivity
:
AppCompatActivity
()
{
...
@@ -77,11 +78,12 @@ class UdpFallbackProfileActivity : AppCompatActivity() {
...
@@ -77,11 +78,12 @@ class UdpFallbackProfileActivity : AppCompatActivity() {
private
val
profilesAdapter
=
ProfilesAdapter
()
private
val
profilesAdapter
=
ProfilesAdapter
()
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
if
(
editingId
==
null
)
{
if
(
editingId
==
null
)
{
finish
()
finish
()
return
return
}
}
super
.
onCreate
(
savedInstanceState
)
SingleInstanceActivity
.
register
(
this
)
?:
return
setContentView
(
R
.
layout
.
layout_udp_fallback
)
setContentView
(
R
.
layout
.
layout_udp_fallback
)
val
toolbar
=
findViewById
<
Toolbar
>(
R
.
id
.
toolbar
)
val
toolbar
=
findViewById
<
Toolbar
>(
R
.
id
.
toolbar
)
...
...
plugin/build.gradle
View file @
c2bf045b
...
@@ -26,6 +26,11 @@ android {
...
@@ -26,6 +26,11 @@ android {
testInstrumentationRunner
"androidx.testgetRepositoryPassword().runner.AndroidJUnitRunner"
testInstrumentationRunner
"androidx.testgetRepositoryPassword().runner.AndroidJUnitRunner"
}
}
compileOptions
{
sourceCompatibility
javaVersion
targetCompatibility
javaVersion
}
buildTypes
{
buildTypes
{
release
{
release
{
minifyEnabled
false
minifyEnabled
false
...
...
tv/build.gradle
View file @
c2bf045b
...
@@ -38,6 +38,10 @@ android {
...
@@ -38,6 +38,10 @@ android {
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
}
}
}
}
compileOptions
{
sourceCompatibility
javaVersion
targetCompatibility
javaVersion
}
packagingOptions
.
exclude
'**/*.kotlin_*'
packagingOptions
.
exclude
'**/*.kotlin_*'
splits
{
splits
{
abi
{
abi
{
...
...
tv/src/main/AndroidManifest.xml
View file @
c2bf045b
...
@@ -17,8 +17,7 @@
...
@@ -17,8 +17,7 @@
tools:replace=
"theme"
>
tools:replace=
"theme"
>
<activity
<activity
android:name=
".MainActivity"
android:name=
".MainActivity"
android:label=
"@string/app_name"
android:label=
"@string/app_name"
>
android:launchMode=
"singleTask"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<action
android:name=
"android.intent.action.MAIN"
/>
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainActivity.kt
View file @
c2bf045b
...
@@ -22,10 +22,12 @@ package com.github.shadowsocks.tv
...
@@ -22,10 +22,12 @@ package com.github.shadowsocks.tv
import
android.os.Bundle
import
android.os.Bundle
import
androidx.fragment.app.FragmentActivity
import
androidx.fragment.app.FragmentActivity
import
com.github.shadowsocks.utils.SingleInstanceActivity
class
MainActivity
:
FragmentActivity
()
{
class
MainActivity
:
FragmentActivity
()
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
SingleInstanceActivity
.
register
(
this
)
?:
return
setContentView
(
R
.
layout
.
activity_main
)
setContentView
(
R
.
layout
.
activity_main
)
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment