diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
index a6c06502..be833516 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
@@ -467,7 +467,8 @@ public class MainActivity extends StateDialogActivity
startActivity(new Intent(Intent.ACTION_VIEW, uri));
break;
}
- getApi().editSettings(getApi().getGui(), options, this);
+ getApi().editSettings(getApi().getGui(), options);
+ getApi().restart();
};
getApi().getUsageReport(report -> {
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/RestartActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/RestartActivity.java
deleted file mode 100644
index 27f104ec..00000000
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/RestartActivity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.nutomic.syncthingandroid.activities;
-
-import android.app.AlertDialog;
-import android.os.Bundle;
-
-import com.nutomic.syncthingandroid.R;
-import com.nutomic.syncthingandroid.service.NotificationHandler;
-
-/**
- * Shows restart dialog.
- *
- * The user can choose to restart Syncthing immediately. Otherwise, a restart notification is
- * displayed.
- */
-public class RestartActivity extends SyncthingActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
-
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setMessage(R.string.restart_title)
- .setPositiveButton(R.string.restart_now, (dialogInterface, i) -> {
- getService().getApi().restart();
- finish();
- })
- .setNegativeButton(R.string.restart_later, (dialogInterface, i) -> {
- createRestartNotification();
- finish();
- })
- .setOnCancelListener(dialog -> {
- createRestartNotification();
- finish();
- })
- .show();
- }
-
- /**
- * Creates a notification prompting the user to restart the app.
- */
- private void createRestartNotification() {
- new NotificationHandler(getService()).showRestartNotification();
- getApi().setRestartPostponed();
- }
-
-}
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
index 5a385233..d1321cb2 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
@@ -110,6 +110,7 @@ public class SettingsActivity extends SyncthingActivity {
/* Experimental options */
private CheckBoxPreference mUseRoot;
+ private CheckBoxPreference mUseWakelock;
private CheckBoxPreference mUseTor;
private EditTextPreference mSocksProxyAddress;
private EditTextPreference mHttpProxyAddress;
@@ -122,6 +123,8 @@ public class SettingsActivity extends SyncthingActivity {
private Options mOptions;
private Config.Gui mGui;
+ private Boolean mRequireRestart = false;
+
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -196,7 +199,7 @@ public class SettingsActivity extends SyncthingActivity {
Preference stResetDeltas = findPreference("st_reset_deltas");
mUseRoot = (CheckBoxPreference) findPreference(Constants.PREF_USE_ROOT);
- Preference useWakelock = (CheckBoxPreference) findPreference(Constants.PREF_USE_WAKE_LOCK);
+ 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);
@@ -220,7 +223,7 @@ public class SettingsActivity extends SyncthingActivity {
/* Experimental options */
mUseRoot.setOnPreferenceClickListener(this);
- useWakelock.setOnPreferenceChangeListener((p, o) -> requireRestart());
+ mUseWakelock.setOnPreferenceChangeListener(this);
mUseTor.setOnPreferenceChangeListener(this);
mSocksProxyAddress.setEnabled(!(Boolean) mUseTor.isChecked());
@@ -291,10 +294,11 @@ public class SettingsActivity extends SyncthingActivity {
@Override
public void onDestroy() {
- super.onDestroy();
mPreferences.unregisterOnSharedPreferenceChangeListener(this);
- if (mSyncthingService != null)
+ if (mSyncthingService != null) {
mSyncthingService.unregisterOnApiChangeListener(this);
+ }
+ super.onDestroy();
}
private void setPreferenceCategoryChangeListener(
@@ -365,22 +369,26 @@ public class SettingsActivity extends SyncthingActivity {
mOptions.urAccepted = ((boolean) o)
? systemInfo.urVersionMax
: Options.USAGE_REPORTING_DENIED;
- mApi.editSettings(mGui, mOptions, getActivity());
});
break;
default: throw new InvalidParameterException();
}
- mApi.editSettings(mGui, mOptions, getActivity());
+ mApi.editSettings(mGui, mOptions);
+ mRequireRestart = true;
return true;
}
- public boolean requireRestart() {
- if (mSyncthingService.getCurrentState() != SyncthingService.State.DISABLED &&
- mSyncthingService.getApi() != null) {
- mSyncthingService.getApi().showRestartDialog(getActivity());
+ @Override
+ public void onStop() {
+ if (mRequireRestart) {
+ if (mSyncthingService.getCurrentState() != SyncthingService.State.DISABLED &&
+ mSyncthingService.getApi() != null) {
+ mSyncthingService.getApi().restart();
+ mRequireRestart = false;
+ }
}
- return true;
+ super.onStop();
}
/**
@@ -409,16 +417,16 @@ public class SettingsActivity extends SyncthingActivity {
break;
case KEY_STTRACE:
if (((String) o).matches("[0-9a-z, ]*"))
- requireRestart();
+ mRequireRestart = true;
else {
Toast.makeText(getActivity(), R.string.toast_invalid_sttrace, Toast.LENGTH_SHORT)
.show();
return false;
}
break;
- case "environment_variables":
+ case Constants.PREF_ENVIRONMENT_VARIABLES:
if (((String) o).matches("^(\\w+=[\\w:/\\.]+)?( \\w+=[\\w:/\\.]+)*$")) {
- requireRestart();
+ mRequireRestart = true;
}
else {
Toast.makeText(getActivity(), R.string.toast_invalid_environment_variables, Toast.LENGTH_SHORT)
@@ -426,16 +434,19 @@ public class SettingsActivity extends SyncthingActivity {
return false;
}
break;
+ case Constants.PREF_USE_WAKE_LOCK:
+ mRequireRestart = true;
+ break;
case Constants.PREF_USE_TOR:
mSocksProxyAddress.setEnabled(!(Boolean) o);
mHttpProxyAddress.setEnabled(!(Boolean) o);
- requireRestart();
+ mRequireRestart = true;
break;
case Constants.PREF_SOCKS_PROXY_ADDRESS:
if (o.toString().trim().equals(mPreferences.getString(Constants.PREF_SOCKS_PROXY_ADDRESS, "")))
return false;
if (handleSocksProxyPreferenceChange(preference, o.toString().trim())) {
- requireRestart();
+ mRequireRestart = true;
} else {
return false;
}
@@ -444,7 +455,7 @@ public class SettingsActivity extends SyncthingActivity {
if (o.toString().trim().equals(mPreferences.getString(Constants.PREF_HTTP_PROXY_ADDRESS, "")))
return false;
if (handleHttpProxyPreferenceChange(preference, o.toString().trim())) {
- requireRestart();
+ mRequireRestart = true;
} else {
return false;
}
@@ -465,7 +476,7 @@ public class SettingsActivity extends SyncthingActivity {
new TestRootTask().execute();
} else {
new Thread(() -> Util.fixAppDataPermissions(getActivity())).start();
- requireRestart();
+ mRequireRestart = true;
}
return true;
case KEY_EXPORT_CONFIG:
@@ -561,7 +572,7 @@ public class SettingsActivity extends SyncthingActivity {
@Override
protected void onPostExecute(Boolean haveRoot) {
if (haveRoot) {
- requireRestart();
+ mRequireRestart = true;
mUseRoot.setChecked(true);
} else {
Toast.makeText(getActivity(), R.string.toast_root_denied, Toast.LENGTH_SHORT)
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 c9c34e1c..d8cad799 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java
@@ -17,6 +17,7 @@ public class Constants {
public static final String PREF_RESPECT_BATTERY_SAVING = "respect_battery_saving";
public static final String PREF_USE_ROOT = "use_root";
public static final String PREF_NOTIFICATION_TYPE = "notification_type";
+ public static final String PREF_ENVIRONMENT_VARIABLES = "environment_variables";
public static final String PREF_USE_WAKE_LOCK = "wakelock_while_binary_running";
public static final String PREF_USE_TOR = "use_tor";
public static final String PREF_SOCKS_PROXY_ADDRESS = "socks_proxy_address";
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java b/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java
index 4d3e3df1..41251676 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java
@@ -18,7 +18,6 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.nutomic.syncthingandroid.BuildConfig;
import com.nutomic.syncthingandroid.SyncthingApp;
-import com.nutomic.syncthingandroid.activities.RestartActivity;
import com.nutomic.syncthingandroid.activities.ShareActivity;
import com.nutomic.syncthingandroid.http.GetRequest;
import com.nutomic.syncthingandroid.http.PostConfigRequest;
@@ -83,7 +82,6 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
private String mVersion;
private Config mConfig;
private String mLocalDeviceId;
- private boolean mRestartPostponed = false;
/**
* Stores the result of the last successful request to {@link GetRequest#URI_CONNECTIONS},
@@ -187,24 +185,14 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
}
}
- /**
- * Either shows a restart dialog, or only updates the config, depending on
- * {@link #mRestartPostponed}.
- */
- public void showRestartDialog(Activity activity) {
- if (mRestartPostponed) {
- sendConfig();
- } else {
- activity.startActivity(new Intent(mContext, RestartActivity.class));
- }
- mOnConfigChangedListener.onConfigChanged();
- }
-
/**
* Sends current config to Syncthing.
+ * Will result in a "ConfigSaved" event.
+ * EventProcessor will trigger this.reloadConfig().
*/
private void sendConfig() {
new PostConfigRequest(mContext, mUrl, mApiKey, new Gson().toJson(mConfig), null);
+ mOnConfigChangedListener.onConfigChanged();
}
/**
@@ -216,11 +204,11 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
.setAction(SyncthingService.ACTION_RESTART);
mContext.startService(intent);
});
+ mOnConfigChangedListener.onConfigChanged();
}
public void shutdown() {
mNotificationHandler.cancelRestartNotification();
- mRestartPostponed = false;
}
/**
@@ -330,10 +318,9 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
return deepCopy(mConfig.gui, Config.Gui.class);
}
- public void editSettings(Config.Gui newGui, Options newOptions, Activity activity) {
+ public void editSettings(Config.Gui newGui, Options newOptions) {
mConfig.gui = newGui;
mConfig.options = newOptions;
- showRestartDialog(activity);
}
/**
@@ -490,10 +477,6 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener {
});
}
- public void setRestartPostponed() {
- mRestartPostponed = true;
- }
-
public URL getUrl() {
return mUrl;
}
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index f852de6e..4d7a771b 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -137,9 +137,7 @@
- إعادة تشغيل اﻵن
- فيما بعد
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 7d45e204..c372778c 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -272,9 +272,7 @@
Изисква се рестартиране
- Рестартирай
- По-късно
Натиснете за рестартиране на Syncthing
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 6e6d7ab7..6d721af9 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -338,9 +338,7 @@ Ens podeu informar dels problemes que trobeu a través de Github.
Cal reiniciar
- Reinicia ara
- Més tard
Feu clic aquí per reiniciar el Syncthing ara
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9813ca8b..5e808543 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -342,9 +342,7 @@ Všechny zaznamenané chyby prosím hlašte přes Github.
Je potřeba restartovat
- Restartovat hned
- Později
Tapnout sem pro restart aplikace Syncthing
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index ae2da269..aae5249e 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -332,9 +332,7 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github.
Genstart nødvendig
- Genstart Nu
- Senere
Klik her for at genstarte Syncthing nu
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6e156e77..578a3f03 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -363,9 +363,7 @@ Bitte melden Sie auftretende Probleme via GitHub.
Neustart erforderlich
- Jetzt neu starten
- Später
Klicke hier um Syncthing neu zu starten
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index d13e6bc2..51e2deea 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -338,9 +338,7 @@
Απαιτείται επανεκκίνηση
- Επανεκκίνηση τώρα
- Αργότερα
Πατήστε εδώ για να επανεκκινήσετε τώρα το Syncthing
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 2af446c5..61f81edc 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -252,9 +252,7 @@
Reinicio requerido
- Reiniciar ahora
- Después
Clic aquí para reiniciar syncthing ahora
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ea09322f..45242375 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -308,9 +308,7 @@
Es necesario reiniciar
- Reiniciar ahora
- Después
Haga clic aquí para reiniciar Syncthing ahora
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index db85b8bd..83d9e20e 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -296,9 +296,7 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
Uudelleenkäynnistys tarvitaan
- Uudelleenkäynnistä nyt
- Myöhemmin
Paina tästä uudelleenkäynnistääksesi Syncthingin nyt.
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4066bf41..3b45cb72 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -367,9 +367,7 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.
Redémarrage requis
- Redémarrer maintenant
- Plus tard
Cliquez ici pour redémarrer Syncthing
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 64880e14..c9a435af 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -373,9 +373,7 @@ VIGYÁZAT! Más alkalmazások kiolvashatják a backupból a titkos kulcsot, és
Újraindítás szükséges
- Újraindítás most
- Később
Koppints a Syncthing újraindításához
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 728d61f2..05a26a3f 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -315,7 +315,6 @@ Jika ada masalah silakan laporkan lewat Github.
- Nanti
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6f8810eb..00d1694b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -367,9 +367,7 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.
Riavvio Necessario
- Riavvia ora
- Più tardi
Tap qui per riavviare adesso syncthing
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fa1d8449..0b4097e5 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -334,9 +334,7 @@
再起動が必要です
- 今すぐ再起動
- 後で
今すぐ Syncthing を再起動する
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index f6b78fc7..99927b16 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -334,9 +334,7 @@
재시작 필요
- 지금 재시작
- 나중에
Syncthing을 재시작하려면 이곳을 클릭하세요
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index b16ce125..9e95b975 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -258,9 +258,7 @@
Omstart Nødvendig
- Start på nytt nå
- Senere
Trykk her for å omstarte Syncthing nå
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 556646eb..a83c6cc0 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -367,9 +367,7 @@ Als je problemen tegenkomt, meld ze dan via GitHub.
Herstart vereist
- Nu herstarten
- Later
Klik hier om Syncthing nu te herstarten
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index acaef5d4..1d54b118 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -258,9 +258,7 @@
Omstart naudsynt
- Start om att no
- Seinare
Trykk her for å starte Syncthing om att no
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c3934fe4..048cd33f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -341,9 +341,7 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
Wymagane ponowne uruchomienie
- Uruchom ponownie
- Później
Proszę kliknąć, aby uruchomić program ponownie
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ad80cb6b..530851d9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -344,9 +344,7 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.
É necessário reiniciar
- Reiniciar agora
- Depois
Toque aqui para reiniciar o Syncthing agora
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 4edc7983..a86a8c71 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -278,9 +278,7 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.
É necessário reiniciar
- Reiniciar agora
- Mais tarde
Clique aqui para reiniciar o syncthing agora
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index b5e9bef1..4473d070 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -342,9 +342,7 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
Repornire necesară
- Repornire acum
- Mai târziu
Atingeți aici pentru a reporni Syncthing acum
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3fd94ef4..f592ab2b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -346,9 +346,7 @@
Необходим перезапуск
- Перезапустить сейчас
- Позже
Нажмите здесь чтобы перезапустить Syncthing
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index be7291dd..2e2e406d 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -239,9 +239,7 @@
Je nutný reštart
- Reštartovať Ihneď
- Neskôr
Kliknite sem, ak chcete Syncthing reštartovať ihneď.
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c64e3d5f..a075ef10 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -338,9 +338,7 @@ Vänligen rapportera eventuella problem du stöter på via Github.
Omstart behövs
- Startar om nu
- Senare
Klicka här för att starta om Syncthing nu
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a1922c26..aba22f45 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -278,9 +278,7 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.
Yeniden Başlatma Gerekli
- Şimdi Yeniden Başlat
- Daha Sonra
Şimdi Syncthing\'i yeniden başlatmak için tıkla
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index d665cf68..958be8ff 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -252,9 +252,7 @@
Необхідний перезапуск
- Перезапустити зараз
- Пізніше
Тисни сюди для негайного перезапуску syncthing
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 3b480cfa..9bbe7ac8 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -252,9 +252,7 @@
Cần kh.động lại
- Kh.động lại ngay
- Để sau
Nhấp để kh.động lại Syncthing ngay
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a3cbc40c..92c47efa 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -336,9 +336,7 @@
需要重启以应用
- 立即重启
- 稍后重启
点此立即重启本应用
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e67bd08d..5c929d16 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -334,9 +334,7 @@
需要重新啟動
- 現在重新啟動
- 稍後
按此以重新啟動 syncthing
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b8aa0908..a0c85a2e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -604,11 +604,7 @@ Please report any problems you encounter via Github.
Restart Needed
- Restart Now
-
- Later
-
Click here to restart syncthing now