nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-01 16:51:16 +00:00
Code Releases Activity

Revert "Set home directory to sdcard instead of app data folder. Fixes #9."

Browse source 
This reverts commit e3219ef80d.

This change seems to cause problems on Android 2.3 devices, which exit with
error "No home directory found". I can't test this myself, and don't know
if it happens for everyone (ref #9).
This commit is contained in:
Felix Ableitner 2014-05-25 22:24:41 +02:00
parent 7ca64b8856
commit ebdbb6c5d1
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/nutomic/syncthingandroid/service/SyncthingService.java
View file

@ -6,7 +6,6 @@ import android.app.Service;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Environment;
import android.os.IBinder; import android.os.IBinder;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.util.Log; import android.util.Log;
@ -128,10 +127,9 @@ public class SyncthingService extends Service {
try { try {
Process p = Runtime.getRuntime().exec("sh"); Process p = Runtime.getRuntime().exec("sh");
dos = new DataOutputStream(p.getOutputStream()); dos = new DataOutputStream(p.getOutputStream());
// Set home directory to sdcard (so the "create repo" hint makes sense) // Set home directory to data folder for syncthing to use.
dos.writeBytes("HOME=" + dos.writeBytes("HOME=" + getApplicationInfo().dataDir + "\n");
Environment.getExternalStorageDirectory().toString() + "\n"); // Call syncthing with -home (as it would otherwise use "~/.config/syncthing/".
// Set syncthing config folder to app data folder.
dos.writeBytes(getApplicationInfo().dataDir + "/" + BINARY_NAME + " " + dos.writeBytes(getApplicationInfo().dataDir + "/" + BINARY_NAME + " " +
"-home " + getApplicationInfo().dataDir + "\n"); "-home " + getApplicationInfo().dataDir + "\n");
dos.writeBytes("exit\n"); dos.writeBytes("exit\n");
@ -140,7 +138,7 @@ public class SyncthingService extends Service {
ret = p.waitFor(); ret = p.waitFor();
// Write syncthing binary output to log. // Write syncthing binary output to log.
// NOTE: This is only done on shutdown, not in real time. // NOTE: This is only done on shutdown, not live.
isr = new InputStreamReader(p.getInputStream()); isr = new InputStreamReader(p.getInputStream());
BufferedReader stdout = new BufferedReader(isr); BufferedReader stdout = new BufferedReader(isr);
String line; String line;