From 9d7316e6085dd463288713b96e99571b655b0800 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 19 Dec 2018 14:57:01 +0100 Subject: [PATCH] Build config fields for Play store releases --- app/build.gradle | 4 ++++ app/src/main/java/eu/faircode/email/ActivityView.java | 3 +-- app/src/main/java/eu/faircode/email/Helper.java | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2880dd3437..ba2654d627 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,12 +27,16 @@ android { minifyEnabled = true useProguard = true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + buildConfigField "boolean", "PLAY_STORE_RELEASE", "false" + buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/open-source-email/releases/latest\"" } debug { debuggable = true minifyEnabled = false useProguard = false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + buildConfigField "boolean", "PLAY_STORE_RELEASE", "false" + buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/open-source-email/releases/latest\"" } } diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 464208743b..cdaba0d015 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -145,7 +145,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB static final String ACTION_DECRYPT = BuildConfig.APPLICATION_ID + ".DECRYPT"; static final String ACTION_SHOW_PRO = BuildConfig.APPLICATION_ID + ".SHOW_PRO"; - static final String UPDATE_LATEST_API = "https://api.github.com/repos/M66B/open-source-email/releases/latest"; static final long UPDATE_INTERVAL = 12 * 3600 * 1000L; // milliseconds private static final String PGP_BEGIN_MESSAGE = "-----BEGIN PGP MESSAGE-----"; @@ -642,7 +641,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB StringBuilder json = new StringBuilder(); HttpsURLConnection urlConnection = null; try { - URL latest = new URL(UPDATE_LATEST_API); + URL latest = new URL(BuildConfig.GITHUB_LATEST_API); urlConnection = (HttpsURLConnection) latest.openConnection(); BufferedReader br = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())); diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 7aed2fb90e..8c4951e18b 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -427,6 +427,8 @@ public class Helper { } static boolean isPlayStoreInstall(Context context) { + if (BuildConfig.PLAY_STORE_RELEASE) + return true; if (false && BuildConfig.DEBUG) return true; try {