summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2025-05-06 07:01:10 +0000
committerAndrew Dolgov <fox@fakecake.org>2025-05-06 07:01:10 +0000
commit4411e353086d4a07196ab2b883da25ccc5950094 (patch)
tree1e00c82e0c8a8a6d6ceed1c985bf616cc16cfb18
parent9910680267c52d0c6bdf151068b6fee9bc335311 (diff)
parent4dda65c22f22ccf5ade8d14e3d286e511c8d1117 (diff)
downloadthe-epube-android-4411e353.tar.gz
the-epube-android-4411e353.tar.xz
Merge branch 'protected/spring-cleaning' into 'master' 4411e353
Protected/spring cleaning

See merge request main/the-epube-android!1
-rw-r--r--build.gradle9
-rwxr-xr-x[-rw-r--r--]gradle.properties30
-rw-r--r--gradle/wrapper/gradle-wrapper.properties12
-rwxr-xr-xgradlew282
-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
-rw-r--r--settings.gradle3
9 files changed, 316 insertions, 231 deletions
diff --git a/build.gradle b/build.gradle
index 0125e0e..0fed969 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,14 +2,11 @@
 

 buildscript {

     repositories {

-        google()

         jcenter()

+        google()

     }

     dependencies {

-        classpath 'com.android.tools.build:gradle:4.0.2'

-        

-        // NOTE: Do not place your application dependencies here; they belong

-        // in the individual module build.gradle files

+        classpath 'com.android.tools.build:gradle:8.7.3'

     }

 }

 

@@ -17,7 +14,7 @@ allprojects {
     repositories {

         google()

         jcenter()

-        maven { url "http://dl.bintray.com/populov/maven" }

+        maven { url "https://dl.bintray.com/populov/maven" }

         maven { url "https://jitpack.io" }

         maven { url "https://clojars.org/repo" }

     }

diff --git a/gradle.properties b/gradle.properties
index 55f37b3..fb0d87d 100644..100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,20 +1,10 @@
-# Project-wide Gradle settings.

-# IDE (e.g. Android Studio) users:

-# Gradle settings configured through the IDE *will override*

-# any settings specified in this file.

-# For more details on how to configure your build environment visit

-# http://www.gradle.org/docs/current/userguide/build_environment.html

-# Specifies the JVM arguments used for the daemon process.

-# The setting is particularly useful for tweaking memory settings.

-org.gradle.jvmargs=-Xmx1536m

-# When configured, Gradle will run in incubating parallel mode.

-# This option should only be used with decoupled projects. More details, visit

-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

-# org.gradle.parallel=true

-# AndroidX package structure to make it clearer which packages are bundled with the

-# Android operating system, and which are packaged with your app's APK

-# https://developer.android.com/topic/libraries/support-library/androidx-rn

-android.useAndroidX=true

-# Automatically convert third-party libraries to use AndroidX

-android.enableJetifier=true

-

+android.enableJetifier=true
+android.nonFinalResIds=true
+android.nonTransitiveRClass=false
+android.useAndroidX=true
+org.gradle.jvmargs=\
+    --add-opens java.base/java.io=ALL-UNNAMED \
+    --add-opens jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
+    --add-opens jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
+    --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+    --add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 07d4f10..adfb49b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 20 17:19:42 MSK 2020

-distributionBase=GRADLE_USER_HOME

-distributionPath=wrapper/dists

-zipStoreBase=GRADLE_USER_HOME

-zipStorePath=wrapper/dists

-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

+#Tue May 06 08:21:00 MSK 2025
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index cccdd3d..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
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() {

diff --git a/settings.gradle b/settings.gradle
index 9d93383..284aa42 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,5 @@
+plugins {

+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'

+}

 include ':org.fox.epube'

 rootProject.name='The Epube'