Added Copyright notice, began writing tests

Author: Mitch Talmadge

Emoji-Tools.iml

@@ -16,6 +16,17 @@
     <orderEntry type="library" name="Maven: org.python:jython-standalone:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="module-library" scope="TEST">
+      <library name="JUnit4">
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">

src/main/java/com/AptiTekk/AptiAPI/AptiAPI.java

@@ -6,6 +6,7 @@
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
@@ -15,16 +16,14 @@ public class AptiAPI {
     private static final String API_VERSION = "V1";
     private static final String TOKEN_GENERATOR = "TokenGenerator.php";
     private static final String ERROR_REPORTER = "ErrorReporter.php";
-
+    protected final ArrayList<AptiAPIListener> APIListeners = new ArrayList<>();
     private final int projectID;
 
-    private final ArrayList<AptiAPIListener> APIListeners = new ArrayList<>();
-
     public AptiAPI(int projectID) {
         this.projectID = projectID;
     }
 
-    public void sendErrorReport(String report) {
+    public boolean sendErrorReport(String report) {
 
         try {
 
@@ -33,20 +32,20 @@ public void sendErrorReport(String report) {
 
             if (tokenResponse == null) {
                 displayError("Could not generate token -- Null response!");
-                return;
+                return false;
             }
 
             System.out.println("Response: " + tokenResponse);
 
             String[] responseSplit = tokenResponse.split(":");
             if (responseSplit.length < 3) {
                 displayError("Token response length is < 3!");
-                return;
+                return false;
             }
 
             if (responseSplit[1].equals("FAILURE")) {
                 displayError("Could not submit report: " + responseSplit[2]);
-                return;
+                return false;
             }
 
             String token = responseSplit[2];
@@ -60,20 +59,20 @@ public void sendErrorReport(String report) {
                 displayError("Could not submit report: Null response");
             }
 
-            System.out.println("Response: " + errorReportResponse);
-
             responseSplit = tokenResponse.split(":");
             if (responseSplit.length < 2) {
                 displayError("Could not submit report: Token response length is < 2");
-                return;
+                return false;
             }
 
             if (responseSplit[1].equals("FAILURE")) {
                 displayError("Could not submit report: " + responseSplit[2]);
+                return false;
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
+        return true;
     }
 
     public void addAPIListener(AptiAPIListener listener) {
@@ -120,11 +119,6 @@ private String POSTData(String url, String data) {
             wr.flush();
             wr.close();
 
-            int responseCode = con.getResponseCode();
-            System.out.println("\nSending 'POST' request to URL : " + url);
-            System.out.println("Post parameters : " + data);
-            System.out.println("Response Code : " + responseCode);
-
             BufferedReader in = new BufferedReader(
                     new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8));
             String inputLine;
@@ -136,6 +130,9 @@ private String POSTData(String url, String data) {
             in.close();
 
             return response.toString();
+        } catch (UnknownHostException e) {
+            displayError("Could not connect to Error Reporter. Is your Internet working?");
+            System.exit(0);
         } catch (IOException e) {
             e.printStackTrace();
         }

src/main/java/com/AptiTekk/AptiAPI/AptiCrypto.java

@@ -46,6 +46,22 @@ public String bytesToHex(byte[] data) {
         }
     }
 
+    public byte[] hexToBytes(String str) {
+        if (str == null) {
+            return null;
+        } else if (str.length() < 2) {
+            return null;
+        } else {
+            int len = str.length() / 2;
+            byte[] buffer = new byte[len];
+            for (int i = 0; i < len; i++) {
+                buffer[i] = (byte) Integer.parseInt(
+                        str.substring(i * 2, i * 2 + 2), 16);
+            }
+            return buffer;
+        }
+    }
+
     public String encrypt(String plainData) throws Exception {
 
         // Make sure the plainData length should be multiple with 16
@@ -63,4 +79,12 @@ public String encrypt(String plainData) throws Exception {
         return bytesToHex(encrypted);
     }
 
+    public String decrypt(String encrData) throws Exception {
+        this.cipher.init(Cipher.DECRYPT_MODE, this.keySpec, this.ivSpec);
+        byte[] outText = this.cipher.doFinal(hexToBytes(encrData));
+
+        String decrData = new String(outText).trim();
+        return decrData;
+    }
+
 }

src/main/java/me/MitchT/EmojiTools/ConsoleManager.java

@@ -1,6 +1,24 @@
-package me.MitchT.EmojiTools;
+/*
+ * Emoji Tools helps users and developers of Android, iOS, and OS X extract, modify, and repackage Emoji fonts.
+ * Copyright (C) 2015 Mitch Talmadge
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contact Mitch Talmadge at mitcht@liveforcode.net
+ */
 
-import com.sun.istack.internal.NotNull;
+package me.MitchT.EmojiTools;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -20,6 +38,7 @@ public ConsoleManager() {
         this.originalErrStream = new PrintStream(System.err);
 
         this.outStream = new OutputStream() {
+
             @Override
             public void write(final int b) throws IOException {
                 for (ConsoleListener listener : consoleListeners) {
@@ -29,7 +48,6 @@ public void write(final int b) throws IOException {
             }
 
             @Override
-            @NotNull
             public void write(byte[] b, int off, int len) throws IOException {
                 for (ConsoleListener listener : consoleListeners) {
                     listener.write(new String(b, off, len));
@@ -38,7 +56,6 @@ public void write(byte[] b, int off, int len) throws IOException {
             }
 
             @Override
-            @NotNull
             public void write(byte[] b) throws IOException {
                 write(b, 0, b.length);
             }
@@ -54,7 +71,6 @@ public void write(final int b) throws IOException {
             }
 
             @Override
-            @NotNull
             public void write(byte[] b, int off, int len) throws IOException {
                 for (ConsoleListener listener : consoleListeners) {
                     listener.write(new String(b, off, len));
@@ -63,7 +79,6 @@ public void write(byte[] b, int off, int len) throws IOException {
             }
 
             @Override
-            @NotNull
             public void write(byte[] b) throws IOException {
                 write(b, 0, b.length);
             }

src/main/java/me/MitchT/EmojiTools/Conversion/ConversionManager.java

@@ -1,3 +1,23 @@
+/*
+ * Emoji Tools helps users and developers of Android, iOS, and OS X extract, modify, and repackage Emoji fonts.
+ * Copyright (C) 2015 Mitch Talmadge
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contact Mitch Talmadge at mitcht@liveforcode.net
+ */
+
 package me.MitchT.EmojiTools.Conversion;
 
 import me.MitchT.EmojiTools.GUI.ConversionDialog;

src/main/java/me/MitchT/EmojiTools/Conversion/ConversionThread.java

@@ -1,3 +1,23 @@
+/*
+ * Emoji Tools helps users and developers of Android, iOS, and OS X extract, modify, and repackage Emoji fonts.
+ * Copyright (C) 2015 Mitch Talmadge
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contact Mitch Talmadge at mitcht@liveforcode.net
+ */
+
 package me.MitchT.EmojiTools.Conversion;
 
 import me.MitchT.EmojiTools.Conversion.Converter.Converter;

src/main/java/me/MitchT/EmojiTools/Conversion/Converter/Converter.java

@@ -1,3 +1,23 @@
+/*
+ * Emoji Tools helps users and developers of Android, iOS, and OS X extract, modify, and repackage Emoji fonts.
+ * Copyright (C) 2015 Mitch Talmadge
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contact Mitch Talmadge at mitcht@liveforcode.net
+ */
+
 package me.MitchT.EmojiTools.Conversion.Converter;
 
 import com.jcraft.jzlib.Deflater;

src/main/java/me/MitchT/EmojiTools/Conversion/Converter/PNGChunk.java

@@ -1,3 +1,23 @@
+/*
+ * Emoji Tools helps users and developers of Android, iOS, and OS X extract, modify, and repackage Emoji fonts.
+ * Copyright (C) 2015 Mitch Talmadge
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contact Mitch Talmadge at mitcht@liveforcode.net
+ */
+
 package me.MitchT.EmojiTools.Conversion.Converter;
 
 import java.io.DataInputStream;

src/main/java/me/MitchT/EmojiTools/Conversion/Converter/PNGFilterHandler.java

@@ -1,3 +1,23 @@
+/*
+ * Emoji Tools helps users and developers of Android, iOS, and OS X extract, modify, and repackage Emoji fonts.
+ * Copyright (C) 2015 Mitch Talmadge
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contact Mitch Talmadge at mitcht@liveforcode.net
+ */
+
 package me.MitchT.EmojiTools.Conversion.Converter;
 
 public class PNGFilterHandler {

src/main/java/me/MitchT/EmojiTools/Conversion/Converter/PNGIHDRChunk.java

@@ -1,3 +1,23 @@
+/*
+ * Emoji Tools helps users and developers of Android, iOS, and OS X extract, modify, and repackage Emoji fonts.
+ * Copyright (C) 2015 Mitch Talmadge
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contact Mitch Talmadge at mitcht@liveforcode.net
+ */
+
 package me.MitchT.EmojiTools.Conversion.Converter;
 
 public class PNGIHDRChunk extends PNGChunk {