brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash

Browse Source
This commit is contained in:
Mygod
2018-07-28 19:43:56 +08:00
parent 973fede540
commit 4e127bfcb7
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt
View File

@@ -10,8 +10,10 @@ import android.view.ViewStub
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import android.widget.Button import android.widget.Button
import android.widget.Spinner import android.widget.Spinner
import androidx.annotation.StringRes
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import be.mygod.vpnhotspot.App.Companion.app
import com.android.billingclient.api.* import com.android.billingclient.api.*
import com.crashlytics.android.Crashlytics import com.crashlytics.android.Crashlytics
@@ -48,7 +50,7 @@ class EBegFragment : DialogFragment(), PurchasesUpdatedListener, BillingClientSt
val sku = skus?.getOrNull(googleSpinner.selectedItemPosition) val sku = skus?.getOrNull(googleSpinner.selectedItemPosition)
if (sku == null) { if (sku == null) {
openDialog(R.string.donations__google_android_market_not_supported_title, openDialog(R.string.donations__google_android_market_not_supported_title,
getString(R.string.donations__google_android_market_not_supported)) R.string.donations__google_android_market_not_supported)
} else billingClient.launchBillingFlow(requireActivity(), BillingFlowParams.newBuilder() } else billingClient.launchBillingFlow(requireActivity(), BillingFlowParams.newBuilder()
.setSku(sku.sku).setType(BillingClient.SkuType.INAPP).build()) .setSku(sku.sku).setType(BillingClient.SkuType.INAPP).build())
} }
@@ -59,12 +61,14 @@ class EBegFragment : DialogFragment(), PurchasesUpdatedListener, BillingClientSt
} }
} }
private fun openDialog(title: Int, message: String) = AlertDialog.Builder(requireContext()).apply { private fun openDialog(@StringRes title: Int, @StringRes message: Int) {
setTitle(title) AlertDialog.Builder(context ?: app).apply {
setMessage(message) setTitle(title)
isCancelable = true setMessage(message)
setNeutralButton(R.string.donations__button_close) { dialog, _ -> dialog.dismiss() } isCancelable = true
}.show() setNeutralButton(R.string.donations__button_close) { dialog, _ -> dialog.dismiss() }
}.show()
}
override fun onBillingServiceDisconnected() { override fun onBillingServiceDisconnected() {
skus = null skus = null
@@ -94,7 +98,7 @@ class EBegFragment : DialogFragment(), PurchasesUpdatedListener, BillingClientSt
} }
override fun onConsumeResponse(responseCode: Int, purchaseToken: String?) { override fun onConsumeResponse(responseCode: Int, purchaseToken: String?) {
if (responseCode == BillingClient.BillingResponse.OK) { if (responseCode == BillingClient.BillingResponse.OK) {
openDialog(R.string.donations__thanks_dialog_title, getString(R.string.donations__thanks_dialog)) openDialog(R.string.donations__thanks_dialog_title, R.string.donations__thanks_dialog)
dismiss() dismiss()
} else Crashlytics.log(Log.ERROR, TAG, "onConsumeResponse: $responseCode") } else Crashlytics.log(Log.ERROR, TAG, "onConsumeResponse: $responseCode")
} }