Make sure that add annotations waits for the PdfFragment to be available

Author: irgendeinich

android/src/main/java/com/pspdfkit/react/ReactPdfViewManager.java

@@ -175,7 +175,7 @@ public void accept(List<Annotation> annotations) {
                 break;
             case COMMAND_ADD_ANNOTATION:
                 if (args != null) {
-                    root.addAnnotation(args.getMap(0));
+                    annotationDisposables.add(root.addAnnotation(args.getMap(0)));
                 }
                 break;
             case COMMAND_GET_ALL_UNSAVED_ANNOTATIONS:
@@ -195,7 +195,7 @@ public void accept(JSONObject jsonObject) {
                 break;
             case COMMAND_ADD_ANNOTATIONS:
                 if (args != null && args.size() == 1) {
-                    root.addAnnotations(args.getMap(0));
+                    annotationDisposables.add(root.addAnnotations(args.getMap(0)));
                 }
                 break;
             case COMMAND_GET_FORM_FIELD_VALUE:

android/src/main/java/com/pspdfkit/views/PdfView.java

@@ -454,9 +454,14 @@ private EnumSet<AnnotationType> getTypeFromString(@Nullable String type) {
         return EnumSet.noneOf(AnnotationType.class);
     }
 
-    public void addAnnotation(ReadableMap annotation) {
-        JSONObject json = new JSONObject(annotation.toHashMap());
-        fragment.getDocument().getAnnotationProvider().createAnnotationFromInstantJson(json.toString());
+    public Disposable addAnnotation(ReadableMap annotation) {
+        return fragmentGetter.take(1).map(PdfFragment::getDocument).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(pdfDocument -> {
+                    JSONObject json = new JSONObject(annotation.toHashMap());
+                    pdfDocument.getAnnotationProvider().createAnnotationFromInstantJson(json.toString());
+                });
+
     }
 
     public Single<JSONObject> getAllUnsavedAnnotations() {
@@ -473,10 +478,14 @@ public JSONObject call() throws Exception {
                 });
     }
 
-    public void addAnnotations(ReadableMap annotation) {
-        JSONObject json = new JSONObject(annotation.toHashMap());
-        final DataProvider dataProvider = new DocumentJsonDataProvider(json);
-        DocumentJsonFormatter.importDocumentJson(fragment.getDocument(), dataProvider);
+    public Disposable addAnnotations(ReadableMap annotation) {
+        return fragmentGetter.take(1).map(PdfFragment::getDocument).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(pdfDocument -> {
+                    JSONObject json = new JSONObject(annotation.toHashMap());
+                    final DataProvider dataProvider = new DocumentJsonDataProvider(json);
+                    DocumentJsonFormatter.importDocumentJson(pdfDocument, dataProvider);
+                });
     }
 
     public Disposable getFormFieldValue(final int requestId, @NonNull String formElementName) {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "1.21.1",
+  "version": "1.22.0",
   "description": "A React Native module for the PSPDFKit library.",
   "keywords": [
     "react native",