nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-07 10:42:07 +00:00
Code Releases Activity

Treat ethernet connection "like un-metered Wi-Fi" (fixes #280) (#282)

Browse source 
* Treat ethernet connection "like un-metered Wi-Fi" (fixes #280)

* Update string: run_on_wifi_summary

* Updated de translation

* Update explanation string: reason_wifi_disallowed

* Updated de translation
This commit is contained in:
Catfriend1 2019-01-27 16:23:44 +01:00 committed by GitHub
parent 56bdd740b5
commit f2eacf0401
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java
View file

@ -499,6 +499,14 @@ public class RunConditionMonitor {
// No network connection.
return false;
}
if (ni.getType() == ConnectivityManager.TYPE_ETHERNET) {
/**
* We treat Wi-Fi and ETHERNET as "Wi-Fi" connection.
* Assume ETHERNET connection is un-metered to allow syncing on
* Android TV or VirtualBox ETHERNET connection.
*/
return false;
}
return cm.isActiveNetworkMetered();
}

4
app/src/main/res/values-de/strings.xml
View file

@ -385,7 +385,7 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
<string name="run_on_mobile_data_summary">Starte, wenn das Gerät über das mobile Datennetzwerk verbunden ist. Warnung: Wenn Du große Datenmengen synchronisierst, kann dies einen hohen Verbrauch deines mobilen Datentarifs verursachen.</string>
<string name="run_on_wifi_title">Starte bei WLAN-Verbindung</string>
<string name="run_on_wifi_summary">Starte, wenn das Gerät mit einem WLAN-Netzwerk verbunden ist.</string>
<string name="run_on_wifi_summary">Starte, wenn das Gerät mit einem WLAN- oder Kabel-Netzwerk verbunden ist.</string>
<string name="run_on_metered_wifi_title">Starte bei getakteter WLAN-Verbindung</string>
<string name="run_on_metered_wifi_summary">Starte, wenn das Gerät mit einem getakteten WLAN-Netzwerk wie z. B. einem Hotspot- oder Tethering-Netzwerk verbunden ist. Achtung: Dies kann einen großen Anteil des mobilen Datenvolumens verbrauchen, wenn Du viele Dateien synchronisierst.</string>
@ -689,7 +689,7 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
<string name="reason_mobile_data_disallowed">Syncthing wurde verboten, die mobile Datenverbindung zu nutzen.</string>
<string name="reason_on_mobile_data">Syncthing läuft, weil die mobile Datenverbindung aufgebaut ist.</string>
<string name="reason_not_on_mobile_data">Syncthing darf bei mobiler Datenverbindung laufen, jedoch sind mobile Daten nicht verbunden.</string>
<string name="reason_wifi_disallowed">Syncthing wurde verboten, die WLAN-Verbindung zu nutzen.</string>
<string name="reason_wifi_disallowed">Syncthing wurde verboten, die WLAN- oder Kabel-Verbindung zu nutzen.</string>
<string name="reason_on_wifi">Syncthing darf bei WLAN-Verbindung laufen und WLAN ist gerade verbunden.</string>
<string name="reason_not_on_wifi">Syncthing darf bei WLAN-Verbindung laufen, jedoch ist WLAN gerade nicht verbunden oder das Telefon befindet sich im Flugzeugmodus.</string>
<string name="reason_on_metered_nonmetered_wifi">Syncthing darf bei getakteter und nicht-getakteter WLAN-Verbindung laufen.</string>

4
app/src/main/res/values/strings.xml
View file

@ -388,7 +388,7 @@ Please report any problems you encounter via Github.</string>
<string name="run_on_mobile_data_summary">Run when device is connected via the mobile data network. Warning: This can consume a lot of data from your mobile operator data plan if you sync large amounts of data.</string>
<string name="run_on_wifi_title">Run on Wi-Fi</string>
<string name="run_on_wifi_summary">Run when device is connected to a Wi-Fi network.</string>
<string name="run_on_wifi_summary">Run when device is connected to a Wi-Fi or ethernet network.</string>
<string name="run_on_metered_wifi_title">Run on metered Wi-Fi</string>
<string name="run_on_metered_wifi_summary">Run when device is connected to a metered Wi-Fi network e.g. a hotspot or tethered network. Attention: This can consume large portion of your data plan if you sync a lot of data.</string>
@ -705,7 +705,7 @@ Please report any problems you encounter via Github.</string>
<string name="reason_mobile_data_disallowed">Syncthing is not allowed to run on mobile data connection.</string>
<string name="reason_on_mobile_data">Syncthing is running as mobile data is currently connected.</string>
<string name="reason_not_on_mobile_data">Syncthing is allowed to run on mobile data connection but mobile data isn\'t connected.</string>
<string name="reason_wifi_disallowed">Syncthing is not allowed to run on WiFi.</string>
<string name="reason_wifi_disallowed">Syncthing is not allowed to run on WiFi or ethernet.</string>
<string name="reason_on_wifi">Syncthing is allowed to run on WiFi and WiFi is currently connected.</string>
<string name="reason_not_on_wifi">Syncthing is allowed to run on WiFi but WiFi isn\'t connected or the phone is in flight mode.</string>
<string name="reason_on_metered_nonmetered_wifi">Syncthing is allowed to run on metered and non-metered WiFi connections.</string>