Add setting to change transfer directory in file operations

This commit is contained in:
Victor 2013-07-11 18:24:07 +03:00
parent ab6c571793
commit d48c49ed32
4 changed files with 15 additions and 2 deletions

View File

@ -1,6 +1,7 @@
package com.annimon.socketfiletransfer.operations; package com.annimon.socketfiletransfer.operations;
import com.annimon.socketfiletransfer.OperationListener; import com.annimon.socketfiletransfer.OperationListener;
import com.annimon.socketfiletransfer.util.Config;
import com.annimon.socketfiletransfer.util.Console; import com.annimon.socketfiletransfer.util.Console;
import com.annimon.socketfiletransfer.util.ExceptionHandler; import com.annimon.socketfiletransfer.util.ExceptionHandler;
@ -23,7 +24,7 @@ public class FileOperation extends Operation {
try { try {
String name = dis.readUTF(); String name = dis.readUTF();
Console.println("Filename: " + name); Console.println("Filename: " + name);
fout = new FileOutputStream("/mnt/sdcard/" + name);//Config.getTransferDir() + name); fout = new FileOutputStream(Config.getTransferDir() + name);
byte[] buffer = new byte[BUFFER_SIZE]; byte[] buffer = new byte[BUFFER_SIZE];
int count; int count;
while ((count = dis.read(buffer, 0, BUFFER_SIZE)) != -1) { while ((count = dis.read(buffer, 0, BUFFER_SIZE)) != -1) {

View File

@ -8,7 +8,8 @@ public class Config {
private static final String private static final String
PORT = "port", PORT = "port",
IP_ADDRESS = "address"; IP_ADDRESS = "address",
TRANSFER_DIR = "transfer_dir";
public static int getPort() { public static int getPort() {
return Configuration.getInstance().getProperty(PORT, 7119); return Configuration.getInstance().getProperty(PORT, 7119);
@ -18,4 +19,9 @@ public class Config {
String path = Configuration.getInstance().getProperty(IP_ADDRESS, "192.168.1.35"); String path = Configuration.getInstance().getProperty(IP_ADDRESS, "192.168.1.35");
return path.trim(); return path.trim();
} }
public static String getTransferDir() {
String path = Configuration.getInstance().getProperty(TRANSFER_DIR, "/mnt/sdcard/");
return path.trim();
}
} }

View File

@ -12,6 +12,7 @@
<string name="send">Send</string> <string name="send">Send</string>
<string name="ip_address">IP address</string> <string name="ip_address">IP address</string>
<string name="port">Port</string> <string name="port">Port</string>
<string name="transfer_dir">Transfer directory</string>
<string-array name="main_menu"> <string-array name="main_menu">
<item>Start server</item> <item>Start server</item>

View File

@ -12,4 +12,9 @@
android:inputType="number" android:inputType="number"
android:key="port" android:key="port"
android:title="@string/port" /> android:title="@string/port" />
<EditTextPreference
android:defaultValue="/mnt/sdcard/"
android:inputType="text"
android:key="transfer_dir"
android:title="@string/transfer_dir" />
</PreferenceScreen> </PreferenceScreen>