Merge pull request #1297 from nextcloud/fix-intent-crash

Potentially fix intent crash
nextcloud · Jul 10, 2023 · 6126255 · 6126255
2 parents 0427da6 + 06e2659
commit 6126255
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/NextcloudTalk/NCIntentController.m b/NextcloudTalk/NCIntentController.m
@@ -119,7 +119,8 @@ - (void)donateSendMessageIntentForRoom:(NCRoom *)room
                 image = [[AvatarManager shared] createRenderedImageWithImage:image];
             }
 
-            [sendMessageIntent setImage:[INImage imageWithUIImage:image] forParameterNamed:@"speakableGroupName"];
+            INImage *intentImage = [INImage imageWithUIImage:image];
+            [sendMessageIntent setImage:intentImage forParameterNamed:@"speakableGroupName"];
             [self donateMessageSentIntent:sendMessageIntent];
         }
     }];

diff --git a/ShareExtension/ShareConfirmationViewController.m b/ShareExtension/ShareConfirmationViewController.m
@@ -372,11 +372,11 @@ - (void)sendSharedText
 {
     [[NCAPIController sharedInstance] sendChatMessage:self.shareTextView.text toRoom:_room.token displayName:nil replyTo:-1 referenceId:nil silently:NO forAccount:_account withCompletionBlock:^(NSError *error) {
         if (error) {
-            [self.delegate shareConfirmationViewControllerDidFailed:self];
             NSLog(@"Failed to send shared item");
+            [self.delegate shareConfirmationViewControllerDidFailed:self];
         } else {
-            [self.delegate shareConfirmationViewControllerDidFinish:self];
             [[NCIntentController sharedInstance] donateSendMessageIntentForRoom:self->_room];
+            [self.delegate shareConfirmationViewControllerDidFinish:self];
         }
         [self stopAnimatingSharingIndicator];
     }];