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

Settings: Split gui tcp port and bind address (fixes #168) (#179)

* Settings: Split gui tcp port and bind address (fixes #168)

Reorder SettingsActivity pref init code according to settings order derived from UI.

* Start browser after adb forward

from helper script.

* Remove unused translation strings

* Updated translations - shortdescription
This commit is contained in:
Catfriend1 2019-01-02 18:56:27 +01:00 committed by GitHub
parent 755483e9ed
commit 74ab89fb4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 197 additions and 186 deletions

View file

@ -3,5 +3,6 @@ REM
REM adb forward local_port to emulator_port
echo Running ADB to setup port forwarding on the emulated Android device ...
adb forward tcp:18384 tcp:8384
start https://127.0.0.1:18384
echo Done.
timeout 3

View file

@ -110,6 +110,8 @@ public class SettingsActivity extends SyncthingActivity {
private static final String TAG = "SettingsFragment";
// Settings/Syncthing
private static final String KEY_WEBUI_TCP_PORT = "webUITcpPort";
private static final String KEY_WEBUI_REMOTE_ACCESS = "webUIRemoteAccess";
private static final String KEY_UNDO_IGNORED_DEVICES_FOLDERS = "undo_ignored_devices_folders";
// Settings/Import and Export
private static final String KEY_EXPORT_CONFIG = "export_config";
@ -121,6 +123,9 @@ public class SettingsActivity extends SyncthingActivity {
private static final String KEY_SYNCTHING_API_KEY = "syncthing_api_key";
private static final String KEY_SYNCTHING_DATABASE_SIZE = "syncthing_database_size";
private static final String BIND_ALL = "0.0.0.0";
private static final String BIND_LOCALHOST = "127.0.0.1";
@Inject NotificationHandler mNotificationHandler;
@Inject SharedPreferences mPreferences;
@ -144,7 +149,8 @@ public class SettingsActivity extends SyncthingActivity {
private CheckBoxPreference mGlobalAnnounceEnabled;
private CheckBoxPreference mRelaysEnabled;
private EditTextPreference mGlobalAnnounceServers;
private EditTextPreference mAddress;
private EditTextPreference mWebUITcpPort;
private CheckBoxPreference mWebUIRemoteAccess;
private CheckBoxPreference mRestartOnWakeup;
private CheckBoxPreference mUrAccepted;
@ -188,25 +194,8 @@ public class SettingsActivity extends SyncthingActivity {
public void onActivityCreated(Bundle savedInstanceState) {
mContext = getActivity().getApplicationContext();
super.onActivityCreated(savedInstanceState);
addPreferencesFromResource(R.xml.app_settings);
PreferenceScreen screen = getPreferenceScreen();
mStartServiceOnBoot =
(CheckBoxPreference) findPreference(Constants.PREF_START_SERVICE_ON_BOOT);
mPowerSource =
(ListPreference) findPreference(Constants.PREF_POWER_SOURCE);
mRunOnMobileData =
(CheckBoxPreference) findPreference(Constants.PREF_RUN_ON_WIFI);
mRunOnWifi =
(CheckBoxPreference) findPreference(Constants.PREF_RUN_ON_WIFI);
mRunOnMeteredWifi =
(CheckBoxPreference) findPreference(Constants.PREF_RUN_ON_METERED_WIFI);
mUseWifiWhitelist =
(CheckBoxPreference) findPreference(Constants.PREF_USE_WIFI_SSID_WHITELIST);
mWifiSsidWhitelist =
(WifiSsidPreference) findPreference(Constants.PREF_WIFI_SSID_WHITELIST);
mRunInFlightMode =
(CheckBoxPreference) findPreference(Constants.PREF_RUN_IN_FLIGHT_MODE);
mPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
ListPreference languagePref = (ListPreference) findPreference(Languages.PREFERENCE_LANGUAGE);
PreferenceScreen categoryBehaviour = (PreferenceScreen) findPreference("category_behaviour");
@ -223,6 +212,44 @@ public class SettingsActivity extends SyncthingActivity {
});
}
/* Run conditions */
PreferenceScreen screen = getPreferenceScreen();
mRunOnWifi =
(CheckBoxPreference) findPreference(Constants.PREF_RUN_ON_WIFI);
mRunOnMeteredWifi =
(CheckBoxPreference) findPreference(Constants.PREF_RUN_ON_METERED_WIFI);
mUseWifiWhitelist =
(CheckBoxPreference) findPreference(Constants.PREF_USE_WIFI_SSID_WHITELIST);
mWifiSsidWhitelist =
(WifiSsidPreference) findPreference(Constants.PREF_WIFI_SSID_WHITELIST);
mRunOnMobileData =
(CheckBoxPreference) findPreference(Constants.PREF_RUN_ON_WIFI);
mPowerSource =
(ListPreference) findPreference(Constants.PREF_POWER_SOURCE);
mRunInFlightMode =
(CheckBoxPreference) findPreference(Constants.PREF_RUN_IN_FLIGHT_MODE);
mRunOnMeteredWifi.setEnabled(mRunOnWifi.isChecked());
mUseWifiWhitelist.setEnabled(mRunOnWifi.isChecked());
mWifiSsidWhitelist.setEnabled(mRunOnWifi.isChecked() && mUseWifiWhitelist.isChecked());
screen.findPreference(Constants.PREF_POWER_SOURCE).setSummary(mPowerSource.getEntry());
String wifiSsidSummary = TextUtils.join(", ", mPreferences.getStringSet(Constants.PREF_WIFI_SSID_WHITELIST, new HashSet<>()));
screen.findPreference(Constants.PREF_WIFI_SSID_WHITELIST).setSummary(TextUtils.isEmpty(wifiSsidSummary) ?
getString(R.string.wifi_ssid_whitelist_empty) :
getString(R.string.run_on_whitelisted_wifi_networks, wifiSsidSummary)
);
mCategoryRunConditions = findPreference("category_run_conditions");
setPreferenceCategoryChangeListener(mCategoryRunConditions, this::onRunConditionPreferenceChange);
/* Behaviour */
mStartServiceOnBoot =
(CheckBoxPreference) findPreference(Constants.PREF_START_SERVICE_ON_BOOT);
mUseRoot =
(CheckBoxPreference) findPreference(Constants.PREF_USE_ROOT);
/* Syncthing options */
mDeviceName = (EditTextPreference) findPreference("deviceName");
mListenAddresses = (EditTextPreference) findPreference("listenAddresses");
mMaxRecvKbps = (EditTextPreference) findPreference("maxRecvKbps");
@ -232,79 +259,61 @@ public class SettingsActivity extends SyncthingActivity {
mGlobalAnnounceEnabled = (CheckBoxPreference) findPreference("globalAnnounceEnabled");
mRelaysEnabled = (CheckBoxPreference) findPreference("relaysEnabled");
mGlobalAnnounceServers = (EditTextPreference) findPreference("globalAnnounceServers");
mAddress = (EditTextPreference) findPreference("address");
mWebUITcpPort = (EditTextPreference) findPreference(KEY_WEBUI_TCP_PORT);
mWebUIRemoteAccess = (CheckBoxPreference) findPreference(KEY_WEBUI_REMOTE_ACCESS);
mSyncthingApiKey = findPreference(KEY_SYNCTHING_API_KEY);
mRestartOnWakeup = (CheckBoxPreference) findPreference("restartOnWakeup");
mUrAccepted = (CheckBoxPreference) findPreference("urAccepted");
Preference undoIgnoredDevicesFolders = findPreference(KEY_UNDO_IGNORED_DEVICES_FOLDERS);
mCategorySyncthingOptions = findPreference("category_syncthing_options");
setPreferenceCategoryChangeListener(mCategorySyncthingOptions, this::onSyncthingPreferenceChange);
mSyncthingApiKey.setOnPreferenceClickListener(this);
undoIgnoredDevicesFolders.setOnPreferenceClickListener(this);
/* Import and Export */
Preference exportConfig = findPreference("export_config");
Preference importConfig = findPreference("import_config");
exportConfig.setOnPreferenceClickListener(this);
importConfig.setOnPreferenceClickListener(this);
Preference undoIgnoredDevicesFolders = findPreference(KEY_UNDO_IGNORED_DEVICES_FOLDERS);
/* Debugging */
Preference debugFacilitiesEnabled = findPreference(Constants.PREF_DEBUG_FACILITIES_ENABLED);
Preference environmentVariables = findPreference("environment_variables");
Preference stResetDatabase = findPreference("st_reset_database");
Preference stResetDeltas = findPreference("st_reset_deltas");
mUseRoot = (CheckBoxPreference) findPreference(Constants.PREF_USE_ROOT);
mUseWakelock = (CheckBoxPreference) findPreference(Constants.PREF_USE_WAKE_LOCK);
mUseTor = (CheckBoxPreference) findPreference(Constants.PREF_USE_TOR);
mSocksProxyAddress = (EditTextPreference) findPreference(Constants.PREF_SOCKS_PROXY_ADDRESS);
mHttpProxyAddress = (EditTextPreference) findPreference(Constants.PREF_HTTP_PROXY_ADDRESS);
Preference appVersion = findPreference("app_version");
mSyncthingVersion = findPreference("syncthing_version");
mSyncthingApiKey = findPreference(KEY_SYNCTHING_API_KEY);
mRunOnMeteredWifi.setEnabled(mRunOnWifi.isChecked());
mUseWifiWhitelist.setEnabled(mRunOnWifi.isChecked());
mWifiSsidWhitelist.setEnabled(mRunOnWifi.isChecked() && mUseWifiWhitelist.isChecked());
/* Experimental options */
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
/* Wakelocks are only valid on Android 5 or lower. */
mUseWakelock.setEnabled(false);
mUseWakelock.setChecked(false);
}
mCategorySyncthingOptions = findPreference("category_syncthing_options");
setPreferenceCategoryChangeListener(mCategorySyncthingOptions, this::onSyncthingPreferenceChange);
mCategoryRunConditions = findPreference("category_run_conditions");
setPreferenceCategoryChangeListener(mCategoryRunConditions, this::onRunConditionPreferenceChange);
/* Syncthing options */
undoIgnoredDevicesFolders.setOnPreferenceClickListener(this);
/* Import and Export */
exportConfig.setOnPreferenceClickListener(this);
importConfig.setOnPreferenceClickListener(this);
/* Debug */
debugFacilitiesEnabled.setOnPreferenceChangeListener(this);
environmentVariables.setOnPreferenceChangeListener(this);
stResetDatabase.setOnPreferenceClickListener(this);
stResetDeltas.setOnPreferenceClickListener(this);
/* Experimental options */
mUseTor = (CheckBoxPreference) findPreference(Constants.PREF_USE_TOR);
mSocksProxyAddress = (EditTextPreference) findPreference(Constants.PREF_SOCKS_PROXY_ADDRESS);
mHttpProxyAddress = (EditTextPreference) findPreference(Constants.PREF_HTTP_PROXY_ADDRESS);
mUseWakelock = (CheckBoxPreference) findPreference(Constants.PREF_USE_WAKE_LOCK);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
/* Wakelocks are only valid on Android 5 or lower. */
mUseWakelock.setEnabled(false);
mUseWakelock.setChecked(false);
}
mUseRoot.setOnPreferenceClickListener(this);
mUseWakelock.setOnPreferenceChangeListener(this);
mUseTor.setOnPreferenceChangeListener(this);
mSocksProxyAddress.setEnabled(!(Boolean) mUseTor.isChecked());
mSocksProxyAddress.setOnPreferenceChangeListener(this);
handleSocksProxyPreferenceChange(screen.findPreference(Constants.PREF_SOCKS_PROXY_ADDRESS), mPreferences.getString(Constants.PREF_SOCKS_PROXY_ADDRESS, ""));
mHttpProxyAddress.setEnabled(!(Boolean) mUseTor.isChecked());
mHttpProxyAddress.setOnPreferenceChangeListener(this);
/* Initialize summaries */
mPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
screen.findPreference(Constants.PREF_POWER_SOURCE).setSummary(mPowerSource.getEntry());
String wifiSsidSummary = TextUtils.join(", ", mPreferences.getStringSet(Constants.PREF_WIFI_SSID_WHITELIST, new HashSet<>()));
screen.findPreference(Constants.PREF_WIFI_SSID_WHITELIST).setSummary(TextUtils.isEmpty(wifiSsidSummary) ?
getString(R.string.wifi_ssid_whitelist_empty) :
getString(R.string.run_on_whitelisted_wifi_networks, wifiSsidSummary)
);
handleSocksProxyPreferenceChange(screen.findPreference(Constants.PREF_SOCKS_PROXY_ADDRESS), mPreferences.getString(Constants.PREF_SOCKS_PROXY_ADDRESS, ""));
handleHttpProxyPreferenceChange(screen.findPreference(Constants.PREF_HTTP_PROXY_ADDRESS), mPreferences.getString(Constants.PREF_HTTP_PROXY_ADDRESS, ""));
/* About */
Preference appVersion = findPreference("app_version");
mSyncthingVersion = findPreference("syncthing_version");
try {
String versionName = getActivity().getPackageManager()
.getPackageInfo(getActivity().getPackageName(), 0).versionName;
@ -312,7 +321,6 @@ public class SettingsActivity extends SyncthingActivity {
} catch (PackageManager.NameNotFoundException e) {
Log.d(TAG, "Failed to get app version name");
}
mSyncthingApiKey.setOnPreferenceClickListener(this);
screen.findPreference(KEY_SYNCTHING_DATABASE_SIZE).setSummary(getDatabaseSize());
openSubPrefScreen(screen);
@ -359,7 +367,6 @@ public class SettingsActivity extends SyncthingActivity {
mSyncthingVersion.setSummary(mRestApi.getVersion());
mSyncthingApiKey.setSummary(mRestApi.getApiKey());
mOptions = mRestApi.getOptions();
mGui = mRestApi.getGui();
Joiner joiner = Joiner.on(", ");
mDeviceName.setText(mRestApi.getLocalDevice().name);
@ -371,7 +378,15 @@ public class SettingsActivity extends SyncthingActivity {
mGlobalAnnounceEnabled.setChecked(mOptions.globalAnnounceEnabled);
mRelaysEnabled.setChecked(mOptions.relaysEnabled);
mGlobalAnnounceServers.setText(joiner.join(mOptions.globalAnnounceServers));
mAddress.setText(mGui.address);
// Web GUI tcp port and bind ip address.
mGui = mRestApi.getGui();
if (mGui != null) {
mWebUITcpPort.setText(mGui.getBindPort());
mWebUITcpPort.setSummary(mGui.getBindPort());
mWebUIRemoteAccess.setChecked(!BIND_LOCALHOST.equals(mGui.getBindAddress()));
}
mRestartOnWakeup.setChecked(mOptions.restartOnWakeup);
mRestApi.getSystemStatus(systemStatus ->
mUrAccepted.setChecked(mOptions.isUsageReportingAccepted(systemStatus.urVersionMax)));
@ -468,8 +483,22 @@ public class SettingsActivity extends SyncthingActivity {
case "globalAnnounceServers":
mOptions.globalAnnounceServers = Iterables.toArray(splitter.split((String) o), String.class);
break;
case "address":
mGui.address = (String) o;
case KEY_WEBUI_TCP_PORT:
Integer webUITcpPort = 0;
try {
webUITcpPort = Integer.parseInt((String) o);
} catch (Exception e) {
}
if (webUITcpPort < 1 || webUITcpPort > 65535) {
Toast.makeText(getActivity(), getResources().getString(R.string.invalid_port_number, 1, 65535), Toast.LENGTH_LONG)
.show();
return false;
}
mWebUITcpPort.setSummary(Integer.toString(webUITcpPort));
mGui.address = mGui.getBindAddress() + ":" + Integer.toString(webUITcpPort);
break;
case KEY_WEBUI_REMOTE_ACCESS:
mGui.address = ((boolean) o ? BIND_ALL : BIND_LOCALHOST) + ":" + mWebUITcpPort.getSummary();
break;
case "restartOnWakeup":
mOptions.restartOnWakeup = (boolean) o;
@ -592,6 +621,16 @@ public class SettingsActivity extends SyncthingActivity {
.setNegativeButton(android.R.string.no, null)
.show();
return true;
case KEY_SYNCTHING_API_KEY:
// Copy syncthing's API key to clipboard.
ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText(getString(R.string.syncthing_api_key), mSyncthingApiKey.getSummary());
clipboard.setPrimaryClip(clip);
Toast.makeText(getActivity(), R.string.api_key_copied_to_clipboard, Toast.LENGTH_SHORT)
.show();
return true;
default:
return false;
case KEY_UNDO_IGNORED_DEVICES_FOLDERS:
new AlertDialog.Builder(getActivity())
.setMessage(R.string.undo_ignored_devices_folders_question)
@ -641,16 +680,6 @@ public class SettingsActivity extends SyncthingActivity {
})
.show();
return true;
case KEY_SYNCTHING_API_KEY:
// Copy syncthing's API key to clipboard.
ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
ClipData clip = ClipData.newPlainText(getString(R.string.syncthing_api_key), mSyncthingApiKey.getSummary());
clipboard.setPrimaryClip(clip);
Toast.makeText(getActivity(), R.string.api_key_copied_to_clipboard, Toast.LENGTH_SHORT)
.show();
return true;
default:
return false;
}
}

View file

@ -20,5 +20,21 @@ public class Config {
public String apiKey;
public boolean insecureAdminAccess;
public String theme;
public String getBindAddress() {
if (address == null) {
return "";
}
String[] split = address.split(":");
return split.length < 1 ? "" : split[0];
}
public String getBindPort() {
if (address == null) {
return "";
}
String[] split = address.split(":");
return split.length < 2 ? "" : split[1];
}
}
}

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Отворено и надеждно приложение за децентрализирано синхронизиране на файлове.
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Sincronització de fitxers oberta, confiable i descentralitzada.
Wrapper for Syncthing - Sincronització de fitxers oberta, confiable i descentralitzada.

View file

@ -1 +1 @@
Otevřené, důvěryhodné a decentralizované řešení pro synchronizaci souborů
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Åben, troværdig og decentraliseret filsynkronisering
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Offene, vertrauenswürdige und dezentralisierte Dateisynchronisation
Wrapper für Syncthing - Offene und dezentralisierte Dateisynchronisation

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Sincronización de ficheros abierta, de confianza y descentralizada
Wrapper for Syncthing - Sincronización de ficheros abierta, de confianza y descentralizada

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Sincronización de archivos abierta, confiable y descentralizada
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Avoin, luotettava ja hajautettu tiedostojensynkronointisovellus.
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Une synchronisation de fichiers ouverte, fiable et décentralisée
Wrapper for Syncthing - Une synchronisation de fichiers ouverte, décentralisée

View file

@ -1 +1 @@
Nyílt, megbízható és decentralizált fájlszinkronizáció
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Sinkronisasi berkas secara terbuka, terdesentralisasi dan terpercaya
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Sincronizzazione file aperta, affidabile e decentralizzata
Wrapper for Syncthing - Sincronizzazione file aperta, affidabile e decentralizzata

View file

@ -1 +1 @@
オープンで、信頼できる、分散型ファイル同期
Wrapper for Syncthing - オープンで、信頼できる、分散型ファイル同期

View file

@ -1 +1 @@
개방적이고 믿을 수 있는, 분산 파일 동기화
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Open, betrouwbare en gedecentraliseerde bestandssynchronisatie
Wrapper for Syncthing - Open, betrouwbare en gedecentraliseerde bestandssynchronisatie

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Replace proprietary services with something open, trustworthy and decentralized.
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Otwarty, godny zaufania i zdecentralizowany program do synchronizowania plików.
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Sincronização aberta, fiável e descentralizada
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Sincronização de arquivos aberta, confiável e descentralizada
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Sincronizare de fișiere în mod deschis, de încredere și descentralizat
Wrapper for Syncthing - Sincronizare de fișiere în mod deschis, de încredere și descentralizat

View file

@ -1 +1 @@
Открытая, надёжная и децентрализованная синхронизация файлов.
Wrapper for Syncthing - Открытая, надёжная и децентрализованная синхронизация файлов.

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Öppen, pålitlig och decentraliserad filsynkronisering
Wrapper for Syncthing - Öppen, pålitlig och decentraliserad filsynkronisering

View file

@ -1 +1 @@
Öppen, pålitlig och decentraliserad filsynkronisering
Wrapper for Syncthing - Öppen, pålitlig och decentraliserad filsynkronisering

View file

@ -1 +1 @@
ık, güvenilir ve merkezi olmayan dosya eşzamanlama uygulaması
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Open, trustworthy and decentralized file synchronization
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
Đồng bộ hoá tập tin phi tập trung, mở và đáng tin cậy
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -1 +1 @@
开放、分布式且值得信赖的自由服务
Wrapper for Syncthing - 开放、分布式且值得信赖的自由服务

View file

@ -1 +1 @@
開放、可靠及去中心化的檔案同步
Wrapper for Syncthing - 開放、可靠及去中心化的檔案同步

View file

@ -242,8 +242,6 @@
<string name="usage_reporting"> Анонимен доклад за ползване на програмата</string>
<string name="gui_address">Адрес за свързване с потребителския интерфейс</string>
<string name="export_config">Изнасяне на настройките</string>
<string name="use_tor_title">Ползване на Tor</string>

View file

@ -429,8 +429,6 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
<string name="usage_reporting">Informes d\'ús anònims</string>
<string name="gui_address">Adreça d\'escolta de la interfície gràfica</string>
<!-- Titles for the preference to undo ignored devices and folders -->
<string name="undo_ignored_devices_folders_title">Desfés ignorant els dispositius i carpetes</string>
<string name="undo_ignored_devices_folders_question">Això desfarà les decisions anteriors d\'ignorar els dispositius i carpetes. Voleu continuar?</string>

View file

@ -274,8 +274,6 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
<string name="usage_reporting">Anonymní hlášení o používání</string>
<string name="gui_address">Adresy naslouchání GUI</string>
<string name="export_config">Zálohovat nastavení</string>
<string name="keep_wakelock_while_binary_running">Udržovat CPU aktivní pokud běží Syncthing</string>

View file

@ -270,8 +270,6 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
<string name="usage_reporting">Anonym Forburgsrapportering</string>
<string name="gui_address">GUI Listen Addresser</string>
<string name="export_config">Eksporter Konfigurering</string>
<string name="keep_wakelock_while_binary_running">Lad CPU\'en køre imens Syncthing kører</string>

View file

@ -453,7 +453,11 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
<string name="usage_reporting">Anonymer Nutzungsbericht</string>
<string name="gui_address">Adressen für Weboberfläche</string>
<string name="webui_tcp_port_title">Web UI TCP Port</string>
<string name="webui_remote_access_title">Web UI Fernzugriff</string>
<string name="webui_remote_access_summary">Erlaubt es, von einem anderen Gerät aus auf die Weboberfläche zuzugreifen. Wenn aktiviert, kannst Du dich mit dem Benutzer \'syncthing\' und dem API Key als Passwort anmelden. Standard: Deaktiviert (am sichersten)</string>
<!-- Titles for the preference to undo ignored devices and folders -->
<string name="undo_ignored_devices_folders_title">Mache Ignorieren von Geräten und Ordnern rückgängig</string>
@ -462,6 +466,9 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
<string name="export_config">Konfiguration exportieren</string>
<!-- Toast after entering an invalid tcp port -->
<string name="invalid_port_number" tools:ignore="PluralsCandidate">Die eingegebene Portnummer ist ungültig. Bitte gib einen Port zwischen %1$d und %2$d ein.</string>
<!-- Toast after entering invalid integer value -->
<string name="invalid_integer_value" tools:ignore="PluralsCandidate">Der eingegebene Wert ist ungültig. Bitte gib eine Zahl zwischen %1$d und %2$d ein.</string>

View file

@ -270,8 +270,6 @@
<string name="usage_reporting">Ανώνυμη αναφορά δεδομένων χρήσης</string>
<string name="gui_address">Διευθύνσεις ακρόασης του GUI</string>
<string name="export_config">Εξαγωγή ρυθμίσεων</string>
<string name="keep_wakelock_while_binary_running">Διατήρηση της CPU σε ενεργό κατάσταση όσο εκτελείται το Syncthing</string>

View file

@ -216,8 +216,6 @@
<string name="usage_reporting">Reporte de uso anónimo</string>
<string name="gui_address">Direcciones de escucha de la interfaz gráfica</string>
<string name="export_config">Exportar Configuración</string>
<string name="keep_wakelock_while_binary_running">Mantener el CPU encendido mientras Syncthing está en ejecución</string>

View file

@ -247,8 +247,6 @@
<string name="usage_reporting">Informe de uso anónimo</string>
<string name="gui_address">Direcciones de escucha de la interfaz</string>
<string name="export_config">Exportar configuración</string>
<string name="keep_wakelock_while_binary_running">Mantener la CPU activa mientras se ejecuta Syncthing</string>

View file

@ -262,8 +262,6 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
<string name="usage_reporting">Anonyymi käytönseuranta</string>
<string name="gui_address">Käyttöliittymän kuunteluosoite</string>
<string name="export_config">Vie asetukset</string>
<string name="keep_wakelock_while_binary_running">Pidä suoritin hereillä kun Syncthing on käynnissä</string>

View file

@ -295,8 +295,6 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
<string name="usage_reporting">Rapports anonymes d\'utilisation</string>
<string name="gui_address">Adresse pour l\'interface WEB</string>
<string name="export_config">Exporter la configuration</string>
<!-- Toast after entering invalid integer value -->

View file

@ -296,8 +296,6 @@ Néhány eszközön extra alkalmazás-leállító alkalmazást telepített fel a
<string name="usage_reporting">Anonim használati statisztikák küldése</string>
<string name="gui_address">Webes felület IP címe</string>
<string name="export_config">Beállítások mentése</string>
<!-- Experimental options -->

View file

@ -256,8 +256,6 @@ Jika ada masalah silakan laporkan lewat Github.</string>
<string name="usage_reporting">Laporan Penggunaan Anonim</string>
<string name="gui_address">Alamat Listen GUI</string>
<string name="export_config">Ekspor Konfigurasi</string>
<string name="keep_wakelock_while_binary_running">Buat CPU tetap aktif saat Syncthing berjalan</string>

View file

@ -292,8 +292,6 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
<string name="usage_reporting">Statistiche Anonime Utilizzo</string>
<string name="gui_address">Indirizzi Interfaccia Grafica</string>
<string name="export_config">Esporta Configurazione</string>
<!-- Toast after entering invalid integer value -->

View file

@ -271,8 +271,6 @@
<string name="usage_reporting">匿名での使用状況レポート</string>
<string name="gui_address">GUI 待ち受けアドレス</string>
<string name="export_config">設定のエクスポート</string>
<string name="keep_wakelock_while_binary_running">実行中は CPU をオンのままにする</string>

View file

@ -269,8 +269,6 @@
<string name="usage_reporting">익명 사용 기록 </string>
<string name="gui_address">접속 대기 주소</string>
<string name="export_config">설정 내보내기</string>
<string name="keep_wakelock_while_binary_running">Syncthing이 실행 중일 때 CPU를 깨어 있는 상태로 두기</string>

View file

@ -225,8 +225,6 @@
<string name="usage_reporting">Anonym bruksrapportering</string>
<string name="gui_address">GUI Lytteadresser</string>
<string name="export_config">Eksporter innstillinger</string>
<string name="keep_wakelock_while_binary_running">Hold prosessoren våken mens Syncthing kjører</string>

View file

@ -314,8 +314,6 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
<string name="usage_reporting">Anoniem gebruiksrapportage</string>
<string name="gui_address">GUI-luisteradressen</string>
<string name="export_config">Configuratie exporteren</string>
<!-- Toast after entering invalid integer value -->

View file

@ -225,8 +225,6 @@
<string name="usage_reporting">Anonym rapportering av bruk</string>
<string name="gui_address">Grensesnitt: lytteadresser</string>
<string name="export_config">Eksporter innstillingar</string>
<string name="keep_wakelock_while_binary_running">Hald prosessoren vaken medan Syncthing køyrer</string>

View file

@ -274,8 +274,6 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
<string name="usage_reporting">Anonimowe statystyki użycia</string>
<string name="gui_address">Adres nasłuchiwania</string>
<string name="export_config">Eksportuj ustawienia</string>
<string name="keep_wakelock_while_binary_running">Utrzymywanie wybudzonego CPU podczas działania</string>

View file

@ -292,8 +292,6 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
<string name="usage_reporting">Relatório anônimo de uso</string>
<string name="gui_address">Endereços de escuta da interface</string>
<string name="export_config">Exportar configuração</string>
<!-- Experimental options -->

View file

@ -245,8 +245,6 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
<string name="usage_reporting">Enviar relatórios anónimos de utilização</string>
<string name="gui_address">Endereço de escuta da interface gráfica</string>
<string name="export_config">Exportar configuração</string>
<string name="keep_wakelock_while_binary_running">Manter a CPU acordada enquanto o Syncthing está a correr</string>

View file

@ -319,8 +319,6 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
<string name="usage_reporting">Raport utilizare anonim</string>
<string name="gui_address">Adresa de ascultare a interfeței</string>
<!-- Titles for the preference to undo ignored devices and folders -->
<string name="undo_ignored_devices_folders_title">Reface setarea de ignorare de dispozitive și directoare</string>
<string name="undo_ignored_devices_folders_question">Această acțiune va reface decizia precedentă de ignorare a dispozitivelor și directoarelor. Continuați?</string>

View file

@ -355,8 +355,6 @@
<string name="usage_reporting">Анонимные Отчёты Использования</string>
<string name="gui_address">Адрес Ожидания GUI</string>
<string name="export_config">Экспорт настроек</string>
<!-- Experimental options -->

View file

@ -199,8 +199,6 @@
<string name="usage_reporting">Povoliť Anonymné Hlásenia o Používaní</string>
<string name="gui_address">Adresa pre GUI</string>
<string name="export_config">Exportovať Konfiguráciu</string>
<!-- Dialog shown before config import -->

View file

@ -404,8 +404,6 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
<string name="usage_reporting">Anonym användningsrapportering</string>
<string name="gui_address">Gränssnittets lyssnaradresser</string>
<!-- Titles for the preference to undo ignored devices and folders -->
<string name="undo_ignored_devices_folders_title">Ångra ignorerande enheter och mappar</string>
<string name="undo_ignored_devices_folders_question">Detta kommer att ångra tidigare beslut att ignorera enheter och mappar. Fortsätta?</string>

View file

@ -240,8 +240,6 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
<string name="usage_reporting">Anonim Kullanım Raporlama</string>
<string name="gui_address">Arayüz Dinleme Adresleri</string>
<string name="export_config">Yapılandırmayı Dışa Aktar</string>
<string name="keep_wakelock_while_binary_running">Syncthing çalışırken CPU\'yu uyanık tut</string>

View file

@ -216,8 +216,6 @@
<string name="usage_reporting">Báo cáo sử dụng ẩn danh</string>
<string name="gui_address">Các đ.chỉ lắng nghe GUI</string>
<string name="export_config">Xuất cấu hình</string>
<string name="keep_wakelock_while_binary_running">Giữ CPU thức khi Syncthing đang chạy</string>

View file

@ -273,8 +273,6 @@
<string name="usage_reporting">匿名使用报告</string>
<string name="gui_address">管理页监听地址</string>
<string name="export_config">导出设置</string>
<string name="keep_wakelock_while_binary_running">当 Syncthing 正在运行时保持 CPU 唤醒</string>

View file

@ -269,8 +269,6 @@
<string name="usage_reporting">匿名使用資訊回報</string>
<string name="gui_address">GUI 監聽位址</string>
<string name="export_config">匯出設定</string>
<string name="keep_wakelock_while_binary_running">當 Syncthing 正在執行時,保持 CPU 清醒</string>

View file

@ -453,7 +453,11 @@ Please report any problems you encounter via Github.</string>
<string name="usage_reporting">Anonymous Usage Reporting</string>
<string name="gui_address">GUI Listen Addresses</string>
<string name="webui_tcp_port_title">Web UI TCP Port</string>
<string name="webui_remote_access_title">Web UI remote access</string>
<string name="webui_remote_access_summary">Specify to permit accessing the Web UI from another device. If enabled, you are able to logon with user \'syncthing\' and API key as password. Default: disabled (most secure)</string>
<!-- Titles for the preference to undo ignored devices and folders -->
<string name="undo_ignored_devices_folders_title">Undo ignoring devices and folders</string>
@ -462,6 +466,9 @@ Please report any problems you encounter via Github.</string>
<string name="export_config">Export Configuration</string>
<!-- Toast after entering an invalid tcp port -->
<string name="invalid_port_number" tools:ignore="PluralsCandidate">Port number not valid. Please enter a port between %1$d and %2$d.</string>
<!-- Toast after entering invalid integer value -->
<string name="invalid_integer_value" tools:ignore="PluralsCandidate">Input value not valid. Please enter value between %1$d and %2$d.</string>

View file

@ -160,10 +160,23 @@
android:inputType="textNoSuggestions" />
<EditTextPreference
android:key="address"
android:title="@string/gui_address"
android:key="webUITcpPort"
android:title="@string/webui_tcp_port_title"
android:summary=""
android:persistent="false"
android:inputType="textNoSuggestions" />
android:inputType="number" />
<CheckBoxPreference
android:key="webUIRemoteAccess"
android:title="@string/webui_remote_access_title"
android:summary="@string/webui_remote_access_summary"
android:persistent="false" />
<Preference
android:persistent="false"
android:selectable="true"
android:key="syncthing_api_key"
android:title="@string/syncthing_api_key" />
<CheckBoxPreference
android:key="restartOnWakeup"
@ -292,12 +305,6 @@
android:key="syncthing_version"
android:title="@string/syncthing_version_title" />
<Preference
android:persistent="false"
android:selectable="true"
android:key="syncthing_api_key"
android:title="@string/syncthing_api_key" />
<Preference
android:persistent="false"
android:selectable="false"