Simplify the wifi vs. mobile data connection code. (#3469)

Author: mikehaney24

GoogleDataTransport/GDTLibrary/GDTUploadCoordinator.m

@@ -133,38 +133,22 @@ - (void)uploadTargets:(NSArray<NSNumber *> *)targets conditions:(GDTUploadCondit
  */
 - (GDTUploadConditions)uploadConditions {
   SCNetworkReachabilityFlags currentFlags = [GDTReachability currentFlags];
-
   BOOL reachable =
       (currentFlags & kSCNetworkReachabilityFlagsReachable) == kSCNetworkReachabilityFlagsReachable;
   BOOL connectionRequired = (currentFlags & kSCNetworkReachabilityFlagsConnectionRequired) ==
                             kSCNetworkReachabilityFlagsConnectionRequired;
-  BOOL interventionRequired = (currentFlags & kSCNetworkReachabilityFlagsInterventionRequired) ==
-                              kSCNetworkReachabilityFlagsInterventionRequired;
-  BOOL connectionOnDemand = (currentFlags & kSCNetworkReachabilityFlagsConnectionOnDemand) ==
-                            kSCNetworkReachabilityFlagsConnectionOnDemand;
-  BOOL connectionOnTraffic = (currentFlags & kSCNetworkReachabilityFlagsConnectionOnTraffic) ==
-                             kSCNetworkReachabilityFlagsConnectionOnTraffic;
-  BOOL isWWAN = GDTReachabilityFlagsContainWWAN(currentFlags);
+  BOOL networkConnected = reachable && !connectionRequired;
 
-  if (!reachable) {
+  if (!networkConnected) {
     return GDTUploadConditionNoNetwork;
   }
 
-  GDTUploadConditions conditions = 0;
-  conditions |= !connectionRequired ? GDTUploadConditionWifiData : conditions;
-  conditions |= isWWAN ? GDTUploadConditionMobileData : conditions;
-  if ((connectionOnTraffic || connectionOnDemand) && !interventionRequired) {
-    conditions = GDTUploadConditionWifiData;
-  }
-
-  BOOL wifi = (conditions & GDTUploadConditionWifiData) == GDTUploadConditionWifiData;
-  BOOL cell = (conditions & GDTUploadConditionMobileData) == GDTUploadConditionMobileData;
-
-  if (!(wifi || cell)) {
-    conditions = GDTUploadConditionUnclearConnection;
+  BOOL isWWAN = GDTReachabilityFlagsContainWWAN(currentFlags);
+  if (isWWAN) {
+    return GDTUploadConditionMobileData;
+  } else {
+    return GDTUploadConditionWifiData;
   }
-
-  return conditions;
 }
 
 #pragma mark - NSSecureCoding support