Compare commits

...

2 Commits

Author SHA1 Message Date
Greyson Parrelli
9e51db2332 Bump version to 6.2.4 2022-11-24 22:32:49 -05:00
Cody Henthorne
ea6aaf2daa Fix megaphone donate crash. 2022-11-24 22:31:36 -05:00
2 changed files with 9 additions and 9 deletions

View File

@@ -51,14 +51,14 @@ ktlint {
} }
def canonicalVersionCode = 1164 def canonicalVersionCode = 1164
def canonicalVersionName = "6.2.3" def canonicalVersionName = "6.2.4"
def postFixSize = 100 def postFixSize = 100
def abiPostFix = ['universal' : 0, def abiPostFix = ['universal' : 5,
'armeabi-v7a' : 1, 'armeabi-v7a' : 6,
'arm64-v8a' : 2, 'arm64-v8a' : 7,
'x86' : 3, 'x86' : 8,
'x86_64' : 4] 'x86_64' : 9]
def keystores = [ 'debug' : loadKeystoreProperties('keystore.debug.properties') ] def keystores = [ 'debug' : loadKeystoreProperties('keystore.debug.properties') ]

View File

@@ -2,8 +2,10 @@ package org.thoughtcrime.securesms.components.settings.app.subscription.donate
import android.content.Intent import android.content.Intent
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.navigation.fragment.NavHostFragment
import io.reactivex.rxjava3.subjects.PublishSubject import io.reactivex.rxjava3.subjects.PublishSubject
import io.reactivex.rxjava3.subjects.Subject import io.reactivex.rxjava3.subjects.Subject
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.FragmentWrapperActivity import org.thoughtcrime.securesms.components.FragmentWrapperActivity
import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository
@@ -18,9 +20,7 @@ class DonateToSignalActivity : FragmentWrapperActivity(), DonationPaymentCompone
override val googlePayResultPublisher: Subject<DonationPaymentComponent.GooglePayResult> = PublishSubject.create() override val googlePayResultPublisher: Subject<DonationPaymentComponent.GooglePayResult> = PublishSubject.create()
override fun getFragment(): Fragment { override fun getFragment(): Fragment {
return DonateToSignalFragment().apply { return NavHostFragment.create(R.navigation.donate_to_signal, DonateToSignalFragmentArgs.Builder(DonateToSignalType.ONE_TIME).build().toBundle())
arguments = DonateToSignalFragmentArgs.Builder(DonateToSignalType.ONE_TIME).build().toBundle()
}
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {