From 04d6bbaa3b9383b845b97be1244fb2f4a51b27e3 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Wed, 13 Mar 2013 19:05:43 +0800
Subject: [PATCH] fix missing pdnsd.conf in 1.3.3, close #8

---
 AndroidManifest.xml                         | 4 ++--
 pom.xml                                     | 2 +-
 src/com/github/shadowsocks/Shadowsocks.java | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 778eea1a..64ea5396 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.github.shadowsocks"
           android:installLocation="auto"
-          android:versionCode="15"
-          android:versionName="1.3.3">
+          android:versionCode="16"
+          android:versionName="1.3.4">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/pom.xml b/pom.xml
index b359ea5f..dc5656f9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.shadowsocks</groupId>
     <artifactId>shadowsocks</artifactId>
-    <version>1.3.3</version>
+    <version>1.3.4</version>
     <packaging>apk</packaging>
     <name>Shadowsocks</name>
 
diff --git a/src/com/github/shadowsocks/Shadowsocks.java b/src/com/github/shadowsocks/Shadowsocks.java
index f9820e08..67d71d85 100755
--- a/src/com/github/shadowsocks/Shadowsocks.java
+++ b/src/com/github/shadowsocks/Shadowsocks.java
@@ -117,7 +117,11 @@ public class Shadowsocks extends PreferenceActivity implements
                 InputStream in = null;
                 OutputStream out = null;
                 try {
-                    in = assetManager.open(path + "/" + file);
+                    if (path.length() > 0) {
+                        in = assetManager.open(path + "/" + file);
+                    } else {
+                        in = assetManager.open(file);
+                    }
                     out = new FileOutputStream("/data/data/com.github.shadowsocks/"
                             + file);
                     copyFile(in, out);