From 0f954c07fb26f9d89b710652ec09ad2ad680c1fa Mon Sep 17 00:00:00 2001 From: Catfriend1 Date: Mon, 18 Jun 2018 01:02:45 +0200 Subject: [PATCH] Rename RestApi.restart to RestApi.saveConfigAndRestart (#1158) --- .../com/nutomic/syncthingandroid/activities/MainActivity.java | 2 +- .../nutomic/syncthingandroid/activities/SettingsActivity.java | 2 +- .../main/java/com/nutomic/syncthingandroid/service/RestApi.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 5670cbdf..73ba5e80 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java @@ -493,7 +493,7 @@ public class MainActivity extends StateDialogActivity break; } getApi().editSettings(getApi().getGui(), options); - getApi().restart(); + getApi().saveConfigAndRestart(); }; getApi().getUsageReport(report -> { 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 b5351973..fcf13ee2 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java @@ -378,7 +378,7 @@ public class SettingsActivity extends SyncthingActivity { if (mRequireRestart) { if (mSyncthingService != null && mApi != null && mSyncthingService.getCurrentState() != SyncthingService.State.DISABLED) { - mApi.restart(); + mApi.saveConfigAndRestart(); mRequireRestart = false; } } 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 a6288543..856d1524 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java @@ -249,7 +249,7 @@ public class RestApi { /** * Sends current config and restarts Syncthing. */ - public void restart() { + public void saveConfigAndRestart() { new PostConfigRequest(mContext, mUrl, mApiKey, new Gson().toJson(mConfig), result -> { Intent intent = new Intent(mContext, SyncthingService.class) .setAction(SyncthingService.ACTION_RESTART);