nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 11:21:29 +00:00
Code Releases Activity

Restart now when importing config (fixes #386)

Browse source
This commit is contained in:
Lode Hoste 2015-05-06 07:59:09 +02:00
parent cde276891c
commit 9ef1474cbe
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
View file

@ -1,5 +1,9 @@
package com.nutomic.syncthingandroid.fragments;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Bundle;
@ -16,6 +20,7 @@ import android.view.MenuItem;
import android.widget.Toast;
import com.nutomic.syncthingandroid.R;
import com.nutomic.syncthingandroid.activities.MainActivity;
import com.nutomic.syncthingandroid.activities.SyncthingActivity;
import com.nutomic.syncthingandroid.syncthing.RestApi;
import com.nutomic.syncthingandroid.syncthing.SyncthingService;
@ -269,6 +274,16 @@ public class SettingsFragment extends PreferenceFragment
if (mSyncthingService.importConfig()) {
Toast.makeText(getActivity(), getString(R.string.config_imported_successful),
Toast.LENGTH_SHORT).show();
// Restart application because API key changed
// TODO Should be nicer
Intent mStartActivity = new Intent(this.getActivity(), MainActivity.class);
int mPendingIntentId = 838465;
PendingIntent mPendingIntent = PendingIntent.getActivity(this.getActivity(),
mPendingIntentId,
mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
AlarmManager mgr = (AlarmManager)this.getActivity().getSystemService(Context.ALARM_SERVICE);
mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
System.exit(0);
} else {
Toast.makeText(getActivity(), getString(R.string.config_import_failed,
SyncthingService.EXPORT_PATH), Toast.LENGTH_LONG).show();

2
src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
View file

@ -339,7 +339,6 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
}
return json;
}
/**
* Sends the updated mConfig via Rest API to syncthing and displays a "restart"
* dialog or notification.
@ -347,6 +346,7 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
@TargetApi(11)
public void requireRestart(Activity activity) {
new PostTask(mHttpsCertPath).execute(mUrl, PostTask.URI_CONFIG, mApiKey, mConfig.toString());
// TODO Should wait for completion...
if (mRestartPostponed)
return;