Peertube
/
p2play-app-android
mirror of https://gitlab.com/agosto182/p2play
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into development

This commit is contained in:
ivan agosto 2018-09-16 01:12:56 -05:00
parent 3fe8456621 994211b2d4
commit 72d1922d97
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
View File

@ -48,8 +48,9 @@ class HostActivity : AppCompatActivity() {
AsyncTask.execute { AsyncTask.execute {
if (Looper.myLooper() == null) if (Looper.myLooper() == null)
Looper.prepare() Looper.prepare()
startApp()
if (token.status == 1 && user.status == 1) { if (token.status == 1 && user.status == 1) {
startApp()
val client_id = settings.getString("client_id", "") val client_id = settings.getString("client_id", "")
val client_secret = settings.getString("client_secret", "") val client_secret = settings.getString("client_secret", "")

2
app/src/main/res/values/mainActivity.xml
View File

@ -7,7 +7,7 @@
<string name="view_text">views</string> <string name="view_text">views</string>
<string name="time_text">seconds</string> <string name="time_text">seconds</string>
<string name="nav_header_title">Log In</string> <string name="nav_header_title">Log In</string>
<string name="nav_header_subtitle">P2Play (alpha)</string> <string name="nav_header_subtitle">P2Play</string>
<!-- Toast msg --> <!-- Toast msg -->
<string name="logout_msg">You are disconnected</string> <string name="logout_msg">You are disconnected</string>