From c102274c9bf64e9919465027568444022455d5c4 Mon Sep 17 00:00:00 2001
From: vincent-paing <dev.aungkyawpaing@gmail.com>
Date: Tue, 3 Nov 2020 21:26:36 +0630
Subject: [PATCH] fix: Fix candidate race issue on visible property

---
 .../listing/lowerhouse/LowerHouseCandidateListController.kt | 6 ------
 .../regionalhouse/RegionalHouseCandidateListController.kt   | 1 -
 .../listing/upperhouse/UpperHouseCandidateListController.kt | 1 -
 buildSrc/src/main/kotlin/Dependencies.kt                    | 2 +-
 release.properties                                          | 2 +-
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/lowerhouse/LowerHouseCandidateListController.kt b/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/lowerhouse/LowerHouseCandidateListController.kt
index c981042..56a89ad 100644
--- a/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/lowerhouse/LowerHouseCandidateListController.kt
+++ b/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/lowerhouse/LowerHouseCandidateListController.kt
@@ -68,12 +68,7 @@ class LowerHouseCandidateListController : MvvmController<ControllerLowerHouseCan
     }
 
     if (viewModel.viewItemLiveData.value == null) {
-      lifecycleScope.launch {
-        //For some reason on fast phone, the candidate list doesn't show up
-        //Adding delay somehow solves this problem
-        delay(100)
         loadCandidates()
-      }
     }
   }
 
@@ -91,7 +86,6 @@ class LowerHouseCandidateListController : MvvmController<ControllerLowerHouseCan
 
   private fun observeViewItem(viewState: AsyncViewState<CandidateListResult>) = with(binding) {
     progressBar.isVisible = viewState is AsyncViewState.Loading
-    rvCandidate.isVisible = viewState is AsyncViewState.Success
     tvErrorMessage.isVisible = viewState is AsyncViewState.Error
     btnRetry.isVisible = viewState is AsyncViewState.Error
 
diff --git a/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/regionalhouse/RegionalHouseCandidateListController.kt b/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/regionalhouse/RegionalHouseCandidateListController.kt
index 50e36ed..f06d6e7 100644
--- a/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/regionalhouse/RegionalHouseCandidateListController.kt
+++ b/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/regionalhouse/RegionalHouseCandidateListController.kt
@@ -85,7 +85,6 @@ class RegionalHouseCandidateListController() : MvvmController<ControllerRegional
 
   private fun observeViewItem(viewState: AsyncViewState<CandidateListResult>) = with(binding) {
     progressBar.isVisible = viewState is AsyncViewState.Loading
-    rvCandidate.isVisible = viewState is AsyncViewState.Success
     tvErrorMessage.isVisible = viewState is AsyncViewState.Error
     btnRetry.isVisible = viewState is AsyncViewState.Error
     groupRemark.isVisible = false
diff --git a/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/upperhouse/UpperHouseCandidateListController.kt b/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/upperhouse/UpperHouseCandidateListController.kt
index 86cb68a..77a363b 100644
--- a/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/upperhouse/UpperHouseCandidateListController.kt
+++ b/app/src/main/java/com/popstack/mvoter2015/feature/candidate/listing/upperhouse/UpperHouseCandidateListController.kt
@@ -82,7 +82,6 @@ class UpperHouseCandidateListController : MvvmController<ControllerUpperHouseCan
 
   private fun observeViewItem(viewState: AsyncViewState<CandidateListResult>) = with(binding) {
     progressBar.isVisible = viewState is AsyncViewState.Loading
-    rvCandidate.isVisible = viewState is AsyncViewState.Success
     tvErrorMessage.isVisible = viewState is AsyncViewState.Error
     btnRetry.isVisible = viewState is AsyncViewState.Error
 
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 5d81453..24347e7 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -5,7 +5,7 @@ object BuildConfig {
 
   private const val versionMajor = 4
   private const val versionMinor = 1
-  private const val versionPatch = 4
+  private const val versionPatch = 5
   private const val versionBuild = 0
 
   const val versionName =
diff --git a/release.properties b/release.properties
index 2c357e4..909447b 100644
--- a/release.properties
+++ b/release.properties
@@ -1,2 +1,2 @@
-forceUpdate=false
+forceUpdate=true
 url=https://us-central1-maepaysoh2020.cloudfunctions.net/deploy/android
\ No newline at end of file