Minor fixes

Author: markmur

modules/@shopify/checkout-sheet-kit/android/src/main/java/com/shopify/reactnative/checkoutsheetkit/CustomCheckoutEventProcessor.java

@@ -49,7 +49,6 @@ public class CustomCheckoutEventProcessor extends DefaultCheckoutEventProcessor
 
   private String geolocationOrigin;
   private GeolocationPermissions.Callback geolocationCallback;
-  private boolean retainGeolocationForFutureRequests = true;
 
   public CustomCheckoutEventProcessor(Context context, ReactApplicationContext reactContext) {
     super(context);
@@ -60,6 +59,7 @@ public CustomCheckoutEventProcessor(Context context, ReactApplicationContext rea
 
   public void invokeGeolocationCallback(boolean allow) {
     if (geolocationCallback != null) {
+      boolean retainGeolocationForFutureRequests = false;
       geolocationCallback.invoke(geolocationOrigin, allow, retainGeolocationForFutureRequests);
       geolocationCallback = null;
     }
@@ -90,8 +90,8 @@ public void onGeolocationPermissionsShowPrompt(@NonNull String origin,
 
     // Emit a "geolocationRequest" event to the app.
     try {
-      Map<String, Object> event = new HashMap();
-      event.put("origin", origin.toString());
+      Map<String, Object> event = new HashMap<>();
+      event.put("origin", origin);
       sendEventWithStringData("geolocationRequest", mapper.writeValueAsString(event));
     } catch (IOException e) {
       Log.e("ShopifyCheckoutSheetKit", "Error emitting \"geolocationRequest\" event", e);

modules/@shopify/checkout-sheet-kit/android/src/main/java/com/shopify/reactnative/checkoutsheetkit/ShopifyCheckoutSheetKitModule.java

@@ -48,6 +48,8 @@ public class ShopifyCheckoutSheetKitModule extends ReactContextBaseJavaModule {
 
   private CheckoutSheetKitDialog checkoutSheet;
 
+  private CustomCheckoutEventProcessor checkoutEventProcessor;
+
   public ShopifyCheckoutSheetKitModule(ReactApplicationContext reactContext) {
     super(reactContext);
 
@@ -86,8 +88,7 @@ public void removeListeners(Integer count) {
   public void present(String checkoutURL) {
     Activity currentActivity = getCurrentActivity();
     if (currentActivity instanceof ComponentActivity) {
-      DefaultCheckoutEventProcessor checkoutEventProcessor = new CustomCheckoutEventProcessor(currentActivity,
-          this.reactContext);
+      checkoutEventProcessor = new CustomCheckoutEventProcessor(currentActivity, this.reactContext);
       currentActivity.runOnUiThread(() -> {
         checkoutSheet = ShopifyCheckoutSheetKit.present(checkoutURL, (ComponentActivity) currentActivity,
             checkoutEventProcessor);
@@ -163,7 +164,9 @@ public void setConfig(ReadableMap config) {
 
   @ReactMethod
   public void initiateGeolocationRequest(Boolean allow) {
-    checkoutEventProcessor.invokeGeolocationCallback(allow);
+    if (checkoutEventProcessor != null) {
+      checkoutEventProcessor.invokeGeolocationCallback(allow);
+    }
   }
 
   // Private