Merge branch 'master' of github.com:buggins/coolreader

.gitignore

@@ -9,6 +9,7 @@ qtbuild
 qt-build
 qtcreator-build
 CMakeLists.txt.user
+CMakeLists.txt.user.*
 *~
 *.a
 *.so
@@ -21,3 +22,6 @@ cr3gui/data/dict/
 cr3gui/data/dict_ext
 cr3gui/data/tessdata/
 .directory
+*.orig
+*.rej
+/clang-analyzer-reports/

android/.gitignore

@@ -12,4 +12,10 @@ obj
 .DS_Store
 /build
 /captures
-.externalNativeBuild
+/.externalNativeBuild
+/.idea/assetWizardSettings.xml
+/.idea/encodings.xml
+/.idea/jarRepositories.xml
+/.idea/modules.xml
+/.idea/caches/
+/.idea/dictionaries/

android/app/.gitignore

@@ -1,2 +1,6 @@
 /build
 .externalNativeBuild
+/.cxx/
+/debug/
+/release/
+/release_stripped/

android/app/CMakeLists.txt

@@ -53,8 +53,8 @@ set(CRENGINE_SRC_FILES
  ${CR3_ROOT}/crengine/src/cp_stats.cpp
  ${CR3_ROOT}/crengine/src/lvstring.cpp
  ${CR3_ROOT}/crengine/src/lvstring8collection.cpp
- ${CR3_ROOT}/crengine/src/lvstring16collection.cpp
- ${CR3_ROOT}/crengine/src/lvstring16hashedcollection.cpp
+ ${CR3_ROOT}/crengine/src/lvstring32collection.cpp
+ ${CR3_ROOT}/crengine/src/lvstring32hashedcollection.cpp
  ${CR3_ROOT}/crengine/src/crlog.cpp
  ${CR3_ROOT}/crengine/src/serialbuf.cpp
  ${CR3_ROOT}/crengine/src/props.cpp

android/app/build.gradle

@@ -5,7 +5,7 @@ android {
  defaultConfig {
  applicationId "org.coolreader"
  minSdkVersion 3
- targetSdkVersion 28
+ targetSdkVersion 29
  // When new version released, version code must be incremented at least by 8
  // for compatibility with ABI versioning of split apk (see below).
  versionCode 32490
@@ -29,8 +29,10 @@ android {
  }
  buildTypes {
  release {
- minifyEnabled true
- shrinkResources true
+ // to make the bug report more readable.
+ minifyEnabled false
+ shrinkResources false
+ debuggable false
  proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-optimize.pro'
  externalNativeBuild {
  cmake {

android/app/proguard-rules-optimize.pro

@@ -109,6 +109,8 @@
  java.lang.String series;
  int seriesNumber;
  java.lang.String language;
+ java.lang.String description;
+ long crc32;
 }
 
 -keep class org.coolreader.crengine.Selection {

android/app/src/main/AndroidManifest.xml

@@ -65,7 +65,8 @@
  android:label="@string/app_name"
  android:process="org.coolreader"
  android:resizeableActivity="true"
- android:usesCleartextTraffic="true" >
+ android:usesCleartextTraffic="true"
+ android:requestLegacyExternalStorage="true" >
  <!--
  android:configChanges="orientation|keyboardHidden|locale|screenSize"
  -->