Browse Source

using evernote

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 7 years ago
parent
commit
f733f7b0bb
1 changed files with 3 additions and 10 deletions
  1. 3 10
      src/main/java/com/owncloud/android/utils/ConnectivityUtils.java

+ 3 - 10
src/main/java/com/owncloud/android/utils/ConnectivityUtils.java

@@ -30,6 +30,8 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
+import com.evernote.android.job.JobRequest;
+import com.evernote.android.job.util.Device;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -94,22 +96,13 @@ public class ConnectivityUtils {
             } catch (AuthenticatorException e) {
                 Log_OC.e(TAG, e.getMessage());
             }
-        } else if (!isOffline(context)) {
+        } else if (!Device.getNetworkType(context).equals(JobRequest.NetworkType.ANY)) {
             return false;
         }
 
         return true;
     }
 
-    private static boolean isOffline(Context context) {
-        try {
-            ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            return !cm.getActiveNetworkInfo().isConnectedOrConnecting();
-        } catch (NullPointerException exception) {
-            return false;
-        }
-    }
-
     private static boolean isOnlineWithWifi(Context context) {
         try {
             ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);