From 44629a190b3ce29e823594201077bb9ae963b46d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 10 Jan 2024 21:26:43 +0300 Subject: move epube base url to build config --- org.fox.epube/build.gradle | 3 +++ org.fox.epube/src/main/java/org/fox/epube/MainActivity.java | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/org.fox.epube/build.gradle b/org.fox.epube/build.gradle index e604e14..efb0e8f 100644 --- a/org.fox.epube/build.gradle +++ b/org.fox.epube/build.gradle @@ -11,6 +11,7 @@ android { versionName "1.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField "boolean", "ENABLE_UPDATER", "false" + buildConfigField "String", "EPUBE_BASE_URL", "\"https://epube.dev.ka.ke\"" } signingConfigs { @@ -28,6 +29,7 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + buildConfigField "String", "EPUBE_BASE_URL", "\"https://books.fakecake.org\"" } fdroid { @@ -36,6 +38,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' signingConfig signingConfigs.fdroid buildConfigField "boolean", "ENABLE_UPDATER", "true" + buildConfigField "String", "EPUBE_BASE_URL", "\"https://books.fakecake.org\"" //matchingFallbacks = ['release'] } } diff --git a/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java b/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java index 2a9dde4..55086bf 100644 --- a/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java +++ b/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java @@ -37,9 +37,6 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei private final String TAG = this.getClass().getSimpleName(); - private final String BASE_URL = "https://fakecake.org/books"; - private final String BASE_URL_DEV = "https://dev.fakecake.org/books"; - public enum AppPage { PAGE_UNKNOWN, PAGE_LOGIN, PAGE_LIBRARY, PAGE_FAVORITES, PAGE_OFFLINE, PAGE_READER } private ProgressBar m_loadingBar; @@ -56,10 +53,7 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (BuildConfig.DEBUG) - m_baseUrl = BASE_URL_DEV; - else - m_baseUrl = BASE_URL; + m_baseUrl = BuildConfig.EPUBE_BASE_URL; startNetworkBroadcastReceiver(this); -- cgit v1.2.3