From d48c49ed32a03ab81349c0dde4b967789e3986f3 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Thu, 11 Jul 2013 18:24:07 +0300
Subject: [PATCH] Add setting to change transfer directory in file operations

---
 .../socketfiletransfer/operations/FileOperation.java      | 3 ++-
 .../java/com/annimon/socketfiletransfer/util/Config.java  | 8 +++++++-
 SocketFileTransfer/src/main/res/values/strings.xml        | 1 +
 SocketFileTransfer/src/main/res/xml/settings_main.xml     | 5 +++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/operations/FileOperation.java b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/operations/FileOperation.java
index 553ba96..0a813b4 100644
--- a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/operations/FileOperation.java
+++ b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/operations/FileOperation.java
@@ -1,6 +1,7 @@
 package com.annimon.socketfiletransfer.operations;
 
 import com.annimon.socketfiletransfer.OperationListener;
+import com.annimon.socketfiletransfer.util.Config;
 import com.annimon.socketfiletransfer.util.Console;
 import com.annimon.socketfiletransfer.util.ExceptionHandler;
 
@@ -23,7 +24,7 @@ public class FileOperation extends Operation {
         try {
             String name = dis.readUTF();
             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];
             int count;
             while ((count = dis.read(buffer, 0, BUFFER_SIZE)) != -1) {
diff --git a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/util/Config.java b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/util/Config.java
index b394ce6..3610df1 100644
--- a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/util/Config.java
+++ b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/util/Config.java
@@ -8,7 +8,8 @@ public class Config {
 
     private static final String
             PORT = "port",
-            IP_ADDRESS = "address";
+            IP_ADDRESS = "address",
+            TRANSFER_DIR = "transfer_dir";
 
     public static int getPort() {
         return Configuration.getInstance().getProperty(PORT, 7119);
@@ -18,4 +19,9 @@ public class Config {
         String path = Configuration.getInstance().getProperty(IP_ADDRESS, "192.168.1.35");
         return path.trim();
     }
+
+    public static String getTransferDir() {
+        String path = Configuration.getInstance().getProperty(TRANSFER_DIR, "/mnt/sdcard/");
+        return path.trim();
+    }
 }
diff --git a/SocketFileTransfer/src/main/res/values/strings.xml b/SocketFileTransfer/src/main/res/values/strings.xml
index 0ca5f05..5194d80 100644
--- a/SocketFileTransfer/src/main/res/values/strings.xml
+++ b/SocketFileTransfer/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="send">Send</string>
     <string name="ip_address">IP address</string>
     <string name="port">Port</string>
+    <string name="transfer_dir">Transfer directory</string>
 
     <string-array name="main_menu">
         <item>Start server</item>
diff --git a/SocketFileTransfer/src/main/res/xml/settings_main.xml b/SocketFileTransfer/src/main/res/xml/settings_main.xml
index 205b2f5..eb4f7fd 100644
--- a/SocketFileTransfer/src/main/res/xml/settings_main.xml
+++ b/SocketFileTransfer/src/main/res/xml/settings_main.xml
@@ -12,4 +12,9 @@
             android:inputType="number"
             android:key="port"
             android:title="@string/port" />
+    <EditTextPreference
+            android:defaultValue="/mnt/sdcard/"
+            android:inputType="text"
+            android:key="transfer_dir"
+            android:title="@string/transfer_dir" />
 </PreferenceScreen>
\ No newline at end of file