Analysis

dart-lang · Mar 23, 2024 · e4e6f4b · e4e6f4b
1 parent 9dbff63
commit e4e6f4b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/pkgs/cupertino_http/lib/src/cupertino_api.dart b/pkgs/cupertino_http/lib/src/cupertino_api.dart
@@ -243,7 +243,7 @@ class URLCache extends _ObjectHolder<ncb.NSURLCache> {
   /// See [NSURLCache.sharedURLCache](https://developer.apple.com/documentation/foundation/nsurlcache/1413377-sharedurlcache)
   static URLCache? get sharedURLCache {
     final sharedCache = ncb.NSURLCache.getSharedURLCache(linkedLibs);
-    return sharedCache == null ? null : URLCache._(sharedCache);
+    return URLCache._(sharedCache);
   }
 
   /// Create a new [URLCache] with the given memory and disk cache sizes.
@@ -291,7 +291,7 @@ class URLSessionConfiguration
       URLSessionConfiguration._(
           ncb.NSURLSessionConfiguration.castFrom(
               ncb.NSURLSessionConfiguration.getDefaultSessionConfiguration(
-                  linkedLibs)!),
+                  linkedLibs)),
           isBackground: false);
 
   /// A session configuration that uses no persistent storage for caches,
@@ -302,7 +302,7 @@ class URLSessionConfiguration
       URLSessionConfiguration._(
           ncb.NSURLSessionConfiguration.castFrom(
               ncb.NSURLSessionConfiguration.getEphemeralSessionConfiguration(
-                  linkedLibs)!),
+                  linkedLibs)),
           isBackground: false);
 
   /// Whether connections over a cellular network are allowed.
@@ -625,8 +625,7 @@ class HTTPURLResponse extends URLResponse {
   ///
   /// See [HTTPURLResponse.allHeaderFields](https://developer.apple.com/documentation/foundation/nshttpurlresponse/1417930-allheaderfields)
   Map<String, String> get allHeaderFields {
-    final headers =
-        ncb.NSDictionary.castFrom(_httpUrlResponse.allHeaderFields!);
+    final headers = ncb.NSDictionary.castFrom(_httpUrlResponse.allHeaderFields);
     return stringNSDictionaryToMap(headers);
   }
 
@@ -1159,15 +1158,15 @@ void _setupDelegation(
 
         try {
           final request = URLRequest._(
-              ncb.NSURLRequest.castFrom(forwardedRedirect.request!));
+              ncb.NSURLRequest.castFrom(forwardedRedirect.request));
 
           if (onRedirect == null) {
             redirectRequest = request;
             break;
           }
           try {
             final response = HTTPURLResponse._(
-                ncb.NSHTTPURLResponse.castFrom(forwardedRedirect.response!));
+                ncb.NSHTTPURLResponse.castFrom(forwardedRedirect.response));
             redirectRequest = onRedirect(session, task, response, request);
           } catch (e) {
             // TODO(https://github.com/dart-lang/ffigen/issues/386): Package
@@ -1190,7 +1189,7 @@ void _setupDelegation(
             break;
           }
           final response =
-              URLResponse._exactURLResponseType(forwardedResponse.response!);
+              URLResponse._exactURLResponseType(forwardedResponse.response);
 
           try {
             disposition = onResponse(session, task, response);
@@ -1212,8 +1211,8 @@ void _setupDelegation(
             break;
           }
           try {
-            onData(session, task,
-                Data._(ncb.NSData.castFrom(forwardedData.data!)));
+            onData(
+                session, task, Data._(ncb.NSData.castFrom(forwardedData.data)));
           } catch (e) {
             // TODO(https://github.com/dart-lang/ffigen/issues/386): Package
             // this exception as an `Error` and call the completion function
@@ -1235,7 +1234,7 @@ void _setupDelegation(
                 session,
                 task as URLSessionDownloadTask,
                 Uri.parse(
-                    finishedDownloading.location!.absoluteString!.toString()));
+                    finishedDownloading.location.absoluteString!.toString()));
           } catch (e) {
             // TODO(https://github.com/dart-lang/ffigen/issues/386): Package
             // this exception as an `Error` and call the completion function
@@ -1473,7 +1472,7 @@ class URLSession extends _ObjectHolder<ncb.NSURLSession> {
   ///
   /// See [NSURLSession.configuration](https://developer.apple.com/documentation/foundation/nsurlsession/1411477-configuration)
   URLSessionConfiguration get configuration => URLSessionConfiguration._(
-      ncb.NSURLSessionConfiguration.castFrom(_nsObject.configuration!),
+      ncb.NSURLSessionConfiguration.castFrom(_nsObject.configuration),
       isBackground: _isBackground);
 
   /// A description of the session that may be useful for debugging.

diff --git a/pkgs/cupertino_http/lib/src/utils.dart b/pkgs/cupertino_http/lib/src/utils.dart
@@ -66,12 +66,11 @@ Map<String, String> stringNSDictionaryToMap(ncb.NSDictionary d) {
   // true types.
   final m = <String, String>{};
 
-  final keys = ncb.NSArray.castFrom(d.allKeys!);
+  final keys = ncb.NSArray.castFrom(d.allKeys);
   for (var i = 0; i < keys.count; ++i) {
     final nsKey = keys.objectAtIndex_(i);
-    final key = toStringOrNull(ncb.NSString.castFrom(nsKey))!;
-    final value =
-        toStringOrNull(ncb.NSString.castFrom(d.objectForKey_(nsKey)!))!;
+    final key = ncb.NSString.castFrom(nsKey).toString();
+    final value = ncb.NSString.castFrom(d.objectForKey_(nsKey)!).toString();
     m[key] = value;
   }