summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorfox <fox@fakecake.org>2026-08-01 23:38:34 +0300
committerfox <fox@fakecake.org>2026-08-01 23:38:34 +0300
commit1248f14b8922979f9ce0dd07925fac5a0161538d (patch)
tree54c28b35ee589af56869ee56b08c81a429c8b3db
parentde4e6e79e6e76b3adf795c753ec1c3b613de594b (diff)
parent24fb8fc4f3a653214e9f40ae530e781425e22cc9 (diff)
downloadthe-epube-android-master.tar.gz
the-epube-android-master.tar.xz
Merge branch 'dev' into 'master' HEAD 26.08-1248f14b-signed master
Dev

See merge request git/the-epube-android!8
-rw-r--r--org.fox.epube/build.gradle14
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java10
-rw-r--r--org.fox.epube/src/main/res/values/strings.xml2
3 files changed, 19 insertions, 7 deletions
diff --git a/org.fox.epube/build.gradle b/org.fox.epube/build.gradle
index 76a5b85..a3c7f5c 100644
--- a/org.fox.epube/build.gradle
+++ b/org.fox.epube/build.gradle
@@ -53,7 +53,6 @@ android {
             minifyEnabled false

             versionNameSuffix "-unsigned"

             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.txt'

-            buildConfigField "String", "EPUBE_BASE_URL", "\"https://books.fakecake.org\""

         }

 

         signed {

@@ -64,6 +63,19 @@ android {
             buildConfigField "String", "EPUBE_BASE_URL", "\"https://books.fakecake.org\""

             matchingFallbacks = ['release']

         }

+

+        branch {

+            minifyEnabled  false

+            versionNameSuffix "-signed-branch"

+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'

+            signingConfig signingConfigs.signed

+            applicationIdSuffix ".branch"

+            resValue "string", "app_name", "The Epube (dev)"

+            manifestPlaceholders = [

+                    appIcon: "@mipmap/ic_launcher_variant"

+            ]

+            matchingFallbacks = ['release']

+        }

     }

 

     namespace 'org.fox.epube'

diff --git a/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
index 0300f9b..4b3abbb 100644
--- a/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
+++ b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
@@ -399,23 +399,23 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
             m_web.evaluateJavascript("Reader.close();", null);

             return true;

         } else if (itemId == R.id.library_favorites) {

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

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

             return true;

         } else if (itemId == R.id.library_all) {

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

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

             return true;

         } else if (itemId == R.id.library_local || itemId == R.id.library_local_offline) {

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

             return true;

         } else if (itemId == R.id.refresh_script_cache) {

             m_web.clearCache(true);

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

+            m_web.evaluateJavascript("window.location.reload();", null);

             return true;

         } else if (itemId == R.id.favorites_download_all) {

-            m_web.evaluateJavascript("App.Offline.getAll();", null);

+            m_web.evaluateJavascript("App.getAll();", null);

             return true;

         } else if (itemId == R.id.offline_remove_all) {

-            m_web.evaluateJavascript("App.Offline.removeAll();", null);

+            m_web.evaluateJavascript("App.removeAll();", null);

             return true;

         } else if (itemId == R.id.reader_search) {

             showActionBar(false);

diff --git a/org.fox.epube/src/main/res/values/strings.xml b/org.fox.epube/src/main/res/values/strings.xml
index 95a4153..3c76cba 100644
--- a/org.fox.epube/src/main/res/values/strings.xml
+++ b/org.fox.epube/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="page_favorites">Favorites</string>

     <string name="page_downloaded">Downloaded</string>

     <string name="page_all_books">All books</string>

-    <string name="refresh_script_cache">Refresh script cache</string>

+    <string name="refresh_script_cache">Reload page</string>

     <string name="logout">Logout</string>

     <string name="download_all">Download all</string>

     <string name="remove_all_downloads">Remove all downloads</string>