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
f0f18181
Commit
f0f18181
authored
Apr 23, 2020
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to Android R DP2
parent
c7e6a578
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
buildSrc/src/main/kotlin/Helpers.kt
buildSrc/src/main/kotlin/Helpers.kt
+2
-2
core/src/main/java/com/github/shadowsocks/net/DefaultNetworkListener.kt
...java/com/github/shadowsocks/net/DefaultNetworkListener.kt
+1
-1
mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt
...e/src/main/java/com/github/shadowsocks/ScannerActivity.kt
+1
-1
No files found.
buildSrc/src/main/kotlin/Helpers.kt
View file @
f0f18181
...
...
@@ -24,10 +24,10 @@ val Project.currentFlavor get() = gradle.startParameter.taskRequests.toString().
fun
Project
.
setupCommon
()
{
android
.
apply
{
compileSdkVersion
(
29
)
compileSdkVersion
(
"android-R"
)
defaultConfig
{
minSdkVersion
(
21
)
targetSdkVersion
(
29
)
targetSdkVersion
(
"R"
)
testInstrumentationRunner
=
"androidx.test.runner.AndroidJUnitRunner"
}
val
javaVersion
=
JavaVersion
.
VERSION_1_8
...
...
core/src/main/java/com/github/shadowsocks/net/DefaultNetworkListener.kt
View file @
f0f18181
...
...
@@ -93,7 +93,7 @@ object DefaultNetworkListener {
// NB: this runs in ConnectivityThread, and this behavior cannot be changed until API 26
private
object
Callback
:
ConnectivityManager
.
NetworkCallback
()
{
override
fun
onAvailable
(
network
:
Network
)
=
runBlocking
{
networkActor
.
send
(
NetworkMessage
.
Put
(
network
))
}
override
fun
onCapabilitiesChanged
(
network
:
Network
,
networkCapabilities
:
NetworkCapabilities
?
)
{
override
fun
onCapabilitiesChanged
(
network
:
Network
,
networkCapabilities
:
NetworkCapabilities
)
{
// it's a good idea to refresh capabilities
runBlocking
{
networkActor
.
send
(
NetworkMessage
.
Update
(
network
))
}
}
...
...
mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt
View file @
f0f18181
...
...
@@ -120,7 +120,7 @@ class ScannerActivity : AppCompatActivity(), BarcodeRetriever {
menuInflater
.
inflate
(
R
.
menu
.
scanner_menu
,
menu
)
return
true
}
override
fun
onOptionsItemSelected
(
item
:
MenuItem
?)
=
when
(
item
?
.
itemId
)
{
override
fun
onOptionsItemSelected
(
item
:
MenuItem
)
=
when
(
item
.
itemId
)
{
R
.
id
.
action_import_clipboard
->
{
startImport
(
true
)
true
...
...
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