API and cosmetic fixes

Author: borisf

ClassySharkWS/src/com/google/classyshark/silverghost/translator/apk/ApkTranslator.java

@@ -57,7 +57,7 @@ public void apply() {
 
         for (int i = 0; i < numDexes; i++) {
 
-            ELEMENT element = new ELEMENT("\nclasses" + ((i==0)? "" : i + "") + ".dex", TAG.MODIFIER);
+            ELEMENT element = new ELEMENT("\nclasses" + ((i == 0) ? "" : i + "") + ".dex", TAG.MODIFIER);
             elements.add(element);
 
             element = new ELEMENT(
@@ -96,7 +96,7 @@ public void apply() {
 
         for (int i = 0; i < numDexes; i++) {
 
-            element = new ELEMENT("\nclasses" + ((i==0)? "" : i + "") + ".dex", TAG.MODIFIER);
+            element = new ELEMENT("\nclasses" + ((i == 0) ? "" : i + "") + ".dex", TAG.MODIFIER);
             elements.add(element);
 
             element = new ELEMENT(
@@ -123,8 +123,12 @@ public List<String> getDependencies() {
     }
 
     public String toString() {
-        // TODO some sort of convertion for the command line
+        StringBuilder sb = new StringBuilder();
 
-        return elements.toString();
+        for (ELEMENT element : elements) {
+            sb.append(element.text);
+        }
+
+        return sb.toString();
     }
 }

ClassySharkWS/src/com/google/classyshark/silverghost/translator/apk/apkinspectionsbag/ApkInspectionsBag.java

@@ -95,7 +95,14 @@ public List<String> getNativeLibNamesSorted() {
     }
 
     public String getPrivateLibErrorTag(String nativeLib) {
-        return PrivateNativeLibsInspector.isPrivate(nativeLib, getNativeLibNamesSorted());
+        boolean isPrivate = PrivateNativeLibsInspector.isPrivate(nativeLib, getNativeLibNamesSorted());
+
+        if(isPrivate) {
+            return " -- private api!";
+        } else {
+            return "";
+        }
+
     }
 
     public static Set<String> getClassesWithNativeMethodsPerDexIndex(int dexIndex, File classesDex) {

ClassySharkWS/src/com/google/classyshark/silverghost/translator/apk/apkinspectionsbag/PrivateNativeLibsInspector.java

@@ -53,13 +53,12 @@ public class PrivateNativeLibsInspector {
 
     private static List<String> APIS_LIB_LIST = new LinkedList<>(Arrays.asList(apiLibs));
 
-    // TODO make it boolean
-    public static String isPrivate(String nativeLib, List<String> nativeLibNames) {
+    public static boolean isPrivate(String nativeLib, List<String> nativeLibNames) {
 
         if (!APIS_LIB_LIST.contains(nativeLib) && !nativeLibNames.contains(nativeLib)) {
-            return " -- private api!";
+            return true;
         }
 
-        return "";
+        return false;
     }
 }