Revert "fix qif export to SDCard" to fix codinguser#357.

It's easier starting with this fix.
rivaldi8 · Nov 9, 2015 · 6818e45 · 6818e45
1 parent 6e0e853
commit 6818e45
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java b/app/src/main/java/org/gnucash/android/export/ExportAsyncTask.java
@@ -472,19 +472,15 @@ private void shareFile(String path) {
      * @throws IOException if the file could not be copied
      */
     public void copyFile(File src, File dst) throws IOException {
-        //TODO: Make this asynchronous at some time, t in the future
-        if (mExportParams.getExportFormat() == ExportFormat.QIF) {
-            QifExporter.splitQIF(src, dst);
-        } else {
-            FileChannel inChannel = new FileInputStream(src).getChannel();
-            FileChannel outChannel = new FileOutputStream(dst).getChannel();
-            try {
-                inChannel.transferTo(0, inChannel.size(), outChannel);
-            } finally {
-                if (inChannel != null)
-                    inChannel.close();
-                outChannel.close();
-            }
+        //TODO: Make this asynchronous at some time, t in the future.
+        FileChannel inChannel = new FileInputStream(src).getChannel();
+        FileChannel outChannel = new FileOutputStream(dst).getChannel();
+        try {
+            inChannel.transferTo(0, inChannel.size(), outChannel);
+        } finally {
+            if (inChannel != null)
+                inChannel.close();
+            outChannel.close();
         }
     }
 

diff --git a/app/src/main/java/org/gnucash/android/export/qif/QifExporter.java b/app/src/main/java/org/gnucash/android/export/qif/QifExporter.java
@@ -228,15 +228,11 @@ public void generateExport(Writer writer) throws ExporterException {
      * @throws IOException if something went wrong while splitting the file.
      */
     public static List<String> splitQIF(File file) throws IOException {
-        return splitQIF(file, file);
-    }
-
-    public static List<String> splitQIF(File src, File dst) throws IOException {
         // split only at the last dot
-        String[] pathParts = dst.getPath().split("(?=\\.[^\\.]+$)");
+        String[] pathParts = file.getPath().split("(?=\\.[^\\.]+$)");
         ArrayList<String> splitFiles = new ArrayList<>();
         String line;
-        BufferedReader in = new BufferedReader(new FileReader(src));
+        BufferedReader in = new BufferedReader(new FileReader(file));
         BufferedWriter out = null;
         try {
             while ((line = in.readLine()) != null) {
@@ -250,7 +246,7 @@ public static List<String> splitQIF(File src, File dst) throws IOException {
                     out = new BufferedWriter(new FileWriter(newFileName));
                 } else {
                     if (out == null) {
-                        throw new IllegalArgumentException(src.getPath() + " format is not correct");
+                        throw new IllegalArgumentException(file.getPath() + " format is not correct");
                     }
                     out.append(line).append('\n');
                 }