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
9f432374
Commit
9f432374
authored
Dec 30, 2018
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Misc refinements
parent
f164d5a9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
19 deletions
+14
-19
core/src/main/AndroidManifest.xml
core/src/main/AndroidManifest.xml
+2
-0
core/src/main/java/com/github/shadowsocks/Core.kt
core/src/main/java/com/github/shadowsocks/Core.kt
+3
-3
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+3
-1
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
.../src/main/java/com/github/shadowsocks/ProfilesFragment.kt
+3
-8
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
.../java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
+3
-7
No files found.
core/src/main/AndroidManifest.xml
View file @
9f432374
...
...
@@ -74,6 +74,8 @@
<provider
android:name=
"com.crashlytics.android.CrashlyticsInitProvider"
tools:node=
"remove"
/>
<provider
android:name=
"com.google.firebase.provider.FirebaseInitProvider"
tools:node=
"remove"
/>
<!-- https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/work/workmanager/src/main/AndroidManifest.xml -->
<provider
android:name=
"androidx.work.impl.WorkManagerInitializer"
tools:node=
"remove"
/>
...
...
core/src/main/java/com/github/shadowsocks/Core.kt
View file @
9f432374
...
...
@@ -35,10 +35,10 @@ import android.os.Build
import
android.os.Handler
import
android.os.Looper
import
android.os.UserManager
import
android.util.Log
import
androidx.annotation.RequiresApi
import
androidx.core.content.ContextCompat
import
androidx.core.content.getSystemService
import
androidx.work.Configuration
import
androidx.work.WorkManager
import
com.crashlytics.android.Crashlytics
import
com.github.shadowsocks.acl.Acl
...
...
@@ -50,7 +50,6 @@ import com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.utils.*
import
com.google.firebase.FirebaseApp
import
com.google.firebase.analytics.FirebaseAnalytics
import
com.google.firebase.remoteconfig.FirebaseRemoteConfig
import
io.fabric.sdk.android.Fabric
import
java.io.File
import
java.io.IOException
...
...
@@ -96,7 +95,8 @@ object Core {
}
Fabric
.
with
(
deviceStorage
,
Crashlytics
())
// multiple processes needs manual set-up
WorkManager
.
initialize
(
deviceStorage
,
androidx
.
work
.
Configuration
.
Builder
().
build
())
FirebaseApp
.
initializeApp
(
deviceStorage
)
WorkManager
.
initialize
(
deviceStorage
,
Configuration
.
Builder
().
build
())
// handle data restored/crash
if
(
Build
.
VERSION
.
SDK_INT
>=
24
&&
DataStore
.
directBootAware
&&
...
...
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
View file @
9f432374
...
...
@@ -85,7 +85,9 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, OnPre
}
fun
launchUrl
(
uri
:
String
)
=
try
{
customTabsIntent
.
launchUrl
(
this
,
uri
.
toUri
())
}
catch
(
_
:
ActivityNotFoundException
)
{
}
// ignore
}
catch
(
_
:
ActivityNotFoundException
)
{
snackbar
(
uri
).
show
()
}
// service
var
state
=
BaseService
.
IDLE
...
...
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
View file @
9f432374
...
...
@@ -39,7 +39,6 @@ import androidx.core.content.getSystemService
import
androidx.core.os.bundleOf
import
androidx.fragment.app.DialogFragment
import
androidx.recyclerview.widget.*
import
com.crashlytics.android.Crashlytics
import
com.github.shadowsocks.bg.BaseService
import
com.github.shadowsocks.database.Profile
import
com.github.shadowsocks.database.ProfileManager
...
...
@@ -416,13 +415,9 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
private
fun
startFilesForResult
(
intent
:
Intent
?,
requestCode
:
Int
)
{
try
{
startActivityForResult
(
intent
,
requestCode
)
}
catch
(
e
:
ActivityNotFoundException
)
{
Crashlytics
.
logException
(
e
)
(
activity
as
MainActivity
).
snackbar
(
getString
(
R
.
string
.
file_manager_missing
)).
show
()
}
catch
(
e
:
SecurityException
)
{
Crashlytics
.
logException
(
e
)
(
activity
as
MainActivity
).
snackbar
(
getString
(
R
.
string
.
file_manager_missing
)).
show
()
}
return
}
catch
(
_
:
ActivityNotFoundException
)
{
}
catch
(
_
:
SecurityException
)
{
}
(
activity
as
MainActivity
).
snackbar
(
getString
(
R
.
string
.
file_manager_missing
)).
show
()
}
override
fun
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
?)
{
...
...
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
View file @
9f432374
...
...
@@ -275,13 +275,9 @@ class MainPreferenceFragment : LeanbackPreferenceFragment(), ShadowsocksConnecti
private
fun
startFilesForResult
(
intent
:
Intent
?,
requestCode
:
Int
)
{
try
{
startActivityForResult
(
intent
,
requestCode
)
}
catch
(
e
:
ActivityNotFoundException
)
{
Crashlytics
.
logException
(
e
)
Toast
.
makeText
(
activity
,
R
.
string
.
file_manager_missing
,
Toast
.
LENGTH_SHORT
).
show
()
}
catch
(
e
:
SecurityException
)
{
Crashlytics
.
logException
(
e
)
Toast
.
makeText
(
activity
,
R
.
string
.
file_manager_missing
,
Toast
.
LENGTH_SHORT
).
show
()
}
return
}
catch
(
_
:
ActivityNotFoundException
)
{
}
catch
(
_
:
SecurityException
)
{
}
Toast
.
makeText
(
activity
,
R
.
string
.
file_manager_missing
,
Toast
.
LENGTH_SHORT
).
show
()
}
override
fun
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
?)
{
...
...
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