repo fix ...

Author: plotn

android/app/src/main/AndroidManifest.xml

@@ -640,11 +640,9 @@
                 <data android:scheme="content" />
                 <data android:mimeType="text/html" />
                 <data android:mimeType="application/xhtml+xml" />
-                <!--
                 <data android:mimeType="application/vnd.oasis.opendocument.text" />
                 <data android:mimeType="application/vnd.oasis.opendocument.spreadsheet" />
                 <data android:mimeType="application/vnd.oasis.opendocument.presentation" />
-                -->
             </intent-filter>
         </activity-alias>
         <!-- alias activity to disable CHM -->

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-rc01'
+        classpath 'com.android.tools.build:gradle:3.6.0-rc02'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip

android/jni/cr3engine.cpp

@@ -274,16 +274,28 @@ static bool GetFB3BookProperties(const char *name, LVStreamRef stream, BookPrope
 	}
 
 	ldomNode * item = descDoc->nodeFromXPath(lString16("document-info"));
-	lString16 created = item->getAttributeValue("created");
-	lString16 docprogram = item->getAttributeValue("program-used");
-	lString16 docauthor = item->getAttributeValue("editor");
-	lString16 docsrcurl = item->getAttributeValue("src-url");
-	lString16 docsrcocr = item->getAttributeValue("ocr");
+    lString16 created = cs16("");
+    lString16 docprogram = cs16("");
+    lString16 docauthor = cs16("");
+    lString16 docsrcurl = cs16("");
+    lString16 docsrcocr = cs16("");
+	if (item) {
+        created = item->getAttributeValue("created");
+        docprogram = item->getAttributeValue("program-used");
+        docauthor = item->getAttributeValue("editor");
+        docsrcurl = item->getAttributeValue("src-url");
+        docsrcocr = item->getAttributeValue("ocr");
+    }
 	lString16 series = descDoc->textFromXPath(lString16("fb3-description/sequence/title/main"));
 	ldomNode * item2 = descDoc->nodeFromXPath(lString16("paper-publish-info"));
-	lString16 publisher = item2->getAttributeValue("publisher");
-	lString16 city = item2->getAttributeValue("city");
-	lString16 year = item2->getAttributeValue("year");
+    lString16 publisher = cs16("");
+    lString16 city = cs16("");
+    lString16 year = cs16("");
+    if ( item2 ) {
+        publisher = item2->getAttributeValue("publisher");
+        city = item2->getAttributeValue("city");
+        year = item2->getAttributeValue("year");
+    }
 	lString16 publisbn = descDoc->textFromXPath(lString16("paper-publish-info/isbn"));
 	lString16 publsequence = descDoc->textFromXPath(lString16("paper-publish-info/sequence"));
 

icons8/convert_all_s.pl

@@ -263,7 +263,9 @@
         'icons8_settings_to_gd.svg' => 'icons8_settings_to_gd.png',
         'icons8_sun.svg' => 'icons8_sun.png',
         'icons8_sun_1.svg' => 'icons8_sun_1.png',
-        'icons8_folder_az.svg' => 'icons8_folder_az.png'
+        'icons8_folder_az.svg' => 'icons8_folder_az.png',
+        'icons8_cloud_storage.svg' => 'icons8_cloud_storage.png',
+        'icons8_send_by_email.svg' => 'icons8_send_by_email.png'
 );
 
 my %ic_menu_list=(

icons8/convert_all_s1.pl

@@ -11,15 +11,19 @@
 my %ic_bigicons_sizes = (ldpi=>36, mdpi=>48, hdpi=>72, xhdpi=>96, xxhdpi=>144, xxxhdpi=>192);
 
 my %ic_smaller_list=(
-        'icons8_star_filled.svg' => 'icons8_fav_star_filled.png'
+        'icons8_search_history.svg' => 'icons8_search_history_small.png',
+        'icons8_toc_item_collapsed.svg' => 'icons8_toc_item_collapsed.png',
+        'icons8_toc_item_expanded.svg' => 'icons8_toc_item_expanded.png',
+        'icons8_toc_item_normal.svg' => 'icons8_toc_item_normal.png'
 );
 
 my %ic_actions_list=(
-        'icons8_level_up_filled.svg' => 'icons8_level_up_filled.png'
+        'icons8_rounded_corners_margin2.svg' => 'icons8_rounded_corners_margin2.png',
+        'icons8_ext_fullscreen.svg' => 'icons8_ext_fullscreen.png'
 );
 
 my %ic_menu_list=(
-        'icons8_star.svg' => 'icons8_star.png'
+        'icons8_css.svg' => 'icons8_css.png'
 
 );