From de72f608c1b360600322eed9eeb7aefe880d0fca Mon Sep 17 00:00:00 2001
From: Alexander Kovtunenko <akovtunenko@slice.com>
Date: Tue, 11 Dec 2018 08:05:25 +0200
Subject: [PATCH] enable Emoticons

---
 core/src/main/java/org/jivesoftware/Spark.java | 16 +++++++++-------
 emoticons/pom.xml                              |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/jivesoftware/Spark.java b/core/src/main/java/org/jivesoftware/Spark.java
index 4ed9d8a1b..93f12e09e 100644
--- a/core/src/main/java/org/jivesoftware/Spark.java
+++ b/core/src/main/java/org/jivesoftware/Spark.java
@@ -139,7 +139,7 @@ public final class Spark {
             BIN_DIRECTORY = initializeDirectory(workingDir, "bin");
             File emoticons = new File( XTRA_DIRECTORY, "emoticons").getAbsoluteFile();
             if(!emoticons.exists()){
-
+                copyEmoticonFiles(workingDirectory);
             	//Copy emoticon files from install directory to the spark user home directory
             }
             SECURITY_DIRECTORY = initializeDirectory(workingDir, "security");
@@ -419,16 +419,18 @@ public final class Spark {
             }
         }
     }
-   /* public void copyEmoticonFiles() {
+   public void copyEmoticonFiles(String workdir) {
         // Current Plugin directory
-        File newEmoticonDir = new File(Spark.getLogDirectory().getParentFile(), "xtra/emoticons").getAbsoluteFile();
+        File newEmoticonDir = new File(Spark.getLogDirectory().getParentFile(), "xtra" + File.separator + "emoticons").getAbsoluteFile();
         newEmoticonDir.mkdirs();
+
+        File EMOTICON_DIRECTORY = new File(workdir + File.separator + "xtra" +  File.separator+"emoticons");
         //TODO emoticondirectory anpassen
-        File EMOTICON_DIRECTORY = new File("D:/workspace/Spark 2.6 beta/src","xtra/emoticons");
-        File[] files = EMOTICON_DIRECTORY.listFiles();
+        //File EMOTICON_DIRECTORY = new File("D:/workspace/Spark 2.6 beta/src","xtra/emoticons");
+        //File[] files = EMOTICON_DIRECTORY.listFiles();
 
 
-        for (File file : files) {
+        for (File file : EMOTICON_DIRECTORY.listFiles()) {
             if (file.isFile()) {
 
                // Copy over
@@ -436,5 +438,5 @@ public final class Spark {
 
             }
         }
-    }*/
+    }
 }
diff --git a/emoticons/pom.xml b/emoticons/pom.xml
index c62812572..77c475f94 100644
--- a/emoticons/pom.xml
+++ b/emoticons/pom.xml
@@ -55,5 +55,6 @@
                 </executions>
             </plugin>
         </plugins>
+      <directory>../distribution/target/distribution-base/xtra/emoticons</directory>
     </build>
 </project>