remove unused dependencies; use separate BASE_URL for debug builds

1 files changed, 15 insertions, 9 deletions

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 05c9c92..e2d9cb7 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
@@ -29,14 +29,14 @@ import com.livefront.bridge.Bridge;
 

 import androidx.appcompat.app.AppCompatActivity;

 import androidx.appcompat.widget.Toolbar;

-import androidx.webkit.WebSettingsCompat;

-import androidx.webkit.WebViewFeature;

 import icepick.State;

 

 public class MainActivity extends AppCompatActivity implements NetworkStateReceiver.NetworkStateReceiverListener {

 

     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 }

 

@@ -44,6 +44,7 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
     private WebView m_web;

     private Menu m_menu;

     private NetworkStateReceiver m_networkStateReceiver;

+    private String m_baseUrl;

 

     @State protected boolean m_offlineMode;

     @State protected AppPage m_currentPage = AppPage.PAGE_UNKNOWN;

@@ -53,6 +54,11 @@ 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;

+

         startNetworkBroadcastReceiver(this);

 

         setContentView(R.layout.activity_main);

@@ -100,7 +106,7 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
             public boolean shouldOverrideUrlLoading(WebView view, String url) {

                 Log.d(TAG, "load URL=" + url);

 

-                if (url.indexOf(BASE_URL) == 0) {

+                if (url.indexOf(m_baseUrl) == 0) {

                     view.loadUrl(url);

                 } else {

                     Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));

@@ -134,7 +140,7 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
             }

         });

 

-        CookieManager.getInstance().setCookie(BASE_URL, "is-epube-app=true");

+        //CookieManager.getInstance().setCookie(m_baseUrl, "is-epube-app=true");

 

         m_web.addJavascriptInterface(new WebAppInterface(this), "EpubeApp");

         m_web.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);

@@ -142,7 +148,7 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
         Bridge.restoreInstanceState(this, savedInstanceState);

 

         if (savedInstanceState == null || m_lastVisitedURL == null) {

-            m_web.loadUrl(BASE_URL + "/index.php");

+            m_web.loadUrl(m_baseUrl + "/index.php");

         } else {

             m_web.loadUrl(m_lastVisitedURL);

         }

@@ -234,14 +240,14 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
                 m_web.evaluateJavascript("Reader.close();", null);

                 return true;

             case R.id.library_favorites:

-                m_web.loadUrl(BASE_URL + "/index.php?mode=favorites");

+                m_web.loadUrl(m_baseUrl + "/index.php?mode=favorites");

                 return true;

             case R.id.library_all:

-                m_web.loadUrl(BASE_URL + "/index.php");

+                m_web.loadUrl(m_baseUrl + "/index.php");

                 return true;

             case R.id.library_local:

             case R.id.library_local_offline:

-                m_web.loadUrl(BASE_URL + "/offline.html");

+                m_web.loadUrl(m_baseUrl + "/offline.html");

                 return true;

             case R.id.refresh_script_cache:

                 m_web.evaluateJavascript("App.refreshCache(true);", null);

@@ -264,7 +270,7 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
                 m_web.evaluateJavascript("$(\"#settings-modal\").modal()", null);

                 return true;

             case R.id.logout:

-                m_web.loadUrl(BASE_URL + "/logout.php");

+                m_web.loadUrl(m_baseUrl + "/logout.php");

                 return true;

             default:

                 return super.onOptionsItemSelected(item);