remove auto lock off and optimize session keepalive for mib
Auto Tag on Version Change / check-version (push) Successful in 4s
Auto Tag on Version Change / check-version (push) Successful in 4s
This commit is contained in:
@@ -68,6 +68,7 @@ class MibTransferClient {
|
||||
.withWvHeaders(session)
|
||||
.build()
|
||||
return client.newCall(request).execute().use { response ->
|
||||
if (response.code == 419) throw SessionExpiredException()
|
||||
val bodyStr = response.body?.string() ?: ""
|
||||
val json = try { JSONObject(bodyStr) } catch (_: Exception) { null }
|
||||
if (json == null || !json.optBoolean("success")) {
|
||||
|
||||
@@ -118,6 +118,14 @@ class AccountHistoryFragment : Fragment() {
|
||||
}
|
||||
(activity as? HomeActivity)?.setRefreshing(true)
|
||||
loadNextPage()
|
||||
|
||||
binding.swipeRefresh.setOnRefreshListener {
|
||||
if (isLoading) {
|
||||
binding.swipeRefresh.isRefreshing = false
|
||||
} else {
|
||||
resetAndReload()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
@@ -135,6 +143,17 @@ class AccountHistoryFragment : Fragment() {
|
||||
binding.emptyView.visibility = if (filtered.isEmpty() && !isLoading) View.VISIBLE else View.GONE
|
||||
}
|
||||
|
||||
private fun resetAndReload() {
|
||||
allTransactions.clear()
|
||||
pendingImageNames.clear()
|
||||
pendingIconUrls.clear()
|
||||
firstPageDone = false
|
||||
fetcher = HistoryFetcher(account)
|
||||
adapter.setTransactions(emptyList())
|
||||
binding.emptyView.visibility = View.GONE
|
||||
loadNextPage()
|
||||
}
|
||||
|
||||
private fun loadNextPage() {
|
||||
if (isLoading || !fetcher.hasMore()) return
|
||||
isLoading = true
|
||||
@@ -153,6 +172,7 @@ class AccountHistoryFragment : Fragment() {
|
||||
if (!firstPageDone) {
|
||||
firstPageDone = true
|
||||
(activity as? HomeActivity)?.setRefreshing(false)
|
||||
binding.swipeRefresh.isRefreshing = false
|
||||
}
|
||||
|
||||
if (transactions.isNotEmpty()) {
|
||||
|
||||
@@ -45,6 +45,11 @@ class AccountsFragment : Fragment() {
|
||||
|
||||
viewModel.accounts.observe(viewLifecycleOwner) { adapter.updateAccounts(it) }
|
||||
viewModel.hideAmounts.observe(viewLifecycleOwner) { adapter.setHideAmounts(it) }
|
||||
|
||||
binding.swipeRefresh.setOnRefreshListener {
|
||||
(activity as? HomeActivity)?.triggerRefresh()
|
||||
binding.swipeRefresh.isRefreshing = false
|
||||
}
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
|
||||
@@ -48,6 +48,7 @@ class ContactsFragment : Fragment() {
|
||||
private var currentSearch: String = ""
|
||||
private var mediator: TabLayoutMediator? = null
|
||||
private lateinit var pagerAdapter: ContactsPagerAdapter
|
||||
private var contactsRefreshing = false
|
||||
|
||||
private data class TabPage(val categoryId: String?, val label: String)
|
||||
|
||||
@@ -134,6 +135,11 @@ class ContactsFragment : Fragment() {
|
||||
|
||||
(activity as? HomeActivity)?.loadAllContacts()
|
||||
|
||||
binding.swipeRefresh.setOnRefreshListener {
|
||||
contactsRefreshing = true
|
||||
(activity as? HomeActivity)?.loadAllContacts()
|
||||
}
|
||||
|
||||
viewModel.contactCategories.observe(viewLifecycleOwner) { cats ->
|
||||
rebuildPager(cats)
|
||||
}
|
||||
@@ -143,6 +149,10 @@ class ContactsFragment : Fragment() {
|
||||
pagerAdapter.updateContacts(allContacts)
|
||||
binding.emptyView.visibility = if (contacts.isEmpty()) View.VISIBLE else View.GONE
|
||||
binding.loadingView.visibility = View.GONE
|
||||
if (contactsRefreshing) {
|
||||
contactsRefreshing = false
|
||||
binding.swipeRefresh.isRefreshing = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -38,6 +38,11 @@ class DashboardFragment : Fragment() {
|
||||
updateForeignLimits(viewModel.bmlLimits.value ?: emptyList())
|
||||
}
|
||||
|
||||
binding.swipeRefresh.setOnRefreshListener {
|
||||
(activity as? HomeActivity)?.triggerRefresh()
|
||||
binding.swipeRefresh.isRefreshing = false
|
||||
}
|
||||
|
||||
val bottomPaddingBase = (16 * resources.displayMetrics.density).toInt()
|
||||
ViewCompat.setOnApplyWindowInsetsListener(binding.buttonBar) { v, insets ->
|
||||
val isBottomNav = requireContext().getSharedPreferences("prefs", android.content.Context.MODE_PRIVATE).getBoolean("bottom_nav", false)
|
||||
|
||||
@@ -18,6 +18,7 @@ class FinancingFragment : Fragment() {
|
||||
private val binding get() = _binding!!
|
||||
private val viewModel: HomeViewModel by activityViewModels()
|
||||
private lateinit var adapter: FinancingAdapter
|
||||
private var financingRefreshing = false
|
||||
|
||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
|
||||
_binding = FragmentFinancingBinding.inflate(inflater, container, false)
|
||||
@@ -38,11 +39,20 @@ class FinancingFragment : Fragment() {
|
||||
insets
|
||||
}
|
||||
|
||||
binding.swipeRefresh.setOnRefreshListener {
|
||||
financingRefreshing = true
|
||||
(activity as? HomeActivity)?.triggerRefreshFinancing()
|
||||
}
|
||||
|
||||
viewModel.financing.observe(viewLifecycleOwner) { deals ->
|
||||
adapter.updateDeals(deals)
|
||||
binding.recyclerView.visibility = if (deals.isEmpty()) View.GONE else View.VISIBLE
|
||||
binding.emptyView.visibility = if (deals.isEmpty()) View.VISIBLE else View.GONE
|
||||
binding.loadingView.visibility = View.GONE
|
||||
if (financingRefreshing) {
|
||||
financingRefreshing = false
|
||||
binding.swipeRefresh.isRefreshing = false
|
||||
}
|
||||
}
|
||||
viewModel.hideAmounts.observe(viewLifecycleOwner) { adapter.setHideAmounts(it) }
|
||||
}
|
||||
|
||||
@@ -324,6 +324,18 @@ fun applyNavLabelVisibility() {
|
||||
}
|
||||
}
|
||||
|
||||
fun triggerRefresh() {
|
||||
autoRefresh(CredentialStore(this))
|
||||
}
|
||||
|
||||
fun triggerRefreshFinancing() {
|
||||
val app = application as BasedBankApp
|
||||
for ((loginId, session) in app.mibSessions) {
|
||||
val profiles = app.mibProfilesMap[loginId] ?: emptyList()
|
||||
refreshFinancing(loginId, session, profiles.filterVisibleProfiles(loginId))
|
||||
}
|
||||
}
|
||||
|
||||
fun setRefreshing(visible: Boolean) {
|
||||
binding.refreshIndicator.visibility = if (visible) View.VISIBLE else View.GONE
|
||||
}
|
||||
@@ -337,11 +349,12 @@ fun applyNavLabelVisibility() {
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
// Returning from LockActivity — skip the elapsed check and reset state.
|
||||
// Returning from LockActivity — refresh sessions since they may have expired.
|
||||
if (isLocked) {
|
||||
isLocked = false
|
||||
pauseTime = 0L
|
||||
resetAutolockTimer()
|
||||
autoRefresh(CredentialStore(this))
|
||||
return
|
||||
}
|
||||
// If we were away long enough to have hit the autolock timeout (e.g. while
|
||||
@@ -354,6 +367,9 @@ fun applyNavLabelVisibility() {
|
||||
lock()
|
||||
return
|
||||
}
|
||||
if (elapsed > 45_000L) {
|
||||
autoRefresh(CredentialStore(this))
|
||||
}
|
||||
}
|
||||
resetAutolockTimer()
|
||||
}
|
||||
|
||||
@@ -60,7 +60,6 @@ class SettingsSecurityFragment : Fragment() {
|
||||
|
||||
// Auto-lock
|
||||
binding.autolockToggle.check(when (prefs.getLong("autolock_timeout", 60_000L)) {
|
||||
0L -> R.id.btnAutolockOff
|
||||
30_000L -> R.id.btnAutolock30s
|
||||
180_000L -> R.id.btnAutolock3m
|
||||
300_000L -> R.id.btnAutolock5m
|
||||
@@ -69,7 +68,6 @@ class SettingsSecurityFragment : Fragment() {
|
||||
binding.autolockToggle.addOnButtonCheckedListener { _, checkedId, isChecked ->
|
||||
if (!isChecked) return@addOnButtonCheckedListener
|
||||
val timeout = when (checkedId) {
|
||||
R.id.btnAutolockOff -> 0L
|
||||
R.id.btnAutolock30s -> 30_000L
|
||||
R.id.btnAutolock3m -> 180_000L
|
||||
R.id.btnAutolock5m -> 300_000L
|
||||
|
||||
@@ -652,7 +652,7 @@ class TransferFragment : Fragment() {
|
||||
ReceiptStore.save(requireContext(), receipt)
|
||||
clearForm()
|
||||
val activity = requireActivity() as HomeActivity
|
||||
activity.refreshBalances(src)
|
||||
activity.triggerRefresh()
|
||||
activity.showWithBackStack(TransferReceiptFragment.newInstance(receipt, capturedToAvatar))
|
||||
} else if (!ok) {
|
||||
Toast.makeText(requireContext(), msg, Toast.LENGTH_LONG).show()
|
||||
|
||||
@@ -138,6 +138,14 @@ class TransferHistoryFragment : Fragment() {
|
||||
}
|
||||
(activity as? HomeActivity)?.setRefreshing(true)
|
||||
loadNextPages()
|
||||
|
||||
binding.swipeRefresh.setOnRefreshListener {
|
||||
if (isLoading) {
|
||||
binding.swipeRefresh.isRefreshing = false
|
||||
} else {
|
||||
resetAndReload()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
@@ -145,6 +153,19 @@ class TransferHistoryFragment : Fragment() {
|
||||
requireActivity().title = getString(R.string.nav_transfer_history)
|
||||
}
|
||||
|
||||
private fun resetAndReload() {
|
||||
allTransactions.clear()
|
||||
pendingImageNames.clear()
|
||||
pendingIconUrls.clear()
|
||||
firstBatchDone = false
|
||||
val accounts = accountStates.map { it.account }
|
||||
accountStates.clear()
|
||||
accounts.forEach { accountStates.add(AccountState(it)) }
|
||||
adapter.setTransactions(emptyList())
|
||||
binding.emptyView.visibility = View.GONE
|
||||
loadNextPages()
|
||||
}
|
||||
|
||||
private fun loadNextPages() {
|
||||
val activeStates = accountStates.filter { it.hasMore() }
|
||||
if (isLoading || activeStates.isEmpty()) return
|
||||
@@ -250,6 +271,7 @@ class TransferHistoryFragment : Fragment() {
|
||||
if (!firstBatchDone) {
|
||||
firstBatchDone = true
|
||||
(activity as? HomeActivity)?.setRefreshing(false)
|
||||
binding.swipeRefresh.isRefreshing = false
|
||||
}
|
||||
|
||||
if (newTransactions.isNotEmpty()) {
|
||||
|
||||
Reference in New Issue
Block a user