Merge branch 'release/1.2.1' into main

mouredev · Sep 7, 2021 · ec8fd42 · ec8fd42
2 parents 3e95e7b + 8cd6f1a
commit ec8fd42
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.mouredev.twitimer"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 12
-        versionName "1.2"
+        versionCode 13
+        versionName "1.2.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/mouredev/twitimer/usecases/account/account/AccountFragment.kt b/app/src/main/java/com/mouredev/twitimer/usecases/account/account/AccountFragment.kt
@@ -52,7 +52,6 @@ class AccountFragment : Fragment(), InfoFragmentListener, WebViewFragmentListene
         setup()
         data()
         viewModel.load()
-
     }
 
     override fun onResume() {

diff --git a/app/src/main/java/com/mouredev/twitimer/usecases/account/account/AccountViewModel.kt b/app/src/main/java/com/mouredev/twitimer/usecases/account/account/AccountViewModel.kt
@@ -14,6 +14,8 @@ class AccountViewModel : ViewModel() {
 
     val authorizeURL = TwitchService.authorizeURL
 
+    private var session: String? = null
+
     // Publisehd
 
     val authenticated: MutableLiveData<Boolean> = MutableLiveData()
@@ -24,9 +26,10 @@ class AccountViewModel : ViewModel() {
 
     fun load() {
         loading.postValue(false)
-        if (Session.instance.user?.login != null) {
+        Session.instance.user?.login?.let { login ->
+            session = login
             authenticated.postValue(true)
-        } else {
+        } ?: run {
             info.postValue(true)
         }
     }
@@ -47,7 +50,9 @@ class AccountViewModel : ViewModel() {
     }
 
     fun checkSession() {
-        if (Session.instance.user?.login == null) {
+        val login = Session.instance.user?.login
+        if (login == null && session != login) {
+            session = login
             load()
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
             setup()
             data()
             viewModel.load()
         }
         override fun onResume() {
@@ Expand Down @@