Merge pull request #362 from opendocument-app/fix-core-password-callback

Fix core password callback

Author: TomTasche

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-    android:versionCode="181"
-    android:versionName="3.28"
+    android:versionCode="183"
+    android:versionName="3.29"
     tools:ignore="GoogleAppIndexingWarning">
 
     <uses-permission android:name="android.permission.INTERNET" />

app/src/main/cpp/CoreWrapper.cpp

@@ -119,11 +119,11 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject
                 config.text_document_margin = true;
             }
 
-            html = odr::OpenDocumentReader::html(inputPathCpp, [&passwordCpp]() -> const char * {
+            html = odr::OpenDocumentReader::html(inputPathCpp, [&passwordCpp]() -> std::string {
                 if (passwordCpp.has_value()) {
-                    return passwordCpp.value().c_str();
+                    return passwordCpp.value();
                 }
-                return nullptr;
+                return "";
             }, outputPathCpp, config);
 
             {