From e14cb9d16ab364dde96b017e1d0656b81e4df014 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 10 Nov 2016 14:28:35 +0100 Subject: [PATCH] treat ethernet as WiFi when checking updates Its really easy to use USB Ethernet devices with ChromeOS and some Android devices like Android TV. ChromeOS now supports Android apps. Since really the goal is to avoid metered networks, and ethernet is very rarely metered, this fits in with the user expectations around the preference. And if it doesn't, there are very few people using Ethernet with F-Droid right now, so whatever harm does happen will affect an extremely limited number of people. --- .../main/java/org/fdroid/fdroid/UpdateService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java index 143f67d19..ff8c810f9 100644 --- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java +++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java @@ -294,11 +294,14 @@ public class UpdateService extends IntentService { return false; } - if (activeNetwork.getType() != ConnectivityManager.TYPE_WIFI && Preferences.get().isUpdateOnlyOnWifi()) { - Log.i(TAG, "Skipping update - wifi not available"); - return false; + int networkType = activeNetwork.getType(); + switch (networkType) { + case ConnectivityManager.TYPE_ETHERNET: + case ConnectivityManager.TYPE_WIFI: + return activeNetwork.isConnectedOrConnecting(); + default: + return Preferences.get().isUpdateOnlyOnWifi(); } - return activeNetwork.isConnectedOrConnecting(); } @Override