Fix #2564: Update Rewards lib to include ads crash fix

BraveRewards/BraveRewards.framework/Headers/BATAdNotification.h

@@ -27,14 +27,14 @@ NS_SWIFT_NAME(AdsNotification)
 @property (nonatomic, readonly, copy) NSString *category;
 @property (nonatomic, readonly, copy) NSString *title;
 @property (nonatomic, readonly, copy) NSString *body;
-@property (nonatomic, readonly, copy) NSURL *targetURL;
+@property (nonatomic, readonly, copy) NSString *targetURL;
 @property (nonatomic, readonly, copy) NSString *geoTarget;
 @end
 
 @interface BATAdNotification (MyFirstAd)
 + (instancetype)customAdWithTitle:(NSString *)title
                              body:(NSString *)body
-                              url:(NSURL *)url NS_SWIFT_NAME(customAd(title:body:url:));
+                              url:(NSString *)url NS_SWIFT_NAME(customAd(title:body:url:));
 @end
 
 NS_ASSUME_NONNULL_END

BraveRewardsUI/Ads/AdsViewController.swift

@@ -334,11 +334,16 @@ extension AdsViewController {
     let notification = AdsNotification.customAd(
       title: Strings.myFirstAdTitle,
       body: Strings.myFirstAdBody,
-      url: URL(string: "https://brave.com/my-first-ad")!
+      url: "https://brave.com/my-first-ad"
     )
 
+    guard let targetURL = URL(string: notification.targetURL) else {
+      assertionFailure("My First Ad URL is not valid: \(notification.targetURL)")
+      return
+    }
+
     adsViewController.display(ad: notification, handler: { (notification, action) in
-      completion(action, notification.targetURL)
+      completion(action, targetURL)
     }, animatedOut: {
       adsViewController.view.removeFromSuperview()
     })

BraveRewardsUI/README.md

@@ -6,5 +6,5 @@ The latest BraveRewards.framework was built on:
 
 ```
 brave-browser/0d23cf11ec5dab650d71c3957b3f982d2bef3600
-brave-core/3c96998389af5f49483481ddbe8deba08ff300fa
+brave-core/992f93ac6f9914676de336c88059a5ec917b9c21
 ```

Client/Frontend/Browser/BrowserViewController.swift

@@ -260,7 +260,17 @@ class BrowserViewController: UIViewController {
         notificationsHandler?.actionOccured = { [weak self] notification, action in
             guard let self = self else { return }
             if action == .opened {
-                let request = URLRequest(url: notification.targetURL)
+                var url = URL(string: notification.targetURL)
+                if url == nil, let percentEncodedURLString =
+                    notification.targetURL.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) {
+                    // Try to percent-encode the string and try that
+                    url = URL(string: percentEncodedURLString)
+                }
+                guard let targetURL = url else {
+                    assertionFailure("Invalid target URL for creative instance id: \(notification.creativeInstanceID)")
+                    return
+                }
+                let request = URLRequest(url: targetURL)
                 self.tabManager.addTabAndSelect(request, isPrivate: PrivateBrowsingManager.shared.isPrivateBrowsing)
             }
         }