refinement

pagopa · Nov 17, 2023 · 488324c · 488324c
1 parent f3747f2
commit 488324c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/android/src/main/java/com/saranshmalik/rnzendeskchat/RNZendeskChat.java b/android/src/main/java/com/saranshmalik/rnzendeskchat/RNZendeskChat.java
@@ -8,6 +8,9 @@
 
 import com.facebook.react.bridge.ActivityEventListener;
 import android.util.Log;
+
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.Callback;
 
 
@@ -63,13 +66,17 @@ public class RNZendeskChat extends ReactContextBaseJavaModule implements Activit
   private String logId;
   private RequestProvider requestProvider;
 
+  @Nullable
+  private Callback onOpenTicketDismiss;
+
   public RNZendeskChat(ReactApplicationContext reactContext) {
     super(reactContext);
     appContext = reactContext;
     customFields = new HashMap<>();
     log = new StringBuffer();
     tags = new ArrayList<>();
 
+    onOpenTicketDismiss = null;
     reactContext.addActivityEventListener(this);
   }
 
@@ -234,8 +241,6 @@ public void appendLog(String log){
     this.log.insert(0, "\n"+log);
     this.log = new StringBuffer(this.log.substring(0, Math.max(0, Math.min(this.log.length()-1, logCapacity))));
   }
-
-  Callback onOpenTicketDismiss;
 
   @ReactMethod
   public void openTicket(Callback onClose){
@@ -354,7 +359,9 @@ public void startChat(ReadableMap options) {
   @ReactMethod
   public void dismiss() {
     Activity activity = getCurrentActivity();
-    activity.finishActivity(INTENT_REQUEST_CODE);
+    if (activity != null) {
+      activity.finishActivity(INTENT_REQUEST_CODE);  
+    }
   }
 
 
@@ -368,14 +375,14 @@ public void setNotificationToken(String token) {
 
   @Override
   public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
-
-    if (requestCode == INTENT_REQUEST_CODE) {
-      onOpenTicketDismiss.invoke();
+    if (requestCode == INTENT_REQUEST_CODE && onOpenTicketDismiss != null) {
+        onOpenTicketDismiss.invoke();
+        onOpenTicketDismiss = null;
     }
   }
 
   @Override
   public void onNewIntent(Intent intent) {
-
+    Log.d(TAG, "onNewIntent");
   }
 }
diff --git a/ios/RNZendeskChat.h b/ios/RNZendeskChat.h
@@ -3,11 +3,4 @@
 #import <React/RCTBridgeModule.h>
 
 @interface RNZendeskChat : NSObject<RCTBridgeModule>
-@end
-
-
-@interface NavigationControllerWithCompletion : UINavigationController
-@property (nonatomic, copy) RCTResponseSenderBlock completion;
-@end
-
-
+@end
diff --git a/ios/RNZendeskChat.m b/ios/RNZendeskChat.m
@@ -10,6 +10,11 @@
 #import <SupportSDK/SupportSDK.h>
 #import <SupportProvidersSDK/SupportProvidersSDK.h>
 #import <ZendeskCoreSDK/ZendeskCoreSDK.h>
+
+@interface NavigationControllerWithCompletion : UINavigationController
+@property (nonatomic, copy, nullable) RCTResponseSenderBlock completion;
+@end
+
 @implementation RNZendeskChat
 RCT_EXPORT_MODULE()
 RCT_EXPORT_METHOD(setVisitorInfo:(NSDictionary *)options) {
@@ -351,16 +356,13 @@ - (void) registerForNotifications:(NSData *)deviceToken {
 }
 @end
 
-@interface NavigationControllerWithCompletion ()
-
-@end
-
 @implementation NavigationControllerWithCompletion
 
 - (void)viewDidDisappear:(BOOL)animated {
     [super viewDidDisappear:animated];
     if (self.completion) {
         self.completion(@[[NSNull null]]);
+        self.completion = nil;
     }
 }