summary refs log tree commit diff stats
path: root/org.fox.epube
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.epube')
-rw-r--r--org.fox.epube/build.gradle100
-rw-r--r--org.fox.epube/proguard-rules.pro21
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/Application.java6
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MainActivity.java84
4 files changed, 122 insertions, 89 deletions
diff --git a/org.fox.epube/build.gradle b/org.fox.epube/build.gradle
index fad30e7..6ad6306 100644
--- a/org.fox.epube/build.gradle
+++ b/org.fox.epube/build.gradle
@@ -1,9 +1,6 @@
 apply plugin: 'com.android.application'

 

 android {

-    compileSdkVersion 31

-    buildToolsVersion "29.0.2"

-

     compileOptions {

         sourceCompatibility JavaVersion.VERSION_1_8

         targetCompatibility JavaVersion.VERSION_1_8

@@ -12,21 +9,22 @@ android {
     defaultConfig {

         applicationId "org.fox.epube"

         minSdkVersion 24

+        //noinspection ExpiredTargetSdkVersion

         targetSdkVersion 31

-        versionCode 10

-        versionName "1.9"

-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

+        compileSdk 35

+        versionCode 11

+        versionName getVersion()

         buildConfigField "boolean", "ENABLE_UPDATER", "false"

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

     }

 

     signingConfigs {

-        fdroid {

-            if (project.hasProperty("FDROID_STORE_FILE")) {

-                storeFile file(FDROID_STORE_FILE)

-                storePassword FDROID_STORE_PASSWORD

-                keyAlias FDROID_KEY_ALIAS

-                keyPassword FDROID_KEY_PASSWORD

+        signed {

+            if (project.hasProperty("SIGNING_STORE_FILE")) {

+                storeFile file(SIGNING_STORE_FILE)

+                storePassword SIGNING_STORE_PASSWORD

+                keyAlias SIGNING_KEY_ALIAS

+                keyPassword SIGNING_KEY_PASSWORD

             }

         }

     }

@@ -40,29 +38,87 @@ android {
     buildTypes {

         release {

             minifyEnabled false

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

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

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

         }

 

-        fdroid {

+        signed {

             minifyEnabled  false

-            versionNameSuffix "-fdroid"

+            versionNameSuffix "-signed"

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

-            signingConfig signingConfigs.fdroid

+            signingConfig signingConfigs.signed

             buildConfigField "boolean", "ENABLE_UPDATER", "true"

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

             //matchingFallbacks = ['release']

         }

     }

+

+    namespace 'org.fox.epube'

+    buildFeatures {

+        buildConfig true

+    }

+

+}

+

+def getGitTimestamp() {

+    // gitlab CI iso-8601 timestamp

+    if (System.getenv("CI_COMMIT_TIMESTAMP")) {

+        return Date.parse("yyyy-MM-dd'T'HH:mm:ssXXX", System.getenv("CI_COMMIT_TIMESTAMP")).format('YY.MM')

+    }

+

+    // try to get version from git repo in current dir

+    try {

+        def stdout = new ByteArrayOutputStream()

+        exec {

+            commandLine 'git', '--no-pager', 'log', '--pretty=%ct', '-n1', 'HEAD'

+            standardOutput = stdout

+        }

+

+        return new Date(stdout.toString().trim().toLong() * 1000).format('YY.MM')

+    }

+    catch (ignored) {

+        return 0;

+    }

+

+}

+

+def getGitCommitHash() {

+    // gitlab CI

+    if (System.getenv("CI_COMMIT_SHORT_SHA"))

+        return System.getenv("CI_COMMIT_SHORT_SHA");

+

+    // try to get version from git repo in current dir

+    try {

+        def stdout = new ByteArrayOutputStream()

+        exec {

+            commandLine 'git', '--no-pager', 'log', '--pretty=%h', '-n1', 'HEAD'

+            standardOutput = stdout

+        }

+        return stdout.toString().trim()

+    }

+    catch (ignored) {

+        return 'UNKNOWN';

+    }

+}

+

+def getVersion() {

+    return getGitTimestamp() + '-' + getGitCommitHash();

 }

 

 dependencies {

-    implementation fileTree(dir: 'libs', include: ['*.jar'])

-    implementation 'androidx.appcompat:appcompat:1.6.0'

-    implementation 'androidx.webkit:webkit:1.11.0'

-    implementation 'frankiesardo:icepick:3.2.0'

-    compileOnly 'frankiesardo:icepick-processor:3.2.0'

-    annotationProcessor 'frankiesardo:icepick-processor:3.2.0'

+    // https://issuetracker.google.com/issues/272973596

+    implementation platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")

+    implementation 'androidx.appcompat:appcompat:1.7.0'

+    implementation 'androidx.appcompat:appcompat-resources:1.7.0'

+    implementation 'androidx.webkit:webkit:1.13.0'

+    implementation 'com.evernote:android-state:1.4.1'

+    compileOnly 'com.evernote:android-state:1.4.1'

+    annotationProcessor 'com.evernote:android-state:1.4.1'

     implementation 'com.github.livefront:bridge:v1.1.1'

     implementation 'com.github.javiersantos:AppUpdater:2.7'

 }

+java {

+    toolchain {

+        languageVersion = JavaLanguageVersion.of(17)

+    }

+}

diff --git a/org.fox.epube/proguard-rules.pro b/org.fox.epube/proguard-rules.pro
deleted file mode 100644
index 6e7ffa9..0000000
--- a/org.fox.epube/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.

-# You can control the set of applied configuration files using the

-# proguardFiles setting in build.gradle.

-#

-# For more details, see

-#   http://developer.android.com/guide/developing/tools/proguard.html

-

-# If your project uses WebView with JS, uncomment the following

-# and specify the fully qualified class name to the JavaScript interface

-# class:

-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {

-#   public *;

-#}

-

-# Uncomment this to preserve the line number information for

-# debugging stack traces.

-#-keepattributes SourceFile,LineNumberTable

-

-# If you keep the line number information, uncomment this to

-# hide the original source file name.

-#-renamesourcefileattribute SourceFile

diff --git a/org.fox.epube/src/main/java/org/fox/epube/Application.java b/org.fox.epube/src/main/java/org/fox/epube/Application.java
index 0feab12..982b1d5 100644
--- a/org.fox.epube/src/main/java/org/fox/epube/Application.java
+++ b/org.fox.epube/src/main/java/org/fox/epube/Application.java
@@ -2,6 +2,7 @@ package org.fox.epube;
 

 import android.os.Bundle;

 

+import com.evernote.android.state.StateSaver;

 import com.livefront.bridge.Bridge;

 import com.livefront.bridge.SavedStateHandler;

 

@@ -10,7 +11,6 @@ import java.net.CookieManager;
 

 import androidx.annotation.NonNull;

 import androidx.annotation.Nullable;

-import icepick.Icepick;

 

 public class Application extends android.app.Application {

     private static Application m_singleton;

@@ -25,12 +25,12 @@ public class Application extends android.app.Application {
         Bridge.initialize(getApplicationContext(), new SavedStateHandler() {

             @Override

             public void saveInstanceState(@NonNull Object target, @NonNull Bundle state) {

-                Icepick.saveInstanceState(target, state);

+                StateSaver.saveInstanceState(target, state);

             }

 

             @Override

             public void restoreInstanceState(@NonNull Object target, @Nullable Bundle state) {

-                Icepick.restoreInstanceState(target, state);

+                StateSaver.restoreInstanceState(target, state);

             }

         });

 

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 243372f..b4f0b28 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
@@ -1,5 +1,6 @@
 package org.fox.epube;

 

+import android.annotation.SuppressLint;

 import android.content.Context;

 import android.content.Intent;

 import android.content.IntentFilter;

@@ -35,7 +36,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;

 import androidx.webkit.WebViewAssetLoader;

 

-import icepick.State;

+import com.evernote.android.state.State;

 

 public class MainActivity extends AppCompatActivity implements NetworkStateReceiver.NetworkStateReceiverListener {

 

@@ -53,6 +54,7 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
     @State protected AppPage m_currentPage = AppPage.PAGE_UNKNOWN;

     @State protected String m_lastVisitedURL;

 

+    @SuppressLint("SetJavaScriptEnabled")

     @Override

     protected void onCreate(Bundle savedInstanceState) {

         super.onCreate(savedInstanceState);

@@ -81,8 +83,6 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
         settings.setCacheMode(WebSettings.LOAD_DEFAULT);

         settings.setDatabaseEnabled(true);

         settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);

-        settings.setAppCachePath(getCacheDir().getAbsolutePath());

-        settings.setAppCacheEnabled(true);

 

         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {

             settings.setForceDark(WebSettings.FORCE_DARK_OFF);

@@ -260,47 +260,45 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
 

     @Override

     public boolean onOptionsItemSelected(MenuItem item) {

-        switch (item.getItemId()) {

-            case android.R.id.home:

-                m_web.evaluateJavascript("Reader.close();", null);

-                return true;

-            case R.id.library_favorites:

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

-                return true;

-            case R.id.library_all:

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

-                return true;

-            case R.id.library_local:

-            case R.id.library_local_offline:

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

-                return true;

-            case R.id.refresh_script_cache:

-                m_web.clearCache(true);

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

-                return true;

-            case R.id.favorites_download_all:

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

-                return true;

-            case R.id.offline_remove_all:

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

-                return true;

-            case R.id.reader_search:

-                getSupportActionBar().hide();

-                m_web.evaluateJavascript("$(\"#search-modal\").modal()", null);

-                return true;

-            case R.id.reader_toggle_fullscreen:

-                toggleSystemUI();

-                return true;

-            case R.id.reader_settings:

-                getSupportActionBar().hide();

-                m_web.evaluateJavascript("$(\"#settings-modal\").modal()", null);

-                return true;

-            case R.id.logout:

-                m_web.evaluateJavascript("App.logout();", null);

-                return true;

-            default:

-                return super.onOptionsItemSelected(item);

+        int itemId = item.getItemId();

+        if (itemId == android.R.id.home) {

+            m_web.evaluateJavascript("Reader.close();", null);

+            return true;

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

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

+            return true;

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

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

+            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);

+            return true;

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

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

+            return true;

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

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

+            return true;

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

+            getSupportActionBar().hide();

+            m_web.evaluateJavascript("$(\"#search-modal\").modal()", null);

+            return true;

+        } else if (itemId == R.id.reader_toggle_fullscreen) {

+            toggleSystemUI();

+            return true;

+        } else if (itemId == R.id.reader_settings) {

+            getSupportActionBar().hide();

+            m_web.evaluateJavascript("$(\"#settings-modal\").modal()", null);

+            return true;

+        } else if (itemId == R.id.logout) {

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

+            return true;

         }

+        return super.onOptionsItemSelected(item);

     }

 

     private void toggleSystemUI() {