diff --git a/app/lint.xml b/app/lint.xml
index 933c5df0..8e305441 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -2,57 +2,60 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java
index 9ca1dce0..17b3bbcf 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java
@@ -217,6 +217,7 @@ public class WebGuiActivity extends StateDialogActivity
* Returns boolean if successful.
* Source: https://stackoverflow.com/a/26781539
*/
+ @SuppressLint("PrivateApi")
public static boolean setWebViewProxy(Context appContext, String host, int port, String exclusionList) {
if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
// Not supported on android version lower than KitKat.
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
index 9dfa0261..b121516d 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
@@ -1,5 +1,6 @@
package com.nutomic.syncthingandroid.service;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -105,6 +106,7 @@ public class SyncthingRunnable implements Runnable {
run(false);
}
+ @SuppressLint("WakelockTimeout")
public String run(boolean returnStdOut) {
trimLogFile();
int ret;
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index c372778c..94fa4810 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -193,7 +193,6 @@
Внасянето на настройките се провали. Уверете се, че файловете са в %1$s
- В настройките на STTRACE са разрешени само символите 0-9, a-z и \',\'
Нулиране на базата данни
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 6d721af9..729c79ef 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -227,7 +227,6 @@ Ens podeu informar dels problemes que trobeu a través de Github.
Opcions de STTRACE
Variables d\'entorn
- Només es permet utilitzar 0-9, a-z i \',\' a les opcions de STTRACE
Aquest valor no és una cadena de variable d\'entorn vàlida
Reinicia la base de dades
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5e808543..4cb9b266 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -228,7 +228,6 @@ Všechny zaznamenané chyby prosím hlašte přes Github.
Možnosti STTRACE
Proměnné prostředí
- V STTRACE jsou povoleny pouze znaky \'0-9\', \'a-z\' a \',\'
Hodnota není platným řetězcem proměnné prostředí
Resetovat databázi
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index aae5249e..98185b51 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -226,7 +226,6 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github.
Debug Muligheder
Miljøvariabler
- Kun 0-9, a-z og \',\' er tilladte i STTRACE options
Værdien er ugyldig som miljøvariablestreng
Nulstil database
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 578a3f03..d5c2d05e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -246,7 +246,6 @@ Bitte melden Sie auftretende Probleme via GitHub.
STTRACE Optionen
Umgebungsvariablen
- Nur 0-9, a-z und \',\' sind erlaubt in STTRACE Optionen
Wert ist kein gültiger Umgebungsvariablen-String
Datenbank zurücksetzen
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 51e2deea..492f9cac 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -227,7 +227,6 @@
Επιλογές STTRACE
Μεταβλητές περιβάλλοντος
- Οι αποδεκτοί χαρακτήρες στις επιλογές STTRACE είναι τα 0-9, a-z και το \',\'.
Η τιμή δεν είναι έγκυρη συμβολοσειρά μεταβλητής περιβάλλοντος
Επαναφορά βάσης δεδομένων
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 45242375..456d2f53 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -203,7 +203,6 @@
Importación de la configuración fallida, comprueba que los ficheros están en %1$s
- Sólo se permite 0-9, a-z y coma (\',\') en las opciones de STTRACE
Restablecer base de datos
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 83d9e20e..6d46f991 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -204,7 +204,6 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
Asetusten tuonti epäonnistui. Varmista, että tiedostot ovat kansiossa %1$s
- Vain 0-9, a-z ja \',\' ovat sallittuja STTRACE valintoja
Nollaa tietokanta
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3b45cb72..7ef61e19 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -246,7 +246,6 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.Options STTRACE
Variables d\'environnement
- Seulement 0-9, a-z et \',\' sont autorisés dans les options STTRACE
La valeur n\'est pas une chaîne de variable d\'environnement valide
Remise à zéro de la base de données
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index c9a435af..10e8bc9f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -254,7 +254,6 @@ VIGYÁZAT! Más alkalmazások kiolvashatják a backupból a titkos kulcsot, és
STTRACE beállítások
Környezeti változók
- Az STTRACE beállítás csak 0-9, a-z és \',\' karaktereket tartalmazhat
Az érték nem egy érvényes környezeti változó string
Adatbázis törlése
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 05a26a3f..40d9b792 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -217,7 +217,6 @@ Jika ada masalah silakan laporkan lewat Github.
Opsi STTRACE
- Hanya 0-9, a-z dan \',\' yang dibolehkan dalam opsi STTRACE
Reset Database
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 00d1694b..ef53b9fb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -246,7 +246,6 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.
Opzioni STTRACE
Variabili d\'ambiente
- Solo 0-9, a-z e \',\' sono consentiti nelle opzioni STTRACE
Il valore non è una stringa valida per una variabile d\'ambiente
Reset del Database
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 0b4097e5..5948c321 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -226,7 +226,6 @@
STTRACE オプション
環境変数
- STTRACE オプションでは、0-9、a-z および \',\' のみ使用できます。
値は有効な環境変数文字列ではありません
データベースをリセットする
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 99927b16..ff442dbf 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -226,7 +226,6 @@
STTRACE 옵션
환경 변수
- STTRACE 옵션에서는 0-9, a-z 와 \'.\' 외의 문자를 사용할 수 없습니다.
값이 유효한 환경 변수 문자열이 아닙니다
데이터베이스 리셋
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a83c6cc0..8f745ab7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -246,7 +246,6 @@ Als je problemen tegenkomt, meld ze dan via GitHub.
STTRACE-opties
Omgevingsvariabelen
- Enkel 0-9, a-z en \',\' zijn toegestaan in STTRACE-opties
Waarde is geen geldige omgevingsvariabele
Database opnieuw instellen
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 048cd33f..28606f7a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -224,7 +224,6 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
Opcje STTRACE
Zmienne środowiskowe
- Tylko 0-9, a-z i \",\" są dozwolone w opcjach STTRACE
Value nie jest prawidłowwą zmienną środowiskową
Przywróć pierwotny stan bazy danych
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 530851d9..0c6c5499 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -233,7 +233,6 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.
Opções do STTRACE
Variáveis de ambiente
- Somente os caracteres 0-9, a-z e vírgula são permitidos nas opções de STTRACE
O a variável de ambiente não é um valor válido
Limpar banco de dados
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a86a8c71..76d723a4 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -199,7 +199,6 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.A importação da configuração falhou, assegure-se que os ficheiros estão em %1$s
- Nas opções STTRACE apenas é permitido 0-9, a-z e \',\'
Reiniciar a base de dados
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 4473d070..e95618de 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -228,7 +228,6 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
Opțiuni STTRACE
Variabile de mediu
- Doar 0-9, a-z și \',\' sunt permise în opțiunile STTRACE
Această valoare nu este un șir de variabile de mediu valabil
Resetează baza de date
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f592ab2b..e5ab7926 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -229,7 +229,6 @@
STTRACE Options
Environment variables
- Только 0-9, a-z и \',\' допустимы для параметра STTRACE
Value is not a valid environment variable string
Сбросить базу данных
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a075ef10..b69252c3 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -227,7 +227,6 @@ Vänligen rapportera eventuella problem du stöter på via Github.
STTRACE alternativ
Miljövariabler
- Endast 0-9, a-z och \',\' är tillåtna i STTRACE alternativ
Värdet är inte en giltig miljövariabel sträng
Återställ databas
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index aba22f45..b4c61ea2 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -197,7 +197,6 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.Yapılandırma içe aktarılamadı, dosyaların %1$s içinde olduğundan emin olun
- STTRACE seçeneklerinde yalnızca 0-9, a-z ve \",\" karakterlerine izin verilir
Veritabanını Sıfırla
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 92c47efa..74c9d496 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -228,7 +228,6 @@
STTRACE 选项
环境变量
- STTRACE 选项仅允许 0-9、a-z 与半角逗号“,”
该值不是有效的环境变量字符串
重置数据库
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 5c929d16..054fd3ac 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -226,7 +226,6 @@
STTRACE 選項
環境變數
- STTRACE 選項僅允許 0-9、a-z 及 \',\'
輸入的值不是有效的環境變數字串
重設資料庫
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a0c85a2e..c87bf647 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -354,7 +354,7 @@ Please report any problems you encounter via Github.
Export Configuration
- Input value not valid. Please enter value between %1$d and %2$d.
+ Input value not valid. Please enter value between %1$d and %2$d.
Connect through a proxy
@@ -411,8 +411,6 @@ Please report any problems you encounter via Github.
Environment variables
- Only 0-9, a-z and \',\' are allowed in STTRACE options
-
Value is not a valid environment variable string