diff options
author | Marvin Borner | 2018-09-10 18:45:04 +0200 |
---|---|---|
committer | Marvin Borner | 2018-09-10 18:45:04 +0200 |
commit | ed1e15a75dec67bc47d393a227c6db870df6bc3f (patch) | |
tree | f25c1b546ab3aabbcdfad0fd3ade33d7103509a9 | |
parent | 1ddc1a914d805cc11e6b603fb617ea5fa630e317 (diff) |
Applied naming convention for util package :art:
5 files changed, 7 insertions, 7 deletions
diff --git a/app/src/main/java/me/texx/Texx/CameraActivity.kt b/app/src/main/java/me/texx/Texx/CameraActivity.kt index 7879737..6d31644 100644 --- a/app/src/main/java/me/texx/Texx/CameraActivity.kt +++ b/app/src/main/java/me/texx/Texx/CameraActivity.kt @@ -23,8 +23,8 @@ import com.otaliastudios.cameraview.SessionType import daio.io.dresscode.dressCodeName import daio.io.dresscode.matchDressCode import kotlinx.android.synthetic.main.activity_camera.* -import me.texx.Texx.Util.PermissionUtil.askForPermission -import me.texx.Texx.Util.PermissionUtil.permissionGranted +import me.texx.Texx.util.PermissionUtil.askForPermission +import me.texx.Texx.util.PermissionUtil.permissionGranted import me.texx.Texx.util.ThemeUtil.getThemeName import org.jetbrains.anko.intentFor import org.jetbrains.anko.longToast diff --git a/app/src/main/java/me/texx/Texx/LoginActivity.kt b/app/src/main/java/me/texx/Texx/LoginActivity.kt index c575331..d81983d 100644 --- a/app/src/main/java/me/texx/Texx/LoginActivity.kt +++ b/app/src/main/java/me/texx/Texx/LoginActivity.kt @@ -29,7 +29,7 @@ import com.madapps.prefrences.EasyPrefrences import daio.io.dresscode.dressCodeName import daio.io.dresscode.matchDressCode import kotlinx.android.synthetic.main.activity_login.* -import me.texx.Texx.Util.SecureStorage +import me.texx.Texx.util.SecureStorage import me.texx.Texx.util.ThemeUtil.getThemeName import org.jetbrains.anko.longToast import org.jetbrains.anko.startActivity diff --git a/app/src/main/java/me/texx/Texx/RoutingActivity.kt b/app/src/main/java/me/texx/Texx/RoutingActivity.kt index 4e11c60..786bf5f 100644 --- a/app/src/main/java/me/texx/Texx/RoutingActivity.kt +++ b/app/src/main/java/me/texx/Texx/RoutingActivity.kt @@ -9,7 +9,7 @@ import com.github.kittinunf.fuel.httpGet import com.madapps.prefrences.EasyPrefrences import daio.io.dresscode.dressCodeName import daio.io.dresscode.matchDressCode -import me.texx.Texx.Util.SecureStorage +import me.texx.Texx.util.SecureStorage import me.texx.Texx.util.ThemeUtil.getThemeName import org.jetbrains.anko.* import java.io.IOException @@ -72,7 +72,7 @@ class RoutingActivity : AppCompatActivity() { private fun verifyLogin() { val accessToken: String? = SecureStorage(this@RoutingActivity).get("access_token") // because it may be the first start // synced function of fuel doesn't work here (#331) -> ugly workaround - if (accessToken == null) { + if (accessToken != null) { val userID = EasyPrefrences(this@RoutingActivity).getString("user_id") "/users/$userID".httpGet() // verify by making request to user api // TODO: More secure way of verifying .responseJson { _, response, result -> diff --git a/app/src/main/java/me/texx/Texx/Util/PermissionUtil.kt b/app/src/main/java/me/texx/Texx/Util/PermissionUtil.kt index 637d377..e31a10b 100644 --- a/app/src/main/java/me/texx/Texx/Util/PermissionUtil.kt +++ b/app/src/main/java/me/texx/Texx/Util/PermissionUtil.kt @@ -1,4 +1,4 @@ -package me.texx.Texx.Util +package me.texx.Texx.util import android.Manifest.permission.ACCESS_FINE_LOCATION import android.Manifest.permission.WRITE_EXTERNAL_STORAGE diff --git a/app/src/main/java/me/texx/Texx/Util/SecureStorage.kt b/app/src/main/java/me/texx/Texx/Util/SecureStorage.kt index 86b5cbf..4c812ad 100644 --- a/app/src/main/java/me/texx/Texx/Util/SecureStorage.kt +++ b/app/src/main/java/me/texx/Texx/Util/SecureStorage.kt @@ -1,4 +1,4 @@ -package me.texx.Texx.Util +package me.texx.Texx.util import android.content.Context import android.preference.PreferenceManager |