aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/src/main
diff options
context:
space:
mode:
authorMarvin Borner2018-08-29 21:15:22 +0200
committerMarvin Borner2018-08-29 21:15:22 +0200
commit7c32f15a399b132e587db01308b7201483fd5f78 (patch)
treed9b6004cbe3b4b539b521857dde26ab690ebde24 /app/src/main
parentf1426122d797e0c55883d0f128e8d24d6a7e7e6f (diff)
Renamed InitialActivity
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/com/no_name/no_name/RoutingActivity.kt (renamed from app/src/main/java/com/no_name/no_name/InitialActivity.kt)11
1 files changed, 7 insertions, 4 deletions
diff --git a/app/src/main/java/com/no_name/no_name/InitialActivity.kt b/app/src/main/java/com/no_name/no_name/RoutingActivity.kt
index 80ca5a7..efb3789 100644
--- a/app/src/main/java/com/no_name/no_name/InitialActivity.kt
+++ b/app/src/main/java/com/no_name/no_name/RoutingActivity.kt
@@ -1,11 +1,12 @@
package com.no_name.no_name
import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import com.afollestad.aesthetic.AestheticActivity
import com.github.kittinunf.fuel.android.extension.responseJson
import com.github.kittinunf.fuel.core.FuelManager
import com.github.kittinunf.fuel.httpGet
import com.madapps.prefrences.EasyPrefrences
+import com.no_name.no_name.Util.ThemeUtil
import org.jetbrains.anko.alert
import org.jetbrains.anko.startActivity
import java.io.IOException
@@ -14,7 +15,7 @@ import java.io.IOException
* Activity which will be run before any other to verify user and choose which activity
* should be started next
*/
-class InitialActivity : AppCompatActivity() {
+class RoutingActivity : AestheticActivity() {
private val server_address = "192.168.0.102"
override fun onCreate(savedInstanceState: Bundle?) {
@@ -24,6 +25,8 @@ class InitialActivity : AppCompatActivity() {
isCancelable = false
}.show()
verifyLogin()
+
+ (ThemeUtil(this)::setActivityTheme)(true)
}
@Throws(InterruptedException::class, IOException::class)
@@ -33,10 +36,10 @@ class InitialActivity : AppCompatActivity() {
}
private fun verifyLogin() {
- val accessToken: String? = SecureStorage(this@InitialActivity).get("access_token")
+ val accessToken: String? = SecureStorage(this@RoutingActivity).get("access_token")
// synced function of fuel doesn't work here (#331) -> ugly workaround
if (accessToken != null) {
- val userID = EasyPrefrences(this@InitialActivity).getString("user_id")
+ val userID = EasyPrefrences(this@RoutingActivity).getString("user_id")
"/users/$userID".httpGet() // verify by making request to user api
.header("Authorization" to "Bearer $accessToken")
.responseJson { _, response, result ->