瀏覽代碼

Merge pull request #7565 from nextcloud/hardenConnectionCheck

getActiveNetwork might be null
Andy Scherzinger 4 年之前
父節點
當前提交
dc0337476d
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5 1
      src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java

+ 5 - 1
src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java

@@ -118,7 +118,11 @@ class ConnectivityServiceImpl implements ConnectivityService {
                 NetworkCapabilities networkCapabilities = platformConnectivityManager.getNetworkCapabilities(
                 NetworkCapabilities networkCapabilities = platformConnectivityManager.getNetworkCapabilities(
                     platformConnectivityManager.getActiveNetwork());
                     platformConnectivityManager.getActiveNetwork());
 
 
-                isMetered = !networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
+                if (networkCapabilities != null) {
+                    isMetered = !networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
+                } else {
+                    isMetered = ConnectivityManagerCompat.isActiveNetworkMetered(platformConnectivityManager);
+                }
             } else {
             } else {
                 isMetered = ConnectivityManagerCompat.isActiveNetworkMetered(platformConnectivityManager);
                 isMetered = ConnectivityManagerCompat.isActiveNetworkMetered(platformConnectivityManager);
             }
             }