diff --git a/README.md b/README.md index 0d6bf50e..7c7a6c6a 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,6 @@ Connecting things to your VPN made simple. Share your VPN connection over hotspot or repeater. (**root required**) -| Release channel | [GitHub](https://github.com/Mygod/VPNHotspot/releases) | [Google Play](https://play.google.com/store/apps/details?id=be.mygod.vpnhotspot) ([beta](https://play.google.com/apps/testing/be.mygod.vpnhotspot)) | -|---------------------------------------------------------|:--------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------:| -| Auto update | Email updates via watching releases | ✓ | -| In-app update channel | GitHub | Google Play | -| [Sponsor/Donation](https://github.com/sponsors/Mygod) | ✓ | Google Play In-App Purchases only | - This app is useful for: * Connecting things that don't support VPN like Chromecasts behind corporate firewalls; diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index bd97e780..be906080 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -33,7 +33,6 @@ android { put("room.incremental", "true") put("room.schemaLocation", "$projectDir/schemas") } - buildConfigField("boolean", "DONATIONS", "true") } buildFeatures { dataBinding = true @@ -58,7 +57,6 @@ android { create("google") { dimension = "freedom" versionNameSuffix = "-g" - buildConfigField("boolean", "DONATIONS", "false") } } sourceSets.getByName("androidTest").assets.srcDir("$projectDir/schemas") diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt index a57715ea..8ba7ed9a 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt @@ -5,14 +5,25 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter -import android.widget.Button import androidx.appcompat.app.AppCompatDialogFragment import androidx.lifecycle.lifecycleScope import be.mygod.vpnhotspot.App.Companion.app import be.mygod.vpnhotspot.databinding.FragmentEbegBinding import be.mygod.vpnhotspot.util.launchUrl import be.mygod.vpnhotspot.widget.SmartSnackbar -import com.android.billingclient.api.* +import com.android.billingclient.api.BillingClient +import com.android.billingclient.api.BillingClientStateListener +import com.android.billingclient.api.BillingFlowParams +import com.android.billingclient.api.BillingResult +import com.android.billingclient.api.ConsumeParams +import com.android.billingclient.api.ProductDetails +import com.android.billingclient.api.Purchase +import com.android.billingclient.api.PurchasesUpdatedListener +import com.android.billingclient.api.QueryProductDetailsParams +import com.android.billingclient.api.QueryPurchasesParams +import com.android.billingclient.api.consumePurchase +import com.android.billingclient.api.queryProductDetails +import com.android.billingclient.api.queryPurchasesAsync import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch @@ -94,8 +105,7 @@ class EBegFragment : AppCompatDialogFragment() { }.build())) }.build()) else SmartSnackbar.make(R.string.donations__google_android_market_not_supported).show() } - @Suppress("ConstantConditionIf") - if (BuildConfig.DONATIONS) (binding.donationsMoreStub.inflate() as Button).setOnClickListener { + binding.donationsMoreDonateButton.setOnClickListener { requireContext().launchUrl("https://mygod.be/donate/") } } diff --git a/mobile/src/main/res/layout/fragment_ebeg.xml b/mobile/src/main/res/layout/fragment_ebeg.xml index 0d5d035a..d1ba4cea 100644 --- a/mobile/src/main/res/layout/fragment_ebeg.xml +++ b/mobile/src/main/res/layout/fragment_ebeg.xml @@ -77,11 +77,11 @@ - + android:text="@string/settings_misc_donate_more"/> diff --git a/mobile/src/main/res/layout/fragment_ebeg_more.xml b/mobile/src/main/res/layout/fragment_ebeg_more.xml deleted file mode 100644 index c1ba416f..00000000 --- a/mobile/src/main/res/layout/fragment_ebeg_more.xml +++ /dev/null @@ -1,9 +0,0 @@ - -