[NoForkingMode] Fix again...

Don't give two methods the same name.
Extern "C" the jni method.
Synchronize the calls to give some thread safety

Author: ViliusSutkus89

pdf2htmlEX/src/main/cpp/pdf2htmlEX.cc

@@ -84,8 +84,10 @@ Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_set_1environment_1value(JN
 }
 
 static bool forkBeforeConverting = true;
+
+extern "C"
 JNIEXPORT void JNICALL
-Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_setNoForking(JNIEnv *, jobject) {
+Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_set_1no_1forking(JNIEnv *, jclass) {
   forkBeforeConverting = false;
 }
 
@@ -164,4 +166,3 @@ Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_call_1pdf2htmlEX(JNIEnv *e
 
   return retVal;
 }
-

pdf2htmlEX/src/main/java/com/viliussutkus89/android/pdf2htmlex/pdf2htmlEX.java

@@ -43,7 +43,8 @@ public final class pdf2htmlEX {
   private String p_ownerPassword = "";
   private String p_userPassword = "";
 
-  private boolean m_isNoForking = false;
+  private final static Object m_forkingSynchro = new Object();
+  private static boolean m_isNoForking = false;
   private static boolean m_noForkingConversionAlreadyDone = false;
 
   public static class ConversionFailedException extends Exception {
@@ -113,20 +114,17 @@ public pdf2htmlEX setUserPassword(@NonNull String userPassword) {
     return this;
   }
 
-  public pdf2htmlEX setNoForking(boolean iDoUnderstandThatIWillHaveToRestartTheAppBeforeICanRunConversionForTheSecondTime) throws IllegalArgumentException {
+  public void setNoForking(boolean iDoUnderstandThatIWillHaveToRestartTheAppBeforeICanRunConversionForTheSecondTime) throws IllegalArgumentException {
     if (!iDoUnderstandThatIWillHaveToRestartTheAppBeforeICanRunConversionForTheSecondTime) {
       throw new IllegalArgumentException();
     }
-    this.m_isNoForking = true;
-    setNoForking();
-    return this;
+    synchronized (m_forkingSynchro) {
+      m_isNoForking = true;
+    }
+    set_no_forking();
   }
 
   public File convert() throws IOException, ConversionFailedException {
-    if (this.m_noForkingConversionAlreadyDone) {
-      throw new ConversionFailedException("No forking mode allows only one conversion!");
-    }
-
     if (null == this.p_inputPDF) {
       throw new ConversionFailedException("No Input PDF given!");
     }
@@ -135,6 +133,12 @@ public File convert() throws IOException, ConversionFailedException {
       throw new ConversionFailedException("Input PDF does not exist!");
     }
 
+    synchronized (m_forkingSynchro) {
+      if (m_noForkingConversionAlreadyDone) {
+        throw new ConversionFailedException("No forking mode allows only one conversion!");
+      }
+      m_noForkingConversionAlreadyDone = m_isNoForking;
+    }
     String inputFilenameNoPDFExt = this.p_inputPDF.getName();
     if (inputFilenameNoPDFExt.endsWith(".pdf")) {
       inputFilenameNoPDFExt = inputFilenameNoPDFExt.substring(0, inputFilenameNoPDFExt.length() - 4);
@@ -149,11 +153,7 @@ public File convert() throws IOException, ConversionFailedException {
       m_poppler_dataDir.getAbsolutePath(), m_pdf2htmlEX_tmpDir.getAbsolutePath(),
       this.p_inputPDF.getAbsolutePath(), outputHtml.getAbsolutePath(),
       this.p_ownerPassword, this.p_userPassword
-      );
-
-    if (this.m_isNoForking) {
-      this.m_noForkingConversionAlreadyDone = true;
-    }
+    );
 
     if (0 != retVal) {
       outputHtml.delete();
@@ -168,5 +168,5 @@ public File convert() throws IOException, ConversionFailedException {
   // Because Java cannot setenv for the current process
   static native void set_environment_value(String key, String value);
 
-  private native void setNoForking();
+  private native static void set_no_forking();
 }