Merge pull request #5893 from vector-im/andy/5883_search_crash

Prevent crash when searching for rooms
element-hq · Mar 22, 2022 · 70d39ef · 70d39ef
2 parents ea44865 + 413a1eb
commit 70d39ef
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 17 deletions.
diff --git a/Riot/Modules/Application/LegacyAppDelegate.h b/Riot/Modules/Application/LegacyAppDelegate.h
@@ -227,14 +227,6 @@ UINavigationControllerDelegate
 // Reopen an existing direct room with this userId or creates a new one (if it doesn't exist)
 - (void)startDirectChatWithUserId:(NSString*)userId completion:(void (^)(void))completion;
 
-/**
- Process the fragment part of a vector.im link.
-
- @param fragment the fragment part of the universal link.
- @return YES in case of processing success.
- */
-- (BOOL)handleUniversalLinkFragment:(NSString*)fragment;
-
 /**
  Process the fragment part of a vector.im link.
 

diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -1263,12 +1263,6 @@ - (BOOL)handleUniversalLink:(NSUserActivity*)userActivity
     return [self handleUniversalLinkFragment:webURL.fragment fromURL:webURL];
 }
 
-- (BOOL)handleUniversalLinkFragment:(NSString*)fragment
-{
-    return [self handleUniversalLinkFragment:fragment fromURL:nil];
-}
-
-
 - (BOOL)handleUniversalLinkFragment:(NSString*)fragment fromURL:(NSURL*)universalLinkURL
 
 {

diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -1564,7 +1564,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         {
             // Open the room or preview it
             NSString *fragment = [NSString stringWithFormat:@"/room/%@", [MXTools encodeURIComponent:roomIdOrAlias]];
-            [[AppDelegate theDelegate] handleUniversalLinkFragment:fragment];
+            NSURL *url = [NSURL URLWithString:[MXTools permalinkToRoom:fragment]];
+            [[AppDelegate theDelegate] handleUniversalLinkFragment:fragment fromURL:url];
         }
         [tableView deselectRowAtIndexPath:indexPath animated:NO];
     }

diff --git a/Riot/Modules/Communities/Home/GroupHomeViewController.m b/Riot/Modules/Communities/Home/GroupHomeViewController.m
@@ -890,7 +890,7 @@ - (BOOL)textView:(UITextView *)textView shouldInteractWithURL:(NSURL *)URL inRan
         // Open the group or preview it
         NSString *fragment = [NSString stringWithFormat:@"/group/%@",
                         [MXTools encodeURIComponent:absoluteURLString]];
-        [[AppDelegate theDelegate] handleUniversalLinkFragment:fragment];
+        [[AppDelegate theDelegate] handleUniversalLinkFragment:fragment fromURL:URL];
     }
 
     return shouldInteractWithURL;

diff --git a/Riot/Modules/DeepLink/UniversalLinkParameters.swift b/Riot/Modules/DeepLink/UniversalLinkParameters.swift
@@ -22,7 +22,7 @@ class UniversalLinkParameters: NSObject {
 
     // MARK: - Properties
 
-    /// The unprocessed the universal link URL
+    /// The unprocessed universal link URL
     let universalLinkURL: URL
 
     /// The fragment part of the universal link

diff --git a/changelog.d/5883.bugfix b/changelog.d/5883.bugfix
@@ -0,0 +1,2 @@
+Search: prevent crash when searching for rooms
+