Merge pull request #117 from PSPDFKit/reinhard/image-stamps

Fix image stamps not working

Author: irgendeinich

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

@@ -15,37 +15,67 @@
 
 import android.app.Activity;
 import android.app.Application;
+import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
 
+import com.facebook.react.bridge.ActivityEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.pspdfkit.PSPDFKit;
 import com.pspdfkit.document.PdfDocument;
+import com.pspdfkit.document.image.CameraImagePickerFragment;
+import com.pspdfkit.document.image.GalleryImagePickerFragment;
 import com.pspdfkit.listeners.SimpleDocumentListener;
 import com.pspdfkit.ui.PdfActivity;
+import com.pspdfkit.ui.PdfFragment;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class PSPDFKitModule extends ReactContextBaseJavaModule implements Application.ActivityLifecycleCallbacks {
+public class PSPDFKitModule extends ReactContextBaseJavaModule implements Application.ActivityLifecycleCallbacks, ActivityEventListener {
 
     private static final String VERSION_KEY = "versionString";
     private static final String FILE_SCHEME = "file:///";
 
+    private static final int REQUEST_CODE_TO_INDEX = 16;
+    private static final int MASKED_REQUEST_CODE_TO_REAL_CODE = 0xffff;
+
     @Nullable
     private Activity resumedActivity;
     @Nullable
     private Runnable onPdfActivityOpenedTask;
 
+    /**
+     * Used to dispatch onActivityResult calls to our fragments.
+     */
+    @NonNull
+    private Handler activityResultHandler = new Handler(Looper.getMainLooper());
+
     public PSPDFKitModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
 
+    @Override
+    public void initialize() {
+        super.initialize();
+        getReactApplicationContext().addActivityEventListener(this);
+    }
+
+    @Override
+    public void onCatalystInstanceDestroy() {
+        super.onCatalystInstanceDestroy();
+        getReactApplicationContext().removeActivityEventListener(this);
+    }
+
     @Override
     public String getName() {
         return "PSPDFKit";
@@ -165,4 +195,36 @@ public synchronized void onActivityDestroyed(Activity activity) {
             resumedActivity = null;
         }
     }
+
+    @Override
+    public void onActivityResult(Activity activity, final int requestCode, final int resultCode, final Intent data) {
+        if (activity instanceof FragmentActivity) {
+            // Forward the result to all our fragments.
+            FragmentActivity fragmentActivity = (FragmentActivity) activity;
+            for (final Fragment fragment : fragmentActivity.getSupportFragmentManager().getFragments()) {
+                if (fragment instanceof PdfFragment ||
+                        fragment instanceof GalleryImagePickerFragment ||
+                        fragment instanceof CameraImagePickerFragment) {
+                    // When starting an intent from a fragment its request code is shifted to make it unique,
+                    // we undo it here manually since react by default eats all activity results.
+                    int requestIndex = requestCode >> REQUEST_CODE_TO_INDEX;
+                    if (requestIndex != 0) {
+                        // We need to wait until the next frame with delivering the result to the fragment,
+                        // otherwise the app will crash since the fragment won't be ready.
+                        activityResultHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                fragment.onActivityResult(requestCode & MASKED_REQUEST_CODE_TO_REAL_CODE, resultCode, data);
+                            }
+                        });
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        // Not required right now.
+    }
 }