Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grayjay
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoStreaming
Grayjay
Commits
b4fddbe2
Commit
b4fddbe2
authored
11 months ago
by
Kelvin
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay
parents
ab6d7669
3f22c7f7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt
+3
-0
3 additions, 0 deletions
...n/java/com/futo/platformplayer/activities/MainActivity.kt
dep/polycentricandroid
+1
-1
1 addition, 1 deletion
dep/polycentricandroid
with
4 additions
and
1 deletion
app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt
+
3
−
0
View file @
b4fddbe2
...
@@ -48,6 +48,7 @@ import com.futo.platformplayer.stores.FragmentedStorage
...
@@ -48,6 +48,7 @@ import com.futo.platformplayer.stores.FragmentedStorage
import
com.futo.platformplayer.stores.SubscriptionStorage
import
com.futo.platformplayer.stores.SubscriptionStorage
import
com.futo.platformplayer.stores.v2.ManagedStore
import
com.futo.platformplayer.stores.v2.ManagedStore
import
com.futo.platformplayer.views.ToastView
import
com.futo.platformplayer.views.ToastView
import
com.futo.polycentric.core.ApiMethods
import
com.google.gson.JsonParser
import
com.google.gson.JsonParser
import
com.google.zxing.integration.android.IntentIntegrator
import
com.google.zxing.integration.android.IntentIntegrator
import
kotlinx.coroutines.*
import
kotlinx.coroutines.*
...
@@ -154,6 +155,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
...
@@ -154,6 +155,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
}
}
constructor
()
:
super
()
{
constructor
()
:
super
()
{
ApiMethods
.
UserAgent
=
"Grayjay Android (${BuildConfig.VERSION_CODE})"
;
Thread
.
setDefaultUncaughtExceptionHandler
{
_
,
throwable
->
Thread
.
setDefaultUncaughtExceptionHandler
{
_
,
throwable
->
val
writer
=
StringWriter
();
val
writer
=
StringWriter
();
...
...
This diff is collapsed.
Click to expand it.
polycentricandroid
@
cedbb52d
Compare
00927bb7
...
cedbb52d
Subproject commit
00927bb7001abefe87e23e4f8da081a66bd91ca6
Subproject commit
cedbb52d33a87bbff7b3e713347700138b715b69
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment