nutomic
/
syncthing-android
mirror of https://github.com/syncthing/syncthing-android.git
1
0
Fork 0
Code Releases Activity

Rename RestApi.restart to RestApi.saveConfigAndRestart (#1158)

This commit is contained in:
Catfriend1 2018-06-18 01:02:45 +02:00 committed by Audrius Butkevicius
parent 73e32ce5d0
commit 0f954c07fb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
View File

@ -493,7 +493,7 @@ public class MainActivity extends StateDialogActivity
break; break;
} }
getApi().editSettings(getApi().getGui(), options); getApi().editSettings(getApi().getGui(), options);
getApi().restart(); getApi().saveConfigAndRestart();
}; };
getApi().getUsageReport(report -> { getApi().getUsageReport(report -> {

2
app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
View File

@ -378,7 +378,7 @@ public class SettingsActivity extends SyncthingActivity {
if (mRequireRestart) { if (mRequireRestart) {
if (mSyncthingService != null && mApi != null && if (mSyncthingService != null && mApi != null &&
mSyncthingService.getCurrentState() != SyncthingService.State.DISABLED) { mSyncthingService.getCurrentState() != SyncthingService.State.DISABLED) {
mApi.restart(); mApi.saveConfigAndRestart();
mRequireRestart = false; mRequireRestart = false;
} }
} }

2
app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java
View File

@ -249,7 +249,7 @@ public class RestApi {
/** /**
* Sends current config and restarts Syncthing. * Sends current config and restarts Syncthing.
*/ */
public void restart() { public void saveConfigAndRestart() {
new PostConfigRequest(mContext, mUrl, mApiKey, new Gson().toJson(mConfig), result -> { new PostConfigRequest(mContext, mUrl, mApiKey, new Gson().toJson(mConfig), result -> {
Intent intent = new Intent(mContext, SyncthingService.class) Intent intent = new Intent(mContext, SyncthingService.class)
.setAction(SyncthingService.ACTION_RESTART); .setAction(SyncthingService.ACTION_RESTART);