Skip to content

Commit

Permalink
NTV-515: Hotfix for 3.1.1 (#1598)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Arkariang authored Apr 11, 2022
1 parent 47a4669 commit 320442c
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ dependencies {
implementation "com.jakewharton.timber:timber:4.7.1"
implementation 'com.optimizely.ab:android-sdk:3.11.1'
implementation "com.stripe:stripe-android:19.2.0"
final okhttp_version = "4.9.+"
final okhttp_version = "4.10.+"
implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttp_version"

Expand Down
2 changes: 1 addition & 1 deletion app/external_version_code.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2013150884
2013150885
2 changes: 1 addition & 1 deletion app/external_version_name.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.0
3.1.1
2 changes: 1 addition & 1 deletion app/internal_version_code.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2013150884
2013150885
2 changes: 1 addition & 1 deletion app/internal_version_name.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.0
3.1.1
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.kickstarter.ui.fragments.DiscoveryFragment
import com.kickstarter.ui.fragments.DiscoveryFragment.Companion.newInstance
import com.kickstarter.viewmodels.DiscoveryViewModel
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
import kotlin.collections.ArrayList

@RequiresActivityViewModel(DiscoveryViewModel.ViewModel::class)
Expand Down Expand Up @@ -146,6 +147,8 @@ class DiscoveryActivity : BaseActivity<DiscoveryViewModel.ViewModel>() {
viewModel.outputs.navigationDrawerData()
.compose(bindToLifecycle())
.compose(Transformers.observeForUI())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe { drawerAdapter.takeData(it) }

viewModel.outputs.drawerIsOpen()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import com.kickstarter.ui.fragments.RewardsFragment
import com.kickstarter.viewmodels.projectpage.ProjectPageViewModel
import com.stripe.android.view.CardInputWidget
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers

@RequiresActivityViewModel(ProjectPageViewModel.ViewModel::class)
class ProjectPageActivity :
Expand Down Expand Up @@ -118,11 +119,12 @@ class ProjectPageActivity :

this.viewModel.outputs.projectData()
.compose(bindToLifecycle())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe {
// - Every time the ProjectData gets updated
// - the fragments on the viewPager are updated as well
(binding.projectPager.adapter as ProjectPagerAdapter).updatedWithProjectData(it)
(binding.projectPager.adapter as? ProjectPagerAdapter)?.updatedWithProjectData(it)
}

this.viewModel.outputs.updateTabs()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import com.kickstarter.ui.data.LoginReason
import com.kickstarter.ui.viewholders.EditorialViewHolder
import com.kickstarter.viewmodels.DiscoveryFragmentViewModel
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers

@RequiresFragmentViewModel(DiscoveryFragmentViewModel.ViewModel::class)
class DiscoveryFragment : BaseFragment<DiscoveryFragmentViewModel.ViewModel>() {
Expand Down Expand Up @@ -90,6 +91,8 @@ class DiscoveryFragment : BaseFragment<DiscoveryFragmentViewModel.ViewModel>() {
this.viewModel.outputs.activity()
.compose(bindToLifecycle())
.compose(Transformers.observeForUI())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe { discoveryActivitySampleAdapter.takeActivity(it) }

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

this.viewModel.outputs.shouldShowEditorial()
Expand Down

0 comments on commit 320442c

Please sign in to comment.