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
b3f25710
Commit
b3f25710
authored
Jan 26, 2021
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix deprecation of kotlin extensions
parent
76008532
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
26 additions
and
20 deletions
+26
-20
core/build.gradle.kts
core/build.gradle.kts
+1
-1
core/src/main/java/com/github/shadowsocks/UrlImportActivity.kt
...src/main/java/com/github/shadowsocks/UrlImportActivity.kt
+1
-1
core/src/main/java/com/github/shadowsocks/aidl/TrafficStats.kt
...src/main/java/com/github/shadowsocks/aidl/TrafficStats.kt
+1
-1
core/src/main/java/com/github/shadowsocks/database/Profile.kt
.../src/main/java/com/github/shadowsocks/database/Profile.kt
+1
-1
mobile/build.gradle.kts
mobile/build.gradle.kts
+1
-1
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
+16
-10
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
...main/java/com/github/shadowsocks/ProfileConfigFragment.kt
+1
-1
mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
...in/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
+1
-1
mobile/src/main/java/com/github/shadowsocks/subscription/SubscriptionFragment.kt
...m/github/shadowsocks/subscription/SubscriptionFragment.kt
+1
-1
plugin/build.gradle.kts
plugin/build.gradle.kts
+1
-1
plugin/src/main/java/com/github/shadowsocks/plugin/Utils.kt
plugin/src/main/java/com/github/shadowsocks/plugin/Utils.kt
+1
-1
No files found.
core/build.gradle.kts
View file @
b3f25710
...
...
@@ -4,8 +4,8 @@ plugins {
id
(
"com.android.library"
)
id
(
"org.mozilla.rust-android-gradle.rust-android"
)
kotlin
(
"android"
)
kotlin
(
"android.extensions"
)
kotlin
(
"kapt"
)
id
(
"kotlin-parcelize"
)
}
setupCore
()
...
...
core/src/main/java/com/github/shadowsocks/UrlImportActivity.kt
View file @
b3f25710
...
...
@@ -32,7 +32,7 @@ import com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.plugin.AlertDialogFragment
import
com.github.shadowsocks.plugin.Empty
import
com.github.shadowsocks.plugin.showAllowingStateLoss
import
kotlinx.
android.parcel
.Parcelize
import
kotlinx.
parcelize
.Parcelize
class
UrlImportActivity
:
AppCompatActivity
()
{
@Parcelize
...
...
core/src/main/java/com/github/shadowsocks/aidl/TrafficStats.kt
View file @
b3f25710
...
...
@@ -21,7 +21,7 @@
package
com.github.shadowsocks.aidl
import
android.os.Parcelable
import
kotlinx.
android.parcel
.Parcelize
import
kotlinx.
parcelize
.Parcelize
@Parcelize
data class
TrafficStats
(
...
...
core/src/main/java/com/github/shadowsocks/database/Profile.kt
View file @
b3f25710
...
...
@@ -36,7 +36,7 @@ import com.google.gson.JsonArray
import
com.google.gson.JsonElement
import
com.google.gson.JsonObject
import
com.google.gson.JsonPrimitive
import
kotlinx.
android.parcel
.Parcelize
import
kotlinx.
parcelize
.Parcelize
import
org.json.JSONArray
import
org.json.JSONObject
import
timber.log.Timber
...
...
mobile/build.gradle.kts
View file @
b3f25710
...
...
@@ -4,7 +4,7 @@ plugins {
id
(
"com.google.gms.google-services"
)
id
(
"com.google.firebase.crashlytics"
)
kotlin
(
"android"
)
kotlin
(
"android.extensions
"
)
id
(
"kotlin-parcelize
"
)
}
setupApp
()
...
...
mobile/src/main/java/com/github/shadowsocks/AppManager.kt
View file @
b3f25710
...
...
@@ -33,11 +33,10 @@ import android.graphics.drawable.Drawable
import
android.os.Bundle
import
android.util.SparseBooleanArray
import
android.view.*
import
android.widget.Filter
import
android.widget.Filterable
import
android.widget.SearchView
import
android.widget.*
import
androidx.annotation.UiThread
import
androidx.appcompat.app.AppCompatActivity
import
androidx.appcompat.widget.Toolbar
import
androidx.core.util.set
import
androidx.core.view.ViewCompat
import
androidx.lifecycle.lifecycleScope
...
...
@@ -52,8 +51,6 @@ import com.github.shadowsocks.utils.listenForPackageChanges
import
com.github.shadowsocks.widget.ListHolderListener
import
com.github.shadowsocks.widget.ListListener
import
com.google.android.material.snackbar.Snackbar
import
kotlinx.android.synthetic.main.layout_apps.*
import
kotlinx.android.synthetic.main.layout_apps_item.view.*
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Job
import
kotlinx.coroutines.ensureActive
...
...
@@ -110,14 +107,14 @@ class AppManager : AppCompatActivity() {
fun
bind
(
app
:
ProxiedApp
)
{
item
=
app
itemView
.
itemicon
.
setImageDrawable
(
app
.
icon
)
itemView
.
title
.
text
=
app
.
name
itemView
.
desc
.
text
=
"${app.packageName} (${app.uid})"
itemView
.
itemcheck
.
isChecked
=
isProxiedApp
(
app
)
itemView
.
findViewById
<
ImageView
>(
R
.
id
.
itemicon
)
.
setImageDrawable
(
app
.
icon
)
itemView
.
findViewById
<
TextView
>(
R
.
id
.
title
)
.
text
=
app
.
name
itemView
.
findViewById
<
TextView
>(
R
.
id
.
desc
)
.
text
=
"${app.packageName} (${app.uid})"
itemView
.
findViewById
<
Switch
>(
R
.
id
.
itemcheck
)
.
isChecked
=
isProxiedApp
(
app
)
}
fun
handlePayload
(
payloads
:
List
<
String
>)
{
if
(
payloads
.
contains
(
SWITCH
))
itemView
.
itemcheck
.
isChecked
=
isProxiedApp
(
item
)
if
(
payloads
.
contains
(
SWITCH
))
itemView
.
findViewById
<
Switch
>(
R
.
id
.
itemcheck
)
.
isChecked
=
isProxiedApp
(
item
)
}
override
fun
onClick
(
v
:
View
?)
{
...
...
@@ -175,6 +172,11 @@ class AppManager : AppCompatActivity() {
override
fun
getPopupText
(
position
:
Int
)
=
filteredApps
[
position
].
name
.
firstOrNull
()
?.
toString
()
?:
""
}
private
val
loading
by
lazy
{
findViewById
<
View
>(
R
.
id
.
loading
)
}
private
lateinit
var
toolbar
:
Toolbar
private
lateinit
var
bypassGroup
:
RadioGroup
private
lateinit
var
list
:
RecyclerView
private
lateinit
var
search
:
SearchView
private
val
proxiedUids
=
SparseBooleanArray
()
private
var
loader
:
Job
?
=
null
private
var
apps
=
emptyList
<
ProxiedApp
>()
...
...
@@ -219,6 +221,7 @@ class AppManager : AppCompatActivity() {
super
.
onCreate
(
savedInstanceState
)
setContentView
(
R
.
layout
.
layout_apps
)
ListHolderListener
.
setup
(
this
)
toolbar
=
findViewById
(
R
.
id
.
toolbar
)
setSupportActionBar
(
toolbar
)
supportActionBar
!!
.
setDisplayHomeAsUpEnabled
(
true
)
...
...
@@ -227,6 +230,7 @@ class AppManager : AppCompatActivity() {
DataStore
.
dirty
=
true
}
bypassGroup
=
findViewById
(
R
.
id
.
bypassGroup
)
bypassGroup
.
check
(
if
(
DataStore
.
bypass
)
R
.
id
.
btn_bypass
else
R
.
id
.
btn_on
)
bypassGroup
.
setOnCheckedChangeListener
{
_
,
checkedId
->
DataStore
.
dirty
=
true
...
...
@@ -241,12 +245,14 @@ class AppManager : AppCompatActivity() {
}
initProxiedUids
()
list
=
findViewById
(
R
.
id
.
list
)
ViewCompat
.
setOnApplyWindowInsetsListener
(
list
,
ListListener
)
list
.
layoutManager
=
LinearLayoutManager
(
this
,
RecyclerView
.
VERTICAL
,
false
)
list
.
itemAnimator
=
DefaultItemAnimator
()
list
.
adapter
=
appsAdapter
FastScrollerBuilder
(
list
).
useMd2Style
().
build
()
search
=
findViewById
(
R
.
id
.
search
)
search
.
setOnQueryTextListener
(
object
:
SearchView
.
OnQueryTextListener
{
override
fun
onQueryTextSubmit
(
query
:
String
?)
=
false
override
fun
onQueryTextChange
(
newText
:
String
?)
=
true
.
also
{
appsAdapter
.
filter
.
filter
(
newText
)
}
...
...
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
View file @
b3f25710
...
...
@@ -45,9 +45,9 @@ import com.github.shadowsocks.preference.*
import
com.github.shadowsocks.utils.*
import
com.github.shadowsocks.widget.ListListener
import
com.google.android.material.snackbar.Snackbar
import
kotlinx.android.parcel.Parcelize
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.launch
import
kotlinx.parcelize.Parcelize
class
ProfileConfigFragment
:
PreferenceFragmentCompat
(),
Preference
.
OnPreferenceChangeListener
,
OnPreferenceDataStoreChangeListener
{
...
...
mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
View file @
b3f25710
...
...
@@ -54,7 +54,7 @@ import com.github.shadowsocks.widget.ListHolderListener
import
com.github.shadowsocks.widget.MainListListener
import
com.github.shadowsocks.widget.UndoSnackbarManager
import
com.google.android.material.textfield.TextInputLayout
import
kotlinx.
android.parcel
.Parcelize
import
kotlinx.
parcelize
.Parcelize
import
me.zhanghai.android.fastscroll.FastScrollerBuilder
import
timber.log.Timber
import
java.net.IDN
...
...
mobile/src/main/java/com/github/shadowsocks/subscription/SubscriptionFragment.kt
View file @
b3f25710
...
...
@@ -47,7 +47,7 @@ import com.github.shadowsocks.widget.ListHolderListener
import
com.github.shadowsocks.widget.MainListListener
import
com.github.shadowsocks.widget.UndoSnackbarManager
import
com.google.android.material.textfield.TextInputLayout
import
kotlinx.
android.parcel
.Parcelize
import
kotlinx.
parcelize
.Parcelize
import
me.zhanghai.android.fastscroll.FastScrollerBuilder
import
java.net.MalformedURLException
import
java.net.URL
...
...
plugin/build.gradle.kts
View file @
b3f25710
...
...
@@ -2,7 +2,7 @@ plugins {
id
(
"com.android.library"
)
id
(
"com.vanniktech.maven.publish"
)
kotlin
(
"android"
)
kotlin
(
"android.extensions
"
)
id
(
"kotlin-parcelize
"
)
}
setupCommon
()
...
...
plugin/src/main/java/com/github/shadowsocks/plugin/Utils.kt
View file @
b3f25710
...
...
@@ -25,7 +25,7 @@ package com.github.shadowsocks.plugin
import
android.os.Parcelable
import
androidx.fragment.app.DialogFragment
import
androidx.fragment.app.FragmentManager
import
kotlinx.
android.parcel
.Parcelize
import
kotlinx.
parcelize
.Parcelize
@Parcelize
class
Empty
:
Parcelable
...
...
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