From 36b6dc13b9ff87e9b66e06e4c298bcc64225048c Mon Sep 17 00:00:00 2001
From: Zsombor Gegesy <gzsombor@gmail.com>
Date: Wed, 4 May 2016 07:19:35 +0200
Subject: [PATCH 1/4] Trying to fix the build

---
 third-party/AmbilWarna/build.xml                 | 2 +-
 third-party/SuperToasts/build.xml                | 2 +-
 third-party/android-filechooser/code/build.xml   | 2 +-
 third-party/drag-sort-listview/library/build.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/third-party/AmbilWarna/build.xml b/third-party/AmbilWarna/build.xml
index 86c2b053fa1..60c702a29d9 100644
--- a/third-party/AmbilWarna/build.xml
+++ b/third-party/AmbilWarna/build.xml
@@ -4,7 +4,7 @@
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
          Version Control Systems. -->
-    <property file="local.properties" />
+    <property file="../../local.properties" />
 
     <!-- The ant.properties file can be created by you. It is only edited by the
          'android' tool to add properties to it.
diff --git a/third-party/SuperToasts/build.xml b/third-party/SuperToasts/build.xml
index ed55f46519f..5beab56fe76 100644
--- a/third-party/SuperToasts/build.xml
+++ b/third-party/SuperToasts/build.xml
@@ -4,7 +4,7 @@
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
          Version Control Systems. -->
-    <property file="local.properties" />
+    <property file="../../local.properties" />
 
     <!-- The ant.properties file can be created by you. It is only edited by the
          'android' tool to add properties to it.
diff --git a/third-party/android-filechooser/code/build.xml b/third-party/android-filechooser/code/build.xml
index 716fae9eec9..ce6fa47d4d1 100755
--- a/third-party/android-filechooser/code/build.xml
+++ b/third-party/android-filechooser/code/build.xml
@@ -4,7 +4,7 @@
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
          Version Control Systems. -->
-    <property file="local.properties" />
+    <property file="../../../local.properties" />
 
     <!-- The ant.properties file can be created by you. It is only edited by the
          'android' tool to add properties to it.
diff --git a/third-party/drag-sort-listview/library/build.xml b/third-party/drag-sort-listview/library/build.xml
index 5f6ada975fa..d1916489235 100644
--- a/third-party/drag-sort-listview/library/build.xml
+++ b/third-party/drag-sort-listview/library/build.xml
@@ -4,7 +4,7 @@
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
          Version Control Systems. -->
-    <property file="local.properties" />
+    <property file="../../../local.properties" />
 
     <!-- The ant.properties file can be created by you. It is only edited by the
          'android' tool to add properties to it.

From d104a19bd8ad7e5dcbb12d953cc3a4f178c605c4 Mon Sep 17 00:00:00 2001
From: Zsombor Gegesy <gzsombor@gmail.com>
Date: Wed, 4 May 2016 07:35:48 +0200
Subject: [PATCH 2/4] Set target to android-19 in all the submodules

---
 third-party/AmbilWarna/project.properties                 | 2 +-
 third-party/android-filechooser/code/project.properties   | 2 +-
 third-party/drag-sort-listview/library/project.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/third-party/AmbilWarna/project.properties b/third-party/AmbilWarna/project.properties
index ce256fda416..e21e21085c3 100644
--- a/third-party/AmbilWarna/project.properties
+++ b/third-party/AmbilWarna/project.properties
@@ -11,4 +11,4 @@ android.library=true
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-11
+target=android-19
diff --git a/third-party/android-filechooser/code/project.properties b/third-party/android-filechooser/code/project.properties
index d5255772356..8e4bc5fdcea 100755
--- a/third-party/android-filechooser/code/project.properties
+++ b/third-party/android-filechooser/code/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-19
 android.library=true
diff --git a/third-party/drag-sort-listview/library/project.properties b/third-party/drag-sort-listview/library/project.properties
index e80f2971a43..61afc8fe541 100644
--- a/third-party/drag-sort-listview/library/project.properties
+++ b/third-party/drag-sort-listview/library/project.properties
@@ -12,4 +12,4 @@
 
 android.library=true
 # Project target.
-target=android-5
+target=android-19

From 67b4100159512b3369ad571d822d225503f4cd29 Mon Sep 17 00:00:00 2001
From: Zsombor Gegesy <gzsombor@gmail.com>
Date: Wed, 4 May 2016 07:36:25 +0200
Subject: [PATCH 3/4] Fix the NaturalOrderComparator problems

---
 .../main/java/org/geometerplus/fbreader/library/FileTree.java   | 2 +-
 .../main/java/org/geometerplus/fbreader/sort/TitledEntity.java  | 2 +-
 .../pals/android/lib/ui/filechooser/utils/FileComparator.java   | 2 +-
 .../lib/ui/filechooser/utils}/NaturalOrderComparator.java       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename {fbreader/app/src/main/java/org/fbreader/util => third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils}/NaturalOrderComparator.java (98%)

diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java
index 11d56b1be78..c74fc8266fc 100644
--- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java
+++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java
@@ -21,7 +21,7 @@
 
 import java.util.*;
 
-import org.fbreader.util.NaturalOrderComparator;
+import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
 import org.fbreader.util.Pair;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java
index 2818531dd3b..f9b8b7cd460 100644
--- a/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java
+++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java
@@ -26,7 +26,7 @@
 import android.annotation.TargetApi;
 import android.os.Build;
 
-import org.fbreader.util.NaturalOrderComparator;
+import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
 
 public abstract class TitledEntity<T extends TitledEntity<T>> implements Comparable<T> {
 	private static final NaturalOrderComparator ourComparator = new NaturalOrderComparator();
diff --git a/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/FileComparator.java b/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/FileComparator.java
index 31990d27a70..45cf158daa7 100755
--- a/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/FileComparator.java
+++ b/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/FileComparator.java
@@ -13,7 +13,7 @@
 
 import java.util.Comparator;
 
-import org.fbreader.util.NaturalOrderComparator;
+import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
 
 /**
  * {@link IFile} comparator.<br>
diff --git a/fbreader/app/src/main/java/org/fbreader/util/NaturalOrderComparator.java b/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/NaturalOrderComparator.java
similarity index 98%
rename from fbreader/app/src/main/java/org/fbreader/util/NaturalOrderComparator.java
rename to third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/NaturalOrderComparator.java
index 904829209af..c0a16cb3e69 100644
--- a/fbreader/app/src/main/java/org/fbreader/util/NaturalOrderComparator.java
+++ b/third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/NaturalOrderComparator.java
@@ -1,4 +1,4 @@
-package org.fbreader.util;
+package group.pals.android.lib.ui.filechooser.utils;
 
 /*
  NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java.

From edf413d3234e94ecc22a252ca0811a179950c93b Mon Sep 17 00:00:00 2001
From: Zsombor Gegesy <gzsombor@gmail.com>
Date: Wed, 4 May 2016 08:18:49 +0200
Subject: [PATCH 4/4] Fix to include the same android-support library as the
 main module

---
 third-party/drag-sort-listview/library/build.xml      | 11 +++++++++++
 .../drag-sort-listview/library/project.properties     |  1 +
 2 files changed, 12 insertions(+)

diff --git a/third-party/drag-sort-listview/library/build.xml b/third-party/drag-sort-listview/library/build.xml
index d1916489235..16ea3daef3a 100644
--- a/third-party/drag-sort-listview/library/build.xml
+++ b/third-party/drag-sort-listview/library/build.xml
@@ -78,6 +78,17 @@
          in order to avoid having your file be overridden by tools such as "android update project"
     -->
     <!-- version-tag: 1 -->
+
+    <!-- because of this: https://code.google.com/p/android/issues/detail?id=33194, this target is needed to use jar.libs.dir -->
+    <target name="-pre-compile">
+        <echo>Custom pre-compile!</echo>
+        <path id="project.all.jars.path">
+            <fileset dir="${jar.libs.dir}">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
+    </target>
+
     <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>
diff --git a/third-party/drag-sort-listview/library/project.properties b/third-party/drag-sort-listview/library/project.properties
index 61afc8fe541..804a5ce56fe 100644
--- a/third-party/drag-sort-listview/library/project.properties
+++ b/third-party/drag-sort-listview/library/project.properties
@@ -13,3 +13,4 @@
 android.library=true
 # Project target.
 target=android-19
+jar.libs.dir=../../../libs
\ No newline at end of file