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
7922be56
Commit
7922be56
authored
Mar 08, 2018
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix signatures are being deprecated
parent
a134cba0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
5 deletions
+14
-5
mobile/src/main/java/com/github/shadowsocks/App.kt
mobile/src/main/java/com/github/shadowsocks/App.kt
+3
-2
mobile/src/main/java/com/github/shadowsocks/bg/BaseService.kt
...le/src/main/java/com/github/shadowsocks/bg/BaseService.kt
+1
-1
mobile/src/main/java/com/github/shadowsocks/plugin/PluginManager.kt
.../main/java/com/github/shadowsocks/plugin/PluginManager.kt
+2
-1
mobile/src/main/java/com/github/shadowsocks/plugin/ResolvedPlugin.kt
...main/java/com/github/shadowsocks/plugin/ResolvedPlugin.kt
+2
-1
mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
+6
-0
No files found.
mobile/src/main/java/com/github/shadowsocks/App.kt
View file @
7922be56
...
@@ -34,6 +34,7 @@ import android.os.Build
...
@@ -34,6 +34,7 @@ import android.os.Build
import
android.os.Handler
import
android.os.Handler
import
android.os.Looper
import
android.os.Looper
import
android.support.annotation.RequiresApi
import
android.support.annotation.RequiresApi
import
android.support.v4.os.BuildCompat
import
android.support.v4.os.UserManagerCompat
import
android.support.v4.os.UserManagerCompat
import
android.support.v7.app.AppCompatDelegate
import
android.support.v7.app.AppCompatDelegate
import
android.util.Log
import
android.util.Log
...
@@ -73,8 +74,8 @@ class App : Application() {
...
@@ -73,8 +74,8 @@ class App : Application() {
private
val
tracker
:
Tracker
by
lazy
{
GoogleAnalytics
.
getInstance
(
deviceContext
).
newTracker
(
R
.
xml
.
tracker
)
}
private
val
tracker
:
Tracker
by
lazy
{
GoogleAnalytics
.
getInstance
(
deviceContext
).
newTracker
(
R
.
xml
.
tracker
)
}
val
info
:
PackageInfo
by
lazy
{
getPackageInfo
(
packageName
)
}
val
info
:
PackageInfo
by
lazy
{
getPackageInfo
(
packageName
)
}
fun
getPackageInfo
(
packageName
:
String
)
=
fun
getPackageInfo
(
packageName
:
String
)
=
packageManager
.
getPackageInfo
(
packageName
,
if
(
BuildCompat
.
isAtLeastP
())
packageManager
.
getPackageInfo
(
packageName
,
PackageManager
.
GET_SIGNATURES
)
!!
PackageManager
.
GET_SIGNING_CERTIFICATES
else
@Suppress
(
"DEPRECATION"
)
PackageManager
.
GET_SIGNATURES
)
!!
fun
startService
()
{
fun
startService
()
{
val
intent
=
Intent
(
this
,
BaseService
.
serviceClass
.
java
)
val
intent
=
Intent
(
this
,
BaseService
.
serviceClass
.
java
)
...
...
mobile/src/main/java/com/github/shadowsocks/bg/BaseService.kt
View file @
7922be56
...
@@ -354,7 +354,7 @@ object BaseService {
...
@@ -354,7 +354,7 @@ object BaseService {
.
readTimeout
(
30
,
TimeUnit
.
SECONDS
)
.
readTimeout
(
30
,
TimeUnit
.
SECONDS
)
.
build
()
.
build
()
val
mdg
=
MessageDigest
.
getInstance
(
"SHA-1"
)
val
mdg
=
MessageDigest
.
getInstance
(
"SHA-1"
)
mdg
.
update
(
app
.
info
.
signatures
[
0
]
.
toByteArray
())
mdg
.
update
(
app
.
info
.
signatures
Compat
.
first
()
.
toByteArray
())
val
requestBody
=
FormBody
.
Builder
()
val
requestBody
=
FormBody
.
Builder
()
.
add
(
"sig"
,
String
(
Base64
.
encode
(
mdg
.
digest
(),
0
)))
.
add
(
"sig"
,
String
(
Base64
.
encode
(
mdg
.
digest
(),
0
)))
.
build
()
.
build
()
...
...
mobile/src/main/java/com/github/shadowsocks/plugin/PluginManager.kt
View file @
7922be56
...
@@ -32,6 +32,7 @@ import android.util.Base64
...
@@ -32,6 +32,7 @@ import android.util.Base64
import
android.util.Log
import
android.util.Log
import
com.github.shadowsocks.App.Companion.app
import
com.github.shadowsocks.App.Companion.app
import
com.github.shadowsocks.utils.Commandline
import
com.github.shadowsocks.utils.Commandline
import
com.github.shadowsocks.utils.signaturesCompat
import
eu.chainfire.libsuperuser.Shell
import
eu.chainfire.libsuperuser.Shell
import
java.io.File
import
java.io.File
import
java.io.FileNotFoundException
import
java.io.FileNotFoundException
...
@@ -47,7 +48,7 @@ object PluginManager {
...
@@ -47,7 +48,7 @@ object PluginManager {
* public key yet since it will also automatically trust packages signed by the same signatures, e.g. debug keys.
* public key yet since it will also automatically trust packages signed by the same signatures, e.g. debug keys.
*/
*/
val
trustedSignatures
by
lazy
{
val
trustedSignatures
by
lazy
{
app
.
info
.
signatures
.
toSet
()
+
app
.
info
.
signatures
Compat
.
toSet
()
+
Signature
(
Base64
.
decode
(
// @Mygod
Signature
(
Base64
.
decode
(
// @Mygod
"""
"""
|MIIDWzCCAkOgAwIBAgIEUzfv8DANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJD
|MIIDWzCCAkOgAwIBAgIEUzfv8DANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJD
...
...
mobile/src/main/java/com/github/shadowsocks/plugin/ResolvedPlugin.kt
View file @
7922be56
...
@@ -24,6 +24,7 @@ import android.content.pm.ResolveInfo
...
@@ -24,6 +24,7 @@ import android.content.pm.ResolveInfo
import
android.graphics.drawable.Drawable
import
android.graphics.drawable.Drawable
import
android.os.Bundle
import
android.os.Bundle
import
com.github.shadowsocks.App.Companion.app
import
com.github.shadowsocks.App.Companion.app
import
com.github.shadowsocks.utils.signaturesCompat
abstract
class
ResolvedPlugin
(
protected
val
resolveInfo
:
ResolveInfo
)
:
Plugin
()
{
abstract
class
ResolvedPlugin
(
protected
val
resolveInfo
:
ResolveInfo
)
:
Plugin
()
{
protected
abstract
val
metaData
:
Bundle
protected
abstract
val
metaData
:
Bundle
...
@@ -34,6 +35,6 @@ abstract class ResolvedPlugin(protected val resolveInfo: ResolveInfo) : Plugin()
...
@@ -34,6 +35,6 @@ abstract class ResolvedPlugin(protected val resolveInfo: ResolveInfo) : Plugin()
override
val
defaultConfig
:
String
by
lazy
{
metaData
.
getString
(
PluginContract
.
METADATA_KEY_DEFAULT_CONFIG
)
}
override
val
defaultConfig
:
String
by
lazy
{
metaData
.
getString
(
PluginContract
.
METADATA_KEY_DEFAULT_CONFIG
)
}
override
val
packageName
:
String
get
()
=
resolveInfo
.
resolvePackageName
override
val
packageName
:
String
get
()
=
resolveInfo
.
resolvePackageName
override
val
trusted
by
lazy
{
override
val
trusted
by
lazy
{
app
.
getPackageInfo
(
packageName
).
signatures
.
any
(
PluginManager
.
trustedSignatures
::
contains
)
app
.
getPackageInfo
(
packageName
).
signatures
Compat
.
any
(
PluginManager
.
trustedSignatures
::
contains
)
}
}
}
}
mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
View file @
7922be56
...
@@ -3,12 +3,14 @@ package com.github.shadowsocks.utils
...
@@ -3,12 +3,14 @@ package com.github.shadowsocks.utils
import
android.content.BroadcastReceiver
import
android.content.BroadcastReceiver
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.content.pm.PackageInfo
import
android.content.res.Resources
import
android.content.res.Resources
import
android.os.Build
import
android.os.Build
import
android.support.annotation.AttrRes
import
android.support.annotation.AttrRes
import
android.support.v4.app.Fragment
import
android.support.v4.app.Fragment
import
android.support.v4.app.FragmentManager
import
android.support.v4.app.FragmentManager
import
android.support.v4.content.ContextCompat
import
android.support.v4.content.ContextCompat
import
android.support.v4.os.BuildCompat
import
android.support.v7.util.SortedList
import
android.support.v7.util.SortedList
import
android.util.TypedValue
import
android.util.TypedValue
import
com.github.shadowsocks.App.Companion.app
import
com.github.shadowsocks.App.Companion.app
...
@@ -53,6 +55,10 @@ val URLConnection.responseLength: Long
...
@@ -53,6 +55,10 @@ val URLConnection.responseLength: Long
inline
fun
<
reified
T
>
Context
.
systemService
()
=
ContextCompat
.
getSystemService
(
this
,
T
::
class
.
java
)
!!
inline
fun
<
reified
T
>
Context
.
systemService
()
=
ContextCompat
.
getSystemService
(
this
,
T
::
class
.
java
)
!!
val
PackageInfo
.
signaturesCompat
get
()
=
if
(
BuildCompat
.
isAtLeastP
())
signingCertificateHistory
.
flatten
()
else
@Suppress
(
"DEPRECATION"
)
signatures
.
asIterable
()
/**
/**
* Based on: https://stackoverflow.com/a/15656428/2245107
* Based on: https://stackoverflow.com/a/15656428/2245107
*/
*/
...
...
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