From ef63f3173bbe85629d0f2d7ed35b5f642623061f Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Fri, 13 Jul 2018 17:41:30 +0800
Subject: [PATCH] Refine ebegging

---
 mobile/build.gradle                                    |  2 +-
 mobile/src/main/AndroidManifest.xml                    |  1 -
 .../src/main/java/be/mygod/vpnhotspot/EBegFragment.kt  | 10 ++++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 5c88b9c8..34bb8418 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         resConfigs "zh-rCN"
-        versionCode 26
+        versionCode 29
         versionName "1.3.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 2959d482..2796e587 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -21,7 +21,6 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.BILLING"/>
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt
index 2f6c7e37..d21152d0 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt
@@ -47,8 +47,7 @@ class EBegFragment : DialogFragment(), PurchasesUpdatedListener, BillingClientSt
         view.findViewById<Button>(R.id.donations__google_android_market_donate_button).setOnClickListener {
             val skus = skus
             if (skus == null) {
-                openDialog(android.R.drawable.ic_dialog_alert,
-                        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))
             } else billingClient.launchBillingFlow(requireActivity(), BillingFlowParams.newBuilder()
                     .setSku(skus[googleSpinner.selectedItemPosition].sku).setType(BillingClient.SkuType.INAPP).build())
@@ -60,8 +59,7 @@ class EBegFragment : DialogFragment(), PurchasesUpdatedListener, BillingClientSt
                 }
     }
 
-    private fun openDialog(icon: Int, title: Int, message: String) = AlertDialog.Builder(requireContext()).apply {
-        setIcon(icon)
+    private fun openDialog(title: Int, message: String) = AlertDialog.Builder(requireContext()).apply {
         setTitle(title)
         setMessage(message)
         isCancelable = true
@@ -96,8 +94,8 @@ class EBegFragment : DialogFragment(), PurchasesUpdatedListener, BillingClientSt
     }
     override fun onConsumeResponse(responseCode: Int, purchaseToken: String?) {
         if (responseCode == BillingClient.BillingResponse.OK) {
-            openDialog(android.R.drawable.ic_dialog_info, R.string.donations__thanks_dialog_title,
-                    getString(R.string.donations__thanks_dialog))
+            openDialog(R.string.donations__thanks_dialog_title, getString(R.string.donations__thanks_dialog))
+            dismiss()
         } else Crashlytics.log(Log.ERROR, TAG, "onConsumeResponse: $responseCode")
     }
 }