erisu commented on code in PR #130:
URL:
https://github.com/apache/cordova-plugin-network-information/pull/130#discussion_r994691719
##########
src/ios/CDVConnection.m:
##########
@@ -60,28 +60,35 @@ -
(NSString*)w3cConnectionTypeFor:(CDVReachability*)reachability
} else {
if ([[[UIDevice currentDevice] systemVersion] compare:@"7.0"
options:NSNumericSearch] != NSOrderedAscending) {
CTTelephonyNetworkInfo *telephonyInfo =
[CTTelephonyNetworkInfo new];
- if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyGPRS]) {
+ NSString *currentRadioAccessTechnology =
radioAccessNameIn(telephonyInfo);
+ if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyGPRS]) {
return @"2g";
- } else if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyEdge]) {
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyEdge]) {
return @"2g";
- } else if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyWCDMA]) {
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyWCDMA]) {
return @"3g";
- } else if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyHSDPA]) {
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyHSDPA]) {
return @"3g";
- } else if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyHSUPA]) {
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyHSUPA]) {
return @"3g";
- } else if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyCDMA1x]) {
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyCDMA1x]) {
return @"3g";
- } else if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyCDMAEVDORev0]) {
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyCDMAEVDORev0]) {
return @"3g";
- } else if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyCDMAEVDORevA]) {
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyCDMAEVDORevA]) {
return @"3g";
- } else if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyCDMAEVDORevB]) {
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyCDMAEVDORevB]) {
return @"3g";
- } else if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyeHRPD]) {
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyeHRPD]) {
return @"3g";
- } else if ([telephonyInfo.currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyLTE]) {
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyLTE]) {
return @"4g";
+ } else if (@available(iOS 14.1, *)) {
+ if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyNRNSA]) {
+ return @"5g";
+ } else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyNR]) {
+ return @"5g";
+ }
Review Comment:
The tests is failing because `CTRadioAccessTechnologyNRNSA` and
`CTRadioAccessTechnologyNR` cant be seen with the version of Xcode that is
compiling for iOS 13.
You might want want to test it with something like this.
```suggestion
}
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_1
else if (@available(iOS 14.1, *)) {
if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyNRNSA]) {
return @"5g";
} else if ([currentRadioAccessTechnology
isEqualToString:CTRadioAccessTechnologyNR]) {
return @"5g";
}
}
#endif
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
