From 7c32f15a399b132e587db01308b7201483fd5f78 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 29 Aug 2018 21:15:22 +0200
Subject: Renamed InitialActivity

---
 .../java/com/no_name/no_name/InitialActivity.kt    | 56 --------------------
 .../java/com/no_name/no_name/RoutingActivity.kt    | 59 ++++++++++++++++++++++
 2 files changed, 59 insertions(+), 56 deletions(-)
 delete mode 100644 app/src/main/java/com/no_name/no_name/InitialActivity.kt
 create mode 100644 app/src/main/java/com/no_name/no_name/RoutingActivity.kt

(limited to 'app/src/main/java')

diff --git a/app/src/main/java/com/no_name/no_name/InitialActivity.kt b/app/src/main/java/com/no_name/no_name/InitialActivity.kt
deleted file mode 100644
index 80ca5a7..0000000
--- a/app/src/main/java/com/no_name/no_name/InitialActivity.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.no_name.no_name
-
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-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 org.jetbrains.anko.alert
-import org.jetbrains.anko.startActivity
-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() {
-    private val server_address = "192.168.0.102"
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        FuelManager.instance.basePath = "http://$server_address"
-        alert("Logging you in.", "Loading...") {
-            isCancelable = false
-        }.show()
-        verifyLogin()
-    }
-
-    @Throws(InterruptedException::class, IOException::class)
-    fun isConnected(): Boolean {
-        val command = "ping -c 1 google.com"
-        return Runtime.getRuntime().exec(command).waitFor() == 0
-    }
-
-    private fun verifyLogin() {
-        val accessToken: String? = SecureStorage(this@InitialActivity).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")
-            "/users/$userID".httpGet() // verify by making request to user api
-                    .header("Authorization" to "Bearer $accessToken")
-                    .responseJson { _, response, result ->
-                        val (_, serverError) = result
-                        when {
-                            response.httpStatusCode == 200 -> startActivity<MainActivity>()
-                            response.httpStatusCode == 401 -> startActivity<LoginActivity>()
-                            !isConnected() -> startActivity<MainActivity>("notConnected" to true)
-                            serverError != null -> startActivity<MainActivity>("serverDown" to true)
-                            else -> startActivity<LoginActivity>()
-                        }
-                    }
-        } else {
-            startActivity<LoginActivity>()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/no_name/no_name/RoutingActivity.kt b/app/src/main/java/com/no_name/no_name/RoutingActivity.kt
new file mode 100644
index 0000000..efb3789
--- /dev/null
+++ b/app/src/main/java/com/no_name/no_name/RoutingActivity.kt
@@ -0,0 +1,59 @@
+package com.no_name.no_name
+
+import android.os.Bundle
+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
+
+/**
+ * Activity which will be run before any other to verify user and choose which activity
+ * should be started next
+ */
+class RoutingActivity : AestheticActivity() {
+    private val server_address = "192.168.0.102"
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        FuelManager.instance.basePath = "http://$server_address"
+        alert("Logging you in.", "Loading...") {
+            isCancelable = false
+        }.show()
+        verifyLogin()
+
+        (ThemeUtil(this)::setActivityTheme)(true)
+    }
+
+    @Throws(InterruptedException::class, IOException::class)
+    fun isConnected(): Boolean {
+        val command = "ping -c 1 google.com"
+        return Runtime.getRuntime().exec(command).waitFor() == 0
+    }
+
+    private fun verifyLogin() {
+        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@RoutingActivity).getString("user_id")
+            "/users/$userID".httpGet() // verify by making request to user api
+                    .header("Authorization" to "Bearer $accessToken")
+                    .responseJson { _, response, result ->
+                        val (_, serverError) = result
+                        when {
+                            response.httpStatusCode == 200 -> startActivity<MainActivity>()
+                            response.httpStatusCode == 401 -> startActivity<LoginActivity>()
+                            !isConnected() -> startActivity<MainActivity>("notConnected" to true)
+                            serverError != null -> startActivity<MainActivity>("serverDown" to true)
+                            else -> startActivity<LoginActivity>()
+                        }
+                    }
+        } else {
+            startActivity<LoginActivity>()
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3