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
6240a1b4
Commit
6240a1b4
authored
Feb 01, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into dns-server
parents
732c46ee
78f021cd
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
95 additions
and
78 deletions
+95
-78
build.gradle
build.gradle
+1
-1
core/src/main/java/com/github/shadowsocks/bg/TrafficMonitor.kt
...src/main/java/com/github/shadowsocks/bg/TrafficMonitor.kt
+1
-1
core/src/main/java/com/github/shadowsocks/database/Profile.kt
.../src/main/java/com/github/shadowsocks/database/Profile.kt
+3
-2
mobile/src/main/java/com/github/shadowsocks/ProfileConfigActivity.kt
...main/java/com/github/shadowsocks/ProfileConfigActivity.kt
+1
-1
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/ProfilesFragment.kt
.../src/main/java/com/github/shadowsocks/ProfilesFragment.kt
+5
-4
plugin/build.gradle
plugin/build.gradle
+1
-1
tv/build.gradle
tv/build.gradle
+1
-1
tv/src/main/java/com/github/shadowsocks/tv/MainFragment.kt
tv/src/main/java/com/github/shadowsocks/tv/MainFragment.kt
+8
-8
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
.../java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
+38
-32
tv/src/main/java/com/github/shadowsocks/tv/ProfilesDialogFragment.kt
.../java/com/github/shadowsocks/tv/ProfilesDialogFragment.kt
+30
-21
tv/src/main/java/com/github/shadowsocks/tv/preference/LeanbackSingleListPreferenceDialogFragment.kt
.../preference/LeanbackSingleListPreferenceDialogFragment.kt
+5
-5
No files found.
build.gradle
View file @
6240a1b4
...
...
@@ -32,7 +32,7 @@ buildscript {
classpath
'com.android.tools.build:gradle:3.3.0'
classpath
'com.github.ben-manes:gradle-versions-plugin:0.20.0'
classpath
'com.google.gms:google-services:4.2.0'
classpath
'io.fabric.tools:gradle:1.27.
0
'
classpath
'io.fabric.tools:gradle:1.27.
1
'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
...
...
core/src/main/java/com/github/shadowsocks/bg/TrafficMonitor.kt
View file @
6240a1b4
...
...
@@ -30,7 +30,7 @@ import java.nio.ByteBuffer
import
java.nio.ByteOrder
class
TrafficMonitor
(
statFile
:
File
)
:
AutoCloseable
{
private
val
thread
=
object
:
LocalSocketListener
(
"TrafficMonitor
"
,
statFile
)
{
private
val
thread
=
object
:
LocalSocketListener
(
"TrafficMonitor
-"
+
statFile
.
name
,
statFile
)
{
private
val
buffer
=
ByteArray
(
16
)
private
val
stat
=
ByteBuffer
.
wrap
(
buffer
).
order
(
ByteOrder
.
LITTLE_ENDIAN
)
override
fun
acceptInternal
(
socket
:
LocalSocket
)
{
...
...
core/src/main/java/com/github/shadowsocks/database/Profile.kt
View file @
6240a1b4
...
...
@@ -23,6 +23,7 @@ package com.github.shadowsocks.database
import
android.net.Uri
import
android.util.Base64
import
android.util.Log
import
android.util.LongSparseArray
import
androidx.core.net.toUri
import
androidx.room.*
import
com.github.shadowsocks.plugin.PluginConfiguration
...
...
@@ -249,7 +250,7 @@ class Profile : Serializable {
}
override
fun
toString
()
=
toUri
().
toString
()
fun
toJson
(
profiles
:
Map
<
Long
,
Profile
>?
=
null
):
JSONObject
=
JSONObject
().
apply
{
fun
toJson
(
profiles
:
LongSparseArray
<
Profile
>?
=
null
):
JSONObject
=
JSONObject
().
apply
{
put
(
"server"
,
host
)
put
(
"server_port"
,
remotePort
)
put
(
"password"
,
password
)
...
...
@@ -274,7 +275,7 @@ class Profile : Serializable {
}
})
put
(
"udpdns"
,
udpdns
)
val
fallback
=
profiles
[
udpFallback
]
val
fallback
=
profiles
.
get
(
udpFallback
?:
return
@apply
)
if
(
fallback
!=
null
&&
fallback
.
plugin
.
isNullOrEmpty
())
fallback
.
toJson
().
also
{
put
(
"udp_fallback"
,
it
)
}
}
...
...
mobile/src/main/java/com/github/shadowsocks/ProfileConfigActivity.kt
View file @
6240a1b4
...
...
@@ -56,7 +56,7 @@ class ProfileConfigActivity : AppCompatActivity() {
menuInflater
.
inflate
(
R
.
menu
.
profile_config_menu
,
menu
)
return
true
}
override
fun
onOptionsItemSelected
(
item
:
MenuItem
?
)
=
child
.
onOptionsItemSelected
(
item
)
override
fun
onOptionsItemSelected
(
item
:
MenuItem
)
=
child
.
onOptionsItemSelected
(
item
)
override
fun
onBackPressed
()
{
if
(
DataStore
.
dirty
)
AlertDialog
.
Builder
(
this
)
...
...
mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
View file @
6240a1b4
...
...
@@ -179,7 +179,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
}
else
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
)
}
override
fun
onOptionsItemSelected
(
item
:
MenuItem
?)
=
when
(
item
?
.
itemId
)
{
override
fun
onOptionsItemSelected
(
item
:
MenuItem
)
=
when
(
item
.
itemId
)
{
R
.
id
.
action_delete
->
{
val
activity
=
requireActivity
()
AlertDialog
.
Builder
(
activity
)
...
...
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
View file @
6240a1b4
...
...
@@ -28,6 +28,7 @@ import android.nfc.NdefRecord
import
android.nfc.NfcAdapter
import
android.os.Bundle
import
android.text.format.Formatter
import
android.util.LongSparseArray
import
android.view.*
import
android.widget.ImageView
import
android.widget.LinearLayout
...
...
@@ -98,7 +99,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
return
image
}
override
fun
onAttach
(
context
:
Context
?
)
{
override
fun
onAttach
(
context
:
Context
)
{
super
.
onAttach
(
context
)
val
adapter
=
NfcAdapter
.
getDefaultAdapter
(
context
)
adapter
?.
setNdefPushMessage
(
NdefMessage
(
arrayOf
(
...
...
@@ -301,7 +302,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
val
profilesAdapter
by
lazy
{
ProfilesAdapter
()
}
private
lateinit
var
undoManager
:
UndoSnackbarManager
<
Profile
>
private
val
statsCache
=
mutableMapOf
<
Long
,
TrafficStats
>()
private
val
statsCache
=
LongSparseArray
<
TrafficStats
>()
private
val
clipboard
by
lazy
{
requireContext
().
getSystemService
<
ClipboardManager
>()
!!
}
...
...
@@ -443,7 +444,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
REQUEST_EXPORT_PROFILES
->
{
val
profiles
=
ProfileManager
.
getAllProfiles
()
if
(
profiles
!=
null
)
try
{
val
lookup
=
profiles
.
associateBy
{
it
.
id
}
val
lookup
=
LongSparseArray
<
Profile
>(
profiles
.
size
).
apply
{
profiles
.
forEach
{
put
(
it
.
id
,
it
)
}
}
requireContext
().
contentResolver
.
openOutputStream
(
data
?.
data
!!
)
!!
.
bufferedWriter
().
use
{
it
.
write
(
JSONArray
(
profiles
.
map
{
it
.
toJson
(
lookup
)
}.
toTypedArray
()).
toString
(
2
))
}
...
...
@@ -458,7 +459,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
override
fun
onTrafficUpdated
(
profileId
:
Long
,
stats
:
TrafficStats
)
{
if
(
profileId
!=
0L
)
{
// ignore aggregate stats
statsCache
[
profileId
]
=
stats
statsCache
.
put
(
profileId
,
stats
)
profilesAdapter
.
refreshId
(
profileId
)
}
}
...
...
plugin/build.gradle
View file @
6240a1b4
...
...
@@ -25,7 +25,7 @@ android {
dependencies
{
api
"androidx.core:core-ktx:1.0.1"
api
"com.google.android.material:material:1.1.0-alpha0
2
"
api
"com.google.android.material:material:1.1.0-alpha0
3
"
api
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
testImplementation
"junit:junit:$junitVersion"
androidTestImplementation
"androidx.test:runner:$androidTestVersion"
...
...
tv/build.gradle
View file @
6240a1b4
...
...
@@ -52,7 +52,7 @@ android {
dependencies
{
implementation
project
(
':core'
)
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
implementation
"androidx.leanback:leanback-preference:1.
0.0
"
implementation
"androidx.leanback:leanback-preference:1.
1.0-alpha01
"
}
apply
plugin:
'com.google.gms.google-services'
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainFragment.kt
View file @
6240a1b4
...
...
@@ -21,26 +21,26 @@
package
com.github.shadowsocks.tv
import
androidx.core.os.bundleOf
import
androidx.leanback.preference.LeanbackPreferenceDialogFragment
import
androidx.leanback.preference.LeanbackSettingsFragment
import
androidx.leanback.preference.LeanbackPreferenceDialogFragment
Compat
import
androidx.leanback.preference.LeanbackSettingsFragment
Compat
import
androidx.preference.*
import
com.github.shadowsocks.bg.BaseService
import
com.github.shadowsocks.tv.preference.LeanbackSingleListPreferenceDialogFragment
import
com.github.shadowsocks.utils.Key
class
MainFragment
:
LeanbackSettingsFragment
()
{
class
MainFragment
:
LeanbackSettingsFragment
Compat
()
{
override
fun
onPreferenceStartInitialScreen
()
=
startPreferenceFragment
(
MainPreferenceFragment
())
override
fun
onPreferenceStartScreen
(
caller
:
PreferenceFragment
?,
pref
:
PreferenceScreen
?):
Boolean
{
override
fun
onPreferenceStartScreen
(
caller
:
PreferenceFragment
Compat
?,
pref
:
PreferenceScreen
?):
Boolean
{
onPreferenceStartInitialScreen
()
return
true
}
override
fun
onPreferenceStartFragment
(
caller
:
PreferenceFragment
?,
pref
:
Preference
?)
=
false
override
fun
onPreferenceDisplayDialog
(
caller
:
PreferenceFragment
,
pref
:
Preference
?):
Boolean
{
override
fun
onPreferenceStartFragment
(
caller
:
PreferenceFragment
Compat
?,
pref
:
Preference
?)
=
false
override
fun
onPreferenceDisplayDialog
(
caller
:
PreferenceFragment
Compat
,
pref
:
Preference
?):
Boolean
{
if
(
pref
?.
key
==
Key
.
id
)
{
if
((
childFragmentManager
.
findFragmentById
(
R
.
id
.
settings_preference_fragment_container
)
as
MainPreferenceFragment
).
state
==
BaseService
.
STOPPED
)
{
startPreferenceFragment
(
ProfilesDialogFragment
().
apply
{
arguments
=
bundleOf
(
Pair
(
LeanbackPreferenceDialogFragment
.
ARG_KEY
,
Key
.
id
))
arguments
=
bundleOf
(
Pair
(
LeanbackPreferenceDialogFragment
Compat
.
ARG_KEY
,
Key
.
id
))
setTargetFragment
(
caller
,
0
)
})
}
...
...
@@ -48,7 +48,7 @@ class MainFragment : LeanbackSettingsFragment() {
}
if
(
pref
is
ListPreference
&&
pref
!
is
MultiSelectListPreference
)
{
startPreferenceFragment
(
LeanbackSingleListPreferenceDialogFragment
().
apply
{
arguments
=
bundleOf
(
Pair
(
LeanbackPreferenceDialogFragment
.
ARG_KEY
,
pref
.
key
))
arguments
=
bundleOf
(
Pair
(
LeanbackPreferenceDialogFragment
Compat
.
ARG_KEY
,
pref
.
key
))
setTargetFragment
(
caller
,
0
)
})
return
true
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
View file @
6240a1b4
This diff is collapsed.
Click to expand it.
tv/src/main/java/com/github/shadowsocks/tv/ProfilesDialogFragment.kt
View file @
6240a1b4
...
...
@@ -25,22 +25,40 @@ import android.text.format.Formatter
import
android.view.LayoutInflater
import
android.view.View
import
android.view.ViewGroup
import
android.widget.CompoundButton
import
android.widget.TextView
import
androidx.leanback.preference.LeanbackListPreferenceDialogFragment
import
androidx.leanback.preference.LeanbackListPreferenceDialogFragment
Compat
import
androidx.recyclerview.widget.RecyclerView
import
com.github.shadowsocks.Core
import
com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.plugin.PluginConfiguration
import
com.github.shadowsocks.preference.DataStore
class
ProfilesDialogFragment
:
LeanbackListPreferenceDialogFragment
()
{
inner
class
ProfilesAdapter
:
RecyclerView
.
Adapter
<
ViewHolder
>(),
ViewHolder
.
OnItemClickListener
{
private
val
profiles
=
ProfileManager
.
getAllProfiles
()
!!
class
ProfilesDialogFragment
:
LeanbackListPreferenceDialogFragmentCompat
()
{
private
inner
class
ProfileViewHolder
(
view
:
View
)
:
RecyclerView
.
ViewHolder
(
view
),
View
.
OnClickListener
{
val
widgetView
=
view
.
findViewById
<
CompoundButton
>(
R
.
id
.
button
)
val
titleView
=
view
.
findViewById
<
TextView
>(
android
.
R
.
id
.
title
)
init
{
view
.
findViewById
<
ViewGroup
>(
R
.
id
.
container
).
setOnClickListener
(
this
)
}
override
fun
onClick
(
v
:
View
)
{
val
index
=
adapterPosition
if
(
index
==
RecyclerView
.
NO_POSITION
)
return
Core
.
switchProfile
(
adapter
.
profiles
[
index
].
id
)
(
targetFragment
as
MainPreferenceFragment
).
startService
()
fragmentManager
?.
popBackStack
()
adapter
.
notifyDataSetChanged
()
}
}
private
inner
class
ProfilesAdapter
:
RecyclerView
.
Adapter
<
ProfileViewHolder
>()
{
val
profiles
=
ProfileManager
.
getAllProfiles
()
!!
override
fun
onCreateViewHolder
(
parent
:
ViewGroup
,
viewType
:
Int
)
=
ViewHolder
(
LayoutInflater
.
from
(
parent
.
context
).
inflate
(
R
.
layout
.
leanback_list_preference_item_single_2
,
parent
,
false
),
this
)
override
fun
onCreateViewHolder
(
parent
:
ViewGroup
,
viewType
:
Int
)
=
ProfileViewHolder
(
LayoutInflater
.
from
(
parent
.
context
).
inflate
(
R
.
layout
.
leanback_list_preference_item_single_2
,
parent
,
false
))
override
fun
onBindViewHolder
(
holder
:
ViewHolder
,
position
:
Int
)
{
override
fun
onBindViewHolder
(
holder
:
Profile
ViewHolder
,
position
:
Int
)
{
val
profile
=
profiles
[
position
]
holder
.
widgetView
.
isChecked
=
profile
.
id
==
DataStore
.
profileId
holder
.
titleView
.
text
=
profile
.
formattedName
...
...
@@ -54,24 +72,15 @@ class ProfilesDialogFragment : LeanbackListPreferenceDialogFragment() {
}
override
fun
getItemCount
()
=
profiles
.
size
override
fun
onItemClick
(
viewHolder
:
ViewHolder
)
{
val
index
=
viewHolder
.
adapterPosition
if
(
index
==
RecyclerView
.
NO_POSITION
)
return
Core
.
switchProfile
(
profiles
[
index
].
id
)
(
targetFragment
as
MainPreferenceFragment
).
startService
()
fragmentManager
?.
popBackStack
()
notifyDataSetChanged
()
}
val
selectedIndex
=
profiles
.
indexOfFirst
{
it
.
id
==
DataStore
.
profileId
}
}
override
fun
onCreateAdapter
()
=
ProfilesAdapter
()
override
fun
onCreateView
(
inflater
:
LayoutInflater
?,
container
:
ViewGroup
?,
savedInstanceState
:
Bundle
?):
View
{
private
val
adapter
=
ProfilesAdapter
()
override
fun
onCreateView
(
inflater
:
LayoutInflater
,
container
:
ViewGroup
?,
savedInstanceState
:
Bundle
?):
View
{
return
super
.
onCreateView
(
inflater
,
container
,
savedInstanceState
)
!!
.
also
{
val
list
=
it
.
findViewById
<
RecyclerView
>(
android
.
R
.
id
.
list
)
list
.
layoutManager
!!
.
scrollToPosition
((
list
.
adapter
as
ProfilesAdapter
).
selectedIndex
)
list
.
adapter
=
adapter
list
.
layoutManager
!!
.
scrollToPosition
(
adapter
.
profiles
.
indexOfFirst
{
it
.
id
==
DataStore
.
profileId
})
}
}
}
tv/src/main/java/com/github/shadowsocks/tv/preference/LeanbackSingleListPreferenceDialogFragment.kt
View file @
6240a1b4
...
...
@@ -24,21 +24,21 @@ import android.os.Bundle
import
android.view.LayoutInflater
import
android.view.View
import
android.view.ViewGroup
import
androidx.leanback.preference.LeanbackListPreferenceDialogFragment
import
androidx.leanback.preference.LeanbackListPreferenceDialogFragment
Compat
import
androidx.recyclerview.widget.RecyclerView
/**
* Fix: scroll to selected item.
*/
open
class
LeanbackSingleListPreferenceDialogFragment
:
LeanbackListPreferenceDialogFragment
()
{
open
class
LeanbackSingleListPreferenceDialogFragment
:
LeanbackListPreferenceDialogFragment
Compat
()
{
companion
object
{
private
val
mEntryValues
=
LeanbackListPreferenceDialogFragment
::
class
.
java
private
val
mEntryValues
=
LeanbackListPreferenceDialogFragment
Compat
::
class
.
java
.
getDeclaredField
(
"mEntryValues"
).
apply
{
isAccessible
=
true
}
private
val
mInitialSelection
=
LeanbackListPreferenceDialogFragment
::
class
.
java
private
val
mInitialSelection
=
LeanbackListPreferenceDialogFragment
Compat
::
class
.
java
.
getDeclaredField
(
"mInitialSelection"
).
apply
{
isAccessible
=
true
}
}
override
fun
onCreateView
(
inflater
:
LayoutInflater
?,
container
:
ViewGroup
?,
savedInstanceState
:
Bundle
?):
View
{
override
fun
onCreateView
(
inflater
:
LayoutInflater
,
container
:
ViewGroup
?,
savedInstanceState
:
Bundle
?):
View
?
{
val
selected
=
mInitialSelection
.
get
(
this
)
as
?
String
val
index
=
(
mEntryValues
.
get
(
this
)
as
?
Array
<
CharSequence
?
>)
?.
indexOfFirst
{
it
==
selected
}
return
super
.
onCreateView
(
inflater
,
container
,
savedInstanceState
)
!!
.
also
{
...
...
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