From 07c6aa673984e012ca6c2442f6ae37d13103a7e0 Mon Sep 17 00:00:00 2001
From: Pepe Schwarz <peschwa@gmail.com>
Date: Tue, 9 Jul 2013 18:18:52 +0200
Subject: [PATCH] Fixed a few wrong method calls in GemRB.java.

---
 android/GemRB.java | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/android/GemRB.java b/android/GemRB.java
index 04f4f9a5db..beca9e8cde 100644
--- a/android/GemRB.java
+++ b/android/GemRB.java
@@ -49,9 +49,9 @@ protected void onCreate(Bundle savedInstanceState) {
     Log.d("GemRB Activity", "Checking GemRB.cfg content.");
 
     File finalConfFile = new File(gemrbHomeFolder.getAbsolutePath().concat(gemrbHomeFolder.separator).concat("GemRB.cfg"));
-    File userSuppliedConfig = new File(Environment.getExternalStoragePath().concat(gemrbHomeFolder.separator).concat("GemRB.cfg"));
+    File userSuppliedConfig = new File(Environment.getExternalStorageDirectory().concat(gemrbHomeFolder.separator).concat("GemRB.cfg"));
 
-    if(!finalConfFile.exists() && !userSuppliedConfig.exists()) {
+    if(!finalConfFile.exists()) {
       Log.d("GemRB Activity", "GemRB.cfg doesn't exist in the expected location, creating it from the packaged template.");
 
       // String[] keysToChange = { "GUIScriptsPath", "GemRBOverridePath", "GemRBUnhardcodedPath" };
@@ -76,20 +76,6 @@ protected void onCreate(Bundle savedInstanceState) {
       } catch (IOException e) {
         throw new RuntimeException(e);
       }
-    } else if (!finalConfFile.exists() && userSuppliedConfig.exists()) {
-        BufferedReader inConf = new BufferedReader(new FileReader(userSuppliedConfig));
-        File outConfFile = new File(gemrbHomeFolder.getAbsolutePath().concat(gemrbHomeFolder.separator).concat("GemRB.cfg"));
-        BufferedWriter outConf = new BufferedWriter(new FileWriter(outConfFile));
-
-        String line;
-
-        while((line = inConf.readLine()) != null) {
-          outConf.write(line.concat("\n"));
-          outConf.flush();
-        }
-        inConf.close();
-        outConf.flush();
-        outConf.close();
     }
 
     super.onCreate(savedInstanceState);