Skip to content

Commit 74638e8

Browse files
committed
chore: remove nativebridge remnants and ignore more useless errors
1 parent 5ea6398 commit 74638e8

File tree

5 files changed

+65
-39
lines changed

5 files changed

+65
-39
lines changed

headers/Logger.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ typedef NS_ENUM(NSInteger, LogLevel) {
3434
#define LOG_CATEGORY_UTILITIES "utilities"
3535
#define LOG_CATEGORY_TOOLBOX "toolbox"
3636
#define LOG_CATEGORY_FONTS "fonts"
37-
#define LOG_CATEGORY_NATIVEBRIDGE "nativebridge"
37+
#define LOG_CATEGORY_CHATUI "chatui"
38+
#define LOG_CATEGORY_PLUGINAPI "pluginapi"
3839

3940
NS_ASSUME_NONNULL_END

headers/PluginAPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818

1919
@end
2020

21-
@interface NativeBridgePluginAPIDelegate : NSObject <AVPlayerViewControllerDelegate, AVPictureInPictureControllerDelegate>
21+
@interface PluginAPIDelegate : NSObject <AVPlayerViewControllerDelegate, AVPictureInPictureControllerDelegate>
2222
+ (instancetype)sharedDelegate;
2323
@end

sources/ChatUI.x

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ static UIColor *messageCellDynamicColor = nil;
2323
{
2424
if (!radius)
2525
{
26-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE format:@"Avatar corner radius cannot be nil"];
26+
[Logger error:LOG_CATEGORY_CHATUI format:@"Avatar corner radius cannot be nil"];
2727
return;
2828
}
2929

3030
float radiusValue = [radius floatValue];
3131
if (radiusValue < 0)
3232
{
33-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE format:@"Avatar corner radius cannot be negative"];
33+
[Logger error:LOG_CATEGORY_CHATUI format:@"Avatar corner radius cannot be negative"];
3434
return;
3535
}
3636

3737
customAvatarRadius = radius;
38-
[Logger info:LOG_CATEGORY_NATIVEBRIDGE format:@"Avatar corner radius set to: %@", radius];
38+
[Logger info:LOG_CATEGORY_CHATUI format:@"Avatar corner radius set to: %@", radius];
3939

4040
[self updateAllAvatarViews];
4141
}
@@ -48,7 +48,7 @@ static UIColor *messageCellDynamicColor = nil;
4848
+ (void)resetAvatarCornerRadius
4949
{
5050
customAvatarRadius = nil;
51-
[Logger info:LOG_CATEGORY_NATIVEBRIDGE format:@"Avatar corner radius reset to default"];
51+
[Logger info:LOG_CATEGORY_CHATUI format:@"Avatar corner radius reset to default"];
5252

5353
[self updateAllAvatarViews];
5454
}
@@ -94,7 +94,7 @@ static UIColor *messageCellDynamicColor = nil;
9494
{
9595
view.layer.cornerRadius = view.bounds.size.width / 2.0;
9696
}
97-
[Logger debug:LOG_CATEGORY_NATIVEBRIDGE
97+
[Logger debug:LOG_CATEGORY_CHATUI
9898
format:@"Updated avatar view with radius: %f", view.layer.cornerRadius];
9999
}
100100

@@ -117,12 +117,12 @@ static UIColor *messageCellDynamicColor = nil;
117117
{
118118
if (!enabled)
119119
{
120-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE format:@"Message bubbles enabled cannot be nil"];
120+
[Logger error:LOG_CATEGORY_CHATUI format:@"Message bubbles enabled cannot be nil"];
121121
return;
122122
}
123123

124124
messageBubblesEnabled = enabled;
125-
[Logger info:LOG_CATEGORY_NATIVEBRIDGE format:@"Message bubbles enabled set to: %@", enabled];
125+
[Logger info:LOG_CATEGORY_CHATUI format:@"Message bubbles enabled set to: %@", enabled];
126126

127127
[self updateMessageBubbleSettings];
128128
}
@@ -133,7 +133,7 @@ static UIColor *messageCellDynamicColor = nil;
133133
{
134134
if (!enabled)
135135
{
136-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE format:@"Message bubbles enabled cannot be nil"];
136+
[Logger error:LOG_CATEGORY_CHATUI format:@"Message bubbles enabled cannot be nil"];
137137
return;
138138
}
139139

@@ -149,7 +149,7 @@ static UIColor *messageCellDynamicColor = nil;
149149
messageBubbleDarkColor = darkColor;
150150
}
151151

152-
[Logger info:LOG_CATEGORY_NATIVEBRIDGE
152+
[Logger info:LOG_CATEGORY_CHATUI
153153
format:@"Message bubbles enabled: %@, light color: %@, dark color: %@", enabled,
154154
lightColor ?: @"default", darkColor ?: @"default"];
155155

@@ -161,7 +161,7 @@ static UIColor *messageCellDynamicColor = nil;
161161
messageBubbleLightColor = lightColor;
162162
messageBubbleDarkColor = darkColor;
163163

164-
[Logger info:LOG_CATEGORY_NATIVEBRIDGE
164+
[Logger info:LOG_CATEGORY_CHATUI
165165
format:@"Message bubble colors set - light: %@, dark: %@", lightColor ?: @"default",
166166
darkColor ?: @"default"];
167167

@@ -172,21 +172,21 @@ static UIColor *messageCellDynamicColor = nil;
172172
{
173173
if (!radius)
174174
{
175-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE
175+
[Logger error:LOG_CATEGORY_CHATUI
176176
format:@"Message bubble corner radius cannot be nil"];
177177
return;
178178
}
179179

180180
float radiusValue = [radius floatValue];
181181
if (radiusValue < 0)
182182
{
183-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE
183+
[Logger error:LOG_CATEGORY_CHATUI
184184
format:@"Message bubble corner radius cannot be negative"];
185185
return;
186186
}
187187

188188
messageBubbleCornerRadius = radius;
189-
[Logger info:LOG_CATEGORY_NATIVEBRIDGE
189+
[Logger info:LOG_CATEGORY_CHATUI
190190
format:@"Message bubble corner radius set to: %@", radius];
191191

192192
[self updateMessageBubbleSettings];
@@ -218,7 +218,7 @@ static UIColor *messageCellDynamicColor = nil;
218218
messageBubbleLightColor = nil;
219219
messageBubbleDarkColor = nil;
220220
messageBubbleCornerRadius = nil;
221-
[Logger info:LOG_CATEGORY_NATIVEBRIDGE format:@"Message bubbles reset to default"];
221+
[Logger info:LOG_CATEGORY_CHATUI format:@"Message bubbles reset to default"];
222222

223223
[self updateMessageBubbleSettings];
224224
}

sources/Debug.x

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,18 @@ static BOOL shouldIgnoreError(NSString *domain, NSInteger code, NSDictionary *in
2727
if (code == 17)
2828
return YES;
2929

30+
if (code == 57)
31+
return YES;
32+
3033
if (code == 22 && (!info || info.count == 0))
3134
return YES;
3235
}
3336

37+
if ([domain isEqualToString:@"kCFErrorDomainCFNetwork"] && code == -1004)
38+
{
39+
return YES;
40+
}
41+
3442
if ([domain isEqualToString:@"BSActionErrorDomain"] && code == 1)
3543
{
3644
return YES;
@@ -82,6 +90,9 @@ static BOOL shouldIgnoreError(NSString *domain, NSInteger code, NSDictionary *in
8290
if (isPOSIX22 || isAppsFlyerPath || isAppsFlyerURL)
8391
return YES;
8492
}
93+
94+
if (code == 4099)
95+
return YES;
8596
}
8697

8798
if ([domain isEqualToString:@"com.appsflyer.sdk.network"] && code == 50)
@@ -108,7 +119,21 @@ static BOOL shouldIgnoreError(NSString *domain, NSInteger code, NSDictionary *in
108119
return YES;
109120
}
110121

111-
if ([domain isEqualToString:@"SDWebImageErrorDomain"] && code == 1000)
122+
if ([domain isEqualToString:@"SDWebImageErrorDomain"])
123+
{
124+
if (code == 1000)
125+
return YES;
126+
127+
if (code == 2002)
128+
return YES;
129+
}
130+
131+
if ([domain isEqualToString:@"LLVideoPlayerCacheTask"] && code == -999)
132+
{
133+
return YES;
134+
}
135+
136+
if ([domain isEqualToString:@"NSURLErrorDomain"] && code == -999)
112137
{
113138
return YES;
114139
}

sources/PluginAPI.m

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#import "PluginAPI.h"
22

3-
@implementation NativeBridgePluginAPIDelegate
3+
@implementation PluginAPIDelegate
44

55
+ (instancetype)sharedDelegate
66
{
7-
static NativeBridgePluginAPIDelegate *sharedInstance = nil;
7+
static PluginAPIDelegate *sharedInstance = nil;
88
static dispatch_once_t onceToken;
9-
dispatch_once(&onceToken, ^{ sharedInstance = [[NativeBridgePluginAPIDelegate alloc] init]; });
9+
dispatch_once(&onceToken, ^{ sharedInstance = [[PluginAPIDelegate alloc] init]; });
1010
return sharedInstance;
1111
}
1212

@@ -46,14 +46,14 @@ - (void)playerViewControllerDidStartPictureInPicture:(AVPlayerViewController *)p
4646
- (void)playerViewController:(AVPlayerViewController *)playerViewController
4747
failedToStartPictureInPictureWithError:(NSError *)error
4848
{
49-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE
49+
[Logger error:LOG_CATEGORY_PLUGINAPI
5050
format:@"Failed to start PiP: %@", error.localizedDescription];
5151
}
5252

5353
- (void)pictureInPictureController:(AVPictureInPictureController *)pictureInPictureController
5454
failedToStartPictureInPictureWithError:(NSError *)error
5555
{
56-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE
56+
[Logger error:LOG_CATEGORY_PLUGINAPI
5757
format:@"PiP controller failed to start: %@", error.localizedDescription];
5858
}
5959

@@ -92,7 +92,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
9292
dispatch_async(dispatch_get_main_queue(), ^{
9393
@try
9494
{
95-
[pip removeObserver:[NativeBridgePluginAPIDelegate sharedDelegate]
95+
[pip removeObserver:[PluginAPIDelegate sharedDelegate]
9696
forKeyPath:@"pictureInPicturePossible"];
9797
}
9898
@catch (__unused NSException *e)
@@ -124,7 +124,7 @@ + (void)cleanupPiPResources
124124
{
125125
@try
126126
{
127-
[currentPiPController removeObserver:[NativeBridgePluginAPIDelegate sharedDelegate]
127+
[currentPiPController removeObserver:[PluginAPIDelegate sharedDelegate]
128128
forKeyPath:@"pictureInPicturePossible"
129129
context:&kPiPObserverContext];
130130
}
@@ -163,14 +163,14 @@ + (NSString *)playPiPVideo:(NSString *)videoURL
163163
{
164164
if (!videoURL || [videoURL length] == 0)
165165
{
166-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE
166+
[Logger error:LOG_CATEGORY_PLUGINAPI
167167
format:@"Video URL is required for PiP video player"];
168168
return nil;
169169
}
170170

171171
if (![AVPictureInPictureController isPictureInPictureSupported])
172172
{
173-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE format:@"PiP is not supported on this device"];
173+
[Logger error:LOG_CATEGORY_PLUGINAPI format:@"PiP is not supported on this device"];
174174
return nil;
175175
}
176176

@@ -185,9 +185,9 @@ + (NSString *)playPiPVideo:(NSString *)videoURL
185185
{
186186
@try
187187
{
188-
[currentPiPController removeObserver:[NativeBridgePluginAPIDelegate sharedDelegate]
189-
forKeyPath:@"pictureInPicturePossible"
190-
context:&kPiPObserverContext];
188+
[currentPiPController removeObserver:[PluginAPIDelegate sharedDelegate]
189+
forKeyPath:@"pictureInPicturePossible"
190+
context:&kPiPObserverContext];
191191
}
192192
@catch (__unused NSException *e)
193193
{
@@ -203,7 +203,7 @@ + (NSString *)playPiPVideo:(NSString *)videoURL
203203
NSURL *url = [NSURL URLWithString:videoURL];
204204
if (!url)
205205
{
206-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE format:@"Invalid video URL: %@", videoURL];
206+
[Logger error:LOG_CATEGORY_PLUGINAPI format:@"Invalid video URL: %@", videoURL];
207207
return;
208208
}
209209

@@ -216,20 +216,20 @@ + (NSString *)playPiPVideo:(NSString *)videoURL
216216
error:&audioError];
217217
if (!ok || audioError)
218218
{
219-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE
219+
[Logger error:LOG_CATEGORY_PLUGINAPI
220220
format:@"Audio session category error: %@", audioError.localizedDescription];
221221
}
222222
audioError = nil;
223223
ok = [session setActive:YES error:&audioError];
224224
if (!ok || audioError)
225225
{
226-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE
226+
[Logger error:LOG_CATEGORY_PLUGINAPI
227227
format:@"Audio session activate error: %@", audioError.localizedDescription];
228228
}
229229
}
230230
@catch (NSException *exception)
231231
{
232-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE
232+
[Logger error:LOG_CATEGORY_PLUGINAPI
233233
format:@"Audio session exception: %@", exception.reason];
234234
}
235235

@@ -244,7 +244,7 @@ + (NSString *)playPiPVideo:(NSString *)videoURL
244244
UIViewController *topViewController = [self topViewController];
245245
if (!topViewController)
246246
{
247-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE
247+
[Logger error:LOG_CATEGORY_PLUGINAPI
248248
format:@"No top view controller found to host PiP layer"];
249249
return;
250250
}
@@ -272,7 +272,7 @@ + (NSString *)playPiPVideo:(NSString *)videoURL
272272
currentPiPController =
273273
[[AVPictureInPictureController alloc] initWithPlayerLayer:currentPlayerLayer];
274274
}
275-
currentPiPController.delegate = [NativeBridgePluginAPIDelegate sharedDelegate];
275+
currentPiPController.delegate = [PluginAPIDelegate sharedDelegate];
276276
currentPiPController.canStartPictureInPictureAutomaticallyFromInline = YES;
277277

278278
[currentPlayer play];
@@ -285,15 +285,15 @@ + (NSString *)playPiPVideo:(NSString *)videoURL
285285
{
286286
@try
287287
{
288-
[currentPiPController addObserver:[NativeBridgePluginAPIDelegate sharedDelegate]
288+
[currentPiPController addObserver:[PluginAPIDelegate sharedDelegate]
289289
forKeyPath:@"pictureInPicturePossible"
290290
options:NSKeyValueObservingOptionNew
291291
context:&kPiPObserverContext];
292292
sPiPObservationAdded = YES;
293293
}
294294
@catch (NSException *exception)
295295
{
296-
[Logger error:LOG_CATEGORY_NATIVEBRIDGE
296+
[Logger error:LOG_CATEGORY_PLUGINAPI
297297
format:@"Failed to add PiP KVO observer: %@", exception.reason];
298298
}
299299
}
@@ -371,12 +371,12 @@ + (NSString *)showNotification:(NSString *)title
371371
if (error)
372372
{
373373
[Logger
374-
error:LOG_CATEGORY_NATIVEBRIDGE
374+
error:LOG_CATEGORY_PLUGINAPI
375375
format:@"Error scheduling notification: %@", error.localizedDescription];
376376
}
377377
else
378378
{
379-
[Logger info:LOG_CATEGORY_NATIVEBRIDGE
379+
[Logger info:LOG_CATEGORY_PLUGINAPI
380380
format:@"Notification scheduled with id: %@", notificationId];
381381
}
382382
}];

0 commit comments

Comments
 (0)