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

Merge branch 'gingerbread_home_threading_fixes' of git://github.com/chr15m/syncthing-android

Browse source
This commit is contained in:
Felix Ableitner 2014-06-09 00:46:50 +02:00
commit 665a081500
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
View file

@ -7,6 +7,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.IBinder; import android.os.IBinder;
import android.os.Looper;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.util.Log; import android.util.Log;
@ -136,7 +137,7 @@ public class SyncthingService extends Service {
process = Runtime.getRuntime().exec("sh"); process = Runtime.getRuntime().exec("sh");
dos = new DataOutputStream(process.getOutputStream()); dos = new DataOutputStream(process.getOutputStream());
// Set home directory to data folder for syncthing to use. // Set home directory to data folder for syncthing to use.
dos.writeBytes("HOME=" + getFilesDir() + "\n"); dos.writeBytes("HOME=" + getFilesDir() + " ");
// Call syncthing with -home (as it would otherwise use "~/.config/syncthing/". // Call syncthing with -home (as it would otherwise use "~/.config/syncthing/".
dos.writeBytes(getApplicationInfo().dataDir + "/" + BINARY_NAME + " " + dos.writeBytes(getApplicationInfo().dataDir + "/" + BINARY_NAME + " " +
"-home " + getFilesDir() + "\n"); "-home " + getFilesDir() + "\n");
@ -294,6 +295,7 @@ public class SyncthingService extends Service {
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
Looper.prepare();
if (isFirstStart(SyncthingService.this)) { if (isFirstStart(SyncthingService.this)) {
Log.i(TAG, "App started for the first time. " + Log.i(TAG, "App started for the first time. " +
"Copying default config, keys will be generated automatically"); "Copying default config, keys will be generated automatically");