Skip to content

Commit 320442c

Browse files
authored
NTV-515: Hotfix for 3.1.1 (#1598)
* Hotfix for 3.1.0, it includes crashesh: - https://console.firebase.google.com/u/1/project/android-external-release/crashlytics/app/android:com.kickstarter.kickstarter/issues/aa0ef93c85eb1d77a8010a90febcb62b?time=last-seven-days&versions=3.1.0%20(2013150885)&sessionEventKey=625456FF00FC00010DDF2ADFD9A3B2F5_1663829381702599841 - https://console.firebase.google.com/u/1/project/android-external-release/crashlytics/app/android:com.kickstarter.kickstarter/issues/b903e509d8a417c06cab703564b51047?time=last-seven-days&versions=3.1.0%20(2013150885)&sessionEventKey=625456E202B5000144251933FC5F8C46_1663829255489627912 - https://console.firebase.google.com/u/1/project/android-external-release/crashlytics/app/android:com.kickstarter.kickstarter/issues/2a20ccc151eaa81a2bb25ab866feb4af?time=last-seven-days&versions=3.1.0%20(2013150885)&sessionEventKey=62543497017700010D1A72D8A2FD5E2A_1663791545976324517 - https://console.firebase.google.com/u/1/project/android-external-release/crashlytics/app/android:com.kickstarter.kickstarter/issues/5e2224fdbe35219259a9d012f6fbc951?time=last-seven-days&versions=3.1.0%20(2013150885)&sessionEventKey=6250AC9B03DF0001672A963557B54810_1663046190455469519 (cherry picked from commit 5cd29b9) * - https://console.firebase.google.com/u/1/project/android-external-release/crashlytics/app/android:com.kickstarter.kickstarter/issues/aa0ef93c85eb1d77a8010a90febcb62b?time=last-seven-days&versions=3.1.0%20(2013150885)&sessionEventKey=625456FF00FC00010DDF2ADFD9A3B2F5_1663829381702599841 * - updated okhttp version as it seems related to this ANR https://console.firebase.google.com/u/1/project/android-external-release/crashlytics/app/android:com.kickstarter.kickstarter/issues/a49db31aa172fbf99d2bbf750eb748a6?time=last-seven-days&sessionEventKey=625430FD02BF00012DBC0FF710443525_1663841903472819600 * - updated versions
1 parent 47a4669 commit 320442c

8 files changed

+16
-6
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ dependencies {
223223
implementation "com.jakewharton.timber:timber:4.7.1"
224224
implementation 'com.optimizely.ab:android-sdk:3.11.1'
225225
implementation "com.stripe:stripe-android:19.2.0"
226-
final okhttp_version = "4.9.+"
226+
final okhttp_version = "4.10.+"
227227
implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
228228
implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttp_version"
229229

app/external_version_code.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2013150884
1+
2013150885

app/external_version_name.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.0
1+
3.1.1

app/internal_version_code.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2013150884
1+
2013150885

app/internal_version_name.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.0
1+
3.1.1

app/src/main/java/com/kickstarter/ui/activities/DiscoveryActivity.kt

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import com.kickstarter.ui.fragments.DiscoveryFragment
3131
import com.kickstarter.ui.fragments.DiscoveryFragment.Companion.newInstance
3232
import com.kickstarter.viewmodels.DiscoveryViewModel
3333
import rx.android.schedulers.AndroidSchedulers
34+
import rx.schedulers.Schedulers
3435
import kotlin.collections.ArrayList
3536

3637
@RequiresActivityViewModel(DiscoveryViewModel.ViewModel::class)
@@ -146,6 +147,8 @@ class DiscoveryActivity : BaseActivity<DiscoveryViewModel.ViewModel>() {
146147
viewModel.outputs.navigationDrawerData()
147148
.compose(bindToLifecycle())
148149
.compose(Transformers.observeForUI())
150+
.subscribeOn(Schedulers.io())
151+
.observeOn(AndroidSchedulers.mainThread())
149152
.subscribe { drawerAdapter.takeData(it) }
150153

151154
viewModel.outputs.drawerIsOpen()

app/src/main/java/com/kickstarter/ui/activities/ProjectPageActivity.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import com.kickstarter.ui.fragments.RewardsFragment
5858
import com.kickstarter.viewmodels.projectpage.ProjectPageViewModel
5959
import com.stripe.android.view.CardInputWidget
6060
import rx.android.schedulers.AndroidSchedulers
61+
import rx.schedulers.Schedulers
6162

6263
@RequiresActivityViewModel(ProjectPageViewModel.ViewModel::class)
6364
class ProjectPageActivity :
@@ -118,11 +119,12 @@ class ProjectPageActivity :
118119

119120
this.viewModel.outputs.projectData()
120121
.compose(bindToLifecycle())
122+
.subscribeOn(Schedulers.io())
121123
.observeOn(AndroidSchedulers.mainThread())
122124
.subscribe {
123125
// - Every time the ProjectData gets updated
124126
// - the fragments on the viewPager are updated as well
125-
(binding.projectPager.adapter as ProjectPagerAdapter).updatedWithProjectData(it)
127+
(binding.projectPager.adapter as? ProjectPagerAdapter)?.updatedWithProjectData(it)
126128
}
127129

128130
this.viewModel.outputs.updateTabs()

app/src/main/java/com/kickstarter/ui/fragments/DiscoveryFragment.kt

+5
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import com.kickstarter.ui.data.LoginReason
4444
import com.kickstarter.ui.viewholders.EditorialViewHolder
4545
import com.kickstarter.viewmodels.DiscoveryFragmentViewModel
4646
import rx.android.schedulers.AndroidSchedulers
47+
import rx.schedulers.Schedulers
4748

4849
@RequiresFragmentViewModel(DiscoveryFragmentViewModel.ViewModel::class)
4950
class DiscoveryFragment : BaseFragment<DiscoveryFragmentViewModel.ViewModel>() {
@@ -90,6 +91,8 @@ class DiscoveryFragment : BaseFragment<DiscoveryFragmentViewModel.ViewModel>() {
9091
this.viewModel.outputs.activity()
9192
.compose(bindToLifecycle())
9293
.compose(Transformers.observeForUI())
94+
.subscribeOn(Schedulers.io())
95+
.observeOn(AndroidSchedulers.mainThread())
9396
.subscribe { discoveryActivitySampleAdapter.takeActivity(it) }
9497

9598
this.viewModel.outputs.startHeartAnimation()
@@ -101,6 +104,8 @@ class DiscoveryFragment : BaseFragment<DiscoveryFragmentViewModel.ViewModel>() {
101104
this.viewModel.outputs.projectList()
102105
.compose(bindToLifecycle())
103106
.compose(Transformers.observeForUI())
107+
.subscribeOn(Schedulers.io())
108+
.observeOn(AndroidSchedulers.mainThread())
104109
.subscribe { discoveryProjectCardAdapter.takeProjects(it) }
105110

106111
this.viewModel.outputs.shouldShowEditorial()

0 commit comments

Comments
 (0)