diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java index 9ed89405..4ac3baec 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java @@ -396,16 +396,7 @@ public class FirstStartActivity extends AppCompatActivity { */ private void startApp() { Intent mainIntent = new Intent(this, MainActivity.class); - - /** - * In case start_into_web_gui option is enabled, start both activities - * so that back navigation works as expected. - */ - if (mPreferences.getBoolean(Constants.PREF_START_INTO_WEB_GUI, false)) { - startActivities(new Intent[]{mainIntent, new Intent(this, WebGuiActivity.class)}); - } else { - startActivity(mainIntent); - } + startActivity(mainIntent); finish(); } diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java b/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java index 8082ebe3..f49994f6 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java @@ -27,7 +27,6 @@ public class Constants { public static final String PREF_RUN_IN_FLIGHT_MODE = "run_in_flight_mode"; // Preferences - Behaviour - public static final String PREF_START_INTO_WEB_GUI = "start_into_web_gui"; public static final String PREF_USE_ROOT = "use_root"; public static final String PREF_ENVIRONMENT_VARIABLES = "environment_variables"; public static final String PREF_DEBUG_FACILITIES_ENABLED = "debug_facilities_enabled"; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java index c35bd6c7..721ed811 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java @@ -948,6 +948,7 @@ public class SyncthingService extends Service { case "advanced_folder_picker": case "notification_type": case "notify_crashes": + case "start_into_web_gui": Log.v(TAG, "importConfig: Ignoring deprecated pref \"" + prefKey + "\"."); break; // Cached information which is not available on SettingsActivity. diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 6ef06242..d329250d 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -375,10 +375,6 @@ Canvieu l\'idioma de l\'aplicació - Inicia amb la interfície web directament - - Quan s\'inicia la aplicació, obre la interfície web enlloc de la pantalla principal - Idioma per defecte diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 9486dcc9..aacfdfa1 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -236,10 +236,6 @@ Změnit jazyk aplikace - Spustit přímo do Syncthing GUI - - Při spouštění aplikace přejít přímo do Syncthing GUI - Výchozí jazyk diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 1cb737c5..3c77cdc3 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -232,10 +232,6 @@ Ændr app sproget - Start direkte i webinterfacet - - Når app\'en starter, åben webinterfacet i stedet for hovedskærmen - Default Sprog diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8fc26168..76f45722 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -428,10 +428,6 @@ Bitte melden Sie auftretende Probleme via GitHub. Anwendungssprache ändern - Starte direkt in die Weboberfläche - - Beim Start der App die Weboberfläche anstelle des Hauptfensters öffnen - Standardsprache diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 887a76c7..7881d4be 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -232,10 +232,6 @@ Αλλαγή γλώσσας της εφαρμογής - Άνοιγμα απευθείας στο web GUI - - Κατά την εκκίνηση της εφαρμογής, να ανοίγει το web GUI αντί της κεντρικής οθόνης - Προεπιλεγμένη γλώσσα diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index dc13a9e1..ac3996b0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -258,10 +258,6 @@ Changer la langue de l\'application - Démarrer directement dans l\'interface WEB - - Au lancement de l\'application, ouvre l\'interface WEB au lieu de l\'écran d\'accueil. - Langue par défaut diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 79d530c5..0e255df0 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -254,10 +254,6 @@ Az összesített statisztika nyilvánosan elérhető a https://data.syncthing.ne Alkalmazás nyelvének megváltoztatása - A webes felület legyen a kezdőképernyő - - Az app indításakor a főképernyő helyett a webes felület jelenjen meg - Alapértelmezett nyelv diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 657922ee..27acbeb8 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -226,10 +226,6 @@ Ganti bahasa dalam aplikasi - Mulai dengan web GUI - - Saat memulai aplikasi, buka web GUI saja, bukannya layar utama - Bahasa Standar Nama Perangkat diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c0d8ae96..9b188fcd 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -255,10 +255,6 @@ Cambia la lingua dell\'app - Avvia direttamente nell\'Interfaccia Web - - Quando si avvia l\'applicazione, apre l\'Interfaccia Web invece che la schermata principale - Lingua di default diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3fd335ec..f45d6fdf 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -234,10 +234,6 @@ アプリの言語を変更します - Web GUI に直接起動する - - アプリを起動するとき、メイン画面ではなく Web GUI を開きます - デフォルトの言語 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index a7b6711f..c1d195fa 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -231,10 +231,6 @@ 언어 변경하기 - 웹 GUI로 바로 시작하기 - - 앱을 시작할 때 기본 화면 대신 웹 GUI로 엽니다. - 기본 언어 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3a80b026..43d59d1b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -277,10 +277,6 @@ Wijzig de taal van de app - Rechtstreeks opstarten in webinterface - - Open de webinterface in plaats van het hoofdvenster bij het opstarten van de app - Standaardtaal diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 03dacf80..1d831925 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -236,10 +236,6 @@ Zmień język aplikacji - Startuj bezpośrednio do trybu web GUI - - Uruchamiając aplikację, otwórz web GUI zamiast głównego ekranu - Domyślny język diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3d67625c..aa04751c 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -254,10 +254,6 @@ Alterar o idioma do aplicativo - Iniciar diretamente na interface web - - Quando o app for iniciado, abrir a interface web em vez da tela principal - Idioma padrão diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 241b91e8..862fcae2 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -273,10 +273,6 @@ Alegeți limba de afișat în aplicație - Pornire direct în interfața web - - Când aplicația pornește se deschide direct interfața web în loc de ecranul principal - Limba implicită diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3b4d7cf9..7e0ada6e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -316,10 +316,6 @@ Изменить язык приложения - Использовать веб-интерфейс при старте - - Во время запуска приложения открывать веб-интерфейс вместо главного экрана - Язык по умолчанию diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 19b66c76..7de06a26 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -352,10 +352,6 @@ Ändra appens språk - Starta direkt i webbgränssnittet - - När du startar appen öppnar du webbgränssnittet istället för huvudskärmen - Standardspråk diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 60a1fd0e..1910dca6 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -183,10 +183,6 @@ Змінити мову пристрою - Перехід одразу до веб-інтерфейсу - - При запуску додатка, відкривати веб-інтерфейс замість головного меню - Мова по замовчанню Назва пристрою diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2308b16f..439c44da 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -332,10 +332,6 @@ 更改应用语言 - 启动直接进入 Web GUI - - 启动应用时，打开网页图形用户界面而不是打开主屏幕 - 默认语言 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c0185fbd..ef027e68 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -232,10 +232,6 @@ 選擇應用程式語言 - 直接開啟網頁介面 - - 當開啟應用程式時，打開網頁介面，而不是主螢幕 - 預設語言 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e57b5433..c83c37e5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -428,10 +428,6 @@ Please report any problems you encounter via Github. Change the app language - Start directly into web GUI - - When starting the app, open web GUI instead of the main screen - Default Language diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml index e4cbe589..6194beda 100644 --- a/app/src/main/res/xml/app_settings.xml +++ b/app/src/main/res/xml/app_settings.xml @@ -95,12 +95,6 @@ android:title="@string/preference_language_title" android:summary="@string/preference_language_summary" /> - -