From 0e5397383917f233b6fdfe76491c1eb421a50b08 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 30 Dec 2015 18:57:00 +0100 Subject: [PATCH] A preious donation entitles to all pro features --- .../eu/faircode/netguard/ActivityPro.java | 22 +++++++++---------- .../main/java/eu/faircode/netguard/IAB.java | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/eu/faircode/netguard/ActivityPro.java b/app/src/main/java/eu/faircode/netguard/ActivityPro.java index 2ba7e36b..9559a7e9 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityPro.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityPro.java @@ -172,18 +172,16 @@ public class ActivityPro extends AppCompatActivity { TextView tvSpeed = (TextView) findViewById(R.id.tvSpeed); TextView tvBackup = (TextView) findViewById(R.id.tvBackup); - boolean donated = (IAB.isPurchased(SKU_DONATION, this) || Util.isDebuggable(this)); + btnSelect.setVisibility(IAB.isPurchased(SKU_SELECT, this) ? View.GONE : View.VISIBLE); + btnDefaults.setVisibility(IAB.isPurchased(SKU_DEFAULTS, this) ? View.GONE : View.VISIBLE); + btnTheme.setVisibility(IAB.isPurchased(SKU_THEME, this) ? View.GONE : View.VISIBLE); + btnSpeed.setVisibility(IAB.isPurchased(SKU_SPEED, this) ? View.GONE : View.VISIBLE); + btnBackup.setVisibility(IAB.isPurchased(SKU_BACKUP, this) ? View.GONE : View.VISIBLE); - btnSelect.setVisibility(donated || IAB.isPurchased(SKU_SELECT, this) ? View.GONE : View.VISIBLE); - btnDefaults.setVisibility(donated || IAB.isPurchased(SKU_DEFAULTS, this) ? View.GONE : View.VISIBLE); - btnTheme.setVisibility(donated || IAB.isPurchased(SKU_THEME, this) ? View.GONE : View.VISIBLE); - btnSpeed.setVisibility(donated || IAB.isPurchased(SKU_SPEED, this) ? View.GONE : View.VISIBLE); - btnBackup.setVisibility(donated || IAB.isPurchased(SKU_BACKUP, this) ? View.GONE : View.VISIBLE); - - tvSelect.setVisibility(donated || IAB.isPurchased(SKU_SELECT, this) ? View.VISIBLE : View.GONE); - tvDefaults.setVisibility(donated || IAB.isPurchased(SKU_DEFAULTS, this) ? View.VISIBLE : View.GONE); - tvTheme.setVisibility(donated || IAB.isPurchased(SKU_THEME, this) ? View.VISIBLE : View.GONE); - tvSpeed.setVisibility(donated || IAB.isPurchased(SKU_SPEED, this) ? View.VISIBLE : View.GONE); - tvBackup.setVisibility(donated || IAB.isPurchased(SKU_BACKUP, this) ? View.VISIBLE : View.GONE); + tvSelect.setVisibility(IAB.isPurchased(SKU_SELECT, this) ? View.VISIBLE : View.GONE); + tvDefaults.setVisibility(IAB.isPurchased(SKU_DEFAULTS, this) ? View.VISIBLE : View.GONE); + tvTheme.setVisibility(IAB.isPurchased(SKU_THEME, this) ? View.VISIBLE : View.GONE); + tvSpeed.setVisibility(IAB.isPurchased(SKU_SPEED, this) ? View.VISIBLE : View.GONE); + tvBackup.setVisibility(IAB.isPurchased(SKU_BACKUP, this) ? View.VISIBLE : View.GONE); } } diff --git a/app/src/main/java/eu/faircode/netguard/IAB.java b/app/src/main/java/eu/faircode/netguard/IAB.java index 5dfbd238..8759fc7c 100644 --- a/app/src/main/java/eu/faircode/netguard/IAB.java +++ b/app/src/main/java/eu/faircode/netguard/IAB.java @@ -160,7 +160,7 @@ public class IAB implements ServiceConnection { public static boolean isPurchased(String sku, Context context) { SharedPreferences prefs = context.getSharedPreferences("IAB", Context.MODE_PRIVATE); - return prefs.getBoolean(sku, false); + return (prefs.getBoolean(sku, false) || prefs.getBoolean(ActivityPro.SKU_DONATION, false) || Util.isDebuggable(context)); } public static String getResult(int responseCode) {