Merge pull request #169 from TomTasche/development

3.2.7
opendocument-app · Mar 22, 2020 · 83bf11d · 83bf11d
2 parents de7eab0 + 6653c95
commit 83bf11d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/OpenDocument.core b/OpenDocument.core
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
         xmlns:tools="http://schemas.android.com/tools"
         package="at.tomtasche.reader"
         android:installLocation="auto"
-        android:versionCode="123"
-        android:versionName="3.2.5"
+        android:versionCode="125"
+        android:versionName="3.2.7"
         tools:ignore="GoogleAppIndexingWarning">
 
     <!-- added by HelpCrunch SDK otherwise -->

diff --git a/app/src/main/cpp/CoreWrapper.cpp b/app/src/main/cpp/CoreWrapper.cpp
@@ -44,7 +44,7 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject
             return result;
         }
 
-        const auto meta = translator->getMeta();
+        auto meta = translator->getMeta();
 
         jfieldID passwordField = env->GetFieldID(optionsClass, "password", "Ljava/lang/String;");
         jstring password = (jstring) env->GetObjectField(options, passwordField);
@@ -56,6 +56,8 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject
             env->ReleaseStringUTFChars(password, passwordC);
 
             decrypted = translator->decrypt(passwordCpp);
+
+            meta = translator->getMeta();
         }
 
         if (!decrypted) {
@@ -82,7 +84,7 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject
         jmethodID addMethod = env->GetMethodID(listClass, "add", "(Ljava/lang/Object;)Z");
 
         jfieldID pageNamesField = env->GetFieldID(resultClass, "pageNames", "Ljava/util/List;");
-        jstring pageNames = (jstring) env->GetObjectField(result, pageNamesField);
+        jobject pageNames = (jobject) env->GetObjectField(result, pageNamesField);
 
         jfieldID ooxmlField = env->GetFieldID(optionsClass, "ooxml", "Z");
         jboolean ooxml = env->GetBooleanField(options, ooxmlField);

diff --git a/app/src/main/java/at/tomtasche/reader/ui/activity/MainActivity.java b/app/src/main/java/at/tomtasche/reader/ui/activity/MainActivity.java
@@ -209,7 +209,7 @@ protected void onStart() {
 
         // app was started from another app, but make sure not to load it twice
         // (i.e. after bringing app back from background)
-        if (documentFragment != null) {
+        if (getSupportFragmentManager().findFragmentByTag(DOCUMENT_FRAGMENT_TAG) == null) {
             analyticsManager.setCurrentScreen(this, "screen_main");
 
             handleIntent(getIntent());
@@ -227,7 +227,7 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
     protected void onResume() {
         super.onResume();
 
-        if (documentFragment != null) {
+        if (getSupportFragmentManager().findFragmentByTag(DOCUMENT_FRAGMENT_TAG) == null) {
             // setCurrentScreen not ready to call before that
             analyticsManager.setCurrentScreen(this, "screen_main");
         }