Use a few API15 fields.

i4sorcerer · Apr 7, 2015 · c5b5681 · c5b5681
1 parent f8235ff
commit c5b5681
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/core/src/main/java/org/fourthline/cling/android/NetworkUtils.java b/core/src/main/java/org/fourthline/cling/android/NetworkUtils.java
@@ -31,9 +31,6 @@ public class NetworkUtils {
 
     final private static Logger log = Logger.getLogger(NetworkUtils.class.getName());
 
-    private final static int CONNECTIVITY_TYPE_WIMAX = 6; // Since API 8
-    private final static int CONNECTIVITY_TYPE_ETHERNET = 9; // Since API 13
-
     static public NetworkInfo getConnectedNetworkInfo(Context context) {
 
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -49,10 +46,10 @@ static public NetworkInfo getConnectedNetworkInfo(Context context) {
         networkInfo = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
         if (networkInfo != null && networkInfo.isAvailable() && networkInfo.isConnected()) return networkInfo;
 
-        networkInfo = connectivityManager.getNetworkInfo(CONNECTIVITY_TYPE_WIMAX);
+        networkInfo = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIMAX);
         if (networkInfo != null && networkInfo.isAvailable() && networkInfo.isConnected()) return networkInfo;
 
-        networkInfo = connectivityManager.getNetworkInfo(CONNECTIVITY_TYPE_ETHERNET);
+        networkInfo = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_ETHERNET);
         if (networkInfo != null && networkInfo.isAvailable() && networkInfo.isConnected()) return networkInfo;
 
         log.info("Could not find any connected network...");
@@ -61,15 +58,15 @@ static public NetworkInfo getConnectedNetworkInfo(Context context) {
     }
 
     static public boolean isEthernet(NetworkInfo networkInfo) {
-        return isNetworkType(networkInfo, CONNECTIVITY_TYPE_ETHERNET);
+        return isNetworkType(networkInfo, ConnectivityManager.TYPE_ETHERNET);
     }
 
     static public boolean isWifi(NetworkInfo networkInfo) {
         return isNetworkType(networkInfo, ConnectivityManager.TYPE_WIFI) || ModelUtil.ANDROID_EMULATOR;
     }
 
     static public boolean isMobile(NetworkInfo networkInfo) {
-        return isNetworkType(networkInfo, ConnectivityManager.TYPE_MOBILE) || isNetworkType(networkInfo, CONNECTIVITY_TYPE_WIMAX);
+        return isNetworkType(networkInfo, ConnectivityManager.TYPE_MOBILE) || isNetworkType(networkInfo, ConnectivityManager.TYPE_WIMAX);
     }
 
     static public boolean isNetworkType(NetworkInfo networkInfo, int type) {