From f3a700589e16e16de38a0ae7f3a7c20ef919f3e9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 21 Apr 2020 11:07:35 +0300
Subject: limit webview debugging to actual debug builds

---
 org.fox.epube/src/main/java/org/fox/epube/MainActivity.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'org.fox.epube/src/main/java')

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 e0bdc0c..c9ef961 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
@@ -54,7 +54,8 @@ public class MainActivity extends AppCompatActivity {
         m_loadingBar.setVisibility(View.VISIBLE);
         m_loadingBar.setMax(100);
 
-        WebView.setWebContentsDebuggingEnabled(true);
+        if (BuildConfig.DEBUG)
+            WebView.setWebContentsDebuggingEnabled(true);
 
         m_web.setWebChromeClient(new WebChromeClient() {
             @Override
@@ -153,7 +154,7 @@ public class MainActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                m_web.evaluateJavascript("save_and_close();", null);
+                m_web.evaluateJavascript("Reader.close();", null);
                 return true;
             case R.id.library_favorites:
                 m_web.loadUrl(BASE_URL + "/index.php?mode=favorites");
@@ -174,10 +175,12 @@ public class MainActivity extends AppCompatActivity {
                 m_web.evaluateJavascript("App.Offline.removeAll();", null);
                 return true;
             case R.id.reader_search:
-                m_web.evaluateJavascript("EpubeApp.showActionBar(false); $(\"#search-modal\").modal()", null);
+                getSupportActionBar().hide();
+                m_web.evaluateJavascript("$(\"#search-modal\").modal()", null);
                 return true;
             case R.id.reader_settings:
-                m_web.evaluateJavascript("EpubeApp.showActionBar(false); $(\"#settings-modal\").modal()", null);
+                getSupportActionBar().hide();
+                m_web.evaluateJavascript("$(\"#settings-modal\").modal()", null);
                 return true;
             case R.id.logout:
                 m_web.loadUrl(BASE_URL + "/logout.php");
-- 
cgit v1.2.3