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
c852fc24
Commit
c852fc24
authored
Aug 18, 2020
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use singleTask launchMode
parent
edbe4704
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
58 deletions
+9
-58
core/src/main/java/com/github/shadowsocks/utils/SingleInstanceActivity.kt
...va/com/github/shadowsocks/utils/SingleInstanceActivity.kt
+0
-45
mobile/src/main/AndroidManifest.xml
mobile/src/main/AndroidManifest.xml
+7
-2
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
+0
-2
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+0
-2
mobile/src/main/java/com/github/shadowsocks/ProfileConfigActivity.kt
...main/java/com/github/shadowsocks/ProfileConfigActivity.kt
+0
-2
mobile/src/main/java/com/github/shadowsocks/UdpFallbackProfileActivity.kt
...java/com/github/shadowsocks/UdpFallbackProfileActivity.kt
+0
-2
tv/src/main/AndroidManifest.xml
tv/src/main/AndroidManifest.xml
+2
-1
tv/src/main/java/com/github/shadowsocks/tv/MainActivity.kt
tv/src/main/java/com/github/shadowsocks/tv/MainActivity.kt
+0
-2
No files found.
core/src/main/java/com/github/shadowsocks/utils/SingleInstanceActivity.kt
deleted
100644 → 0
View file @
edbe4704
/*******************************************************************************
* *
* Copyright (C) 2019 by Max Lv <max.c.lv@gmail.com> *
* Copyright (C) 2019 by Mygod Studio <contact-shadowsocks-android@mygod.be> *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
* *
*******************************************************************************/
package
com.github.shadowsocks.utils
import
androidx.activity.ComponentActivity
import
androidx.annotation.MainThread
import
androidx.lifecycle.DefaultLifecycleObserver
import
androidx.lifecycle.LifecycleOwner
/**
* See also: https://stackoverflow.com/a/30821062/2245107
*/
object
SingleInstanceActivity
:
DefaultLifecycleObserver
{
private
val
active
=
mutableSetOf
<
Class
<
LifecycleOwner
>>()
@MainThread
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/src/main/AndroidManifest.xml
View file @
c852fc24
...
...
@@ -20,7 +20,7 @@
android:name=
".MainActivity"
android:label=
"@string/app_name"
android:theme=
"@style/Theme.Shadowsocks.Immersive.Navigation"
android:launchMode=
"singleT
op
"
>
android:launchMode=
"singleT
ask
"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
...
...
@@ -37,19 +37,22 @@
android:name=
".ProfileConfigActivity"
android:theme=
"@style/Theme.Shadowsocks.Immersive"
android:excludeFromRecents=
"true"
android:label=
"@string/profile_config"
/>
android:label=
"@string/profile_config"
android:launchMode=
"singleTask"
/>
<activity
android:name=
".AppManager"
android:label=
"@string/proxied_apps"
android:parentActivityName=
".ProfileConfigActivity"
android:theme=
"@style/Theme.Shadowsocks.Immersive"
android:launchMode=
"singleTask"
android:excludeFromRecents=
"true"
/>
<activity
android:name=
".UdpFallbackProfileActivity"
android:label=
"@string/udp_fallback"
android:theme=
"@style/Theme.Shadowsocks.Immersive"
android:launchMode=
"singleTask"
android:excludeFromRecents=
"true"
/>
<activity
...
...
@@ -57,6 +60,7 @@
android:label=
"@string/add_profile_methods_scan_qr_code"
android:parentActivityName=
".MainActivity"
android:theme=
"@style/Theme.Shadowsocks.Immersive"
android:launchMode=
"singleTask"
android:screenOrientation=
"locked"
android:excludeFromRecents=
"true"
/>
...
...
@@ -71,6 +75,7 @@
android:name=
".QuickToggleShortcut"
android:label=
"@string/quick_toggle"
android:theme=
"@android:style/Theme.Translucent.NoTitleBar"
android:launchMode=
"singleTask"
android:excludeFromRecents=
"true"
android:taskAffinity=
""
android:process=
":bg"
>
...
...
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
View file @
c852fc24
...
...
@@ -47,7 +47,6 @@ import com.github.shadowsocks.Core.app
import
com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.utils.DirectBoot
import
com.github.shadowsocks.utils.SingleInstanceActivity
import
com.github.shadowsocks.utils.listenForPackageChanges
import
com.github.shadowsocks.widget.ListHolderListener
import
com.github.shadowsocks.widget.ListListener
...
...
@@ -217,7 +216,6 @@ class AppManager : AppCompatActivity() {
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
SingleInstanceActivity
.
register
(
this
)
?:
return
setContentView
(
R
.
layout
.
layout_apps
)
ListHolderListener
.
setup
(
this
)
setSupportActionBar
(
toolbar
)
...
...
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
View file @
c852fc24
...
...
@@ -43,7 +43,6 @@ import com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.preference.OnPreferenceDataStoreChangeListener
import
com.github.shadowsocks.subscription.SubscriptionFragment
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.SingleInstanceActivity
import
com.github.shadowsocks.utils.StartService
import
com.github.shadowsocks.widget.ListHolderListener
import
com.github.shadowsocks.widget.ServiceButton
...
...
@@ -133,7 +132,6 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
SingleInstanceActivity
.
register
(
this
)
?:
return
setContentView
(
R
.
layout
.
layout_main
)
snackbar
=
findViewById
(
R
.
id
.
snackbar
)
snackbar
.
setOnApplyWindowInsetsListener
(
ListHolderListener
)
...
...
mobile/src/main/java/com/github/shadowsocks/ProfileConfigActivity.kt
View file @
c852fc24
...
...
@@ -34,7 +34,6 @@ import com.github.shadowsocks.plugin.AlertDialogFragment
import
com.github.shadowsocks.plugin.Empty
import
com.github.shadowsocks.plugin.PluginContract
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.utils.SingleInstanceActivity
import
com.github.shadowsocks.widget.ListHolderListener
class
ProfileConfigActivity
:
AppCompatActivity
()
{
...
...
@@ -51,7 +50,6 @@ class ProfileConfigActivity : AppCompatActivity() {
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
SingleInstanceActivity
.
register
(
this
)
?:
return
setContentView
(
R
.
layout
.
layout_profile_config
)
ListHolderListener
.
setup
(
this
)
setSupportActionBar
(
findViewById
(
R
.
id
.
toolbar
))
...
...
mobile/src/main/java/com/github/shadowsocks/UdpFallbackProfileActivity.kt
View file @
c852fc24
...
...
@@ -35,7 +35,6 @@ import com.github.shadowsocks.database.Profile
import
com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.plugin.PluginConfiguration
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.utils.SingleInstanceActivity
import
com.github.shadowsocks.utils.resolveResourceId
import
com.github.shadowsocks.widget.ListHolderListener
import
com.github.shadowsocks.widget.ListListener
...
...
@@ -85,7 +84,6 @@ class UdpFallbackProfileActivity : AppCompatActivity() {
finish
()
return
}
SingleInstanceActivity
.
register
(
this
)
?:
return
setContentView
(
R
.
layout
.
layout_udp_fallback
)
ListHolderListener
.
setup
(
this
)
...
...
tv/src/main/AndroidManifest.xml
View file @
c852fc24
...
...
@@ -17,7 +17,8 @@
tools:replace=
"theme"
>
<activity
android:name=
".MainActivity"
android:label=
"@string/app_name"
>
android:label=
"@string/app_name"
android:launchMode=
"singleTask"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainActivity.kt
View file @
c852fc24
...
...
@@ -22,12 +22,10 @@ package com.github.shadowsocks.tv
import
android.os.Bundle
import
androidx.appcompat.app.AppCompatActivity
import
com.github.shadowsocks.utils.SingleInstanceActivity
class
MainActivity
:
AppCompatActivity
()
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
SingleInstanceActivity
.
register
(
this
)
?:
return
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