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

Merge branch 'master' of github.com:syncthing/syncthing-android

This commit is contained in:
Lode Hoste 2015-05-05 20:02:36 +02:00
commit a447807ff6
3 changed files with 4 additions and 1 deletions

View file

@ -120,6 +120,7 @@ public class WebGuiActivity extends SyncthingActivity
mWebView = (WebView) findViewById(R.id.webview);
mWebView.getSettings().setJavaScriptEnabled(true);
mWebView.setWebViewClient(mWebViewClient);
mWebView.clearCache(true);
}
@Override

View file

@ -69,6 +69,8 @@ public class GetTask extends AsyncTask<String, Void, String> {
get.addHeader(new BasicHeader(RestApi.HEADER_API_KEY, params[2]));
try {
Log.w(TAG, "Calling Rest API at " + fullUri);
HttpResponse response = httpclient.execute(get);
HttpEntity entity = response.getEntity();

View file

@ -52,7 +52,7 @@ public class SyncthingService extends Service {
/**
* Interval in ms at which the GUI is updated (eg {@link com.nutomic.syncthingandroid.fragments.DrawerFragment}).
*/
public static final int GUI_UPDATE_INTERVAL = 1000;
public static final int GUI_UPDATE_INTERVAL = 10000;
/**
* name of the public key file in the data directory.