|
@@ -52,7 +52,8 @@ class MainActivity : AppCompatActivity(), Router {
|
|
|
visibility = if (config.isDevMode()) View.VISIBLE else View.GONE
|
|
visibility = if (config.isDevMode()) View.VISIBLE else View.GONE
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- private var needUpdate = false
|
|
|
|
|
|
|
+ private var userLoggedIn = false
|
|
|
|
|
+ private var booksChanged = false
|
|
|
private lateinit var loginOption: MenuItem
|
|
private lateinit var loginOption: MenuItem
|
|
|
private lateinit var currentTab: CurrentTab
|
|
private lateinit var currentTab: CurrentTab
|
|
|
|
|
|
|
@@ -75,10 +76,15 @@ class MainActivity : AppCompatActivity(), Router {
|
|
|
refreshOptionsMenu()
|
|
refreshOptionsMenu()
|
|
|
auth.requestAccessToken {
|
|
auth.requestAccessToken {
|
|
|
refreshOptionsMenu()
|
|
refreshOptionsMenu()
|
|
|
- if (needUpdate) {
|
|
|
|
|
|
|
+ if (userLoggedIn) {
|
|
|
|
|
+ userLoggedIn = false
|
|
|
refresh()
|
|
refresh()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ if (booksChanged) {
|
|
|
|
|
+ booksChanged = false
|
|
|
|
|
+ refresh()
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
|
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
|
@@ -86,11 +92,11 @@ class MainActivity : AppCompatActivity(), Router {
|
|
|
ULOGIN_REQUEST_CODE -> {
|
|
ULOGIN_REQUEST_CODE -> {
|
|
|
if (resultCode == RESULT_OK && data != null) {
|
|
if (resultCode == RESULT_OK && data != null) {
|
|
|
auth.saveTokenResponse(data)
|
|
auth.saveTokenResponse(data)
|
|
|
- needUpdate = true
|
|
|
|
|
|
|
+ userLoggedIn = true
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
BOOK_REQUEST_CODE -> {
|
|
BOOK_REQUEST_CODE -> {
|
|
|
- needUpdate = resultCode == RESULT_OK
|
|
|
|
|
|
|
+ booksChanged = resultCode == RESULT_OK
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -225,7 +231,6 @@ class MainActivity : AppCompatActivity(), Router {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private fun setCurrentTab(tab: CurrentTab) {
|
|
private fun setCurrentTab(tab: CurrentTab) {
|
|
|
- needUpdate = false
|
|
|
|
|
addBookButton.hide()
|
|
addBookButton.hide()
|
|
|
currentTab = tab
|
|
currentTab = tab
|
|
|
when (tab) {
|
|
when (tab) {
|