diff --git a/app/build.gradle b/app/build.gradle index 91444330..147b8a00 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,11 +40,17 @@ android { minifyEnabled = true useProguard = true proguardFiles.add(file('proguard-rules.pro')) + buildConfigField "boolean", "PLAY_STORE_RELEASE", "false" + buildConfigField "String", "HOSTS_FILE_URI", "\"http://www.netguard.me/hosts\"" + buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/NetGuard/releases/latest\"" } debug { minifyEnabled = true useProguard = true proguardFiles.add(file('proguard-rules.pro')) + buildConfigField "boolean", "PLAY_STORE_RELEASE", "false" + buildConfigField "String", "HOSTS_FILE_URI", "\"http://www.netguard.me/hosts\"" + buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/NetGuard/releases/latest\"" } } } diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index f8d7293e..6da88653 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -725,7 +725,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere getPreferenceScreen().findPreference(name).setTitle(getString(R.string.setting_stats_samples, prefs.getString(name, "90"))); else if ("hosts_url".equals(name)) - getPreferenceScreen().findPreference(name).setSummary(prefs.getString(name, "http://www.netguard.me/hosts")); + getPreferenceScreen().findPreference(name).setSummary(prefs.getString(name, BuildConfig.HOSTS_FILE_URI)); else if ("loglevel".equals(name)) ServiceSinkhole.reload("changed " + name, this, false); diff --git a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java index 69276a07..82b806df 100644 --- a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java +++ b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java @@ -657,7 +657,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS StringBuilder json = new StringBuilder(); HttpsURLConnection urlConnection = null; try { - URL url = new URL("https://api.github.com/repos/M66B/NetGuard/releases/latest"); + URL url = new URL(BuildConfig.GITHUB_LATEST_API); urlConnection = (HttpsURLConnection) url.openConnection(); BufferedReader br = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())); diff --git a/app/src/main/java/eu/faircode/netguard/Util.java b/app/src/main/java/eu/faircode/netguard/Util.java index e7571ad2..c1662fcb 100644 --- a/app/src/main/java/eu/faircode/netguard/Util.java +++ b/app/src/main/java/eu/faircode/netguard/Util.java @@ -418,6 +418,8 @@ public class Util { } public static boolean isPlayStoreInstall(Context context) { + if (BuildConfig.PLAY_STORE_RELEASE) + return true; try { return "com.android.vending".equals(context.getPackageManager().getInstallerPackageName(context.getPackageName())); } catch (Throwable ex) {